Initial import.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3 6f19259b-4bc3-4df7-8a09-765794883524
author: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524> 2006-04-21 22:54:32 +0000
committer: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524> 2006-04-21 22:54:32 +0000
commit: 878ddf1fc3540a715f63594ed22b6929e881afb4 (patch)
tree: c56c44dac138137b510e1fba7c3efe5e4d84bea2 /Tools
download: edk2-platforms-878ddf1fc3540a715f63594ed22b6929e881afb4.tar.xz
636 files changed, 198944 insertions, 0 deletions
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
new file mode 100644
index 0000000000..782b2714d3
--- /dev/null
+++ b/Tools/Conf/BuildMacro.xml
@@ -0,0 +1,1115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="common">
+  <!--
+    macro definitions for building files with different types
+    -->
+  <!--
+    C Code
+    -->
+  <macrodef name="Build_C_Code">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="c"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        <then>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">
+            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            <input file="${DEST_DIR_DEBUG}\AutoGen.h"/>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+          </makedeps>
+        </then>
+      </if>
+
+      <OnDependency>
+        <sourcefiles>
+          <file ListFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>
+        </sourcefiles>
+        <targetfiles>
+          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        </targetfiles>
+
+        <sequential>
+          <cc userdefine="on">
+            <command type="CC" workdir="${DEST_DIR_OUTPUT}">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+
+              <argument value="${CC_FLAGS}"/>
+              <EXTRA.ARG/>
+              <!-- <argument value="/FI${DEST_DIR_DEBUG}\AutoGen.h" /> -->
+              <includeFile value="${DEST_DIR_DEBUG}\AutoGen.h"/>
+              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->
+              <outputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+
+              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+
+      <!--
+        for library generation later
+        -->
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> 
+    </sequential>
+  </macrodef>
+
+
+  <macrodef name="Build_AUTOGEN">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="c"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        <then>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">
+            <input file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            <input file="${DEST_DIR_DEBUG}\AutoGen.h"/>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+          </makedeps>
+        </then>
+      </if>
+
+      <OnDependency>
+        <sourcefiles>
+          <file ListFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>
+        </sourcefiles>
+        <targetfiles>
+          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        </targetfiles>
+
+        <sequential>
+          <cc userdefine="on">
+            <command type="CC" workdir="${DEST_DIR_OUTPUT}">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+    
+              <argument value="${CC_FLAGS}"/>
+              <EXTRA.ARG/>
+              <!-- <argument value="/FI${DEST_DIR_DEBUG}\AutoGen.h" />  -->
+              <includeFile value="${DEST_DIR_DEBUG}\AutoGen.h"/>
+              <!-- <argument value="/Fo${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->
+              <outputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+    
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+      <!--
+        for library generation later
+        -->
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> 
+    </sequential>
+  </macrodef>
+
+  <macrodef name="Build_Dependency_File">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="dxs"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\${BASE_NAME}.@{FILEEXT}.depex"/>
+        </targetfiles>
+
+        <sequential>
+          <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                tofile="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>
+
+          <cc userdefine="on">
+            <command type="CC" workdir=".">
+              <includepath path="${DEST_DIR_DEBUG}" /> 
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+              <argument value="${PP_FLAGS}"/>
+              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>
+              <outputFile value="@{FILENAME}.@{FILEEXT}.i"/>
+            </command>
+          </cc>
+    
+          <gendepex inputFile="@{FILENAME}.@{FILEEXT}.i" outputFile="${DEST_DIR_OUTPUT}\${BASE_NAME}.@{FILEEXT}.depex"/>
+          <delete file="@{FILENAME}.@{FILEEXT}.i" />
+          <delete file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c" /> 
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+  
+<!-- Usage Example
+   <Build_C_Code
+     FILEPATH="."
+     FILENAME="${SOURCE_NAME}"
+     FILEEXT="c">
+     <EXTRA.INC>
+       <includepath path="${PACKAGE_DIR}\Include"/>
+       <includepath path="${PACKAGE_DIR}\Include\${ARCH}"/>
+     </EXTRA.INC>
+
+     <EXTRA.ARG>
+       <argument value="/D EFI_DEBUG /D EFI_WHATEVER_FLAG"/>
+     </EXTRA.ARG>
+   </Build_C_Code>
+  -->
+
+  <!--
+    IA32/x64 Assembly
+    -->
+  <macrodef name="Build_Assembly">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="asm"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file Name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file Name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        </targetfiles>
+
+        <sequential>
+          <cc userdefine="on">
+            <command type="ASM">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+      
+              <argument value="${ASM_FLAGS}"/>
+              <EXTRA.ARG/>
+              <argument value="/Fl${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.lst"/>
+              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+      
+              <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+      <!--
+        for library generation later
+        -->
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Library    private HashMap map = new HashMap();
+    -->
+  <macrodef name="Build_Library">
+    <attribute name="FILENAME" />
+    <attribute name="FILEEXT" default="obj"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${BIN_DIR}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file list="${OBJECTS}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${BIN_DIR}\@{FILENAME}.lib"/>
+        </targetfiles>
+
+        <sequential>
+          <!--  <echo>re-generate library</echo> -->
+          <cc userdefine="on">
+            <command type="LIB">
+              <argument value="${LIB_FLAGS}"/>
+              <!--<argument value="${OBJECTS}"/>-->
+              <FileList dir="" files="${OBJECTS}"/>
+              <!-- <argument value="/out:${BIN_DIR}\@{FILENAME}.lib"/> -->
+              <OutputFile value="${BIN_DIR}\@{FILENAME}.lib"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    IPF Assembly
+    -->
+  <macrodef name="Build_IPF_Assembly_Code">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="s"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        <then>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">
+            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+          </makedeps>
+        </then>
+      </if>
+
+      <OnDependency>
+        <sourcefiles>
+          <file listfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        </targetfiles>
+
+        <sequential>
+          <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                tofile="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>
+          <cc userdefine="on">
+            <command type="CC" workdir="."> 
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+              <argument value="${PP_FLAGS}"/>
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.c"/>
+            </command>
+          </cc>
+          <move file="@{FILENAME}.@{FILEEXT}.i" 
+                tofile="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pro"/>
+      
+          <cc userdefine="on">
+            <command type="ASM" includepathDelimiter="-I">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <EXTRA.INC/>
+      
+              <argument value="${ASM_FLAGS}"/>
+              <EXTRA.ARG/>
+              <!-- <argument value="-o ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->
+              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+      
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pro"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+      <!--
+        for library generation later
+        -->
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+    </sequential>
+  </macrodef>
+
+
+  <macrodef name="Build_IPF_PP_Code">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="i"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+  
+      <cc userdefine="on">
+        <command type="ASM" includepathDelimiter="-I">
+          <includepath path="${WORKSPACE_DIR}"/>
+          <includepath path="${MODULE_DIR}"/>
+          <includepath path="${MODULE_DIR}\${ARCH}"/>
+          <EXTRA.INC/>
+  
+          <argument value="${ASM_FLAGS}"/>
+          <EXTRA.ARG/>
+          <!-- <argument value="-o ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/> -->
+          <OutputFile File="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+  
+          <fileset casesensitive="off" file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </command>
+      </cc>
+  
+      <!--
+        for library generation later
+        -->
+      <bl NAME="OBJECTS" VALUE="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+    </sequential>
+  </macrodef>
+  
+  <!--
+    [Build.Ia32.Makefile,Build.Ipf.Makefile,Build.Ebc.Makefile]
+    [Build.Ia32.Custom_Makefile,Build.Ipf.Custom_Makefile,Build.Ebc.Custom_Makefile]
+    -->
+  <macrodef name="Build_Custom_Build">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="c"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+
+    </sequential>
+  </macrodef>
+
+  <!--
+    Unicode -> .sdb
+    -->
+  <macrodef name="Build_Unicode">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="uni"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_OUTPUT}\@{FILEPATH}"/>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+        </targetfiles>
+
+        <sequential>
+          <strgather commandtype="parse" newdatabase="true">
+            <database name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+            <EXTRA.ARG/>
+            <inputfile name="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+          </strgather>
+        </sequential>
+      </OnDependency>
+
+      <bl name="SDB_FILES" value="${SDB_FILES}, ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    .sdb(s) -> .c, .h -> .obj
+    -->
+  <macrodef name="Build_Unicode_Database">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="sdb"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <OnDependency>
+        <sourcefiles>
+          <file list="${SDB_FILES}"/>
+          <file list="${SOURCE_FILES}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+        </targetfiles>
+        
+        <sequential>
+          <strgather commandtype="scan" outputdatabase="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb" verbose="read">
+            <skipext name=".uni"/>
+            <skipext name=".h"/>
+            <database list="${SDB_FILES}"/>
+            <inputfile name="${SOURCE_FILES}"/>
+          </strgather>
+        </sequential>
+      </OnDependency>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}StrDefs.h"/>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.hpk"/>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>
+        </targetfiles>
+        
+        <sequential>
+          <strgather basename="@{FILENAME}Strings" commandtype="dump"
+                     outputdefines="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}StrDefs.h"
+                     outputhpk="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.hpk"
+                     outputstring="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c">
+            <database name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.sdb"/>
+          </strgather>
+        </sequential>
+      </OnDependency>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>
+        </targetfiles>
+        
+        <sequential>
+          <cc userdefine="on">
+            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+
+              <argument value="${CC_FLAGS}"/>
+              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>
+
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}Strings.c"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+
+      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Strings.obj"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Vfr
+    -->
+  <macrodef name="Build_Vfr">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="vfr"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${DEST_DIR_DEBUG}/@{FILEPATH}"/>
+
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        <then>
+          <makedeps DepsFile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep">
+            <input file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+            <!-- <input file="${DEST_DIR_DEBUG}\AutoGen.h"/> -->
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+          </makedeps>
+        </then>
+      </if>
+
+      <OnDependency>
+        <sourcefiles>
+          <file listfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}.dep"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+        </targetfiles>
+
+        <sequential>
+          <vfrcompile createIfrBinFile="on" createListFile="on" outPutDir="${DEST_DIR_DEBUG}\@{FILEPATH}" vfrFile="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}">
+            <includepath path="${WORKSPACE_DIR}"/>
+            <includepath path="${MODULE_DIR}"/>
+            <includepath path="${MODULE_DIR}\${ARCH}"/>
+            <EXTRA.INC/>
+          </vfrcompile>
+    
+          <cc userdefine="on">
+            <command type="CC" workdir="${DEST_DIR_OUTPUT}" includepathDelimiter="-I">
+              <includepath path="${WORKSPACE_DIR}"/>
+              <includepath path="${MODULE_DIR}"/>
+              <includepath path="${MODULE_DIR}\${ARCH}"/>
+              <argument value="${CC_FLAGS}"/>
+              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+              <EXTRA.ARG/>
+    
+              <fileset casesensitive="off" file="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.c"/>
+            </command>
+          </cc>
+    
+          <delete file="@{FILENAME}.i"/>
+        </sequential>
+      </OnDependency>
+      <bl name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.obj"/>
+    </sequential>
+  </macrodef>
+
+<!--############################################################################
+  Build Sections
+#############################################################################-->
+  <!--
+    DLL
+    -->
+  <macrodef name="GenDll">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT"/>
+
+    <element name="LIB.ARG" optional="yes"/>
+    <element name="LINK.ARG" optional="yes"/>
+
+    <sequential>
+      <OnDependency>
+        <sourcefiles>
+          <file list="${OBJECTS}"/>
+          <file list="${LIBS}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/>
+        </targetfiles>
+
+        <sequential>
+          <!-- <echo>re-generate dll</echo> -->
+          <cc userdefine="on">
+            <command type="LIB">
+              <argument value="${LIB_FLAGS}"/>
+              <FileList dir="" files="${OBJECTS}"/>
+              <LIB.ARG/>
+              <!-- <argument value="/OUT:${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/> -->
+              <OutputFile value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/>
+            </command>
+          </cc>
+    
+          <cc userdefine="on">
+            <command type="LINK">
+              <argument value="${LINK_FLAGS}"/>
+              <!-- <argument value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/> -->
+              <!--<argument value="${LIBS}"/>-->
+              <libSet libs="${LIBS} ${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}Local.lib"/>
+              <LINK.ARG/>
+              <!-- <argument value="/ENTRY:_ModuleEntryPoint"/> -->
+              <EntryPoint value="_ModuleEntryPoint"/>
+              <!-- <argument value="/MAP:${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.map"/> -->
+              <map value="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.map"/>
+              <!-- <argument value="/PDB:${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pdb"/> -->
+              <pdb value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.pdb"/>
+              <!-- <argument value="/OUT:${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/> -->
+              <OutputFile value="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.dll"/>
+            </command>
+          </cc>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI
+    -->
+  <macrodef name="GenEfi">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="dll"/>
+
+    <sequential>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.efi"/>
+        </targetfiles>
+
+        <sequential>
+          <fwimage componenttype="${COMPONENT_TYPE}" outImage="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" 
+                   peImage="${DEST_DIR_DEBUG}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" time="0"/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+<!--
+  EFI_SECTION_FREEFORM_SUBTYPE_GUID
+  EFI_SECTION_VERSION
+  EFI_SECTION_USER_INTERFACE
+  EFI_SECTION_DXE_DEPEX
+  EFI_SECTION_PEI_DEPEX
+  EFI_SECTION_PE32
+  EFI_SECTION_PIC
+  EFI_SECTION_TE
+  EFI_SECTION_RAW
+  EFI_SECTION_COMPRESSION
+  EFI_SECTION_GUID_DEFINED
+  EFI_SECTION_COMPATIBILITY16
+  EFI_SECTION_FIRMWARE_VOLUME_IMAGE
+  -->
+  <!--
+    EFI_SECTION_PE32
+    -->
+  <macrodef name="EFI_SECTION_PE32">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="" />
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <PRE.PROCESS/>
+
+      <if>
+        <not>
+          <equals arg1="${OBJECTS}" arg2=""/>
+        </not>
+
+        <then>
+          <GenDll FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="">
+            <LIB.ARG></LIB.ARG>
+            <LINK.ARG></LINK.ARG>
+          </GenDll>
+    
+          <GenEfi FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="dll"/>
+        </then>
+      </if>
+
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.efi"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.pe32"/>
+        </targetfiles>
+
+        <sequential>
+          <copy file="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" tofile="${BIN_DIR}\@{FILENAME}.efi" />
+          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.efi" 
+                      outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.pe32" 
+                      sectiontype="EFI_SECTION_PE32"/>
+    
+          <POST.PROCESS/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_VERSION
+    -->
+  <macrodef name="EFI_SECTION_VERSION">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="" />
+    <attribute name="VERSION" default="0000"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <if>
+        <not>
+          <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ver"/>
+        </not>
+
+        <then>
+          <PRE.PROCESS/>
+          <gensection outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ver" 
+                      versionnum="@{VERSION}"
+                      sectiontype="EFI_SECTION_VERSION"/>
+          <POST.PROCESS/>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_USER_INTERFACE
+    -->
+  <macrodef name="EFI_SECTION_USER_INTERFACE">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="" />
+    <attribute name="UI" default="${BASE_NAME}"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <if>
+        <not>
+          <available type="file" file="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ui"/>
+        </not>
+
+        <then>
+          <PRE.PROCESS/>
+          <gensection interfacestring="@{UI}"
+                      outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.ui" 
+                      sectiontype="EFI_SECTION_USER_INTERFACE"/>
+          <POST.PROCESS/>
+        </then>
+      </if>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_FREEFORM_SUBTYPE_GUID
+    <macrodef name="EFI_SECTION_FREEFORM_SUBTYPE_GUID">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="" 
+                    outputfile="" 
+                    sectiontype="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>
+      </sequential>
+    </macrodef>
+    -->
+
+  <!--
+    EFI_SECTION_DXE_DEPEX
+    -->
+  <macrodef name="EFI_SECTION_DXE_DEPEX">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="dxs"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <PRE.PROCESS/>
+
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>
+        <then>
+          <OnDependency>
+            <sourcefiles>
+              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>
+            </sourcefiles>
+            <targetfiles>
+              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </targetfiles>
+            <sequential>
+              <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex" 
+                          outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx" 
+                          sectiontype="EFI_SECTION_DXE_DEPEX"/>
+            </sequential>
+          </OnDependency>
+        </then>
+        <else>
+          <if>
+            <not>
+              <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </not>
+            <then>
+              <touch file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </then>
+          </if>
+        </else>
+      </if>
+
+      <POST.PROCESS/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_PEI_DEPEX
+    -->
+  <macrodef name="EFI_SECTION_PEI_DEPEX">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="dxs"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+    <sequential>
+      <PRE.PROCESS/>
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>
+        <then>
+          <OnDependency>
+            <sourcefiles>
+              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex"/>
+            </sourcefiles>
+            <targetfiles>
+              <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </targetfiles>
+
+            <sequential>
+              <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}.depex" 
+                          outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx" 
+                          sectiontype="EFI_SECTION_PEI_DEPEX"/>
+            </sequential>
+          </OnDependency>
+          
+        </then>
+        <else>
+          <if>
+            <not>
+              <available type="file" file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </not>
+            <then>
+              <touch file="${DEST_DIR_OUTPUT}\@{FILENAME}.dpx"/>
+            </then>
+          </if>
+        </else>
+      </if>
+      <POST.PROCESS/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_PIC
+    <macrodef name="EFI_SECTION_PIC">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="${BIN_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 
+                    sectiontype="EFI_SECTION_PIC"/>
+      </sequential>
+    </macrodef>
+    -->
+
+  <!--
+    EFI_SECTION_TE
+    <macrodef name="EFI_SECTION_TE">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 
+                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 
+                    sectiontype="EFI_SECTION_PE32"/>
+      </sequential>
+    </macrodef>
+    -->
+
+  <!--
+    EFI_SECTION_RAW
+    -->
+  <macrodef name="EFI_SECTION_RAW">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bin"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILENAME}.sec"/>
+        </targetfiles>
+
+        <sequential>
+          <PRE.PROCESS/>
+          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.@{FILEEXT}" 
+                      outputfile="${DEST_DIR_OUTPUT}\@{FILENAME}.sec" 
+                      sectiontype="EFI_SECTION_RAW"/>
+          <POST.PROCESS/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    EFI_SECTION_COMPRESSION
+    <macrodef name="EFI_SECTION_COMPRESSION">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 
+                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 
+                    sectiontype="EFI_SECTION_PE32"/>
+      </sequential>
+    </macrodef>
+    -->
+
+  <!--
+    EFI_SECTION_GUID_DEFINED
+    <macrodef name="EFI_SECTION_GUID_DEFINED">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 
+                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 
+                    sectiontype="EFI_SECTION_PE32"/>
+      </sequential>
+    </macrodef>
+    -->
+
+  <!--
+    EFI_SECTION_COMPATIBILITY16
+    <macrodef name="EFI_SECTION_COMPATIBILITY16">
+      <attribute name="FILEPATH"/>
+      <attribute name="FILENAME"/>
+      <attribute name="FILEEXT" default=""/>
+  
+      <element name="EXTRA.INC" optional="yes"/>
+      <element name="EXTRA.ARG" optional="yes"/>
+  
+      <sequential>
+        <gensection inputfile="${BIN_DIR}\@{FILENAME}.@{FILEEXT}" 
+                    outputfile="${BIN_DIR}\@{FILENAME}.pe32" 
+                    sectiontype="EFI_SECTION_PE32"/>
+      </sequential>
+    </macrodef>
+  
+    -->
+  <!--
+    EFI_SECTION_FIRMWARE_VOLUME_IMAGE
+    -->
+  <macrodef name="EFI_SECTION_FIRMWARE_VOLUME_IMAGE">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="fv"/>
+
+    <element name="PRE.PROCESS" optional="yes"/>
+    <element name="POST.PROCESS" optional="yes"/>
+
+    <sequential>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${FV_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}fv.sec"/>
+        </targetfiles>
+
+        <sequential>
+          <PRE.PROCESS/>
+    
+          <copy file="${FV_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                overwrite="true"/>
+          <gensection inputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+                      outputfile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}fv.sec" 
+                      sectiontype="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>
+    
+          <POST.PROCESS/>
+        </sequential>
+      </OnDependency>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Binary
+    -->
+  <macrodef name="Build_Binary">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bin"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+            tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.bin"/>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Graphics (bmp, ...)
+    -->
+  <macrodef name="Build_Graphics">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="bmp"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${MODULE_DIR}\@{FILEPATH}" /> 
+      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+            tofile="${DEST_DIR_OUTPUT}\@{FILEPATH}\@{FILENAME}.bin"/>
+    </sequential>
+  </macrodef>
+  <macrodef name="Build_EFI">
+    <attribute name="FILEPATH"/>
+    <attribute name="FILENAME"/>
+    <attribute name="FILEEXT" default="efi"/>
+
+    <element name="EXTRA.INC" optional="yes"/>
+    <element name="EXTRA.ARG" optional="yes"/>
+
+    <sequential>
+      <mkdir dir="${MODULE_DIR}\@{FILEPATH}" /> 
+      <copy file="${MODULE_DIR}\@{FILEPATH}\@{FILENAME}.@{FILEEXT}" 
+        tofile="${DEST_DIR_OUTPUT}\${BASE_NAME}.efi"/>
+    </sequential>
+  </macrodef>
+</project>
diff --git a/Tools/Conf/Common.xml b/Tools/Conf/Common.xml
new file mode 100644
index 0000000000..9bf62ca756
--- /dev/null
+++ b/Tools/Conf/Common.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<root>
+  <Ffs type="APPLICATION">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections EncapsulationType="Compress">
+      <Sections EncapsulationType="Guid-Defined">
+        <Section SectionType="EFI_SECTION_PE32" /> 
+        <Section SectionType="EFI_SECTION_USER_INTERFACE" />
+        <Section SectionType="EFI_SECTION_VERSION" /> 
+      </Sections>
+    </Sections>
+  </Ffs>
+
+  <Ffs type="BINARY">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections  EncapsulationType="Compress">
+      <Sections EncapsulationType="Guid-Defined">
+        <Section SectionType="EFI_SECTION_RAW" /> 
+      </Sections>
+    </Sections>
+  </Ffs>
+  
+  <Ffs type="FILE">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections>
+      <Section SectionType="EFI_SECTION_RAW"/> 
+    </Sections>
+  </Ffs>
+  
+  <Ffs type="PE32_PEIM.CompressPEIM">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" /> 
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
+
+    <Sections>
+      <Section SectionType="EFI_SECTION_PEI_DEPEX" />
+      <Sections EncapsulationType="Compress">
+        <Section SectionType="EFI_SECTION_PE32" /> 
+        <Section SectionType="EFI_SECTION_USER_INTERFACE" />
+        <Section SectionType="EFI_SECTION_VERSION" /> 
+      </Sections>
+    </Sections>
+  </Ffs>
+
+  <Ffs type="PEI_CORE">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEI_CORE" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections>
+      <Section SectionType="EFI_SECTION_PE32"/>
+      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+      <Section SectionType="EFI_SECTION_VERSION"/>
+    </Sections>
+  </Ffs>
+
+  <Ffs type="PE32_PEIM.Relocatable">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections>
+      <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
+      <Section SectionType="EFI_SECTION_PE32"/> 
+    </Sections>
+  </Ffs>
+
+  <Ffs type="DXE_CORE">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DXE_CORE" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections EncapsulationType="Compress">
+      <Section SectionType="EFI_SECTION_PE32" /> 
+      <Section SectionType="EFI_SECTION_USER_INTERFACE" />
+      <Section SectionType="EFI_SECTION_VERSION" /> 
+    </Sections>
+  </Ffs>
+
+
+  <Ffs type="BS_DRIVER, RT_DRIVER, SAL_RT_DRIVER">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_DRIVER" /> 
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /> 
+
+    <Sections EncapsulationType="Compress">
+      <Sections EncapsulationType="Guid-Defined">
+        <Section SectionType="EFI_SECTION_PEI_DEPEX" />
+        <Section SectionType="EFI_SECTION_PE32" />
+        <Section SectionType="EFI_SECTION_USER_INTERFACE" />
+        <Section SectionType="EFI_SECTION_VERSION" />
+      </Sections>
+    </Sections>
+  </Ffs>
+
+  <Ffs type="COMBINED_PEIM_DRIVER">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections>
+      <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
+      <Section SectionType="EFI_SECTION_PE32"/> 
+      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+      <Section SectionType="EFI_SECTION_VERSION"/> 
+    </Sections>
+  </Ffs>
+
+  <Ffs type="PE32_PEIM">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_PEIM" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections>
+      <Section SectionType="EFI_SECTION_PEI_DEPEX"/> 
+      <Section SectionType="EFI_SECTION_PE32"/> 
+      <Section SectionType="EFI_SECTION_USER_INTERFACE"/>
+      <Section SectionType="EFI_SECTION_VERSION"/> 
+    </Sections>
+  </Ffs>
+
+  <Ffs type="Logo, Logo.Logo">
+    <Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_FREEFORM" />
+    <Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" />
+    <Sections EncapsulationType="Compress">
+      <Sections EncapsulationType="Guid-Defined">
+        <Section SectionType="EFI_SECTION_RAW" /> 
+      </Sections>
+    </Sections>
+  </Ffs>
+ 
+</root>
diff --git a/Tools/Conf/FrameworkDatabase.db b/Tools/Conf/FrameworkDatabase.db
new file mode 100644
index 0000000000..2c95111493
--- /dev/null
+++ b/Tools/Conf/FrameworkDatabase.db
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FrameworkDatabase xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <FdbHeader>
+    <DatabaseName>FrameworkDatabase</DatabaseName>
+    <Guid>5ce32c23-6448-43ab-b509-a9deae3aae65</Guid>
+    <Version>0.3</Version>
+    <Created>2006-03-04 22:14</Created>
+    <Updated>2006-03-06 16:56</Updated>
+    <Abstract>The Framework Module Development Packaging System Database</Abstract>
+    <Description>This Database tracks the Basename, Version, Guid and Path for all packages installed in this workspace.</Description>
+    <Copyright>Copyright (c) 2006,  Intel Corporation.</Copyright>
+    <License>
+      All rights reserved.
+      This program and the accompanying materials are licensed and made available 
+      under the terms and conditions of the BSD License which accompanies this distribution.
+      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
+      OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+</License>
+  </FdbHeader>
+  <PackageList>
+    <Package>
+      <PackageName>EdkFatBinPkg</PackageName>
+      <Guid>0fd7197b-9bde-44fe-a7e4-d2177a9922e5</Guid>
+      <Version>0.3</Version>
+      <Path>EdkFatBinPkg/</Path>
+      <InstalledDate>2006-03-05 09:49</InstalledDate>
+    </Package>
+    <Package>
+      <PackageName>EdkModulePkg</PackageName>
+      <Guid>0xb6ec423c, 0x21d2, 0x490d, 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74</Guid>
+      <Version>0.3</Version>
+      <Path>EdkModulePkg/</Path>
+      <InstalledDate>2006-02-21 17:43</InstalledDate>
+    </Package>
+    <Package>
+      <PackageName>EdkNt32Pkg</PackageName>
+      <Guid>146fab65-922d-4bc3-b34b-cf1b0fe16eed</Guid>
+      <Version>0.01-test1</Version>
+      <Path>EdkNt32Pkg/</Path>
+      <InstalledDate>2006-02-22 13:25</InstalledDate>
+    </Package>
+    <Package>
+      <PackageName>EdkShellBinPkg</PackageName>
+      <Guid>d4266a1b-1d38-4116-93ae-60dc3e2012a6</Guid>
+      <Version>0.3</Version>
+      <Path>EdkShellBinPkg/</Path>
+      <InstalledDate>2006-03-05 10:13</InstalledDate>
+    </Package>
+    <Package>
+      <PackageName>MdePkg</PackageName>
+      <Guid>18413569-8b0d-43b1-920f-c110aa37265d</Guid>
+      <Version>0.3</Version>
+      <Path>MdePkg/</Path>
+      <InstalledDate>2006-03-05 09:01</InstalledDate>
+    </Package>
+    <Package>
+      <PackageName>Tools</PackageName>
+      <Guid>53f84ca0-53fe-4412-b4e7-dcec602e1d49</Guid>
+      <Version>0.1</Version>
+      <Path>Tools/</Path>
+      <InstalledDate>2006-02-24 14:49</InstalledDate>
+    </Package>
+  </PackageList>
+</FrameworkDatabase>
diff --git a/Tools/Conf/debug_efi_flags.txt b/Tools/Conf/debug_efi_flags.txt
new file mode 100644
index 0000000000..0a5e6373e9
--- /dev/null
+++ b/Tools/Conf/debug_efi_flags.txt
@@ -0,0 +1,4 @@
+WORKSPACE_TARGET = DEBUG
+EFI_LOCK_STATUS  = FALSE
+EFI_S3_RESUME    = YES
+EFI_LOG_LEVEL    = 3
diff --git a/Tools/Conf/efi_flags_table.txt b/Tools/Conf/efi_flags_table.txt
new file mode 100644
index 0000000000..6dfc4fa75f
--- /dev/null
+++ b/Tools/Conf/efi_flags_table.txt
@@ -0,0 +1,26 @@
+#
+# TABLE COLUMES: FLAGS_NAME, FLAGS_SETTING, VENDOR_ARCH_COMMANDTYPE ADD and SUB
+# Here, Vendor is defined in tools_def.txt, for example: MSFT, WINDDK, INTEL, GCC, CYGWIN
+# ARCH is IA32, IPF, x64, EBC and so on
+# COMMANDTYPE is one of CC, LIB, LINK, ASM, ASMLINK, PP, ASL
+#
+
+# EFI_DEBUG
+EFI_DEBUG YES MSFT_IA32_ASM    ADD.["/Zi", "/DEBUG"]
+EFI_DEBUG YES MSFT_IA32_CC     ADD.["/Zi", "/Gm", "/D EFI_DEBUG"] SUB.["/nologo", "/WX"]
+EFI_DEBUG YES MSFT_IA32_LINK   ADD.["/DEBUG"]
+EFI_DEBUG YES MSFT_NT32_CC     ADD.["/DEBUG"]
+
+EFI_DEBUG YES INTEL_EBC_CC     ADD.["/Zd", "/Zi"]
+EFI_DEBUG YES INTEL_EBC_LINK   ADD.["/DEBUG"]
+
+EFI_DEBUG YES WINDDK_X64_ASM   ADD.["/Zi", "/DDEBUG"]
+EFI_DEBUG YES WINDDK_X64_CC    ADD.["/Zi", "/Gm", "/D EFI_DEBUG"]
+EFI_DEBUG YES WINDDK_X64_LINK  ADD.["/DEBUG"]
+
+EFI_DEBUG YES WINDDK_IPF_ASM   ADD.["-d debug"]
+EFI_DEBUG YES WINDDK_IPF_CC    ADD.["/Zi", "/Gm"]
+EFI_DEBUG YES WINDDK_IPF_LINK  ADD.["/DEBUG"]
+
+
+# EFI_DEBUG_CLEAR_MEMORY
diff --git a/Tools/Conf/gcc_tools.txt b/Tools/Conf/gcc_tools.txt
new file mode 100644
index 0000000000..04dab63500
--- /dev/null
+++ b/Tools/Conf/gcc_tools.txt
@@ -0,0 +1,7 @@
+IA32_CC = "-Os","-fno-strict-aliasing","-Wall", "-Werror", "-c", "-x c"
+IA32_LIB = 
+IA32_LINK = "-nostdlib", "-O2", "--gc-sections", "--dll", "--export-all-symbols"
+IA32_ASM = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32"
+IA32_ASMLINK = 
+IA32_PP = "-E"
+
diff --git a/Tools/Conf/gcc_tools_def.txt b/Tools/Conf/gcc_tools_def.txt
new file mode 100644
index 0000000000..0cd372f8eb
--- /dev/null
+++ b/Tools/Conf/gcc_tools_def.txt
@@ -0,0 +1,55 @@
+#Host definitions
+HOST_VENDOR = INTEL
+PATH_TO_HOST_CC = c:\cygwin\bin
+
+#Default values
+CC_NAME = gcc.exe
+LIB_NAME = ar.exe
+LINK_NAME = ld.exe
+ASM_NAME = ml.exe
+ASMLINK_NAME = link.exe
+ASL_NAME = iasl.exe
+PP_NAME=gcc.exe
+
+#define for IA32
+IA32_VENDOR = GCC
+IA32_CC_VENDOR = GCC
+IA32_ASL_VENDOR = GCC
+IA32_ASM_VENDOR = MSFT
+IA32_PATH = C:\cygwin\opt\tiano\i386-tiano-pe\i386-tiano-pe\bin
+IA32_ASM_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+#IA32_ASMLINK_PATH = C:\MASM611\BINR
+IA32_ASL_PATH = C:\TianoTools\Bin
+
+#define for x64
+x64_VENDOR = WINDDK
+x64_CC_VENDOR = WINDDK
+x64_ASM_VENDOR = WINDDK
+x64_CC_NAME = cl.exe
+x64_LIB_NAME = lib.exe
+x64_LINK_NAME = link.exe
+x64_PP_NAME = cl.exe
+x64_ASL_VENDOR = INTEL
+x64_PATH = c:\WINDDK\3790.1830\bin\win64\x86\amd64
+x64_ASL_PATH = C:\TianoTools\Bin
+X64_ASM_NAME = ml64.exe
+
+#define for IPF
+IPF_CC_NAME = cl.exe
+IPF_LIB_NAME = lib.exe
+IPF_LINK_NAME = link.exe
+IPF_PP_NAME = cl.exe
+IPF_VENDOR = WINDDK
+IPF_ASL_VENDOR = INTEL
+IPF_PATH = c:\WINDDK\3790.1830\bin\win64\x86
+IPF_ASL_PATH = C:\TianoTools\Bin
+IPF_ASM_NAME = ias.exe
+
+#define for EBC
+EBC_VENDOR = INTEL
+EBC_ASL_VENDOR = INTEL
+EBC_PATH = C:\Program Files\Intel\EBC\Bin
+EBC_ASL_PATH = C:\TianoTools\Bin
+EBC_CC_NAME = iec.exe
+EBC_LIB_NAME = link.exe
+EBC_LINK_NAME = link.exe
diff --git a/Tools/Conf/global_efi_flags.txt b/Tools/Conf/global_efi_flags.txt
new file mode 100644
index 0000000000..1c1df04f50
--- /dev/null
+++ b/Tools/Conf/global_efi_flags.txt
@@ -0,0 +1,35 @@
+EFI_GENERATE_SYM_FILE   = NO
+EFI_DEBUG               = NO
+EFI_DEBUG_CLEAR_MEMORY  = NO
+EFI_PEI_PERFORMANCE     = YES
+EFI_DXE_PERFORMANCE     = YES
+EFI_SYMBOLIC_DEBUG      = NO
+EFI_USE_NEW_SHELL_BIN   = NO
+EFI_GENERATE_INTERMEDIATE_FILE = NO
+
+EFI_READ_DISABLED_CAP   = TRUE
+EFI_READ_ENABLED_CAP    = TRUE
+EFI_READ_STATUS         = TRUE
+EFI_WRITE_DISABLED_CAP  = TRUE
+EFI_WRITE_ENABLED_CAP   = TRUE
+EFI_WRITE_STATUS        = TRUE
+EFI_LOCK_CAP            = TRUE
+EFI_STICKY_WRITE        = TRUE
+EFI_MEMORY_MAPPED       = TRUE
+EFI_ALIGNMENT_CAP       = TRUE
+EFI_ALIGNMENT_2         = TRUE
+EFI_ALIGNMENT_4         = TRUE
+EFI_ALIGNMENT_8         = TRUE
+EFI_ALIGNMENT_16        = TRUE
+EFI_ALIGNMENT_32        = TRUE
+EFI_ALIGNMENT_64        = TRUE
+EFI_ALIGNMENT_128       = TRUE
+EFI_ALIGNMENT_256       = TRUE
+EFI_ALIGNMENT_512       = TRUE
+EFI_ALIGNMENT_1K        = TRUE
+EFI_ALIGNMENT_2K        = TRUE
+EFI_ALIGNMENT_4K        = TRUE
+EFI_ALIGNMENT_8K        = TRUE
+EFI_ALIGNMENT_16K       = TRUE
+EFI_ALIGNMENT_32K       = TRUE
+EFI_ALIGNMENT_64K       = TRUE
+\ No newline at end of file
diff --git a/Tools/Conf/intel_tools.txt b/Tools/Conf/intel_tools.txt
new file mode 100644
index 0000000000..d4482468fa
--- /dev/null
+++ b/Tools/Conf/intel_tools.txt
@@ -0,0 +1,19 @@
+ASL = -vo
+
+IA32_CC = 
+IA32_LIB =
+IA32_LINK =
+
+X64_CC = 
+X64_LIB =
+X64_LINK =
+
+IPF_CC = 
+IPF_LIB =
+IPF_LINK =
+IPF_ASM = "-N us", "-X explicit", "-M ilp64", "-N so", "-W4"
+
+EBC_CC = "-nologo", "-FAcs", "-c", "-W3", "-WX"
+EBC_LIB = "/lib", "/NOLOGO", "/MACHINE:EBC" 
+EBC_LINK = "/NOLOGO", "/MACHINE:EBC", "/SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER", "/OPT:REF", "/NODEFAULTLIB"
+EBC_PP = "/P"
+\ No newline at end of file
diff --git a/Tools/Conf/msft_tools.txt b/Tools/Conf/msft_tools.txt
new file mode 100644
index 0000000000..cc0cf081b0
--- /dev/null
+++ b/Tools/Conf/msft_tools.txt
@@ -0,0 +1,8 @@
+ASL = "/nologo"
+
+IA32_CC = "/nologo", "/W3", "/WX", "/GX", "/Gy", "/Gs-", "/c", "/D EFI32", "/D UNICODE"
+IA32_LIB = "/NOLOGO"
+IA32_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:I386", "/ALIGN:32", "/DLL", "/LTCG"
+IA32_ASM = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32"
+IA32_ASMLINK = 
+IA32_PP = "/P"
diff --git a/Tools/Conf/msft_tools_def.txt b/Tools/Conf/msft_tools_def.txt
new file mode 100644
index 0000000000..71c7da17e4
--- /dev/null
+++ b/Tools/Conf/msft_tools_def.txt
@@ -0,0 +1,43 @@
+#WORKSPACE = C:\MyWork\Edk2.0
+#Host definitions
+HOST_VENDOR = INTEL
+PATH_TO_HOST_CC = C:\Program Files\Intel\Compiler\c++\9.0\IA32\Bin
+
+#Default values
+CC_NAME = cl.exe
+LIB_NAME = lib.exe
+LINK_NAME = link.exe
+ASM_NAME = ml.exe
+ASMLINK_NAME = link.exe
+ASL_NAME = iasl.exe
+PP_NAME=cl.exe
+
+#define for IA32
+IA32_VENDOR = MSFT
+IA32_ASL_VENDOR = INTEL
+IA32_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+#IA32_ASM_PATH = C:\MASM611\BIN
+IA32_ASMLINK_PATH = C:\MASM611\BINR
+IA32_ASL_PATH = C:\TianoTools\Bin
+
+#define for x64
+x64_VENDOR = WINDDK
+x64_ASL_VENDOR = INTEL
+x64_PATH = c:\WINDDK\3790.1830\bin\win64\x86\amd64
+x64_ASL_PATH = C:\TianoTools\Bin
+X64_ASM_NAME = ml64.exe
+
+#define for IPF
+IPF_VENDOR = WINDDK
+IPF_ASL_VENDOR = INTEL
+IPF_PATH = c:\WINDDK\3790.1830\bin\win64\x86
+IPF_ASL_PATH = C:\TianoTools\Bin
+IPF_ASM_NAME = ias.exe
+
+#define for EBC
+EBC_VENDOR = INTEL
+EBC_ASL_VENDOR = INTEL
+EBC_PATH = C:\Program Files\Intel\EBC\Bin
+EBC_ASL_PATH = C:\TianoTools\Bin
+EBC_CC_NAME = iec.exe
+EBC_LIB_NAME = link.exe
diff --git a/Tools/Conf/my_efi_flags.txt b/Tools/Conf/my_efi_flags.txt
new file mode 100644
index 0000000000..f033429f4b
--- /dev/null
+++ b/Tools/Conf/my_efi_flags.txt
@@ -0,0 +1,2 @@
+EFI_DEBUG              = NO
+EFI_DEBUG_CLEAR_MEMORY = NO
+\ No newline at end of file
diff --git a/Tools/Conf/release_efi_flags.txt b/Tools/Conf/release_efi_flags.txt
new file mode 100644
index 0000000000..0a5e6373e9
--- /dev/null
+++ b/Tools/Conf/release_efi_flags.txt
@@ -0,0 +1,4 @@
+WORKSPACE_TARGET = DEBUG
+EFI_LOCK_STATUS  = FALSE
+EFI_S3_RESUME    = YES
+EFI_LOG_LEVEL    = 3
diff --git a/Tools/Conf/target.txt b/Tools/Conf/target.txt
new file mode 100644
index 0000000000..571d517e82
--- /dev/null
+++ b/Tools/Conf/target.txt
@@ -0,0 +1,2 @@
+WORKSPACE_TARGET    =   DEBUG
+TARGET_ARCH         =   IA32, x64, IPF, EBC
diff --git a/Tools/Conf/tools_def.txt b/Tools/Conf/tools_def.txt
new file mode 100644
index 0000000000..89c76e8380
--- /dev/null
+++ b/Tools/Conf/tools_def.txt
@@ -0,0 +1,44 @@
+WORKSPACE = C:\MDE
+#Host definitions
+HOST_VENDOR = INTEL
+PATH_TO_HOST_CC = C:\Program Files\Intel\Compiler\c++\9.0\IA32\Bin
+
+#Default values
+CC_NAME = cl.exe
+LIB_NAME = lib.exe
+LINK_NAME = link.exe
+ASM_NAME = ml.exe
+ASMLINK_NAME = link.exe
+ASL_NAME = iasl.exe
+PP_NAME=cl.exe
+
+#define for IA32
+IA32_VENDOR = MSFT
+IA32_ASL_VENDOR = INTEL
+#IA32_PATH = C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin
+#IA32_ASM_PATH = C:\MASM611\BIN
+IA32_ASMLINK_PATH = C:\MASM611\BINR
+IA32_ASL_PATH = C:\TianoTools\Bin
+
+#define for x64
+x64_VENDOR = WINDDK
+x64_ASL_VENDOR = INTEL
+x64_PATH = C:\WINDDK\3790.1830\bin\win64\x86\amd64
+x64_ASL_PATH = C:\TianoTools\Bin
+X64_ASM_NAME = ml64.exe
+
+#define for IPF
+IPF_VENDOR = WINDDK
+IPF_ASL_VENDOR = INTEL
+IPF_PATH = C:\WINDDK\3790.1830\bin\win64\x86
+IPF_ASL_PATH = C:\TianoTools\Bin
+IPF_ASM_NAME = ias.exe
+
+#define for EBC
+EBC_VENDOR = INTEL
+EBC_ASL_VENDOR = INTEL
+EBC_PATH = C:\Program Files\Intel\Ebc\Bin
+EBC_ASL_PATH = C:\TianoTools\Bin
+EBC_CC_NAME = iec.exe
+#EBC_LIB_PATH = 
+EBC_LIB_NAME = link.exe
diff --git a/Tools/Conf/winddk_tools.txt b/Tools/Conf/winddk_tools.txt
new file mode 100644
index 0000000000..062d974eaa
--- /dev/null
+++ b/Tools/Conf/winddk_tools.txt
@@ -0,0 +1,19 @@
+IA32_CC = "/nologo", "/X", "/W4", "/WX", "/GX", "/Gy", "/GS-", "/c", "/D EFI32"
+IA32_LIB = "/NOLOGO"
+IA32_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:I386", "/ALIGN:32", "/DLL"
+IA32_ASM = "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32"
+IA32_PP = "/P"
+
+x64_CC = "/nologo", "/X", "/W4", "/WX", "/Gy", "/c", "/Gs8192", "/GS-", "/D EFIx64"
+x64_LIB = "/NOLOGO"
+x64_LINK = "/NOLOGO", "/Machine:AMD64", "/ALIGN:32", "/DLL", "/NODEFAULTLIB", "/OPT:REF"
+x64_ASM = "/nologo", "/W3", "/WX", "/c", "/DEFI32"
+x64_ASMLINK = 
+x64_PP = "/P"
+
+IPF_CC = "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "/D EFI64"
+IPF_PP = "/nologo", "/W4", "/WX", "/EHsc", "/Gy", "/c", "/GS-", "-P", "-C", "/D EFI_MONOSHELL", "/D EFI64"
+IPF_LIB = "/NOLOGO"
+IPF_LINK = "/NOLOGO", "/SUBSYSTEM:CONSOLE", "/NODEFAULTLIB", "/IGNORE:4086", "/MAP", "/OPT:REF", "/MACHINE:IA64"
+IPF_ASM = "-N us", "-X explicit", "-M ilp64", "-N so", "-W4" 
+IPF_PP = "/P"
diff --git a/Tools/JavaResources.msa b/Tools/JavaResources.msa
new file mode 100644
index 0000000000..283dc96cfd
--- /dev/null
+++ b/Tools/JavaResources.msa
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <MsaHeader>
+    <BaseName>JavaResources</BaseName>
+    <ModuleType>BASE</ModuleType>
+    <ComponentType>CUSTOM_BUILD</ComponentType>
+    <Guid>faf22a0f-10fc-428e-b311-fe506a9c0b2d</Guid>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools and resources that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These resources and tools do not require compilation.  (The three JAR files are provided,
+      Pre-compiled, and do not require additional compilation, the sources are provided, but
+      will not be built under normal procedures.
+    </Description>
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Created>2006-03-23 12:00</Created>
+  </MsaHeader>
+  <LibraryClassDefinitions>
+    <LibraryClass>Java</LibraryClass>
+    <LibraryClass>Perl</LibraryClass>
+  </LibraryClassDefinitions>
+  <SourceFiles>
+    <Filename Path="bin" FileType="pl">inf2msa.pl</Filename>
+    <Filename Path="bin" FileType="pl">mkspd.pl</Filename>
+    <Filename Path="bin" FileType="pl">mkdb.pl</Filename>
+    <Filename Path="Conf" FileType="db">FrameworkDatabase.db</Filename>
+    <Filename Path="Conf" FileType="txt">cygwin_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">desktop_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">embedded_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">gcc_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">global_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">intel_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">mobile_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">msft_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">my_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">node.txt</Filename>
+    <Filename Path="Conf" FileType="txt">server_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">target.txt</Filename>
+    <Filename Path="Conf" FileType="txt">tools_def.txt</Filename>
+    <Filename Path="Conf" FileType="txt">winddk_tools.txt</Filename>
+    <Filename Path="Jars" FileType="jar">cpptasks.jar</Filename>
+    <Filename Path="Jars" FileType="jar">frameworktasks.jar</Filename>
+    <Filename Path="Jars" FileType="jar">GenBuild.jar</Filename>
+  </SourceFiles>
+  <Includes>
+    <PackageName>Base</PackageName>
+  </Includes>
+  <BuildOptions>
+    <Option>DO_NOT_COMPILE</Option>
+  </BuildOptions>
+</ModuleSurfaceArea>
diff --git a/Tools/Source/Cpptasks/build.xml b/Tools/Source/Cpptasks/build.xml
new file mode 100644
index 0000000000..cfed13b7b3
--- /dev/null
+++ b/Tools/Source/Cpptasks/build.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="CppTasks" default="all" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="workspace" value="${env.WORKSPACE}"/>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${workspace}/Tools/Jars"/>
+  <target name="all" depends="install"/>
+  <target name="init">
+    <uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">
+      <srcfiles dir="net" includes="**"/>
+    </uptodate>
+  </target>
+  <target name="source" depends="init" unless="jar.newer">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="net" destdir="${buildDir}">
+      <classpath>
+        <fileset dir="${workspace}/Tools/Jars">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <if>
+      <available file="${installLocation}/cpptasks.jar"/>
+      <then>
+        <echo message="You must manually remove the file: ${installLocation}/cpptasks.jar"/>
+        <echo message="Java has already loaded the file, and cannot remove it within ANT!"/>
+      </then>
+    </if>
+  </target>
+  <target name="install" depends="source" unless="jar.newer">
+    <copy file="cpptasks.tasks" toDir="${buildDir}"/>
+    <copy file="cpptasks.types" toDir="${buildDir}"/>
+    <jar destfile="${installLocation}/cpptasks.jar"
+      basedir="${buildDir}"
+      includes="**"
+    />
+  </target>
+</project>
diff --git a/Tools/Source/Cpptasks/cpptasks.mf b/Tools/Source/Cpptasks/cpptasks.mf
new file mode 100644
index 0000000000..a2bf638932
--- /dev/null
+++ b/Tools/Source/Cpptasks/cpptasks.mf
@@ -0,0 +1,7 @@
+Manifest-Version: 2.0
+Main-Class: net.sf.antcontrib.cpptasks.AboutCCTask
+
+Name: CCTask
+Implementation-Vendor: Ant-Contrib project
+Implementation-Version: 1.0
+Implementation-Title: Compile and link tasks for Apache Ant
diff --git a/Tools/Source/Cpptasks/cpptasks.tasks b/Tools/Source/Cpptasks/cpptasks.tasks
new file mode 100644
index 0000000000..f34458374f
--- /dev/null
+++ b/Tools/Source/Cpptasks/cpptasks.tasks
@@ -0,0 +1 @@
+cc=net.sf.antcontrib.cpptasks.CCTask
diff --git a/Tools/Source/Cpptasks/cpptasks.types b/Tools/Source/Cpptasks/cpptasks.types
new file mode 100644
index 0000000000..65af6e66c6
--- /dev/null
+++ b/Tools/Source/Cpptasks/cpptasks.types
@@ -0,0 +1,9 @@
+defineset=net.sf.antcontrib.cpptasks.types.DefineSet
+compiler=net.sf.antcontrib.cpptasks.CompilerDef
+linker=net.sf.antcontrib.cpptasks.LinkerDef
+assembler=net.sf.antcontrib.cpptasks.AssemblerDef
+aslcompiler=net.sf.antcontrib.cpptasks.AslcompilerDef
+targetplatform=net.sf.antcontrib.cpptasks.TargetDef
+versioninfo=net.sf.antcontrib.cpptasks.VersionInfo
+distributer=net.sf.antcontrib.cpptasks.DistributerDef
+command=net.sf.antcontrib.cpptasks.userdefine.UserDefineDef
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/javadoc.xml b/Tools/Source/Cpptasks/javadoc.xml
new file mode 100644
index 0000000000..f0ca9648e9
--- /dev/null
+++ b/Tools/Source/Cpptasks/javadoc.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="javadoc">
+<target name="javadoc">
+
+    <javadoc packagenames="net.sf.antcontrib.*"
+             useexternalfile="yes"
+             sourcepath="."
+             destdir="doc"
+             author="true"
+             version="true"
+             source="1.3"
+             locale="en_US"
+             windowtitle="cpptasks API"
+             doctitle="cpptasks">
+      <group title="CCTasks" packages="net.sf.antcontrib.cpptasks" />
+
+      <bottom>Copyright @2001-2005 Ant-Contrib project. All Rights Reserved.</bottom>
+</javadoc>
+</target>
+</project>
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java
new file mode 100644
index 0000000000..67757bbf87
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AboutCCTask.java
@@ -0,0 +1,49 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+/**
+ * The equivalent of a Help About
+ *    run "java -jar cpptasks.jar" to read
+ *
+ *  @author Curt Arnold
+ */
+public class AboutCCTask {
+    /**
+     * display identification message and exit
+     *
+     * @param args ignored
+     */
+    public static void main(String args[]) {
+      System.out.println("CCTask: Compile and link task for Apache Ant 1.5 or later\n");
+      System.out.println("Copyright (c) 2002-2004, The Ant-Contrib project.\n");
+      System.out.println("http://sf.net/projects/ant-contrib\n");
+      System.out.println("Licensed under the Apache Software License 2.0");
+      System.out.println("available at http://www.apache.org/licenses/LICENSE-2.0\n");
+      System.out.println("This software is not a product of the");
+      System.out.println("of the Apache Software Foundation and no");
+      System.out.println("endorsement or promotion is implied.\n");
+      System.out.println("THIS SOFTWARE IS PROVIDED 'AS-IS', See");
+      System.out.println("http://www.apache.org/LICENSE for additional");
+      System.out.println("disclaimers.\n");
+      System.out.println("To use:");
+      System.out.println("\tPlace cpptasks.jar into lib directory of Ant 1.5 or later.");
+      System.out.println("\tAdd <taskdef resource=\"cpptasks.tasks\"/> and");
+      System.out.println("\t\t<typedef resource=\"cpptasks.types\"/> to build.xml");
+      System.out.println("Add <cc/>, <compiler/>, <linker/>, <assembler/> and <aslcompiler> elements.");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java
new file mode 100644
index 0000000000..e219ad6871
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ArchEnum.java
@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of cpu architecture types.
+ *
+ * @author Curt Arnold
+ *
+ */
+public final class ArchEnum
+    extends EnumeratedAttribute {
+  /**
+   * Constructor.
+   *
+   * Set by default to "pentium3"
+   *
+   * @see java.lang.Object#Object()
+   */
+  public ArchEnum() {
+    setValue("pentium3");
+  }
+
+  /**
+   * Gets list of acceptable values.
+   *
+   * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+   */
+  public String[] getValues() {
+    /**
+     * Class initializer.
+     */
+     return new String[] {
+          "i386",
+          "i486",
+          "i586",
+          "i686",
+          "pentium",
+          "pentium-mmx",
+          "pentiumpro",
+          "pentium2",
+          "pentium3",
+          "pentium4",
+          "k6",
+          "k6-2",
+          "k6-3",
+          "athlon",
+          "athlon-tbird",
+          "athlon-4",
+          "athlon-xp",
+          "athlon-mp",
+          "winchip-c6",
+          "winchip2",
+          "c3"};
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java
new file mode 100644
index 0000000000..f69d3fde63
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerDef.java
@@ -0,0 +1,118 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import net.sf.antcontrib.cpptasks.compiler.Aslcompiler;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.intel.IntelWin32Aslcompiler;
+import net.sf.antcontrib.cpptasks.types.AslcompilerArgument;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * A asl compiler definition. asl compiler elements may be placed either as
+ * children of a cc element or the project element. A asl compiler element with
+ * an id attribute may be referenced from asl compiler elements with refid or
+ * extends attributes.
+ * 
+ */
+public final class AslcompilerDef extends ProcessorDef {
+
+    private Boolean defaultflag = new Boolean(true);
+
+    public AslcompilerDef () {
+    }
+
+    /**
+     * Adds a asl compiler command-line arg.
+     */
+    public void addConfiguredAslcompilerArg(AslcompilerArgument arg) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorArg(arg);
+    }
+
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                        "Not an actual task, but looks like one for documentation purposes");
+    }
+
+    public final Boolean getDefaultflag(AslcompilerDef[] defaultProviders,
+                    int index) {
+        if (isReference()) {
+            return ((AslcompilerDef) getCheckedRef(AslcompilerDef.class,
+                            "AslcompilerDef")).getDefaultflag(defaultProviders,
+                            index);
+        }
+        return defaultflag;
+    }
+
+    public Processor getProcessor() {
+        Processor processor = super.getProcessor();
+        if (processor == null) {
+            processor = IntelWin32Aslcompiler.getInstance();
+        }
+        return processor;
+    }
+
+    /**
+     * Sets r type.
+     * 
+     * <table width="100%" border="1"> <thead>Supported ASL Compilers</thead>
+     * <tr>
+     * <td>iasl (default)</td>
+     * <td>Intel ACPI Source Language</td>
+     * </tr>
+     * <tr>
+     * <td>asl</td>
+     * <td>Microsoft ACPI Source Language</td>
+     * </tr>
+     * </table>
+     * 
+     */
+    public void setName(AslcompilerEnum name) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        Aslcompiler aslcompiler = name.getAslcompiler();
+        setProcessor(aslcompiler);
+    }
+
+    protected void setProcessor(Processor proc) throws BuildException {
+        try {
+            super.setProcessor((Aslcompiler) proc);
+        } catch (ClassCastException ex) {
+            throw new BuildException(ex);
+        }
+    }
+
+    /**
+     * Enables or disables default flags.
+     * 
+     * @param defaultflag
+     *            if true, default flags will add to command line.
+     * 
+     */
+    public void setDefaultflag(boolean defaultflag) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.defaultflag = booleanValueOf(defaultflag);
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java
new file mode 100644
index 0000000000..fa9806916f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AslcompilerEnum.java
@@ -0,0 +1,54 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import net.sf.antcontrib.cpptasks.compiler.Aslcompiler;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioAslcompiler;
+import net.sf.antcontrib.cpptasks.intel.IntelWin32Aslcompiler;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of supported ASL Compilers
+ * 
+ * <table width="100%" border="1"> <thead>Supported ASL Compilers </thead>
+ * <tr>
+ * <td>iasl (default)</td>
+ * <td>Intel ACPI Source Language</td>
+ * </tr>
+ * <tr>
+ * <td>asl</td>
+ * <td>Microsoft ACPI Source Language</td>
+ * </tr>
+ * </table>
+ * 
+ */
+public class AslcompilerEnum extends EnumeratedAttribute {
+    private final static ProcessorEnumValue[] aslcompiler = new ProcessorEnumValue[] {
+                    new ProcessorEnumValue("iasl", IntelWin32Aslcompiler
+                                    .getInstance()),
+                    new ProcessorEnumValue("asl", DevStudioAslcompiler
+                                    .getInstance()), };
+
+    public Aslcompiler getAslcompiler() {
+        return (Aslcompiler) aslcompiler[getIndex()].getProcessor();
+    }
+
+    public String[] getValues() {
+        return ProcessorEnumValue.getValues(aslcompiler);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java
new file mode 100644
index 0000000000..aeae215780
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerDef.java
@@ -0,0 +1,237 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.Assembler;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.gcc.GccAssembler;
+import net.sf.antcontrib.cpptasks.types.AssemblerArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalPath;
+import net.sf.antcontrib.cpptasks.types.IncludePath;
+import net.sf.antcontrib.cpptasks.types.SystemIncludePath;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
+/**
+ * A assembler definition. Assembler elements may be placed either as children
+ * of a cc element or the project element. A assembler element with an id
+ * attribute may be referenced from assembler elements with refid or extends
+ * attributes.
+ * 
+ */
+public final class AssemblerDef extends ProcessorDef {
+
+    private final Vector includePaths = new Vector();
+
+    private final Vector sysIncludePaths = new Vector();
+
+    private Boolean defaultflag = new Boolean(true);
+
+    public AssemblerDef () {
+    }
+
+    /**
+     * Adds a assembler command-line arg.
+     */
+    public void addConfiguredAssemblerArg(AssemblerArgument arg) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorArg(arg);
+    }
+
+    /**
+     * Creates an include path.
+     */
+    public IncludePath createIncludePath() {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        IncludePath path = new IncludePath(p);
+        includePaths.addElement(path);
+        return path;
+    }
+
+    /**
+     * Creates an include path.
+     */
+    public SystemIncludePath createSysIncludePath() {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        SystemIncludePath path = new SystemIncludePath(p);
+        sysIncludePaths.addElement(path);
+        return path;
+    }
+
+    /**
+     * Add a <includepath>or <sysincludepath> if specify the file attribute
+     * 
+     * @throws BuildException
+     *             if the specify file not exist
+     */
+    protected void loadFile(Vector activePath, File file) throws BuildException {
+        FileReader fileReader;
+        BufferedReader in;
+        String str;
+        if (!file.exists()) {
+            throw new BuildException("The file " + file + " is not existed");
+        }
+        try {
+            fileReader = new FileReader(file);
+            in = new BufferedReader(fileReader);
+            while ((str = in.readLine()) != null) {
+                if (str.trim() == "") {
+                    continue;
+                }
+                str = getProject().replaceProperties(str);
+                activePath.addElement(str.trim());
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                        "Not an actual task, but looks like one for documentation purposes");
+    }
+
+    /**
+     * Returns the assembler-specific include path.
+     */
+    public String[] getActiveIncludePaths() {
+        if (isReference()) {
+            return ((AssemblerDef) getCheckedRef(AssemblerDef.class,
+                            "AssemblerDef")).getActiveIncludePaths();
+        }
+        return getActivePaths(includePaths);
+    }
+
+    /**
+     * Returns the assembler-specific sysinclude path.
+     */
+    public String[] getActiveSysIncludePaths() {
+        if (isReference()) {
+            return ((AssemblerDef) getCheckedRef(AssemblerDef.class,
+                            "AssemblerDef")).getActiveSysIncludePaths();
+        }
+        return getActivePaths(sysIncludePaths);
+    }
+
+    private String[] getActivePaths(Vector paths) {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project not set");
+        }
+        Vector activePaths = new Vector(paths.size());
+        for (int i = 0; i < paths.size(); i++) {
+            ConditionalPath path = (ConditionalPath) paths.elementAt(i);
+            if (path.isActive(p)) {
+                if (path.getFile() == null) {
+                    String[] pathEntries = path.list();
+                    for (int j = 0; j < pathEntries.length; j++) {
+                        activePaths.addElement(pathEntries[j]);
+                    }
+                } else {
+                    loadFile(activePaths, path.getFile());
+                }
+            }
+        }
+        String[] pathNames = new String[activePaths.size()];
+        activePaths.copyInto(pathNames);
+        return pathNames;
+    }
+
+    public final Boolean getDefaultflag(AssemblerDef[] defaultProviders,
+                    int index) {
+        if (isReference()) {
+            return ((AssemblerDef) getCheckedRef(AssemblerDef.class,
+                            "AssemblerDef")).getDefaultflag(defaultProviders,
+                            index);
+        }
+        return defaultflag;
+    }
+
+    public Processor getProcessor() {
+        Processor processor = super.getProcessor();
+        if (processor == null) {
+            processor = GccAssembler.getInstance();
+        }
+        return processor;
+    }
+
+    /**
+     * Sets r type.
+     * 
+     * <table width="100%" border="1"> <thead>Supported assemblers</thead>
+     * <tr>
+     * <td>gcc (default)</td>
+     * <td>GAS assembler</td>
+     * </tr>
+     * <tr>
+     * <td>masm</td>
+     * <td>MASM assembler</td>
+     * </tr>
+     * </table>
+     * 
+     */
+    public void setName(AssemblerEnum name) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        Assembler assembler = name.getAssembler();
+        setProcessor(assembler);
+    }
+
+    protected void setProcessor(Processor proc) throws BuildException {
+        try {
+            super.setProcessor((Assembler) proc);
+        } catch (ClassCastException ex) {
+            throw new BuildException(ex);
+        }
+    }
+
+    /**
+     * Enables or disables default flags.
+     * 
+     * @param defaultflag
+     *            if true, default flags will add to command line.
+     * 
+     */
+    public void setDefaultflag(boolean defaultflag) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.defaultflag = booleanValueOf(defaultflag);
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java
new file mode 100644
index 0000000000..9abf9f496d
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/AssemblerEnum.java
@@ -0,0 +1,53 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import net.sf.antcontrib.cpptasks.compiler.Assembler;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioAssembler;
+import net.sf.antcontrib.cpptasks.gcc.GccAssembler;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of supported assemblers
+ * 
+ * <table width="100%" border="1"> <thead>Supported assemblers </thead>
+ * <tr>
+ * <td>gas (default)</td>
+ * <td>GAS assembler</td>
+ * </tr>
+ * <tr>
+ * <td>masm</td>
+ * <td>MASM assembler</td>
+ * </tr>
+ * </table>
+ * 
+ */
+public class AssemblerEnum extends EnumeratedAttribute {
+    private final static ProcessorEnumValue[] assemblers = new ProcessorEnumValue[] {
+                    new ProcessorEnumValue("gas", GccAssembler.getInstance()),
+                    new ProcessorEnumValue("masm", DevStudioAssembler
+                                    .getInstance()), };
+
+    public Assembler getAssembler() {
+        return (Assembler) assemblers[getIndex()].getProcessor();
+    }
+
+    public String[] getValues() {
+        return ProcessorEnumValue.getValues(assemblers);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java
new file mode 100644
index 0000000000..d044df1288
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTask.java
@@ -0,0 +1,1749 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.AslcompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.AssemblerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.LinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+import net.sf.antcontrib.cpptasks.types.AslcompilerArgument;
+import net.sf.antcontrib.cpptasks.types.AssemblerArgument;
+import net.sf.antcontrib.cpptasks.types.CompilerArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalFileSet;
+import net.sf.antcontrib.cpptasks.types.DefineSet;
+import net.sf.antcontrib.cpptasks.types.IncludePath;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LinkerArgument;
+import net.sf.antcontrib.cpptasks.types.SystemIncludePath;
+import net.sf.antcontrib.cpptasks.types.SystemLibrarySet;
+import net.sf.antcontrib.cpptasks.userdefine.UserDefineCompiler;
+import net.sf.antcontrib.cpptasks.userdefine.UserDefineDef;
+import net.sf.antcontrib.cpptasks.VersionInfo;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Environment;
+
+/**
+ * Compile, link, assembler and asl compile task.
+ * 
+ * <p>
+ * This task can compile various source languages and produce executables,
+ * shared libraries (aka DLL's) and static libraries. Compiler adaptors are
+ * currently available for several C/C++ compilers, FORTRAN, MIDL and Windows
+ * Resource files. Assembler adaptors are currently available for MASM and GAS.
+ * And aslcompiler support to ASL and IASL command.
+ * </p>
+ * 
+ * 
+ * <p>
+ * Copyright (c) 2001-2005, The Ant-Contrib project.
+ * </p>
+ * 
+ * <p>
+ * Licensed under the Apache Software License 2.0,
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ * </p>
+ * 
+ * <p>
+ * For use with Apache Ant 1.5 or later. This software is not a product of the
+ * of the Apache Software Foundation and no endorsement is implied.
+ * </p>
+ * 
+ * <p>
+ * THIS SOFTWARE IS PROVIDED 'AS-IS', See
+ * http://www.apache.org/licenses/LICENSE-2.0 for additional disclaimers.
+ * </p>
+ * 
+ * To use:
+ * <ol>
+ * <li>Place cpptasks.jar into the lib directory of Ant 1.5 or later.</li>
+ * <li>Add &lt;taskdef resource="cpptasks.tasks"/&gt; and &lt;typedef
+ * resource="cpptasks.types"/&gt; to build.xml.</li>
+ * <li>Add &lt;cc/&gt;, &lt;compiler/&gt; &lt;linker/&gt; &lt;assembler/&gt;
+ * and &lt;aslcompiler/&gt elements to project.</li>
+ * <li>Set path and environment variables to be able to run compiler from
+ * command line.</li>
+ * <li>Build project.</li>
+ * </ol>
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public class CCTask extends Task {
+    private class SystemLibraryCollector implements FileVisitor {
+        private Hashtable libraries;
+
+        private Linker linker;
+
+        public SystemLibraryCollector (Linker linker, Hashtable libraries) {
+            this.linker = linker;
+            this.libraries = libraries;
+        }
+
+        public void visit(File basedir, String filename) {
+            if (linker.bid(filename) > 0) {
+                File libfile = new File(basedir, filename);
+                String key = linker.getLibraryKey(libfile);
+                libraries.put(key, libfile);
+            }
+        }
+    }
+
+    private static final ProcessorConfiguration[] EMPTY_CONFIG_ARRAY = new ProcessorConfiguration[0];
+
+    /**
+     * Builds a Hashtable to targets needing to be rebuilt keyed by compiler
+     * configuration
+     */
+    public static Hashtable getTargetsToBuildByConfiguration(Hashtable targets) {
+        Hashtable targetsByConfig = new Hashtable();
+        Enumeration targetEnum = targets.elements();
+        while (targetEnum.hasMoreElements()) {
+            TargetInfo target = (TargetInfo) targetEnum.nextElement();
+            if (target.getRebuild()) {
+                Vector targetsForSameConfig = (Vector) targetsByConfig
+                                .get(target.getConfiguration());
+                if (targetsForSameConfig != null) {
+                    targetsForSameConfig.addElement(target);
+                } else {
+                    targetsForSameConfig = new Vector();
+                    targetsForSameConfig.addElement(target);
+                    targetsByConfig.put(target.getConfiguration(),
+                                    targetsForSameConfig);
+                }
+            }
+        }
+        return targetsByConfig;
+    }
+
+    /** The userdefine definitions. */
+    private Vector _userdefines = new Vector();
+    
+    /** The compiler definitions. */
+    private Vector _compilers = new Vector();
+
+    /** The output file type. */
+    // private LinkType _linkType = LinkType.EXECUTABLE;
+    /** The library sets. */
+    private Vector _libsets = new Vector();
+
+    /** The aslcompiler definitions. */
+    private Vector _aslcompiler = new Vector();
+
+    /** The assembler definitions. */
+    private Vector _assemblers = new Vector();
+
+    /** The linker definitions. */
+    private Vector _linkers = new Vector();
+
+    /** The object directory. */
+    private File _objDir;
+
+    /** The output file. */
+    private File _outfile;
+    
+    private boolean userdefine = false;
+    private String arch;
+    private String os;
+    private String vendor;
+    
+    /** the flag for assembler */
+    private boolean assembler = true;
+
+    /** the flag for aslcompiler */
+    private boolean aslcompiler = true;
+
+    /** The linker definitions. */
+    private final Vector targetPlatforms = new Vector();
+
+    /** The distributer definitions. */
+    private Vector distributers = new Vector();
+
+    /**
+     * If true, stop build on compile failure.
+     */
+    protected boolean failOnError = true;
+
+    /**
+     * Content that appears in <cc>and also in <compiler>are maintained by a
+     * captive CompilerDef instance
+     */
+    private final CompilerDef compilerDef = new CompilerDef();
+
+    /**
+     * Content that appears in <cc>and also in <aslcompiler>are maintained by a
+     * captive AslcompilerDef instance
+     */
+    private final AslcompilerDef aslcompilerDef = new AslcompilerDef();
+
+    /** The OS390 dataset to build to object to */
+    private String dataset;
+
+    /**
+     * 
+     * Depth of dependency checking
+     * 
+     * Values < 0 indicate full dependency checking Values >= 0 indicate partial
+     * dependency checking and for superficial compilation checks. Will throw
+     * BuildException before attempting link
+     */
+    private int dependencyDepth = -1;
+
+    /**
+     * Content that appears in <cc>and also in <assembler>are maintained by a
+     * captive AssemblerDef instance
+     */
+    private final AssemblerDef assemblerDef = new AssemblerDef();
+
+    /**
+     * Content that appears in <cc>and also in <linker>are maintained by a
+     * captive CompilerDef instance
+     */
+    private final LinkerDef linkerDef = new LinkerDef();
+
+    /**
+     * contains the subsystem, output type and
+     * 
+     */
+    private final LinkType linkType = new LinkType();
+
+    /**
+     * The property name which will be set with the physical filename of the
+     * file that is generated by the linker
+     */
+    private String outputFileProperty;
+
+    /**
+     * if relentless = true, compilations should attempt to compile as many
+     * files as possible before throwing a BuildException
+     */
+    private boolean relentless;
+
+    public CCTask () {
+    }
+
+    
+    public void addConfiguredCommand(UserDefineDef userdefineDef) {
+        if (userdefineDef == null) {
+            throw new NullPointerException("UserDefineDef");
+        }
+        userdefineDef.setProject(getProject());
+        _userdefines.addElement(userdefineDef);
+    }
+    /**
+     * Adds a asl compiler definition or reference.
+     * 
+     * @param Aslcompiler
+     *            aslcompiler
+     * @throws NullPointerException
+     *             if aslcompiler is null
+     */
+    public void addConfiguredAslcompiler(AslcompilerDef aslcompier) {
+        if (aslcompier == null) {
+            throw new NullPointerException("aslcompier");
+        }
+        aslcompier.setProject(getProject());
+        _aslcompiler.addElement(aslcompier);
+    }
+
+    /**
+     * Adds a asl command-line arg. Argument will be inherited by all nested
+     * aslcompiler elements that do not have inherit="false".
+     * 
+     */
+    public void addConfiguredAslcompilerArg(AslcompilerArgument arg) {
+        aslcompilerDef.addConfiguredAslcompilerArg(arg);
+    }
+
+    /**
+     * Adds a assembler definition or reference.
+     * 
+     * @param assembler
+     *            assemblera
+     * @throws NullPointerException
+     *             if assembler is null
+     */
+    public void addConfiguredAssembler(AssemblerDef assembler) {
+        if (assembler == null) {
+            throw new NullPointerException("assembler");
+        }
+        assembler.setProject(getProject());
+        _assemblers.addElement(assembler);
+    }
+
+    /**
+     * Adds a assembler command-line arg. Argument will be inherited by all
+     * nested assembler elements that do not have inherit="false".
+     * 
+     */
+    public void addConfiguredAssemblerArg(AssemblerArgument arg) {
+        assemblerDef.addConfiguredAssemblerArg(arg);
+    }
+
+    /**
+     * Adds a compiler definition or reference.
+     * 
+     * @param compiler
+     *            compiler
+     * @throws NullPointerException
+     *             if compiler is null
+     */
+    public void addConfiguredCompiler(CompilerDef compiler) {
+        if (compiler == null) {
+            throw new NullPointerException("compiler");
+        }
+        compiler.setProject(getProject());
+        _compilers.addElement(compiler);
+    }
+
+    /**
+     * Adds a compiler command-line arg. Argument will be inherited by all
+     * nested compiler elements that do not have inherit="false".
+     * 
+     */
+    public void addConfiguredCompilerArg(CompilerArgument arg) {
+        compilerDef.addConfiguredCompilerArg(arg);
+    }
+
+    /**
+     * Adds a defineset. Will be inherited by all compiler elements that do not
+     * have inherit="false".
+     * 
+     * @param defs
+     *            Define set
+     */
+    public void addConfiguredDefineset(DefineSet defs) {
+        compilerDef.addConfiguredDefineset(defs);
+    }
+
+    /**
+     * Adds a linker definition. The first linker that is not disqualified by
+     * its "if" and "unless" attributes will perform the link. If no child
+     * linker element is active, the linker implied by the cc elements name or
+     * classname attribute will be used.
+     * 
+     * @param linker
+     *            linker
+     * @throws NullPointerException
+     *             if linker is null
+     */
+    public void addConfiguredLinker(LinkerDef linker) {
+        if (linker == null) {
+            throw new NullPointerException("linker");
+        }
+        linker.setProject(getProject());
+        _linkers.addElement(linker);
+    }
+
+    /**
+     * Adds a linker command-line arg. Argument will be inherited by all nested
+     * linker elements that do not have inherit="false".
+     */
+    public void addConfiguredLinkerArg(LinkerArgument arg) {
+        linkerDef.addConfiguredLinkerArg(arg);
+    }
+
+    /**
+     * Add an environment variable to the launched process.
+     */
+    public void addEnv(Environment.Variable var) {
+        compilerDef.addEnv(var);
+        linkerDef.addEnv(var);
+        assemblerDef.addEnv(var);
+        aslcompilerDef.addEnv(var);
+    }
+
+    /**
+     * Adds a source file set.
+     * 
+     * Files in these filesets will be auctioned to the available compiler
+     * configurations, with the default compiler implied by the cc element
+     * bidding last. If no compiler is interested in the file, it will be passed
+     * to the linker.
+     * 
+     * To have a file be processed by a particular compiler configuration, add a
+     * fileset to the corresponding compiler element.
+     */
+    public void addFileset(ConditionalFileSet srcSet) {
+        compilerDef.addFileset(srcSet);
+    }
+
+    /**
+     * Adds a library set.
+     * 
+     * Library sets will be inherited by all linker elements that do not have
+     * inherit="false".
+     * 
+     * @param libset
+     *            library set
+     * @throws NullPointerException
+     *             if libset is null.
+     */
+    public void addLibset(LibrarySet libset) {
+        if (libset == null) {
+            throw new NullPointerException("libset");
+        }
+        linkerDef.addLibset(libset);
+    }
+
+    /**
+     * Adds a system library set. Timestamps and locations of system library
+     * sets are not used in dependency analysis.
+     * 
+     * Essential libraries (such as C Runtime libraries) should not be specified
+     * since the task will attempt to identify the correct libraries based on
+     * the multithread, debug and runtime attributes.
+     * 
+     * System library sets will be inherited by all linker elements that do not
+     * have inherit="false".
+     * 
+     * @param libset
+     *            library set
+     * @throws NullPointerException
+     *             if libset is null.
+     */
+    public void addSyslibset(SystemLibrarySet libset) {
+        if (libset == null) {
+            throw new NullPointerException("libset");
+        }
+        linkerDef.addSyslibset(libset);
+    }
+
+    /**
+     * Checks all targets that are not forced to be rebuilt or are missing
+     * object files to be checked for modified include files
+     * 
+     * @returns total number of targets to be rebuilt
+     * 
+     */
+    protected int checkForChangedIncludeFiles(Hashtable targets) {
+        int potentialTargets = 0;
+        int definiteTargets = 0;
+        Enumeration targetEnum = targets.elements();
+        while (targetEnum.hasMoreElements()) {
+            TargetInfo target = (TargetInfo) targetEnum.nextElement();
+            if (!target.getRebuild()) {
+                potentialTargets++;
+            } else {
+                definiteTargets++;
+            }
+        }
+        //
+        // If there were remaining targets that
+        // might be out of date
+        //
+        if (potentialTargets > 0) {
+            log("Starting dependency analysis for "
+                            + Integer.toString(potentialTargets) + " files.");
+            DependencyTable dependencyTable = new DependencyTable(_objDir);
+            try {
+                dependencyTable.load();
+            } catch (Exception ex) {
+                log("Problem reading dependencies.xml: " + ex.toString());
+            }
+            targetEnum = targets.elements();
+            while (targetEnum.hasMoreElements()) {
+                TargetInfo target = (TargetInfo) targetEnum.nextElement();
+                if (!target.getRebuild()) {
+                    if (dependencyTable.needsRebuild(this, target,
+                                    dependencyDepth)) {
+                        target.mustRebuild();
+                    }
+                }
+            }
+            dependencyTable.commit(this);
+        }
+        //
+        // count files being rebuilt now
+        //
+        int currentTargets = 0;
+        targetEnum = targets.elements();
+        while (targetEnum.hasMoreElements()) {
+            TargetInfo target = (TargetInfo) targetEnum.nextElement();
+            if (target.getRebuild()) {
+                currentTargets++;
+            }
+        }
+        if (potentialTargets > 0) {
+            log(Integer.toString(potentialTargets - currentTargets
+                            + definiteTargets)
+                            + " files are up to date.");
+            log(Integer.toString(currentTargets - definiteTargets)
+                            + " files to be recompiled from dependency analysis.");
+        }
+        log(Integer.toString(currentTargets) + " total files to be compiled.");
+        return currentTargets;
+    }
+
+    protected LinkerConfiguration collectExplicitObjectFiles(
+                    Vector objectFiles, Vector sysObjectFiles) {
+        //
+        // find the first eligible linker
+        //
+        //
+        ProcessorConfiguration linkerConfig = null;
+        LinkerDef selectedLinkerDef = null;
+        Linker selectedLinker = null;
+        Hashtable sysLibraries = new Hashtable();
+        TargetDef targetPlatform = getTargetPlatform();
+        FileVisitor objCollector = null;
+        FileVisitor sysLibraryCollector = null;
+        for (int i = 0; i < _linkers.size(); i++) {
+            LinkerDef currentLinkerDef = (LinkerDef) _linkers.elementAt(i);
+            if (currentLinkerDef.isActive()) {
+                selectedLinkerDef = currentLinkerDef;
+                selectedLinker = currentLinkerDef.getProcessor().getLinker(
+                                linkType);
+                //
+                // skip the linker if it doesn't know how to
+                // produce the specified link type
+                if (selectedLinker != null) {
+                    linkerConfig = currentLinkerDef.createConfiguration(this,
+                                    linkType, linkerDef, targetPlatform);
+                    if (linkerConfig != null) {
+                        //
+                        // create collectors for object files
+                        // and system libraries
+                        objCollector = new ObjectFileCollector(selectedLinker,
+                                        objectFiles);
+                        sysLibraryCollector = new SystemLibraryCollector(
+                                        selectedLinker, sysLibraries);
+                        //
+                        // if the <linker> has embedded <fileset>'s
+                        // (such as linker specific libraries)
+                        // add them as object files.
+                        //
+                        if (currentLinkerDef.hasFileSets()) {
+                            currentLinkerDef.visitFiles(objCollector);
+                        }
+                        //
+                        // user libraries are just a specialized form
+                        // of an object fileset
+                        selectedLinkerDef.visitUserLibraries(selectedLinker,
+                                        objCollector);
+                    }
+                    break;
+                }
+            }
+        }
+        if (linkerConfig == null) {
+            linkerConfig = linkerDef.createConfiguration(this, linkType, null,
+                            targetPlatform);
+            selectedLinker = (Linker) linkerDef.getProcessor().getLinker(
+                            linkType);
+            objCollector = new ObjectFileCollector(selectedLinker, objectFiles);
+            sysLibraryCollector = new SystemLibraryCollector(selectedLinker,
+                            sysLibraries);
+        }
+        //
+        // unless there was a <linker> element that
+        // explicitly did not inherit files from
+        // containing <cc> element
+        if (selectedLinkerDef == null || selectedLinkerDef.getInherit()) {
+            linkerDef.visitUserLibraries(selectedLinker, objCollector);
+            linkerDef.visitSystemLibraries(selectedLinker, sysLibraryCollector);
+        }
+        //
+        // if there was a <syslibset> in a nested <linker>
+        // evaluate it last so it takes priority over
+        // identically named libs from <cc> element
+        //
+        if (selectedLinkerDef != null) {
+            //
+            // add any system libraries to the hashtable
+            // done in reverse order so the earliest
+            // on the classpath takes priority
+            selectedLinkerDef.visitSystemLibraries(selectedLinker,
+                            sysLibraryCollector);
+        }
+        //
+        // copy over any system libraries to the
+        // object files vector
+        //
+        Enumeration sysLibEnum = sysLibraries.elements();
+        while (sysLibEnum.hasMoreElements()) {
+            sysObjectFiles.addElement(sysLibEnum.nextElement());
+        }
+        return (LinkerConfiguration) linkerConfig;
+    }
+
+    /**
+     * Adds an include path.
+     * 
+     * Include paths will be inherited by nested compiler elements that do not
+     * have inherit="false".
+     */
+    public IncludePath createIncludePath() {
+        return compilerDef.createIncludePath();
+    }
+
+    /**
+     * Specifies precompilation prototype file and exclusions. Inherited by all
+     * compilers that do not have inherit="false".
+     * 
+     */
+    public PrecompileDef createPrecompile() throws BuildException {
+        return compilerDef.createPrecompile();
+    }
+
+    /**
+     * Adds a system include path. Locations and timestamps of files located
+     * using the system include paths are not used in dependency analysis.
+     * 
+     * 
+     * Standard include locations should not be specified. The compiler adapters
+     * should recognized the settings from the appropriate environment variables
+     * or configuration files.
+     * 
+     * System include paths will be inherited by nested compiler elements that
+     * do not have inherit="false".
+     */
+    public SystemIncludePath createSysIncludePath() {
+        return compilerDef.createSysIncludePath();
+    }
+
+    /**
+     * Executes the task. Compiles the given files.
+     * 
+     * @throws BuildException
+     *             if someting goes wrong with the build
+     */
+    public void execute() throws BuildException {
+        //
+        // if link type allowed objdir to be defaulted
+        // provide it from outfile
+        if (_objDir == null) {
+            if (_outfile != null) {
+                _objDir = new File(_outfile.getParent());
+            } else {
+                _objDir = new File(".");
+            }
+        }
+
+        //
+        // if the object directory does not exist
+        //
+        if (!_objDir.exists()) {
+            throw new BuildException("Object directory does not exist");
+        }
+        
+        //
+        // if userdefine is true, then run all user defined command
+        //
+        if (userdefine) {
+            Iterator iter = _userdefines.iterator();
+            while( iter.hasNext()) {
+                UserDefineDef userdefineDef = (UserDefineDef)iter.next();
+                UserDefineCompiler userdefineCompiler = new UserDefineCompiler(this, userdefineDef);
+                userdefineCompiler.command(this, userdefineDef);
+            }
+            return ;
+        }
+        
+        TargetHistoryTable objHistory = new TargetHistoryTable(this, _objDir);
+        //
+        // determine the eventual linker configuration
+        // (may be null) and collect any explicit
+        // object files or libraries
+        Vector objectFiles = new Vector();
+        Vector sysObjectFiles = new Vector();
+        LinkerConfiguration linkerConfig = collectExplicitObjectFiles(
+                        objectFiles, sysObjectFiles);
+        //
+        // Assembler hashtable of all files
+        // that we know how to compile (keyed by output file name)
+        //
+        Hashtable targets = getTargets(linkerConfig, objectFiles);
+        Hashtable acpiTarget = new Hashtable();
+        if (aslcompiler) {
+            acpiTarget = getAcpiTargets(linkerConfig, new Vector());
+        }
+        Hashtable assemblerTarget = new Hashtable();
+        if (assembler) {
+            assemblerTarget = getAssemblerTargets(linkerConfig, objectFiles);
+        }
+        TargetInfo linkTarget = null;
+        //
+        // if output file is not specified,
+        // then skip link step
+        //
+        if (_outfile != null) {
+            linkTarget = getLinkTarget(linkerConfig, objectFiles,
+                            sysObjectFiles, targets, assemblerTarget);
+        }
+        //
+        // If specify the aslcompiler, then call asl compiler
+        //
+        if (aslcompiler) {
+            BuildException acpiException = null;
+            Hashtable targetsByConfig = getTargetsToBuildByConfiguration(acpiTarget);
+            Enumeration acpiTargetEnum = targetsByConfig.elements();
+            Vector[] targetVectors = new Vector[targetsByConfig.size()];
+            int index = 0;
+            while (acpiTargetEnum.hasMoreElements()) {
+                Vector targetsForConfig = (Vector) acpiTargetEnum.nextElement();
+                targetVectors[index++] = targetsForConfig;
+            }
+            for (int i = 0; i < targetVectors.length; i++) {
+                //
+                // get the targets for this configuration
+                //
+                Vector targetsForConfig = targetVectors[i];
+                //
+                // get the configuration from the first entry
+                //
+                AslcompilerConfiguration config = (AslcompilerConfiguration) ((TargetInfo) targetsForConfig
+                                .elementAt(0)).getConfiguration();
+                //
+                // prepare the list of source files
+                //
+                String[] sourceFiles = new String[targetsForConfig.size()];
+                Enumeration targetsEnum = targetsForConfig.elements();
+                index = 0;
+                while (targetsEnum.hasMoreElements()) {
+                    TargetInfo targetInfo = ((TargetInfo) targetsEnum
+                                    .nextElement());
+                    sourceFiles[index++] = targetInfo.getSources()[0]
+                                    .toString();
+                }
+                try {
+                    config.aslcompiler(this, _objDir, sourceFiles);
+                    log(sourceFiles.length
+                                    + " total ACPI source files to be compiled.");
+                } catch (BuildException ex) {
+                    if (acpiException == null) {
+                        acpiException = ex;
+                    }
+                    if (!relentless)
+                        break;
+                }
+            }
+        }
+        //
+        // If specify the assembler, then call assembler
+        //
+        if (assembler) {
+            BuildException assemblerException = null;
+            Hashtable targetsByConfig = getTargetsToBuildByConfiguration(assemblerTarget);
+            Enumeration assembleTargetEnum = targetsByConfig.elements();
+            Vector[] targetVectors = new Vector[targetsByConfig.size()];
+            int index = 0;
+            while (assembleTargetEnum.hasMoreElements()) {
+                Vector targetsForConfig = (Vector) assembleTargetEnum
+                                .nextElement();
+                targetVectors[index++] = targetsForConfig;
+            }
+            for (int i = 0; i < targetVectors.length; i++) {
+                //
+                // get the targets for this configuration
+                //
+                Vector targetsForConfig = targetVectors[i];
+                //
+                // get the configuration from the first entry
+                //
+                AssemblerConfiguration config = (AssemblerConfiguration) ((TargetInfo) targetsForConfig
+                                .elementAt(0)).getConfiguration();
+                //
+                // prepare the list of source files
+                //
+                String[] sourceFiles = new String[targetsForConfig.size()];
+                Enumeration targetsEnum = targetsForConfig.elements();
+                index = 0;
+                while (targetsEnum.hasMoreElements()) {
+                    TargetInfo targetInfo = ((TargetInfo) targetsEnum
+                                    .nextElement());
+                    sourceFiles[index++] = targetInfo.getSources()[0]
+                                    .toString();
+                }
+                try {
+                    config.assembler(this, _objDir, sourceFiles);
+                    log(sourceFiles.length + " total files to be assembled.");
+                } catch (BuildException ex) {
+                    if (assemblerException == null) {
+                        assemblerException = ex;
+                    }
+                    if (!relentless)
+                        break;
+                }
+            }
+            //
+            // if we threw a assembler exception and
+            // didn't throw it at the time because
+            // we were relentless then
+            // save the history and
+            // throw the exception
+            //
+            if (assemblerException != null) {
+                if (failOnError) {
+                    throw assemblerException;
+                } else {
+                    log(assemblerException.getMessage(), Project.MSG_ERR);
+                    return;
+                }
+            }
+        }
+
+        //
+        // mark targets that don't have a history record or
+        // whose source last modification time is not
+        // the same as the history to be rebuilt
+        //
+        objHistory.markForRebuild(targets);
+        CCTaskProgressMonitor monitor = new CCTaskProgressMonitor(objHistory);
+        //
+        // check for changed include files
+        //
+        int rebuildCount = checkForChangedIncludeFiles(targets);
+        if (rebuildCount > 0) {
+            BuildException compileException = null;
+            //
+            // compile all targets with getRebuild() == true
+            //
+            Hashtable targetsByConfig = getTargetsToBuildByConfiguration(targets);
+            //
+            // build array containing Vectors with precompiled generation
+            // steps going first
+            //
+            Vector[] targetVectors = new Vector[targetsByConfig.size()];
+            int index = 0;
+            Enumeration targetVectorEnum = targetsByConfig.elements();
+            while (targetVectorEnum.hasMoreElements()) {
+                Vector targetsForConfig = (Vector) targetVectorEnum
+                                .nextElement();
+                //
+                // get the configuration from the first entry
+                //
+                CompilerConfiguration config = (CompilerConfiguration) ((TargetInfo) targetsForConfig
+                                .elementAt(0)).getConfiguration();
+                if (config.isPrecompileGeneration()) {
+                    targetVectors[index++] = targetsForConfig;
+                }
+            }
+            targetVectorEnum = targetsByConfig.elements();
+            while (targetVectorEnum.hasMoreElements()) {
+                Vector targetsForConfig = (Vector) targetVectorEnum
+                                .nextElement();
+                for (int i = 0; i < targetVectors.length; i++) {
+                    if (targetVectors[i] == targetsForConfig) {
+                        break;
+                    }
+                    if (targetVectors[i] == null) {
+                        targetVectors[i] = targetsForConfig;
+                        break;
+                    }
+                }
+            }
+            for (int i = 0; i < targetVectors.length; i++) {
+                //
+                // get the targets for this configuration
+                //
+                Vector targetsForConfig = targetVectors[i];
+                //
+                // get the configuration from the first entry
+                //
+                CompilerConfiguration config = (CompilerConfiguration) ((TargetInfo) targetsForConfig
+                                .elementAt(0)).getConfiguration();
+                //
+                // prepare the list of source files
+                //
+                String[] sourceFiles = new String[targetsForConfig.size()];
+                Enumeration targetsEnum = targetsForConfig.elements();
+                index = 0;
+                while (targetsEnum.hasMoreElements()) {
+                    TargetInfo targetInfo = ((TargetInfo) targetsEnum
+                                    .nextElement());
+                    sourceFiles[index++] = targetInfo.getSources()[0]
+                                    .toString();
+                }
+                try {
+                    config.compile(this, _objDir, sourceFiles, relentless,
+                                    monitor);
+                } catch (BuildException ex) {
+                    if (compileException == null) {
+                        compileException = ex;
+                    }
+                    if (!relentless)
+                        break;
+                }
+            }
+            //
+            // save the details of the object file compilation
+            // settings to disk for dependency analysis
+            //
+            try {
+                objHistory.commit();
+            } catch (IOException ex) {
+                this.log("Error writing history.xml: " + ex.toString());
+            }
+            //
+            // if we threw a compile exception and
+            // didn't throw it at the time because
+            // we were relentless then
+            // save the history and
+            // throw the exception
+            //
+            if (compileException != null) {
+                if (failOnError) {
+                    throw compileException;
+                } else {
+                    log(compileException.getMessage(), Project.MSG_ERR);
+                    return;
+                }
+            }
+        }
+        //
+        // if the dependency tree was not fully
+        // evaluated, then throw an exception
+        // since we really didn't do what we
+        // should have done
+        //
+        //
+        if (dependencyDepth >= 0) {
+            throw new BuildException(
+                            "All files at depth "
+                                            + Integer.toString(dependencyDepth)
+                                            + " from changes successfully compiled.\n"
+                                            + "Remove or change dependencyDepth to -1 to perform full compilation.");
+        }
+        //
+        // if no link target then
+        // commit the history for the object files
+        // and leave the task
+        if (linkTarget != null) {
+            //
+            // get the history for the link target (may be the same
+            // as the object history)
+            TargetHistoryTable linkHistory = getLinkHistory(objHistory);
+            //
+            // see if it needs to be rebuilt
+            //
+            linkHistory.markForRebuild(linkTarget);
+            //
+            // if it needs to be rebuilt, rebuild it
+            //
+            File output = linkTarget.getOutput();
+            if (linkTarget.getRebuild()) {
+                log("Starting link");
+                LinkerConfiguration linkConfig = (LinkerConfiguration) linkTarget
+                                .getConfiguration();
+                if (failOnError) {
+                    linkConfig.link(this, linkTarget);
+                } else {
+                    try {
+                        linkConfig.link(this, linkTarget);
+                    } catch (BuildException ex) {
+                        log(ex.getMessage(), Project.MSG_ERR);
+                        return;
+                    }
+                }
+                if (outputFileProperty != null)
+                    getProject().setProperty(outputFileProperty,
+                                    output.getAbsolutePath());
+                linkHistory.update(linkTarget);
+                try {
+                    linkHistory.commit();
+                } catch (IOException ex) {
+                    log("Error writing link history.xml: " + ex.toString());
+                }
+            } else {
+                if (outputFileProperty != null)
+                    getProject().setProperty(outputFileProperty,
+                                    output.getAbsolutePath());
+            }
+        }
+    }
+
+    /**
+     * Gets the dataset.
+     * 
+     * @return Returns a String
+     */
+    public String getDataset() {
+        return dataset;
+    }
+
+    protected TargetHistoryTable getLinkHistory(TargetHistoryTable objHistory) {
+        File outputFileDir = new File(_outfile.getParent());
+        //
+        // if the output file is being produced in the link
+        // directory, then we can use the same history file
+        //
+        if (_objDir.equals(outputFileDir)) {
+            return objHistory;
+        }
+        return new TargetHistoryTable(this, outputFileDir);
+    }
+
+    protected TargetInfo getLinkTarget(LinkerConfiguration linkerConfig,
+                    Vector objectFiles, Vector sysObjectFiles,
+                    Hashtable compileTargets, Hashtable assemblerTargets) {
+        //
+        // walk the compile phase targets and
+        // add those sources that have already been
+        // assigned to the linker or
+        // our output files the linker knows how to consume
+        // files the linker knows how to consume
+        //
+        Enumeration compileTargetsEnum = compileTargets.elements();
+        while (compileTargetsEnum.hasMoreElements()) {
+            TargetInfo compileTarget = (TargetInfo) compileTargetsEnum
+                            .nextElement();
+            //
+            // output of compile tasks
+            //
+            int bid = linkerConfig.bid(compileTarget.getOutput().toString());
+            if (bid > 0) {
+                objectFiles.addElement(compileTarget.getOutput());
+            }
+        }
+        //
+        // walk the assembler phase targets and
+        // add those sources that have already been
+        // assigned to the linker or
+        // our output files the linker knows how to consume
+        // files the linker knows how to consume
+        //
+        Enumeration assembleTargetsEnum = assemblerTargets.elements();
+        while (assembleTargetsEnum.hasMoreElements()) {
+            TargetInfo assemblerTarget = (TargetInfo) assembleTargetsEnum
+                            .nextElement();
+            //
+            // output of assemble tasks
+            //
+            int bid = linkerConfig.bid(assemblerTarget.getOutput().toString());
+            if (bid > 0) {
+                objectFiles.addElement(assemblerTarget.getOutput());
+            }
+        }
+        File[] objectFileArray = new File[objectFiles.size()];
+        objectFiles.copyInto(objectFileArray);
+        File[] sysObjectFileArray = new File[sysObjectFiles.size()];
+        sysObjectFiles.copyInto(sysObjectFileArray);
+        String baseName = _outfile.getName();
+        String fullName = linkerConfig.getOutputFileName(baseName);
+        File outputFile = new File(_outfile.getParent(), fullName);
+        return new TargetInfo(linkerConfig, objectFileArray,
+                        sysObjectFileArray, outputFile, linkerConfig
+                                        .getRebuild());
+    }
+
+    public File getObjdir() {
+        return _objDir;
+    }
+
+    public File getOutfile() {
+        return _outfile;
+    }
+
+    public TargetDef getTargetPlatform() {
+        return null;
+    }
+
+    /**
+     * This method collects a Hashtable, keyed by output file name, of
+     * TargetInfo's for every source file that is specified in the filesets of
+     * the <aslcompiler> elements. The TargetInfo's contain the appropriate ACPI
+     * configurations for their possible acpi
+     * 
+     */
+    private Hashtable getAcpiTargets(LinkerConfiguration linkerConfig,
+                    Vector objectFiles) {
+        Hashtable targets = new Hashtable(1000);
+        TargetDef targetPlatform = getTargetPlatform();
+        Vector biddingProcessors = new Vector(_aslcompiler.size());
+        for (int i = 0; i < _aslcompiler.size(); i++) {
+            AslcompilerDef currentAslDef = (AslcompilerDef) _aslcompiler
+                            .elementAt(i);
+            if (currentAslDef.isActive()) {
+                ProcessorConfiguration config = currentAslDef
+                                .createConfiguration(this, linkType,
+                                                aslcompilerDef, targetPlatform);
+                //
+                // if the aslcompiler has a fileset
+                // then allow it to add its files to
+                // the set of potential targets
+                //
+                ProcessorConfiguration[] localConfigs = new ProcessorConfiguration[] { config };
+                if (currentAslDef.hasFileSets()) {
+                    TargetMatcher matcher = new TargetMatcher(this, _objDir,
+                                    localConfigs, linkerConfig, objectFiles,
+                                    targets);
+                    currentAslDef.visitFiles(matcher);
+                }
+                biddingProcessors.addElement(config);
+            }
+        }
+        //
+        // add fallback compiler at the end
+        //
+        ProcessorConfiguration config = aslcompilerDef.createConfiguration(
+                        this, linkType, null, targetPlatform);
+        biddingProcessors.addElement(config);
+        ProcessorConfiguration[] bidders = new ProcessorConfiguration[biddingProcessors
+                        .size()];
+        biddingProcessors.copyInto(bidders);
+        TargetMatcher matcher = new TargetMatcher(this, _objDir, bidders,
+                        linkerConfig, objectFiles, targets);
+        aslcompilerDef.visitFiles(matcher);
+        return targets;
+    }
+
+    /**
+     * This method collects a Hashtable, keyed by output file name, of
+     * TargetInfo's for every source file that is specified in the filesets of
+     * the <assembler> elements. The TargetInfo's contain the appropriate
+     * assembler configurations for their possible assembly
+     * 
+     */
+    private Hashtable getAssemblerTargets(LinkerConfiguration linkerConfig,
+                    Vector objectFiles) {
+        Hashtable targets = new Hashtable(1000);
+        TargetDef targetPlatform = getTargetPlatform();
+        Vector biddingProcessors = new Vector(_assemblers.size());
+        for (int i = 0; i < _assemblers.size(); i++) {
+            AssemblerDef currentAssemblerDef = (AssemblerDef) _assemblers
+                            .elementAt(i);
+            if (currentAssemblerDef.isActive()) {
+                ProcessorConfiguration config = currentAssemblerDef
+                                .createConfiguration(this, linkType,
+                                                assemblerDef, targetPlatform);
+                //
+                // if the assembler has a fileset
+                // then allow it to add its files to
+                // the set of potential targets
+                //
+                ProcessorConfiguration[] localConfigs = new ProcessorConfiguration[] { config };
+                if (currentAssemblerDef.hasFileSets()) {
+                    TargetMatcher matcher = new TargetMatcher(this, _objDir,
+                                    localConfigs, linkerConfig, objectFiles,
+                                    targets);
+                    currentAssemblerDef.visitFiles(matcher);
+                }
+                biddingProcessors.addElement(config);
+            }
+        }
+        //
+        // add fallback assembler at the end
+        //
+        ProcessorConfiguration config = assemblerDef.createConfiguration(this,
+                        linkType, null, targetPlatform);
+        biddingProcessors.addElement(config);
+        ProcessorConfiguration[] bidders = new ProcessorConfiguration[biddingProcessors
+                        .size()];
+        biddingProcessors.copyInto(bidders);
+        TargetMatcher matcher = new TargetMatcher(this, _objDir, bidders,
+                        linkerConfig, objectFiles, targets);
+        assemblerDef.visitFiles(matcher);
+        return targets;
+    }
+
+    /**
+     * This method collects a Hashtable, keyed by output file name, of
+     * TargetInfo's for every source file that is specified in the filesets of
+     * the <cc>and nested <compiler>elements. The TargetInfo's contain the
+     * appropriate compiler configurations for their possible compilation
+     * 
+     */
+    private Hashtable getTargets(LinkerConfiguration linkerConfig,
+                    Vector objectFiles) {
+        Hashtable targets = new Hashtable(1000);
+        TargetDef targetPlatform = getTargetPlatform();
+        //
+        // find active (specialized) compilers
+        //
+        Vector biddingProcessors = new Vector(_compilers.size());
+        for (int i = 0; i < _compilers.size(); i++) {
+            CompilerDef currentCompilerDef = (CompilerDef) _compilers
+                            .elementAt(i);
+            if (currentCompilerDef.isActive()) {
+                ProcessorConfiguration config = currentCompilerDef
+                                .createConfiguration(this, linkType,
+                                                compilerDef, targetPlatform);
+                //
+                // see if this processor had a precompile child element
+                //
+                PrecompileDef precompileDef = currentCompilerDef
+                                .getActivePrecompile(compilerDef);
+                ProcessorConfiguration[] localConfigs = new ProcessorConfiguration[] { config };
+                //
+                // if it does then
+                //
+                if (precompileDef != null) {
+                    File prototype = precompileDef.getPrototype();
+                    //
+                    // will throw exceptions if prototype doesn't exist, etc
+                    //
+                    if (!prototype.exists()) {
+                        throw new BuildException("prototype ("
+                                        + prototype.toString()
+                                        + ") does not exist.");
+                    }
+                    if (prototype.isDirectory()) {
+                        throw new BuildException("prototype ("
+                                        + prototype.toString()
+                                        + ") is a directory.");
+                    }
+                    String[] exceptFiles = precompileDef.getExceptFiles();
+                    //
+                    // create a precompile building and precompile using
+                    // variants of the configuration
+                    // or return null if compiler doesn't support
+                    // precompilation
+                    CompilerConfiguration[] configs = ((CompilerConfiguration) config)
+                                    .createPrecompileConfigurations(prototype,
+                                                    exceptFiles);
+                    if (configs != null && configs.length == 2) {
+                        //
+                        // visit the precompiled file to add it into the
+                        // targets list (just like any other file if
+                        // compiler doesn't support precompilation)
+                        TargetMatcher matcher = new TargetMatcher(
+                                        this,
+                                        _objDir,
+                                        new ProcessorConfiguration[] { configs[0] },
+                                        linkerConfig, objectFiles, targets);
+                        matcher.visit(new File(prototype.getParent()),
+                                        prototype.getName());
+                        //
+                        // only the configuration that uses the
+                        // precompiled header gets added to the bidding list
+                        biddingProcessors.addElement(configs[1]);
+                        localConfigs = new ProcessorConfiguration[2];
+                        localConfigs[0] = configs[1];
+                        localConfigs[1] = config;
+                    }
+                }
+                //
+                // if the compiler has a fileset
+                // then allow it to add its files
+                // to the set of potential targets
+                if (currentCompilerDef.hasFileSets()) {
+                    TargetMatcher matcher = new TargetMatcher(this, _objDir,
+                                    localConfigs, linkerConfig, objectFiles,
+                                    targets);
+                    currentCompilerDef.visitFiles(matcher);
+                }
+                biddingProcessors.addElement(config);
+            }
+        }
+        //
+        // add fallback compiler at the end
+        //
+        ProcessorConfiguration config = compilerDef.createConfiguration(this,
+                        linkType, null, targetPlatform);
+        biddingProcessors.addElement(config);
+        ProcessorConfiguration[] bidders = new ProcessorConfiguration[biddingProcessors
+                        .size()];
+        biddingProcessors.copyInto(bidders);
+        //
+        // bid out the <fileset>'s in the cctask
+        //
+        TargetMatcher matcher = new TargetMatcher(this, _objDir, bidders,
+                        linkerConfig, objectFiles, targets);
+        compilerDef.visitFiles(matcher);
+        return targets;
+    }
+
+    /**
+     * Sets the default compiler adapter. Use the "name" attribute when the
+     * compiler is a supported compiler.
+     * 
+     * @param classname
+     *            fully qualified classname which implements CompilerAdapter
+     */
+    public void setClassname(String classname) {
+        compilerDef.setClassname(classname);
+        linkerDef.setClassname(classname);
+        assemblerDef.setClassname(classname);
+        aslcompilerDef.setClassname(classname);
+    }
+
+    /**
+     * Sets the dataset for OS/390 builds.
+     * 
+     * @param dataset
+     *            The dataset to set
+     */
+    public void setDataset(String dataset) {
+        this.dataset = dataset;
+    }
+
+    /**
+     * Enables or disables generation of debug info.
+     */
+    public void setDebug(boolean debug) {
+        compilerDef.setDebug(debug);
+        linkerDef.setDebug(debug);
+        assemblerDef.setDebug(debug);
+        aslcompilerDef.setDebug(debug);
+    }
+
+    /**
+     * Deprecated.
+     * 
+     * Controls the depth of the dependency evaluation. Used to do a quick check
+     * of changes before a full build.
+     * 
+     * Any negative value which will perform full dependency checking. Positive
+     * values will truncate dependency checking. A value of 0 will cause only
+     * those files that changed to be recompiled, a value of 1 which cause files
+     * that changed or that explicitly include a file that changed to be
+     * recompiled.
+     * 
+     * Any non-negative value will cause a BuildException to be thrown before
+     * attempting a link or completing the task.
+     * 
+     */
+    public void setDependencyDepth(int depth) {
+        dependencyDepth = depth;
+    }
+
+    /**
+     * Enables generation of exception handling code
+     */
+    public void setExceptions(boolean exceptions) {
+        compilerDef.setExceptions(exceptions);
+    }
+
+    /**
+     * Enables run-time type information.
+     */
+    public void setRtti(boolean rtti) {
+        compilerDef.setRtti(rtti);
+    }
+
+    // public LinkType getLinkType() {
+    // return linkType;
+    // }
+    /**
+     * Enables or disables incremental linking.
+     * 
+     * @param incremental
+     *            new state
+     */
+    public void setIncremental(boolean incremental) {
+        linkerDef.setIncremental(incremental);
+    }
+
+    /**
+     * Set use of libtool.
+     * 
+     * If set to true, the "libtool " will be prepended to the command line for
+     * compatible processors
+     * 
+     * @param libtool
+     *            If true, use libtool.
+     */
+    public void setLibtool(boolean libtool) {
+        compilerDef.setLibtool(libtool);
+        linkerDef.setLibtool(libtool);
+        assemblerDef.setLibtool(libtool);
+        aslcompilerDef.setLibtool(libtool);
+    }
+
+    /**
+     * Sets the output file type. Supported values "executable", "shared", and
+     * "static". Deprecated, specify outtype instead.
+     * 
+     * @deprecated
+     */
+    public void setLink(OutputTypeEnum outputType) {
+        linkType.setOutputType(outputType);
+    }
+
+    /**
+     * Enables or disables generation of multithreaded code
+     * 
+     * @param multi
+     *            If true, generated code may be multithreaded.
+     */
+    public void setMultithreaded(boolean multi) {
+        compilerDef.setMultithreaded(multi);
+    }
+
+    //
+    // keep near duplicate comment at CompilerDef.setName in sync
+    //
+    /**
+     * Sets type of the default compiler and linker.
+     * 
+     * <table width="100%" border="1"> <thead>Supported compilers </thead>
+     * <tr>
+     * <td>gcc (default)</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>g++</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>c++</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>g77</td>
+     * <td>GNU FORTRAN compiler</td>
+     * </tr>
+     * <tr>
+     * <td>msvc</td>
+     * <td>Microsoft Visual C++</td>
+     * </tr>
+     * <tr>
+     * <td>bcc</td>
+     * <td>Borland C++ Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>msrc</td>
+     * <td>Microsoft Resource Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>brc</td>
+     * <td>Borland Resource Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>df</td>
+     * <td>Compaq Visual Fortran Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>midl</td>
+     * <td>Microsoft MIDL Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>icl</td>
+     * <td>Intel C++ compiler for Windows (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecl</td>
+     * <td>Intel C++ compiler for Windows (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>icc</td>
+     * <td>Intel C++ compiler for Linux (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecc</td>
+     * <td>Intel C++ compiler for Linux (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>CC</td>
+     * <td>Sun ONE C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>aCC</td>
+     * <td>HP aC++ C++ Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>os390</td>
+     * <td>OS390 C Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>os400</td>
+     * <td>Icc Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>sunc89</td>
+     * <td>Sun C89 C Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>xlC</td>
+     * <td>VisualAge C Compiler</td>
+     * </tr>
+     * </table>
+     * 
+     */
+    public void setName(CompilerEnum name) {
+        compilerDef.setName(name);
+        Processor compiler = compilerDef.getProcessor();
+        Linker linker = compiler.getLinker(linkType);
+        linkerDef.setProcessor(linker);
+    }
+
+    /**
+     * Do not propagate old environment when new environment variables are
+     * specified.
+     */
+    public void setNewenvironment(boolean newenv) {
+        compilerDef.setNewenvironment(newenv);
+        linkerDef.setNewenvironment(newenv);
+        assemblerDef.setNewenvironment(newenv);
+        aslcompilerDef.setNewenvironment(newenv);
+    }
+
+    /**
+     * Sets the destination directory for object files.
+     * 
+     * Generally this should be a property expression that evaluates to distinct
+     * debug and release object file directories.
+     * 
+     * @param dir
+     *            object directory
+     */
+    public void setObjdir(File dir) {
+        if (dir == null) {
+            throw new NullPointerException("dir");
+        }
+        _objDir = dir;
+    }
+
+    /**
+     * Sets the output file name. If not specified, the task will only compile
+     * files and not attempt to link. If an extension is not specified, the task
+     * may use a system appropriate extension and prefix, for example,
+     * outfile="example" may result in "libexample.so" being created.
+     * 
+     * @param outfile
+     *            output file name
+     */
+    public void setOutfile(File outfile) {
+        //
+        // if file name was empty, skip link step
+        //
+        if (outfile == null || outfile.toString().length() > 0) {
+            _outfile = outfile;
+        }
+    }
+
+    /**
+     * Specifies the name of a property to set with the physical filename that
+     * is produced by the linker
+     */
+    public void setOutputFileProperty(String outputFileProperty) {
+        this.outputFileProperty = outputFileProperty;
+    }
+
+    /**
+     * Sets the output file type. Supported values "executable", "shared", and
+     * "static".
+     */
+    public void setOuttype(OutputTypeEnum outputType) {
+        linkType.setOutputType(outputType);
+    }
+
+    /**
+     * Sets the project.
+     */
+    public void setProject(Project project) {
+        super.setProject(project);
+        compilerDef.setProject(project);
+        linkerDef.setProject(project);
+        assemblerDef.setProject(project);
+        aslcompilerDef.setProject(project);
+    }
+
+    /**
+     * If set to true, all files will be rebuilt.
+     * 
+     * @paran rebuildAll If true, all files will be rebuilt. If false, up to
+     *        date files will not be rebuilt.
+     */
+    public void setRebuild(boolean rebuildAll) {
+        compilerDef.setRebuild(rebuildAll);
+        linkerDef.setRebuild(rebuildAll);
+        assemblerDef.setRebuild(rebuildAll);
+        aslcompilerDef.setRebuild(rebuildAll);
+    }
+
+    /**
+     * If set to true, compilation errors will not stop the task until all files
+     * have been attempted.
+     * 
+     * @param relentless
+     *            If true, don't stop on the first compilation error
+     * 
+     */
+    public void setRelentless(boolean relentless) {
+        this.relentless = relentless;
+    }
+
+    /**
+     * Sets the type of runtime library, possible values "dynamic", "static".
+     */
+    public void setRuntime(RuntimeType rtlType) {
+        linkType.setStaticRuntime((rtlType.getIndex() == 1));
+    }
+
+    /**
+     * Sets the nature of the subsystem under which that the program will
+     * execute.
+     * 
+     * <table width="100%" border="1"> <thead>Supported subsystems </thead>
+     * <tr>
+     * <td>gui</td>
+     * <td>Graphical User Interface</td>
+     * </tr>
+     * <tr>
+     * <td>console</td>
+     * <td>Command Line Console</td>
+     * </tr>
+     * <tr>
+     * <td>other</td>
+     * <td>Other</td>
+     * </tr>
+     * </table>
+     * 
+     * @param subsystem
+     *            subsystem
+     * @throws NullPointerException
+     *             if subsystem is null
+     */
+    public void setSubsystem(SubsystemEnum subsystem) {
+        if (subsystem == null) {
+            throw new NullPointerException("subsystem");
+        }
+        linkType.setSubsystem(subsystem);
+    }
+
+    /**
+     * Enumerated attribute with the values "none", "severe", "default",
+     * "production", "diagnostic", and "failtask".
+     */
+    public void setWarnings(CompilerDef.WarningLevel level) {
+        compilerDef.setWarnings(level);
+    }
+
+    /**
+     * Indicates whether the build will continue even if there are compilation
+     * errors; defaults to true.
+     * 
+     * @param fail
+     *            if true halt the build on failure
+     */
+    public void setFailonerror(boolean fail) {
+        failOnError = fail;
+    }
+
+    /**
+     * Gets the failonerror flag.
+     * 
+     * @return the failonerror flag
+     */
+    public boolean getFailonerror() {
+        return failOnError;
+    }
+
+    /**
+     * Adds descriptive version information to be included in the generated
+     * file. The first active version info block will be used. (Non-functional
+     * prototype)
+     */
+    public void addConfiguredVersioninfo(VersionInfo info) {
+        linkerDef.addConfiguredVersioninfo(info);
+    }
+
+    /**
+     * Adds a target definition or reference (Non-functional prototype).
+     * 
+     * @param target
+     *            target
+     * @throws NullPointerException
+     *             if compiler is null
+     */
+    public void addConfiguredTarget(TargetDef target) {
+        if (target == null) {
+            throw new NullPointerException("target");
+        }
+        target.setProject(getProject());
+        targetPlatforms.addElement(target);
+    }
+
+    /**
+     * Adds a distributer definition or reference (Non-functional prototype).
+     * 
+     * @param distributer
+     *            distributer
+     * @throws NullPointerException
+     *             if compiler is null
+     */
+    public void addConfiguredDistributer(DistributerDef distributer) {
+        if (distributer == null) {
+            throw new NullPointerException("distributer");
+        }
+        distributer.setProject(getProject());
+        distributers.addElement(distributer);
+    }
+
+    /**
+     * Sets optimization.
+     * @param optimization
+     */
+    public void setOptimize(OptimizationEnum optimization) {
+        compilerDef.setOptimize(optimization);
+    }
+
+    public boolean isAssembler() {
+        return assembler;
+    }
+
+    public void setAssembler(boolean assembler) {
+        this.assembler = assembler;
+    }
+
+    public boolean isAslcompiler() {
+        return aslcompiler;
+    }
+
+    public void setAslcompiler(boolean aslcompiler) {
+        this.aslcompiler = aslcompiler;
+    }
+
+    public boolean isUserdefine() {
+        return userdefine;
+    }
+
+    public void setUserdefine(boolean userdefine) {
+        this.userdefine = userdefine;
+    }
+
+    public String getArch() {
+        return arch;
+    }
+
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
+
+    public String getOs() {
+        return os;
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
+
+    public String getVendor() {
+        return vendor;
+    }
+
+    public void setVendor(String vendor) {
+        this.vendor = vendor;
+    }
+    
+    
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
new file mode 100644
index 0000000000..78192a5ba7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java
@@ -0,0 +1,56 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.IOException;
+
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.ProgressMonitor;
+public class CCTaskProgressMonitor implements ProgressMonitor {
+    private ProcessorConfiguration config;
+    private TargetHistoryTable history;
+    private long lastCommit = -1;
+    public CCTaskProgressMonitor(TargetHistoryTable history) {
+        this.history = history;
+    }
+    public void finish(ProcessorConfiguration config, boolean normal) {
+        long current = System.currentTimeMillis();
+        if ((current - lastCommit) > 120000) {
+            try {
+                history.commit();
+                lastCommit = System.currentTimeMillis();
+            } catch (IOException ex) {
+            }
+        }
+    }
+    public void progress(String[] sources) {
+        history.update(config, sources);
+        long current = System.currentTimeMillis();
+        if ((current - lastCommit) > 120000) {
+            try {
+                history.commit();
+                lastCommit = current;
+            } catch (IOException ex) {
+            }
+        }
+    }
+    public void start(ProcessorConfiguration config) {
+        if (lastCommit < 0) {
+            lastCommit = System.currentTimeMillis();
+        }
+        this.config = config;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java
new file mode 100644
index 0000000000..ba73902361
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CPUEnum.java
@@ -0,0 +1,71 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of cpu types.
+ *
+ * @author Curt Arnold
+ *
+ */
+public final class CPUEnum
+    extends EnumeratedAttribute {
+
+  /**
+   * Constructor.
+   *
+   * Set by default to "pentium3"
+   *
+   * @see java.lang.Object#Object()
+   */
+  public CPUEnum() {
+    setValue("pentium3");
+  }
+
+  /**
+   * Gets list of acceptable values.
+   *
+   * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+   */
+  public String[] getValues() {
+    return new String[] {
+        "i386",
+        "i486",
+        "i586",
+        "i686",
+        "pentium",
+        "pentium-mmx",
+        "pentiumpro",
+        "pentium2",
+        "pentium3",
+        "pentium4",
+        "k6",
+        "k6-2",
+        "k6-3",
+        "athlon",
+        "athlon-tbird",
+        "athlon-4",
+        "athlon-xp",
+        "athlon-mp",
+        "winchip-c6",
+        "winchip2",
+        "c3" };
+  }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java
new file mode 100644
index 0000000000..074e8b42f8
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CUtil.java
@@ -0,0 +1,461 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.Environment;
+/**
+ * Some utilities used by the CC and Link tasks.
+ * 
+ * @author Adam Murdoch
+ */
+public class CUtil {
+    /**
+     * A class that splits a white-space, comma-separated list into a String
+     * array. Used for task attributes.
+     */
+    public static final class StringArrayBuilder {
+        private String[] _value;
+        public StringArrayBuilder(String value) {
+            // Split the defines up
+            StringTokenizer tokens = new StringTokenizer(value, ", ");
+            Vector vallist = new Vector();
+            while (tokens.hasMoreTokens()) {
+                String val = tokens.nextToken().trim();
+                if (val.length() == 0) {
+                    continue;
+                }
+                vallist.addElement(val);
+            }
+            _value = new String[vallist.size()];
+            vallist.copyInto(_value);
+        }
+        public String[] getValue() {
+            return _value;
+        }
+    }
+    /**
+     * Adds the elements of the array to the given vector
+     */
+    public static void addAll(Vector dest, Object[] src) {
+        if (src == null) {
+            return;
+        }
+        for (int i = 0; i < src.length; i++) {
+            dest.addElement(src[i]);
+        }
+    }
+    /**
+     * Checks a array of names for non existent or non directory entries and
+     * nulls them out.
+     * 
+     * @return Count of non-null elements
+     */
+    public static int checkDirectoryArray(String[] names) {
+        int count = 0;
+        for (int i = 0; i < names.length; i++) {
+            if (names[i] != null) {
+                File dir = new File(names[i]);
+                if (dir.exists() && dir.isDirectory()) {
+                    count++;
+                } else {
+                    names[i] = null;
+                }
+            }
+        }
+        return count;
+    }
+    /**
+     * Extracts the basename of a file, removing the extension, if present
+     */
+    public static String getBasename(File file) {
+        String path = file.getPath();
+        // Remove the extension
+        String basename = file.getName();
+        int pos = basename.lastIndexOf('.');
+        if (pos != -1) {
+            basename = basename.substring(0, pos);
+        }
+        return basename;
+    }
+    /**
+     * Gets the parent directory for the executable file name using the current
+     * directory and system executable path
+     * 
+     * @param exeName
+     *            Name of executable such as "cl.exe"
+     * @return parent directory or null if not located
+     */
+    public static File getExecutableLocation(String exeName) {
+        //
+        //   must add current working directory to the
+        //      from of the path from the "path" environment variable
+        File currentDir = new File(System.getProperty("user.dir"));
+        if (new File(currentDir, exeName).exists()) {
+            return currentDir;
+        }
+        File[] envPath = CUtil.getPathFromEnvironment("PATH",
+                File.pathSeparator);
+        for (int i = 0; i < envPath.length; i++) {
+            if (new File(envPath[i], exeName).exists()) {
+                return envPath[i];
+            }
+        }
+        return null;
+    }
+    /**
+     * Extracts the parent of a file
+     */
+    public static String getParentPath(String path) {
+        int pos = path.lastIndexOf(File.separator);
+        if (pos <= 0) {
+            return null;
+        }
+        return path.substring(0, pos);
+    }
+    /**
+     * Returns an array of File for each existing directory in the specified
+     * environment variable
+     * 
+     * @param envVariable
+     *            environment variable name such as "LIB" or "INCLUDE"
+     * @param delim
+     *            delimitor used to separate parts of the path, typically ";"
+     *            or ":"
+     * @return array of File's for each part that is an existing directory
+     */
+    public static File[] getPathFromEnvironment(String envVariable, String delim) {
+        // OS/4000 does not support the env command.
+        if (System.getProperty("os.name").equals("OS/400"))
+            return new File[]{};
+        Vector osEnv = Execute.getProcEnvironment();
+        String match = envVariable.concat("=");
+        for (Enumeration e = osEnv.elements(); e.hasMoreElements();) {
+            String entry = ((String) e.nextElement()).trim();
+            if (entry.length() > match.length()) {
+                String entryFrag = entry.substring(0, match.length());
+                if (entryFrag.equalsIgnoreCase(match)) {
+                    String path = entry.substring(match.length());
+                    return parsePath(path, delim);
+                }
+            }
+        }
+        File[] noPath = new File[0];
+        return noPath;
+    }
+    /**
+     * Returns a relative path for the targetFile relative to the base
+     * directory.
+     * 
+     * @param canonicalBase
+     *            base directory as returned by File.getCanonicalPath()
+     * @param targetFile
+     *            target file
+     * @return relative path of target file. Returns targetFile if there were
+     *         no commonalities between the base and the target
+     * 
+     * @author Curt Arnold
+     */
+    public static String getRelativePath(String base, File targetFile) {
+        try {
+            //
+            //   remove trailing file separator
+            //
+            String canonicalBase = base;
+            if (base.charAt(base.length() - 1) == File.separatorChar) {
+                canonicalBase = base.substring(0, base.length() - 1);
+            }
+            //
+            //   get canonical name of target and remove trailing separator
+            //
+            String canonicalTarget;
+            if (System.getProperty("os.name").equals("OS/400"))
+                canonicalTarget = targetFile.getPath();
+            else
+                canonicalTarget = targetFile.getCanonicalPath();
+            if (canonicalTarget.charAt(canonicalTarget.length() - 1) == File.separatorChar) {
+                canonicalTarget = canonicalTarget.substring(0, canonicalTarget
+                        .length() - 1);
+            }
+            if (canonicalTarget.equals(canonicalBase)) {
+                return ".";
+            }
+            //
+            //  see if the prefixes are the same
+            //
+            if (canonicalBase.substring(0, 2).equals("\\\\")) {
+                //
+                //  UNC file name, if target file doesn't also start with same
+                //      server name, don't go there
+                int endPrefix = canonicalBase.indexOf('\\', 2);
+                String prefix1 = canonicalBase.substring(0, endPrefix);
+                String prefix2 = canonicalTarget.substring(0, endPrefix);
+                if (!prefix1.equals(prefix2)) {
+                    return canonicalTarget;
+                }
+            } else {
+                if (canonicalBase.substring(1, 3).equals(":\\")) {
+                    int endPrefix = 2;
+                    String prefix1 = canonicalBase.substring(0, endPrefix);
+                    String prefix2 = canonicalTarget.substring(0, endPrefix);
+                    if (!prefix1.equals(prefix2)) {
+                        return canonicalTarget;
+                    }
+                } else {
+                    if (canonicalBase.charAt(0) == '/') {
+                        if (canonicalTarget.charAt(0) != '/') {
+                            return canonicalTarget;
+                        }
+                    }
+                }
+            }
+            char separator = File.separatorChar;
+            int lastSeparator = -1;
+            int minLength = canonicalBase.length();
+            if (canonicalTarget.length() < minLength) {
+                minLength = canonicalTarget.length();
+            }
+            int firstDifference = minLength + 1;
+            //
+            //  walk to the shorter of the two paths
+            //      finding the last separator they have in common
+            for (int i = 0; i < minLength; i++) {
+                if (canonicalTarget.charAt(i) == canonicalBase.charAt(i)) {
+                    if (canonicalTarget.charAt(i) == separator) {
+                        lastSeparator = i;
+                    }
+                } else {
+                    firstDifference = lastSeparator + 1;
+                    break;
+                }
+            }
+            StringBuffer relativePath = new StringBuffer(50);
+            //
+            //   walk from the first difference to the end of the base
+            //      adding "../" for each separator encountered
+            //
+            if (canonicalBase.length() > firstDifference) {
+                relativePath.append("..");
+                for (int i = firstDifference; i < canonicalBase.length(); i++) {
+                    if (canonicalBase.charAt(i) == separator) {
+                        relativePath.append(separator);
+                        relativePath.append("..");
+                    }
+                }
+            }
+            if (canonicalTarget.length() > firstDifference) {
+                //
+                //    append the rest of the target
+                //
+                //
+                if (relativePath.length() > 0) {
+                    relativePath.append(separator);
+                }
+                relativePath.append(canonicalTarget.substring(firstDifference));
+            }
+            return relativePath.toString();
+        } catch (IOException ex) {
+        }
+        return targetFile.toString();
+    }
+    public static boolean isActive(Project p, String ifCond, String unlessCond)
+            throws BuildException {
+        if (ifCond != null) {
+            String ifValue = p.getProperty(ifCond);
+            if (ifValue == null) {
+                return false;
+            } else {
+                if (ifValue.equals("false") || ifValue.equals("no")) {
+                    throw new BuildException("if condition \"" + ifCond
+                            + "\" has suspicious value \"" + ifValue);
+                }
+            }
+        }
+        if (unlessCond != null) {
+            String unlessValue = p.getProperty(unlessCond);
+            if (unlessValue != null) {
+                if (unlessValue.equals("false") || unlessValue.equals("no")) {
+                    throw new BuildException("unless condition \"" + unlessCond
+                            + "\" has suspicious value \"" + unlessValue);
+                }
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Parse a string containing directories into an File[]
+     * 
+     * @param path
+     *            path string, for example ".;c:\something\include"
+     * @param delim
+     *            delimiter, typically ; or :
+     */
+    public static File[] parsePath(String path, String delim) {
+        Vector libpaths = new Vector();
+        int delimPos = 0;
+        for (int startPos = 0; startPos < path.length(); startPos = delimPos
+                + delim.length()) {
+            delimPos = path.indexOf(delim, startPos);
+            if (delimPos < 0) {
+                delimPos = path.length();
+            }
+            //
+            //   don't add an entry for zero-length paths
+            //
+            if (delimPos > startPos) {
+                String dirName = path.substring(startPos, delimPos);
+                File dir = new File(dirName);
+                if (dir.exists() && dir.isDirectory()) {
+                    libpaths.addElement(dir);
+                }
+            }
+        }
+        File[] paths = new File[libpaths.size()];
+        libpaths.copyInto(paths);
+        return paths;
+    }
+    /**
+     * This method is exposed so test classes can overload and test the
+     * arguments without actually spawning the compiler
+     */
+    public static int runCommand(CCTask task, File workingDir,
+            String[] cmdline, boolean newEnvironment, Environment env)
+            throws BuildException {
+        try {
+            task.log(Commandline.toString(cmdline), Project.MSG_VERBOSE);
+            Execute exe = new Execute(new LogStreamHandler(task,
+                    Project.MSG_INFO, Project.MSG_ERR));
+            if (System.getProperty("os.name").equals("OS/390"))
+                exe.setVMLauncher(false);
+            exe.setAntRun(task.getProject());
+            exe.setCommandline(cmdline);
+            exe.setWorkingDirectory(workingDir);
+            if (env != null) {
+                String[] environment = env.getVariables();
+                if (environment != null) {
+                    for (int i = 0; i < environment.length; i++) {
+                        task.log("Setting environment variable: "
+                                + environment[i], Project.MSG_VERBOSE);
+                    }
+                }
+                exe.setEnvironment(environment);
+            }
+            exe.setNewenvironment(newEnvironment);
+            return exe.execute();
+        } catch (java.io.IOException exc) {
+            throw new BuildException("Could not launch " + cmdline[0] + ": "
+                    + exc, task.getLocation());
+        }
+    }
+    /**
+     * Compares the contents of 2 arrays for equaliy.
+     */
+    public static boolean sameList(Object[] a, Object[] b) {
+        if (a == null || b == null || a.length != b.length) {
+            return false;
+        }
+        for (int i = 0; i < a.length; i++) {
+            if (!a[i].equals(b[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Compares the contents of an array and a Vector for equality.
+     */
+    public static boolean sameList(Vector v, Object[] a) {
+        if (v == null || a == null || v.size() != a.length) {
+            return false;
+        }
+        for (int i = 0; i < a.length; i++) {
+            Object o = a[i];
+            if (!o.equals(v.elementAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Compares the contents of an array and a Vector for set equality. Assumes
+     * input array and vector are sets (i.e. no duplicate entries)
+     */
+    public static boolean sameSet(Object[] a, Vector b) {
+        if (a == null || b == null || a.length != b.size()) {
+            return false;
+        }
+        if (a.length == 0) {
+            return true;
+        }
+        // Convert the array into a set
+        Hashtable t = new Hashtable();
+        for (int i = 0; i < a.length; i++) {
+            t.put(a[i], a[i]);
+        }
+        for (int i = 0; i < b.size(); i++) {
+            Object o = b.elementAt(i);
+            if (t.remove(o) == null) {
+                return false;
+            }
+        }
+        return (t.size() == 0);
+    }
+    /**
+     * Converts a vector to a string array.
+     */
+    public static String[] toArray(Vector src) {
+        String[] retval = new String[src.size()];
+        src.copyInto(retval);
+        return retval;
+    }
+    /**
+     * Replaces any embedded quotes in the string so that the value can be
+     * placed in an attribute in an XML file
+     * 
+     * @param attrValue
+     *            value to be expressed
+     * @return equivalent attribute literal
+     *  
+     */
+    public static String xmlAttribEncode(String attrValue) {
+        int quotePos = attrValue.indexOf('\"');
+        if (quotePos < 0) {
+            return attrValue;
+        }
+        int startPos = 0;
+        StringBuffer buf = new StringBuffer(attrValue.length() + 20);
+        while (quotePos >= 0) {
+            buf.append(attrValue.substring(startPos, quotePos));
+            buf.append("&quot;");
+            startPos = quotePos + 1;
+            quotePos = attrValue.indexOf('\"', startPos);
+        }
+        buf.append(attrValue.substring(startPos));
+        return buf.toString();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java
new file mode 100644
index 0000000000..0a92a51512
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerDef.java
@@ -0,0 +1,556 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler;
+import net.sf.antcontrib.cpptasks.compiler.Compiler;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.gcc.GccCCompiler;
+import net.sf.antcontrib.cpptasks.types.CompilerArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalPath;
+import net.sf.antcontrib.cpptasks.types.DefineSet;
+import net.sf.antcontrib.cpptasks.types.IncludePath;
+import net.sf.antcontrib.cpptasks.types.SystemIncludePath;
+import net.sf.antcontrib.cpptasks.types.UndefineArgument;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.*;
+/**
+ * A compiler definition. compiler elements may be placed either as children of
+ * a cc element or the project element. A compiler element with an id attribute
+ * may be referenced from compiler elements with refid or extends attributes.
+ * 
+ * @author Adam Murdoch
+ */
+public final class CompilerDef extends ProcessorDef {
+    /**
+     * Enumerated attribute with the values "none", "severe", "default",
+     * "production", "diagnostic", and "failtask".
+     */
+    public static class WarningLevel extends EnumeratedAttribute {
+        public String[] getValues() {
+            return new String[]{"none", "severe", "default", "production",
+                    "diagnostic", "aserror"};
+        }
+    }
+    /** The source file sets. */
+    private final Vector defineSets = new Vector();
+    private Boolean exceptions;
+    private Boolean rtti;
+    private final Vector includePaths = new Vector();
+    private Boolean multithreaded;
+    private final Vector precompileDefs = new Vector();
+    private final Vector sysIncludePaths = new Vector();
+    private OptimizationEnum optimization;
+    private int warnings = -1;
+    private Boolean defaultflag = new Boolean(true);
+    public CompilerDef() {
+    }
+    /**
+     * Adds a compiler command-line arg.
+     */
+    public void addConfiguredCompilerArg(CompilerArgument arg) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorArg(arg);
+    }
+    /**
+     * Adds a compiler command-line arg.
+     */
+    public void addConfiguredCompilerParam(CompilerParam param) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorParam(param);
+    }
+    /**
+     * Adds a defineset.
+     */
+    public void addConfiguredDefineset(DefineSet defs) {
+        if (defs == null) {
+            throw new NullPointerException("defs");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        defineSets.addElement(defs);
+    }
+    /**
+     * Creates an include path.
+     */
+    public IncludePath createIncludePath() {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        IncludePath path = new IncludePath(p);
+        includePaths.addElement(path);
+        return path;
+    }
+    /**
+     * Add a <includepath>or <sysincludepath> if specify the file 
+     * attribute
+     * 
+     * @throws BuildException
+     *             if the specify file not exist
+     */
+    protected void loadFile(Vector activePath,File file) throws BuildException {
+        FileReader fileReader;
+        BufferedReader in;
+        String str;
+        if (! file.exists()){
+            throw new BuildException("The file " + file + " is not existed");
+        }
+        try {
+            fileReader = new FileReader(file);
+            in = new BufferedReader(fileReader);
+            while ( (str = in.readLine()) != null ){                
+                if(str.trim() == ""){
+                    continue ;
+                }
+                str = getProject().replaceProperties(str);
+                activePath.addElement(str.trim());
+            }
+        }
+        catch(Exception e){
+            throw new BuildException(e.getMessage());
+        }
+    }
+    
+    /**
+     * Specifies precompilation prototype file and exclusions.
+     *  
+     */
+    public PrecompileDef createPrecompile() throws BuildException {
+    	Project p = getProject();
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        PrecompileDef precomp = new PrecompileDef();
+        precomp.setProject(p);
+        precompileDefs.addElement(precomp);
+        return precomp;
+    }
+    /**
+     * Creates a system include path. Locations and timestamps of files located
+     * using the system include paths are not used in dependency analysis.
+     * 
+     * 
+     * Standard include locations should not be specified. The compiler
+     * adapters should recognized the settings from the appropriate environment
+     * variables or configuration files.
+     */
+    public SystemIncludePath createSysIncludePath() {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        SystemIncludePath path = new SystemIncludePath(p);
+        sysIncludePaths.addElement(path);
+        return path;
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    public UndefineArgument[] getActiveDefines() {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException(
+                    "project must be set before this call");
+        }
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getActiveDefines();
+        }
+        Vector actives = new Vector();
+        for (int i = 0; i < defineSets.size(); i++) {
+            DefineSet currentSet = (DefineSet) defineSets.elementAt(i);
+            UndefineArgument[] defines = currentSet.getDefines();
+            for (int j = 0; j < defines.length; j++) {
+                if (defines[j].isActive(p)) {
+                    actives.addElement(defines[j]);
+                }
+            }
+        }
+        UndefineArgument[] retval = new UndefineArgument[actives.size()];
+        actives.copyInto(retval);
+        return retval;
+    }
+    /**
+     * Returns the compiler-specific include path.
+     */
+    public String[] getActiveIncludePaths() {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getActiveIncludePaths();
+        }
+        return getActivePaths(includePaths);
+    }
+    private String[] getActivePaths(Vector paths) {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project not set");
+        }
+        Vector activePaths = new Vector(paths.size());
+        for (int i = 0; i < paths.size(); i++) {
+            ConditionalPath path = (ConditionalPath) paths.elementAt(i);
+            if (path.isActive(p)) {
+                if (path.getFile() == null) {
+                    String[] pathEntries = path.list();
+                    for (int j = 0; j < pathEntries.length; j++) {
+                        activePaths.addElement(pathEntries[j]);
+                    }
+                }
+                else {
+                    loadFile(activePaths, path.getFile());
+                }
+            }
+        }
+        String[] pathNames = new String[activePaths.size()];
+        activePaths.copyInto(pathNames);
+        return pathNames;
+    }
+    public PrecompileDef getActivePrecompile(CompilerDef ccElement) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getActivePrecompile(ccElement);
+        }
+        PrecompileDef current = null;
+        Enumeration enumPrecompilerDef = precompileDefs.elements();
+        while (enumPrecompilerDef.hasMoreElements()) {
+            current = (PrecompileDef) enumPrecompilerDef.nextElement();
+            if (current.isActive()) {
+                return current;
+            }
+        }
+        CompilerDef extendedDef = (CompilerDef) getExtends();
+        if (extendedDef != null) {
+            current = extendedDef.getActivePrecompile(null);
+            if (current != null) {
+                return current;
+            }
+        }
+        if (ccElement != null && getInherit()) {
+            return ccElement.getActivePrecompile(null);
+        }
+        return null;
+    }
+    public String[] getActiveSysIncludePaths() {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getActiveSysIncludePaths();
+        }
+        return getActivePaths(sysIncludePaths);
+    }
+    public final boolean getExceptions(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getExceptions(defaultProviders, index);
+        }
+        if (exceptions != null) {
+            return exceptions.booleanValue();
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getExceptions(defaultProviders,
+                        index + 1);
+            }
+        }
+        return false;
+    }
+    public final Boolean getRtti(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getRtti(defaultProviders, index);
+        }
+        if (rtti != null) {
+            return rtti;
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getRtti(defaultProviders,
+                        index + 1);
+            }
+        }
+        return null;
+    }
+    public final Boolean getDefaultflag(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                  "CompilerDef")).getDefaultflag(defaultProviders, index);
+        }
+        return defaultflag;
+    }
+    public final OptimizationEnum getOptimization(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getOptimization(defaultProviders, index);
+        }
+        if (optimization != null) {
+            return optimization;
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getOptimization(defaultProviders,
+                        index + 1);
+            }
+        }
+        return null;
+    }
+    
+    public boolean getMultithreaded(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getMultithreaded(defaultProviders, index);
+        }
+        if (multithreaded != null) {
+            return multithreaded.booleanValue();
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getMultithreaded(
+                        defaultProviders, index + 1);
+            }
+        }
+        return true;
+    }
+    public Processor getProcessor() {
+        Processor processor = super.getProcessor();
+        if (processor == null) {
+            processor = GccCCompiler.getInstance();
+        }
+        if (getLibtool() && processor instanceof CommandLineCompiler) {
+            CommandLineCompiler compiler = (CommandLineCompiler) processor;
+            processor = compiler.getLibtoolCompiler();
+        }
+        return processor;
+    }
+    public int getWarnings(CompilerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((CompilerDef) getCheckedRef(CompilerDef.class,
+                    "CompilerDef")).getWarnings(defaultProviders, index);
+        }
+        if (warnings == -1) {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getWarnings(defaultProviders,
+                        index + 1);
+            }
+        }
+        return warnings;
+    }
+    /**
+     * Sets the default compiler adapter. Use the "name" attribute when the
+     * compiler is a supported compiler.
+     * 
+     * @param classname
+     *            fully qualified classname which implements CompilerAdapter
+     */
+    public void setClassname(String classname) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        super.setClassname(classname);
+        Processor proc = getProcessor();
+        if (!(proc instanceof Compiler)) {
+            throw new BuildException(classname + " does not implement Compiler");
+        }
+    }
+    /**
+     * Enables or disables exception support.
+     * 
+     * @param exceptions
+     *            if true, exceptions are supported.
+     *  
+     */
+    public void setExceptions(boolean exceptions) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.exceptions = booleanValueOf(exceptions);
+    }
+
+    /**
+     * Enables or disables run-time type information.
+     * 
+     * @param rtti
+     *            if true, run-time type information is supported.
+     *  
+     */
+    public void setRtti(boolean rtti) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.rtti = booleanValueOf(rtti);
+    }
+    
+    /**
+     * Enables or disables generation of multithreaded code. Unless specified,
+     * multithreaded code generation is enabled.
+     * 
+     * @param multi
+     *            If true, generated code may be multithreaded.
+     */
+    public void setMultithreaded(boolean multithreaded) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.multithreaded = booleanValueOf(multithreaded);
+    }
+    /**
+     * Sets compiler type.
+     * 
+     * 
+     * <table width="100%" border="1"> <thead>Supported compilers </thead>
+     * <tr>
+     * <td>gcc (default)</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>g++</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>c++</td>
+     * <td>GCC C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>g77</td>
+     * <td>GNU Fortran compiler</td>
+     * </tr>
+     * <tr>
+     * <td>msvc</td>
+     * <td>Microsoft Visual C++</td>
+     * </tr>
+     * <tr>
+     * <td>bcc</td>
+     * <td>Borland C++ Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>msrc</td>
+     * <td>Microsoft Resource Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>brc</td>
+     * <td>Borland Resource Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>df</td>
+     * <td>Compaq Visual Fortran Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>midl</td>
+     * <td>Microsoft MIDL Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>icl</td>
+     * <td>Intel C++ compiler for Windows (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecl</td>
+     * <td>Intel C++ compiler for Windows (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>icc</td>
+     * <td>Intel C++ compiler for Linux (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecc</td>
+     * <td>Intel C++ compiler for Linux (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>CC</td>
+     * <td>Sun ONE C++ compiler</td>
+     * </tr>
+     * <tr>
+     * <td>aCC</td>
+     * <td>HP aC++ C++ Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>os390</td>
+     * <td>OS390 C Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>os400</td>
+     * <td>Icc Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>sunc89</td>
+     * <td>Sun C89 C Compiler</td>
+     * </tr>
+     * <tr>
+     * <td>xlC</td>
+     * <td>VisualAge C Compiler</td>
+     * </tr>
+     * </table>
+     *  
+     */
+    public void setName(CompilerEnum name) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        Compiler compiler = name.getCompiler();
+        setProcessor(compiler);
+    }
+    protected void setProcessor(Processor proc) throws BuildException {
+        try {
+            super.setProcessor((Compiler) proc);
+        } catch (ClassCastException ex) {
+            throw new BuildException(ex);
+        }
+    }
+    /**
+     * Enumerated attribute with the values "none", "severe", "default",
+     * "production", "diagnostic", and "failtask".
+     */
+    public void setWarnings(CompilerDef.WarningLevel level) {
+        warnings = level.getIndex();
+    }
+    /**
+     * Sets optimization level.
+     * 
+     * @param value optimization level
+     */
+    public void setOptimize(OptimizationEnum value) {
+    	if (isReference()) {
+    		throw tooManyAttributes();
+    	}
+    	this.optimization = value;
+    }
+    /**
+     * Enables or disables default flags.
+     * 
+     * @param defaultflag
+     *            if true, default flags will add to command line.
+     *  
+     */
+    public void setDefaultflag(boolean defaultflag) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.defaultflag = booleanValueOf(defaultflag);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java
new file mode 100644
index 0000000000..a017243522
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerEnum.java
@@ -0,0 +1,221 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import net.sf.antcontrib.cpptasks.arm.ADSCCompiler;
+import net.sf.antcontrib.cpptasks.borland.BorlandCCompiler;
+import net.sf.antcontrib.cpptasks.borland.BorlandResourceCompiler;
+import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranCompiler;
+import net.sf.antcontrib.cpptasks.compiler.Compiler;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCCompiler;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioMIDLCompiler;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioResourceCompiler;
+import net.sf.antcontrib.cpptasks.gcc.GccCCompiler;
+import net.sf.antcontrib.cpptasks.hp.aCCCompiler;
+import net.sf.antcontrib.cpptasks.ibm.VisualAgeCCompiler;
+import net.sf.antcontrib.cpptasks.intel.IntelLinux32CCompiler;
+import net.sf.antcontrib.cpptasks.intel.IntelLinux64CCompiler;
+import net.sf.antcontrib.cpptasks.intel.IntelWin32CCompiler;
+import net.sf.antcontrib.cpptasks.intel.IntelWin64CCompiler;
+import net.sf.antcontrib.cpptasks.os390.OS390CCompiler;
+import net.sf.antcontrib.cpptasks.os400.IccCompiler;
+import net.sf.antcontrib.cpptasks.sun.C89CCompiler;
+import net.sf.antcontrib.cpptasks.sun.ForteCCCompiler;
+import net.sf.antcontrib.cpptasks.ti.ClxxCCompiler;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumeration of supported compilers
+ * 
+ * <table width="100%" border="1"> <thead>Supported compilers </thead>
+ * <tr>
+ * <td>gcc (default)</td>
+ * <td>GCC C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>g++</td>
+ * <td>GCC C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>c++</td>
+ * <td>GCC C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>g77</td>
+ * <td>GNU FORTRAN compiler</td>
+ * </tr>
+ * <tr>
+ * <td>msvc</td>
+ * <td>Microsoft Visual C++</td>
+ * </tr>
+ * <tr>
+ * <td>bcc</td>
+ * <td>Borland C++ Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>msrc</td>
+ * <td>Microsoft Resource Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>brc</td>
+ * <td>Borland Resource Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>df</td>
+ * <td>Compaq Visual Fortran Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>midl</td>
+ * <td>Microsoft MIDL Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>icl</td>
+ * <td>Intel C++ compiler for Windows (IA-32)</td>
+ * </tr>
+ * <tr>
+ * <td>ecl</td>
+ * <td>Intel C++ compiler for Windows (IA-64)</td>
+ * </tr>
+ * <tr>
+ * <td>icc</td>
+ * <td>Intel C++ compiler for Linux (IA-32)</td>
+ * </tr>
+ * <tr>
+ * <td>ecc</td>
+ * <td>Intel C++ compiler for Linux (IA-64)</td>
+ * </tr>
+ * <tr>
+ * <td>CC</td>
+ * <td>Sun ONE C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>aCC</td>
+ * <td>HP aC++ C++ Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>os390</td>
+ * <td>OS390 C Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>os400</td>
+ * <td>Icc Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>sunc89</td>
+ * <td>Sun C89 C Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>xlC</td>
+ * <td>VisualAge C Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>cl6x</td>
+ * <td>TI TMS320C6000 Optimizing Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>cl55</td>
+ * <td>TI TMS320C55x Optimizing C/C++ Compiler</td>
+ * </tr>
+ * <tr>
+ * <td>armcpp</td>
+ * <td>ARM 32-bit C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>armcc</td>
+ * <td>ARM 32-bit C compiler</td>
+ * </tr>
+ * <tr>
+ * <td>tcpp</td>
+ * <td>ARM 16-bit C++ compiler</td>
+ * </tr>
+ * <tr>
+ * <td>tcc</td>
+ * <td>ARM 16-bit C compiler</td>
+ * </tr>
+ * </table>
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public class CompilerEnum extends EnumeratedAttribute {
+    private final static ProcessorEnumValue[] compilers = new ProcessorEnumValue[]{
+            new ProcessorEnumValue("gcc", GccCCompiler.getInstance()),
+            new ProcessorEnumValue("g++", GccCCompiler.getGppInstance()),
+            new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()),
+            new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()),
+            new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()),
+            new ProcessorEnumValue("bcc", BorlandCCompiler.getInstance()),
+            new ProcessorEnumValue("msrc", DevStudioResourceCompiler
+                    .getInstance()),
+            new ProcessorEnumValue("brc", BorlandResourceCompiler.getInstance()),
+            new ProcessorEnumValue("df", CompaqVisualFortranCompiler
+                    .getInstance()),
+            new ProcessorEnumValue("midl", DevStudioMIDLCompiler.getInstance()),
+            new ProcessorEnumValue("icl", IntelWin32CCompiler.getInstance()),
+            new ProcessorEnumValue("ecl", IntelWin64CCompiler.getInstance()),
+            new ProcessorEnumValue("icc", IntelLinux32CCompiler.getInstance()),
+            new ProcessorEnumValue("ecc", IntelLinux64CCompiler.getInstance()),
+            new ProcessorEnumValue("CC", ForteCCCompiler.getInstance()),
+            new ProcessorEnumValue("aCC", aCCCompiler.getInstance()),
+            new ProcessorEnumValue("os390", OS390CCompiler.getInstance()),
+            new ProcessorEnumValue("os400", IccCompiler.getInstance()),
+            new ProcessorEnumValue("sunc89", C89CCompiler.getInstance()),
+            new ProcessorEnumValue("xlC", VisualAgeCCompiler.getInstance()),
+            new ProcessorEnumValue("cl6x", ClxxCCompiler.getCl6xInstance()),
+            new ProcessorEnumValue("cl55", ClxxCCompiler.getCl55Instance()),
+            new ProcessorEnumValue("armcc", ADSCCompiler.getArmCC()),
+            new ProcessorEnumValue("armcpp", ADSCCompiler.getArmCpp()),
+            new ProcessorEnumValue("tcc", ADSCCompiler.getThumbCC()),
+            new ProcessorEnumValue("tcpp", ADSCCompiler.getThumbCpp()),
+            // userdefined
+            //new ProcessorEnumValue("userdefine", UserdefineCompiler.getInstance()),
+            // GCC Cross Compilers
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-gcc",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccCCompiler
+                            .getInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-g++",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccCCompiler
+                            .getGppInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-c++",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccCCompiler
+                            .getCppInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-g77",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccCCompiler
+                            .getG77Instance()),
+            // GCC Cross Compilers
+            new ProcessorEnumValue("gcc-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccCCompiler
+                            .getInstance()),
+            new ProcessorEnumValue("g++-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccCCompiler
+                            .getGppInstance()),
+            new ProcessorEnumValue("c++-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccCCompiler
+                            .getCppInstance()),
+            new ProcessorEnumValue("g77-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccCCompiler
+                            .getG77Instance()),};
+    public Compiler getCompiler() {
+        return (Compiler) compilers[getIndex()].getProcessor();
+    }
+    public String[] getValues() {
+        return ProcessorEnumValue.getValues(compilers);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java
new file mode 100644
index 0000000000..82eb6ee425
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/CompilerParam.java
@@ -0,0 +1,33 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+/*******************************************************************************
+ * Place class description here.
+ * 
+ * @author inger
+ * @author <additional author>
+ * 
+ * @since  
+ ******************************************************************************/
+public class CompilerParam extends ProcessorParam {
+    public CompilerParam() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java
new file mode 100644
index 0000000000..429d2b0107
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyInfo.java
@@ -0,0 +1,86 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.util.Vector;
+/**
+ * @author Curt Arnold
+ */
+public final class DependencyInfo {
+    /**
+     * Last modified time of this file or anything that it depends on.
+     * 
+     * Not persisted since almost any change could invalidate it. Initialized
+     * to long.MIN_VALUE on construction.
+     */
+    private long compositeLastModified;
+    private/* final */String includePathIdentifier;
+    private/* final */String[] includes;
+    private/* final */String source;
+    private/* final */long sourceLastModified;
+    private/* final */String[] sysIncludes;
+    public DependencyInfo(String includePathIdentifier, String source,
+            long sourceLastModified, Vector includes, Vector sysIncludes) {
+        if (source == null) {
+            throw new NullPointerException("source");
+        }
+        if (includePathIdentifier == null) {
+            throw new NullPointerException("includePathIdentifier");
+        }
+        this.source = source;
+        this.sourceLastModified = sourceLastModified;
+        this.includePathIdentifier = includePathIdentifier;
+        this.includes = new String[includes.size()];
+        if (includes.size() == 0) {
+            compositeLastModified = sourceLastModified;
+        } else {
+            includes.copyInto(this.includes);
+            compositeLastModified = Long.MIN_VALUE;
+        }
+        this.sysIncludes = new String[sysIncludes.size()];
+        sysIncludes.copyInto(this.sysIncludes);
+    }
+    /**
+     * Returns the latest modification date of the source or anything that it
+     * depends on.
+     * 
+     * @returns the composite lastModified time, returns Long.MIN_VALUE if not
+     * set
+     */
+    public long getCompositeLastModified() {
+        return compositeLastModified;
+    }
+    public String getIncludePathIdentifier() {
+        return includePathIdentifier;
+    }
+    public String[] getIncludes() {
+        String[] includesClone = (String[]) includes.clone();
+        return includesClone;
+    }
+    public String getSource() {
+        return source;
+    }
+    public long getSourceLastModified() {
+        return sourceLastModified;
+    }
+    public String[] getSysIncludes() {
+        String[] sysIncludesClone = (String[]) sysIncludes.clone();
+        return sysIncludesClone;
+    }
+    public void setCompositeLastModified(long lastMod) {
+        compositeLastModified = lastMod;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java
new file mode 100644
index 0000000000..3cbee7a625
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DependencyTable.java
@@ -0,0 +1,609 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+/**
+ * @author Curt Arnold
+ */
+public final class DependencyTable {
+    /**
+     * This class handles populates the TargetHistory hashtable in response to
+     * SAX parse events
+     */
+    private class DependencyTableHandler extends DefaultHandler {
+        private File baseDir;
+        private final DependencyTable dependencyTable;
+        private String includePath;
+        private Vector includes;
+        private String source;
+        private long sourceLastModified;
+        private Vector sysIncludes;
+        /**
+         * Constructor
+         * 
+         * @param history
+         *            hashtable of TargetHistory keyed by output name
+         * @param outputFiles
+         *            existing files in output directory
+         */
+        private DependencyTableHandler(DependencyTable dependencyTable,
+                File baseDir) {
+            this.dependencyTable = dependencyTable;
+            this.baseDir = baseDir;
+            includes = new Vector();
+            sysIncludes = new Vector();
+            source = null;
+        }
+        public void endElement(String namespaceURI, String localName,
+                String qName) throws SAXException {
+            //
+            //   if </source> then
+            //       create Dependency object and add to hashtable
+            //           if corresponding source file exists and
+            //           has the same timestamp
+            //
+            if (qName.equals("source")) {
+                if (source != null && includePath != null) {
+                    File existingFile = new File(baseDir, source);
+                    //
+                    //   if the file exists and the time stamp is right
+                    //       preserve the dependency info
+                    if (existingFile.exists()) {
+                        //
+                        //   would have expected exact matches
+                        //       but was seeing some unexpected difference by
+                        //       a few tens of milliseconds, as long
+                        //       as the times are within a second
+                        long existingLastModified = existingFile.lastModified();
+                        long diff = existingLastModified - sourceLastModified;
+                        if (diff >= -500 && diff <= 500) {
+                            DependencyInfo dependInfo = new DependencyInfo(
+                                    includePath, source, sourceLastModified,
+                                    includes, sysIncludes);
+                            dependencyTable.putDependencyInfo(source,
+                                    dependInfo);
+                        }
+                    }
+                    source = null;
+                    includes.setSize(0);
+                }
+            } else {
+                //
+                //    this causes any <source> elements outside the
+                //       scope of an <includePath> to be discarded
+                //
+                if (qName.equals("includePath")) {
+                    includePath = null;
+                }
+            }
+        }
+        /**
+         * startElement handler
+         */
+        public void startElement(String namespaceURI, String localName,
+                String qName, Attributes atts) throws SAXException {
+            //
+            //   if includes, then add relative file name to vector
+            //
+            if (qName.equals("include")) {
+                includes.addElement(atts.getValue("file"));
+            } else {
+                if (qName.equals("sysinclude")) {
+                    sysIncludes.addElement(atts.getValue("file"));
+                } else {
+                    //
+                    //    if source then
+                    //        capture source file name,
+                    //        modification time and reset includes vector
+                    //
+                    if (qName.equals("source")) {
+                        source = atts.getValue("file");
+                        sourceLastModified = Long.parseLong(atts
+                                .getValue("lastModified"), 16);
+                        includes.setSize(0);
+                        sysIncludes.setSize(0);
+                    } else {
+                        if (qName.equals("includePath")) {
+                            includePath = atts.getValue("signature");
+                        }
+                    }
+                }
+            }
+        }
+    }
+    public abstract class DependencyVisitor {
+        /**
+         * Previews all the children of this source file.
+         * 
+         * May be called multiple times as DependencyInfo's for children are
+         * filled in.
+         * 
+         * @return true to continue towards recursion into included files
+         */
+        public abstract boolean preview(DependencyInfo parent,
+                DependencyInfo[] children);
+        /**
+         * Called if the dependency depth exhausted the stack.
+         */
+        public abstract void stackExhausted();
+        /**
+         * Visits the dependency info.
+         * 
+         * @returns true to continue towards recursion into included files
+         */
+        public abstract boolean visit(DependencyInfo dependInfo);
+    }
+    public class TimestampChecker extends DependencyVisitor {
+        private boolean noNeedToRebuild;
+        private long outputLastModified;
+        private boolean rebuildOnStackExhaustion;
+        public TimestampChecker(final long outputLastModified,
+                boolean rebuildOnStackExhaustion) {
+            this.outputLastModified = outputLastModified;
+            noNeedToRebuild = true;
+            this.rebuildOnStackExhaustion = rebuildOnStackExhaustion;
+        }
+        public boolean getMustRebuild() {
+            return !noNeedToRebuild;
+        }
+        public boolean preview(DependencyInfo parent, DependencyInfo[] children) {
+            int withCompositeTimes = 0;
+            long parentCompositeLastModified = parent.getSourceLastModified();
+            for (int i = 0; i < children.length; i++) {
+                if (children[i] != null) {
+                    //
+                    //  expedient way to determine if a child forces us to
+                    // rebuild
+                    //
+                    visit(children[i]);
+                    long childCompositeLastModified = children[i]
+                            .getCompositeLastModified();
+                    if (childCompositeLastModified != Long.MIN_VALUE) {
+                        withCompositeTimes++;
+                        if (childCompositeLastModified > parentCompositeLastModified) {
+                            parentCompositeLastModified = childCompositeLastModified;
+                        }
+                    }
+                }
+            }
+            if (withCompositeTimes == children.length) {
+                parent.setCompositeLastModified(parentCompositeLastModified);
+            }
+            //
+            //  may have been changed by an earlier call to visit()
+            //
+            return noNeedToRebuild;
+        }
+        public void stackExhausted() {
+            if (rebuildOnStackExhaustion) {
+                noNeedToRebuild = false;
+            }
+        }
+        public boolean visit(DependencyInfo dependInfo) {
+            if (noNeedToRebuild) {
+                if (dependInfo.getSourceLastModified() > outputLastModified
+                        || dependInfo.getCompositeLastModified() > outputLastModified) {
+                    noNeedToRebuild = false;
+                }
+            }
+            //
+            //   only need to process the children if
+            //      it has not yet been determined whether
+            //      we need to rebuild and the composite modified time
+            //         has not been determined for this file
+            return noNeedToRebuild
+                    && dependInfo.getCompositeLastModified() == Long.MIN_VALUE;
+        }
+    }
+    private/* final */File baseDir;
+    private String baseDirPath;
+    /**
+     * a hashtable of DependencyInfo[] keyed by output file name
+     */
+    private final Hashtable dependencies = new Hashtable();
+    /** The file the cache was loaded from. */
+    private/* final */File dependenciesFile;
+    /** Flag indicating whether the cache should be written back to file. */
+    private boolean dirty;
+    /**
+     * Creates a target history table from dependencies.xml in the prject
+     * directory, if it exists. Otherwise, initializes the dependencies empty.
+     * 
+     * @param task
+     *            task used for logging history load errors
+     * @param baseDir
+     *            output directory for task
+     */
+    public DependencyTable(File baseDir) {
+        if (baseDir == null) {
+            throw new NullPointerException("baseDir");
+        }
+        this.baseDir = baseDir;
+        try {
+            baseDirPath = baseDir.getCanonicalPath();
+        } catch (IOException ex) {
+            baseDirPath = baseDir.toString();
+        }
+        dirty = false;
+        //
+        //   load any existing dependencies from file
+        dependenciesFile = new File(baseDir, "dependencies.xml");
+    }
+    public void commit(CCTask task) {
+        //
+        //   if not dirty, no need to update file
+        //
+        if (dirty) {
+            //
+            //   walk through dependencies to get vector of include paths
+            // identifiers
+            //
+            Vector includePaths = getIncludePaths();
+            //
+            //
+            //   write dependency file
+            //
+            try {
+                FileOutputStream outStream = new FileOutputStream(
+                        dependenciesFile);
+                OutputStreamWriter streamWriter;
+                //
+                //    Early VM's may not have UTF-8 support
+                //       fallback to default code page which
+                //           "should" be okay unless there are
+                //            non ASCII file names
+                String encodingName = "UTF-8";
+                try {
+                    streamWriter = new OutputStreamWriter(outStream, "UTF-8");
+                } catch (UnsupportedEncodingException ex) {
+                    streamWriter = new OutputStreamWriter(outStream);
+                    encodingName = streamWriter.getEncoding();
+                }
+                BufferedWriter writer = new BufferedWriter(streamWriter);
+                writer.write("<?xml version='1.0' encoding='");
+                writer.write(encodingName);
+                writer.write("'?>\n");
+                writer.write("<dependencies>\n");
+                StringBuffer buf = new StringBuffer();
+                Enumeration includePathEnum = includePaths.elements();
+                while (includePathEnum.hasMoreElements()) {
+                    writeIncludePathDependencies((String) includePathEnum
+                            .nextElement(), writer, buf);
+                }
+                writer.write("</dependencies>\n");
+                writer.close();
+                dirty = false;
+            } catch (IOException ex) {
+                task.log("Error writing " + dependenciesFile.toString() + ":"
+                        + ex.toString());
+            }
+        }
+    }
+    /**
+     * Returns an enumerator of DependencyInfo's
+     */
+    public Enumeration elements() {
+        return dependencies.elements();
+    }
+    /**
+     * This method returns a DependencyInfo for the specific source file and
+     * include path identifier
+     *  
+     */
+    public DependencyInfo getDependencyInfo(String sourceRelativeName,
+            String includePathIdentifier) {
+        DependencyInfo dependInfo = null;
+        DependencyInfo[] dependInfos = (DependencyInfo[]) dependencies
+                .get(sourceRelativeName);
+        if (dependInfos != null) {
+            for (int i = 0; i < dependInfos.length; i++) {
+                dependInfo = dependInfos[i];
+                if (dependInfo.getIncludePathIdentifier().equals(
+                        includePathIdentifier)) {
+                    return dependInfo;
+                }
+            }
+        }
+        return null;
+    }
+    private Vector getIncludePaths() {
+        Vector includePaths = new Vector();
+        DependencyInfo[] dependInfos;
+        Enumeration dependenciesEnum = dependencies.elements();
+        while (dependenciesEnum.hasMoreElements()) {
+            dependInfos = (DependencyInfo[]) dependenciesEnum.nextElement();
+            for (int i = 0; i < dependInfos.length; i++) {
+                DependencyInfo dependInfo = dependInfos[i];
+                boolean matchesExisting = false;
+                final String dependIncludePath = dependInfo
+                        .getIncludePathIdentifier();
+                Enumeration includePathEnum = includePaths.elements();
+                while (includePathEnum.hasMoreElements()) {
+                    if (dependIncludePath.equals(includePathEnum.nextElement())) {
+                        matchesExisting = true;
+                        break;
+                    }
+                }
+                if (!matchesExisting) {
+                    includePaths.addElement(dependIncludePath);
+                }
+            }
+        }
+        return includePaths;
+    }
+    public void load() throws IOException, ParserConfigurationException,
+            SAXException {
+        dependencies.clear();
+        if (dependenciesFile.exists()) {
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setValidating(false);
+            SAXParser parser = factory.newSAXParser();
+            parser.parse(dependenciesFile, new DependencyTableHandler(this,
+                    baseDir));
+            dirty = false;
+        }
+    }
+    /**
+     * Determines if the specified target needs to be rebuilt.
+     * 
+     * This task may result in substantial IO as files are parsed to determine
+     * their dependencies
+     */
+    public boolean needsRebuild(CCTask task, TargetInfo target,
+            int dependencyDepth) {
+        //    look at any files where the compositeLastModified
+        //    is not known, but the includes are known
+        //
+        boolean mustRebuild = false;
+        CompilerConfiguration compiler = (CompilerConfiguration) target
+                .getConfiguration();
+        String includePathIdentifier = compiler.getIncludePathIdentifier();
+        File[] sources = target.getSources();
+        DependencyInfo[] dependInfos = new DependencyInfo[sources.length];
+        long outputLastModified = target.getOutput().lastModified();
+        //
+        //   try to solve problem using existing dependency info
+        //      (not parsing any new files)
+        //
+        DependencyInfo[] stack = new DependencyInfo[50];
+        boolean rebuildOnStackExhaustion = true;
+        if (dependencyDepth >= 0) {
+            if (dependencyDepth < 50) {
+                stack = new DependencyInfo[dependencyDepth];
+            }
+            rebuildOnStackExhaustion = false;
+        }
+        TimestampChecker checker = new TimestampChecker(outputLastModified,
+                rebuildOnStackExhaustion);
+        for (int i = 0; i < sources.length && !mustRebuild; i++) {
+            File source = sources[i];
+            String relative = CUtil.getRelativePath(baseDirPath, source);
+            DependencyInfo dependInfo = getDependencyInfo(relative,
+                    includePathIdentifier);
+            if (dependInfo == null) {
+                task.log("Parsing " + relative, Project.MSG_VERBOSE);
+                dependInfo = parseIncludes(task, compiler, source);
+            }
+            walkDependencies(task, dependInfo, compiler, stack, checker);
+            mustRebuild = checker.getMustRebuild();
+        }
+        return mustRebuild;
+    }
+    public DependencyInfo parseIncludes(CCTask task,
+            CompilerConfiguration compiler, File source) {
+        DependencyInfo dependInfo = compiler.parseIncludes(task, baseDir,
+                source);
+        String relativeSource = CUtil.getRelativePath(baseDirPath, source);
+        putDependencyInfo(relativeSource, dependInfo);
+        return dependInfo;
+    }
+    private void putDependencyInfo(String key, DependencyInfo dependInfo) {
+        //
+        //   optimistic, add new value
+        //
+        DependencyInfo[] old = (DependencyInfo[]) dependencies.put(key,
+                new DependencyInfo[]{dependInfo});
+        dirty = true;
+        //
+        //   something was already there
+        //
+        if (old != null) {
+            //
+            //   see if the include path matches a previous entry
+            //       if so replace it
+            String includePathIdentifier = dependInfo
+                    .getIncludePathIdentifier();
+            for (int i = 0; i < old.length; i++) {
+                DependencyInfo oldDepend = old[i];
+                if (oldDepend.getIncludePathIdentifier().equals(
+                        includePathIdentifier)) {
+                    old[i] = dependInfo;
+                    dependencies.put(key, old);
+                    return;
+                }
+            }
+            //
+            //   no match prepend the new entry to the array
+            //      of dependencies for the file
+            DependencyInfo[] combined = new DependencyInfo[old.length + 1];
+            combined[0] = dependInfo;
+            for (int i = 0; i < old.length; i++) {
+                combined[i + 1] = old[i];
+            }
+            dependencies.put(key, combined);
+        }
+        return;
+    }
+    public void walkDependencies(CCTask task, DependencyInfo dependInfo,
+            CompilerConfiguration compiler, DependencyInfo[] stack,
+            DependencyVisitor visitor) throws BuildException {
+        //
+        //   visit this node
+        //       if visit returns true then
+        //          visit the referenced include and sysInclude dependencies
+        //
+        if (visitor.visit(dependInfo)) {
+            //
+            //   find first null entry on stack
+            //
+            int stackPosition = -1;
+            for (int i = 0; i < stack.length; i++) {
+                if (stack[i] == null) {
+                    stackPosition = i;
+                    stack[i] = dependInfo;
+                    break;
+                } else {
+                    //
+                    //   if we have appeared early in the calling history
+                    //      then we didn't exceed the criteria
+                    if (stack[i] == dependInfo) {
+                        return;
+                    }
+                }
+            }
+            if (stackPosition == -1) {
+                visitor.stackExhausted();
+                return;
+            }
+            //
+            //   locate dependency infos
+            //
+            String[] includes = dependInfo.getIncludes();
+            String includePathIdentifier = compiler.getIncludePathIdentifier();
+            DependencyInfo[] includeInfos = new DependencyInfo[includes.length];
+            for (int i = 0; i < includes.length; i++) {
+                DependencyInfo includeInfo = getDependencyInfo(includes[i],
+                        includePathIdentifier);
+                includeInfos[i] = includeInfo;
+            }
+            //
+            //   preview with only the already available dependency infos
+            //
+            if (visitor.preview(dependInfo, includeInfos)) {
+                //
+                //   now need to fill in the missing DependencyInfos
+                //
+                int missingCount = 0;
+                for (int i = 0; i < includes.length; i++) {
+                    if (includeInfos[i] == null) {
+                        missingCount++;
+                        task.log("Parsing " + includes[i], Project.MSG_VERBOSE);
+                        // If the include is part of a UNC don't go building a
+                        // relative file name.
+                        File src = includes[i].startsWith("\\\\") ? new File(
+                                includes[i]) : new File(baseDir, includes[i]);
+                        DependencyInfo includeInfo = parseIncludes(task,
+                                compiler, src);
+                        includeInfos[i] = includeInfo;
+                    }
+                }
+                //
+                //   if it passes a review the second time
+                //      then recurse into all the children
+                if (missingCount == 0
+                        || visitor.preview(dependInfo, includeInfos)) {
+                    //
+                    //   recurse into
+                    //
+                    for (int i = 0; i < includeInfos.length; i++) {
+                        DependencyInfo includeInfo = includeInfos[i];
+                        walkDependencies(task, includeInfo, compiler, stack,
+                                visitor);
+                    }
+                }
+            }
+            stack[stackPosition] = null;
+        }
+    }
+    private void writeDependencyInfo(BufferedWriter writer, StringBuffer buf,
+            DependencyInfo dependInfo) throws IOException {
+        String[] includes = dependInfo.getIncludes();
+        String[] sysIncludes = dependInfo.getSysIncludes();
+        //
+        //   if the includes have not been evaluted then
+        //       it is not worth our time saving it
+        //       and trying to distiguish between files with
+        //       no dependencies and those with undetermined dependencies
+        buf.setLength(0);
+        buf.append("      <source file=\"");
+        buf.append(CUtil.xmlAttribEncode(dependInfo.getSource()));
+        buf.append("\" lastModified=\"");
+        buf.append(Long.toHexString(dependInfo.getSourceLastModified()));
+        buf.append("\">\n");
+        writer.write(buf.toString());
+        for (int i = 0; i < includes.length; i++) {
+            buf.setLength(0);
+            buf.append("         <include file=\"");
+            buf.append(CUtil.xmlAttribEncode(includes[i]));
+            buf.append("\"/>\n");
+            writer.write(buf.toString());
+        }
+        for (int i = 0; i < sysIncludes.length; i++) {
+            buf.setLength(0);
+            buf.append("         <sysinclude file=\"");
+            buf.append(CUtil.xmlAttribEncode(sysIncludes[i]));
+            buf.append("\"/>\n");
+            writer.write(buf.toString());
+        }
+        writer.write("      </source>\n");
+        return;
+    }
+    private void writeIncludePathDependencies(String includePathIdentifier,
+            BufferedWriter writer, StringBuffer buf) throws IOException {
+        //
+        //  include path element
+        //
+        buf.setLength(0);
+        buf.append("   <includePath signature=\"");
+        buf.append(CUtil.xmlAttribEncode(includePathIdentifier));
+        buf.append("\">\n");
+        writer.write(buf.toString());
+        Enumeration dependenciesEnum = dependencies.elements();
+        while (dependenciesEnum.hasMoreElements()) {
+            DependencyInfo[] dependInfos = (DependencyInfo[]) dependenciesEnum
+                    .nextElement();
+            for (int i = 0; i < dependInfos.length; i++) {
+                DependencyInfo dependInfo = dependInfos[i];
+                //
+                //   if this is for the same include path
+                //      then output the info
+                if (dependInfo.getIncludePathIdentifier().equals(
+                        includePathIdentifier)) {
+                    writeDependencyInfo(writer, buf, dependInfo);
+                }
+            }
+        }
+        writer.write("   </includePath>\n");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java
new file mode 100644
index 0000000000..ee4f656ccc
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerDef.java
@@ -0,0 +1,243 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Reference;
+import java.util.Vector;
+
+/**
+ * Distributed build information (Non-functional prototype).
+ *
+ */
+public final class DistributerDef
+    extends DataType {
+  /**
+   * if property.
+   */
+  private String ifCond;
+
+  /**
+   * unless property.
+   */
+  private String unlessCond;
+
+  /**
+   * hosts.
+   *
+   */
+  private String hosts;
+
+  /**
+   * Protocol.
+   *
+   */
+  private DistributerProtocolEnum protocol;
+
+  /**
+   * Not sure what this is.
+   */
+  private int tcpCork;
+
+  /**
+   * user name.
+   */
+  private String user;
+
+  /**
+   *  local to remote file name maps.
+   */
+  private final Vector maps = new Vector();
+
+  /**
+   * Constructor.
+   *
+   */
+  public DistributerDef() {
+  }
+
+  /**
+   * Required by documentation generator.
+   */
+  public void execute() {
+    throw new org.apache.tools.ant.BuildException(
+        "Not an actual task, but looks like one for documentation purposes");
+  }
+
+  /**
+   * Returns true if the if and unless conditions (if any) are
+   * satisfied.
+   * @return true if definition is active.
+   */
+  public boolean isActive() {
+    return CUtil.isActive(getProject(), ifCond, unlessCond);
+  }
+
+  /**
+   * Sets an id that can be used to reference this element.
+   *
+   * @param id
+   *            id
+   */
+  public void setId(final String id) {
+    //
+    //  this is actually accomplished by a different
+    //     mechanism, but we can document it
+    //
+  }
+
+  /**
+   * Sets the property name for the 'if' condition.
+   *
+   * The define will be ignored unless the property is defined.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") will throw an exception when
+   * evaluated.
+   *
+   * @param propName
+   *            property name
+   */
+  public void setIf(final String propName) {
+    ifCond = propName;
+  }
+
+  /**
+   * Specifies that this element should behave as if the content of the
+   * element with the matching id attribute was inserted at this location. If
+   * specified, no other attributes should be specified.
+   * @param r reference name
+   */
+  public void setRefid(final Reference r)  {
+    super.setRefid(r);
+  }
+
+  /**
+   * Set the property name for the 'unless' condition.
+   *
+   * If named property is set, the define will be ignored.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") of the behavior will throw an
+   * exception when evaluated.
+   *
+   * @param propName
+   *            name of property
+   */
+  public void setUnless(final String propName) {
+    unlessCond = propName;
+  }
+
+  /**
+   * Gets hosts.
+   * @return hosts, may be null.
+   *
+   */
+  public String getHosts() {
+    if (isReference()) {
+      DistributerDef refDistributer = (DistributerDef)
+          getCheckedRef(DistributerDef.class,
+                        "DistributerDef");
+      return refDistributer.getHosts();
+    }
+    return hosts;
+  }
+
+  /**
+   * Gets tcp cork.
+   * @return TCP_CORK value.
+   *
+   */
+  public int getTcpcork() {
+    if (isReference()) {
+      DistributerDef refDistributer = (DistributerDef)
+          getCheckedRef(DistributerDef.class,
+                        "DistributerDef");
+      return refDistributer.getTcpcork();
+    }
+    return tcpCork;
+  }
+
+  /**
+   * Gets protocol.
+   * @return protocol, may be null.
+   *
+   */
+  public DistributerProtocolEnum getProtocol() {
+    if (isReference()) {
+      DistributerDef refDistributer = (DistributerDef)
+          getCheckedRef(DistributerDef.class,
+                        "DistributerDef");
+      return refDistributer.getProtocol();
+    }
+    return protocol;
+  }
+
+  /**
+   * Sets hosts.
+   * @param value new value
+   */
+  public void setHosts(final String value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    hosts = value;
+  }
+
+  /**
+   * Sets TCP_CORK value.
+   * @param value new value
+   */
+  public void setTcpcork(final int value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    tcpCork = value;
+  }
+
+  /**
+   * Sets protocol.
+   * @param value new value
+   */
+  public void setProtocol(final DistributerProtocolEnum value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    protocol = value;
+  }
+
+  /**
+   *  Local to remote filename maps.
+   * @return new map
+   */
+  public DistributerMap createMap() {
+    DistributerMap map = new DistributerMap();
+    map.setProject(getProject());
+    maps.addElement(map);
+    return map;
+  }
+
+  /**
+   *  Sets remote user name.
+   * @param value user name
+   */
+  public void setUser(final String value) {
+    user = value;
+  }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java
new file mode 100644
index 0000000000..aeacf551fa
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerMap.java
@@ -0,0 +1,218 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.DataType;
+
+/**
+ * Local to remote filename mapping (Experimental).
+ *
+ */
+public final class DistributerMap
+    extends DataType {
+  /**
+   * if property.
+   */
+  private String ifCond;
+
+  /**
+   * unless property.
+   */
+  private String unlessCond;
+
+  /**
+   * local directory name.
+   *
+   */
+  private File localName;
+
+  /**
+   * Canonical local file name.
+   */
+  private String canonicalPath;
+
+  /**
+   * remote name.
+   *
+   */
+  private String remoteName;
+
+  /**
+   * Separator (/ or \) character on remote system.
+   */
+  private char remoteSeparator = File.separatorChar;
+
+  /**
+   * hosts that for which this map is valid.
+   *
+   */
+  private String hosts;
+
+  /**
+   * Constructor.
+   *
+   */
+  public DistributerMap() {
+  }
+
+  /**
+   * Required by documentation generator.
+   */
+  public void execute()  {
+    throw new org.apache.tools.ant.BuildException(
+        "Not an actual task, but looks like one for documentation purposes");
+  }
+
+  /**
+   * Returns true if the if and unless conditions (if any) are
+   * satisfied.
+   *
+   * @return true if this object is active.
+   */
+  public boolean isActive()  {
+    return CUtil.isActive(getProject(), ifCond, unlessCond);
+  }
+
+  /**
+   * Sets the property name for the 'if' condition.
+   *
+   * This object will be ignored unless the property is defined.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") will throw an exception when
+   * evaluated.
+   *
+   * @param propName
+   *            property name
+   */
+  public void setIf(final String propName) {
+    ifCond = propName;
+  }
+
+  /**
+   * Set the property name for the 'unless' condition.
+   *
+   * If named property is set, the define will be ignored.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") of the behavior will throw an
+   * exception when evaluated.
+   *
+   * @param propName
+   *            name of property
+   */
+  public void setUnless(final String propName) {
+    unlessCond = propName;
+  }
+
+  /**
+   * Gets local directory.
+   * @return local directory, may be null.
+   *
+   */
+  public File getLocal() {
+    return localName;
+  }
+
+  /**
+   * Gets remote name for directory.
+   * @return remote name, may be null.
+   *
+   */
+  public String getRemote() {
+    return remoteName;
+  }
+
+  /**
+   * Converts the local file name to the remote name for the same file.
+   *
+   * @param host host
+   * @param localFile local file
+   * @return remote name for local file, null if unknown.
+   */
+  public String toRemote(final String host, final File localFile) {
+    if (remoteName != null
+        && (hosts == null || hosts.indexOf(host) >= 0)) {
+      try {
+        String canonical = localFile.getCanonicalPath();
+        if (canonical.startsWith(canonicalPath)) {
+          if (isActive()) {
+            return remoteName
+                + canonical.substring(canonicalPath.length()).replace(File.
+                separatorChar, remoteSeparator);
+          }
+        }
+      } catch (IOException ex) {
+        return null;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Sets local directory for base of mapping.
+   *
+   * @param value value
+   */
+  public void setLocal(final File value)  {
+    if (value == null) {
+      throw new NullPointerException("value");
+    }
+    if (value.exists() && !value.isDirectory()) {
+      throw new BuildException("local should be a directory");
+    }
+    localName = value;
+    try {
+      canonicalPath = localName.getCanonicalPath();
+    } catch (IOException ex) {
+      throw new BuildException(ex);
+    }
+  }
+
+  /**
+   * Sets remote name for directory.
+   * @param value remote name for directory
+   */
+  public void setRemote(final String value) {
+    remoteName = value;
+  }
+
+  /**
+   * Sets the separator character (/ or \) for the remote system.
+   * @param value separator character
+   */
+  public void setRemoteSeparator(final String value)  {
+    if (value != null && value.length() != 1) {
+      throw new BuildException("remote separator must be a single character");
+    }
+    remoteSeparator = value.charAt(0);
+  }
+
+  /**
+   * Sets hosts for which this mapping is valid.
+   *
+   * @param value hosts
+   */
+  public void setHosts(final String value) {
+    hosts = value;
+  }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
new file mode 100644
index 0000000000..5606d47a08
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java
@@ -0,0 +1,50 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Distributer prococol names (experimental).
+ *
+ * @author Curt Arnold
+ *
+ */
+public final class DistributerProtocolEnum
+    extends EnumeratedAttribute {
+  /**
+   * Constructor.
+   *
+   * Set by default to "distcc"
+   *
+   * @see java.lang.Object#Object()
+   */
+  public DistributerProtocolEnum() {
+    setValue("distcc");
+  }
+
+  /**
+   * Gets list of acceptable values.
+   *
+   * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+   */
+  public String[] getValues() {
+    return new String[] {
+        "distcc",
+        "ssh"};
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java
new file mode 100644
index 0000000000..24aef25fb6
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/FileVisitor.java
@@ -0,0 +1,27 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * An abstract class implemented to walk over the fileset members of a
+ * ProcessorDef
+ */
+public interface FileVisitor {
+    abstract void visit(File parentDir, String filename) throws BuildException;
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java
new file mode 100644
index 0000000000..d997b2f992
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerDef.java
@@ -0,0 +1,549 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+import net.sf.antcontrib.cpptasks.gcc.GccLinker;
+import net.sf.antcontrib.cpptasks.types.FlexLong;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LinkerArgument;
+import net.sf.antcontrib.cpptasks.types.SystemLibrarySet;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FlexInteger;
+/**
+ * A linker definition. linker elements may be placed either as children of a
+ * cc element or the project element. A linker element with an id attribute may
+ * be referenced by linker elements with refid or extends attributes.
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public class LinkerDef extends ProcessorDef {
+    private long base;
+    private String entry;
+    private Boolean fixed;
+    private Boolean incremental;
+    private final Vector librarySets = new Vector();
+    private Boolean map;
+    private int stack;
+    private final Vector sysLibrarySets = new Vector();
+    private final Vector versionInfos = new Vector();
+    private Boolean defaultflag = new Boolean(true);
+    /**
+     * Default constructor
+     * 
+     * @see java.lang.Object#Object()
+     */
+    public LinkerDef() {
+        base = -1;
+        stack = -1;
+    }
+    private void addActiveLibrarySet(Project project, Vector libsets,
+            Vector srcSets) {
+        Enumeration srcenum = srcSets.elements();
+        while (srcenum.hasMoreElements()) {
+            LibrarySet set = (LibrarySet) srcenum.nextElement();
+            if (set.isActive(project)) {
+                libsets.addElement(set);
+            }
+        }
+    }
+    private void addActiveSystemLibrarySets(Project project, Vector libsets) {
+        addActiveLibrarySet(project, libsets, sysLibrarySets);
+    }
+    private void addActiveUserLibrarySets(Project project, Vector libsets) {
+        addActiveLibrarySet(project, libsets, librarySets);
+    }
+    /**
+     * Adds a linker command-line arg.
+     */
+    public void addConfiguredLinkerArg(LinkerArgument arg) {
+        addConfiguredProcessorArg(arg);
+    }
+    /**
+     * Adds a compiler command-line arg.
+     */
+    public void addConfiguredLinkerParam(LinkerParam param) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorParam(param);
+    }
+    /**
+     * Adds a system library set.
+     */
+    public void addLibset(LibrarySet libset) {
+        if (isReference()) {
+            throw super.noChildrenAllowed();
+        }
+        if (libset == null) {
+            throw new NullPointerException("libset");
+        }
+        librarySets.addElement(libset);
+    }
+    /**
+     * Adds a system library set.
+     */
+    public void addSyslibset(SystemLibrarySet libset) {
+        if (isReference()) {
+            throw super.noChildrenAllowed();
+        }
+        if (libset == null) {
+            throw new NullPointerException("libset");
+        }
+        sysLibrarySets.addElement(libset);
+    }
+    
+    /**
+     * Adds desriptive version information to be included in the
+     * generated file.  The first active version info block will
+     * be used.
+     */
+    public void addConfiguredVersioninfo(VersionInfo newVersionInfo) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        newVersionInfo.setProject(this.getProject());
+        versionInfos.addElement(newVersionInfo);
+    }
+    
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef baseDef, TargetDef targetPlatform) {
+        //
+        //    must combine some local context (the linkType)
+        //       with the referenced element
+        //
+        //    get a pointer to the definition (either local or referenced)
+        ProcessorDef thisDef = this;
+        if (isReference()) {
+            thisDef = ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef"));
+        }
+        //
+        //    find the appropriate processor (combines local linkType
+        //       with possibly remote linker name)
+        Processor proc = getProcessor();
+        proc = proc.getLinker(linkType);
+        ProcessorDef[] defaultProviders = getDefaultProviders(baseDef);
+        return proc.createConfiguration(task, linkType, defaultProviders,
+                thisDef, targetPlatform);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /**
+     * Returns an array of active library sets for this linker definition.
+     */
+    public LibrarySet[] getActiveLibrarySets(LinkerDef[] defaultProviders,
+            int index) {    	
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getActiveUserLibrarySets(defaultProviders, index);
+        }
+        Project p = getProject();
+        Vector libsets = new Vector();
+        for (int i = index; i < defaultProviders.length; i++) {
+            defaultProviders[i].addActiveUserLibrarySets(p, libsets);
+            defaultProviders[i].addActiveSystemLibrarySets(p, libsets);
+        }
+        addActiveUserLibrarySets(p, libsets);
+        addActiveSystemLibrarySets(p, libsets);
+        LibrarySet[] sets = new LibrarySet[libsets.size()];
+        libsets.copyInto(sets);
+        return sets;
+    }
+    /**
+     * Returns an array of active library sets for this linker definition.
+     */
+    public LibrarySet[] getActiveSystemLibrarySets(
+            LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getActiveUserLibrarySets(defaultProviders, index);
+        }
+        Project p = getProject();
+        Vector libsets = new Vector();
+        for (int i = index; i < defaultProviders.length; i++) {
+            defaultProviders[i].addActiveSystemLibrarySets(p, libsets);
+        }
+        addActiveSystemLibrarySets(p, libsets);
+        LibrarySet[] sets = new LibrarySet[libsets.size()];
+        libsets.copyInto(sets);
+        return sets;
+    }
+    /**
+     * Returns an array of active library sets for this linker definition.
+     */
+    public LibrarySet[] getActiveUserLibrarySets(LinkerDef[] defaultProviders,
+            int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getActiveUserLibrarySets(defaultProviders, index);
+        }
+        Project p = getProject();
+        Vector libsets = new Vector();
+        for (int i = index; i < defaultProviders.length; i++) {
+            defaultProviders[i].addActiveUserLibrarySets(p, libsets);
+        }
+        addActiveUserLibrarySets(p, libsets);
+        LibrarySet[] sets = new LibrarySet[libsets.size()];
+        libsets.copyInto(sets);
+        return sets;
+    }
+    public long getBase(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getBase(defaultProviders, index);
+        }
+        if (base <= 0) {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getBase(defaultProviders,
+                        index + 1);
+            }
+        }
+        return base;
+    }
+    public Boolean getFixed(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getFixed(defaultProviders, index);
+        }
+        if (fixed == null) {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getFixed(defaultProviders,
+                        index + 1);
+            }
+        }
+        return fixed;
+    }
+    public boolean getIncremental(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getIncremental(defaultProviders, index);
+        }
+        if (incremental != null) {
+            return incremental.booleanValue();
+        }
+        if (defaultProviders != null && index < defaultProviders.length) {
+            return defaultProviders[index].getIncremental(defaultProviders, index + 1);
+        }
+        return false;
+    }
+    public boolean getMap(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getMap(defaultProviders, index);
+        }
+        if (map != null) {
+            return map.booleanValue();
+        }
+        if (defaultProviders != null && index < defaultProviders.length) {
+            return defaultProviders[index].getMap(defaultProviders, index + 1);
+        }
+        return false;
+    }
+    public final Boolean getDefaultflag(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class,
+                  "LinkerDef")).getDefaultflag(defaultProviders, index);
+        }
+        return defaultflag;
+    }
+    public String getEntry(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getEntry(defaultProviders, index);
+        }
+        if (entry != null) {
+            return entry;
+        }
+        if (defaultProviders != null && index < defaultProviders.length) {
+            return defaultProviders[index].getEntry(defaultProviders, index + 1);
+        }
+        return null;
+    }
+
+    public Processor getProcessor() {
+        Linker linker = (Linker) super.getProcessor();
+        if (linker == null) {
+            linker = GccLinker.getInstance();
+        }
+        if (getLibtool() && linker instanceof CommandLineLinker) {
+            CommandLineLinker cmdLineLinker = (CommandLineLinker) linker;
+            linker = cmdLineLinker.getLibtoolLinker();
+        }
+        return linker;
+    }
+    public int getStack(LinkerDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((LinkerDef) getCheckedRef(LinkerDef.class, "LinkerDef"))
+                    .getStack(defaultProviders, index);
+        }
+        if (stack < 0) {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getStack(defaultProviders,
+                        index + 1);
+            }
+        }
+        return stack;
+    }
+    /**
+     * Sets the base address. May be specified in either decimal or hex.
+     * 
+     * @param base
+     *            base address
+     *  
+     */
+    public void setBase(FlexLong base) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.base = base.longValue();
+    }
+    /**
+     * Sets the starting address.
+     * 
+     * @param name
+     *            function name
+     */
+    public void setEntry(String entry) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.entry = entry;
+    }
+    /**
+     * If true, marks the file to be loaded only at its preferred address.
+     */
+    public void setFixed(boolean fixed) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.fixed = booleanValueOf(fixed);
+    }
+    /**
+     * If true, allows incremental linking.
+     *  
+     */
+    public void setIncremental(boolean incremental) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.incremental = booleanValueOf(incremental);
+    }
+    /**
+     * If set to true, a map file will be produced.
+     */
+    public void setMap(boolean map) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.map = booleanValueOf(map);
+    }
+    /**
+     * Sets linker type.
+     * 
+     * 
+     * <table width="100%" border="1"> <thead>Supported linkers </thead>
+     * <tr>
+     * <td>gcc</td>
+     * <td>Gcc Linker</td>
+     * </tr>
+     * <tr>
+     * <td>g++</td>
+     * <td>G++ Linker</td>
+     * </tr>
+     * <tr>
+     * <td>ld</td>
+     * <td>Ld Linker</td>
+     * </tr>
+     * <tr>
+     * <td>ar</td>
+     * <td>Gcc Librarian</td>
+     * </tr>
+     * <tr>
+     * <td>msvc</td>
+     * <td>Microsoft Linker</td>
+     * </tr>
+     * <tr>
+     * <td>bcc</td>
+     * <td>Borland Linker</td>
+     * </tr>
+     * <tr>
+     * <td>df</td>
+     * <td>Compaq Visual Fortran Linker</td>
+     * </tr>
+     * <tr>
+     * <td>icl</td>
+     * <td>Intel Linker for Windows (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecl</td>
+     * <td>Intel Linker for Windows (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>icc</td>
+     * <td>Intel Linker for Linux (IA-32)</td>
+     * </tr>
+     * <tr>
+     * <td>ecc</td>
+     * <td>Intel Linker for Linux (IA-64)</td>
+     * </tr>
+     * <tr>
+     * <td>CC</td>
+     * <td>Sun ONE Linker</td>
+     * </tr>
+     * <tr>
+     * <td>aCC</td>
+     * <td>HP aC++ Linker</td>
+     * </tr>
+     * <tr>
+     * <td>os390</td>
+     * <td>OS390 Linker</td>
+     * </tr>
+     * <tr>
+     * <td>os390batch</td>
+     * <td>OS390 Linker</td>
+     * </tr>
+     * <tr>
+     * <td>os400</td>
+     * <td>IccLinker</td>
+     * </tr>
+     * <tr>
+     * <td>sunc89</td>
+     * <td>C89 Linker</td>
+     * </tr>
+     * <tr>
+     * <td>xlC</td>
+     * <td>VisualAge Linker</td>
+     * </tr>
+     * </table>
+     *  
+     */
+    public void setName(LinkerEnum name) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        Linker linker = name.getLinker();
+        super.setProcessor(linker);
+    }
+    protected void setProcessor(Processor proc) throws BuildException {
+        Linker linker = null;
+        if (proc instanceof Linker) {
+            linker = (Linker) proc;
+        } else {
+            LinkType linkType = new LinkType();
+            linker = proc.getLinker(linkType);
+        }
+        super.setProcessor(linker);
+    }
+    /**
+     * Sets stack size in bytes.
+     */
+    public void setStack(FlexInteger stack) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.stack = stack.intValue();
+    }
+    public void visitSystemLibraries(Linker linker, FileVisitor libraryVisitor) {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            LinkerDef master = ((LinkerDef) getCheckedRef(LinkerDef.class,
+                    "Linker"));
+            master.visitSystemLibraries(linker, libraryVisitor);
+        } else {
+            //
+            //   if this linker extends another,
+            //      visit its libraries first
+            //
+            LinkerDef extendsDef = (LinkerDef) getExtends();
+            if (extendsDef != null) {
+                extendsDef.visitSystemLibraries(linker, libraryVisitor);
+            }
+            if (sysLibrarySets.size() > 0) {
+                File[] libpath = linker.getLibraryPath();
+                for (int i = 0; i < sysLibrarySets.size(); i++) {
+                    LibrarySet set = (LibrarySet) sysLibrarySets.elementAt(i);
+                    if (set.isActive(p)) {
+                        set.visitLibraries(p, linker, libpath,
+                                libraryVisitor);
+                    }
+                }
+            }
+        }
+    }
+    public void visitUserLibraries(Linker linker, FileVisitor libraryVisitor) {
+    	Project p = getProject();
+    	if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            LinkerDef master = ((LinkerDef) getCheckedRef(LinkerDef.class,
+                    "Linker"));
+            master.visitUserLibraries(linker, libraryVisitor);
+        } else {
+            //
+            //   if this linker extends another,
+            //      visit its libraries first
+            //
+            LinkerDef extendsDef = (LinkerDef) getExtends();
+            if (extendsDef != null) {
+                extendsDef.visitUserLibraries(linker, libraryVisitor);
+            }
+            //
+            //   visit the user libraries
+            //
+            if (librarySets.size() > 0) {
+                File[] libpath = linker.getLibraryPath();
+                for (int i = 0; i < librarySets.size(); i++) {
+                    LibrarySet set = (LibrarySet) librarySets.elementAt(i);
+                    if (set.isActive(p)) {
+                        set.visitLibraries(p, linker, libpath,
+                                libraryVisitor);
+                    }
+                }
+            }
+        }
+    }
+    /**
+     * Enables or disables default flags.
+     * 
+     * @param defaultflag
+     *            if true, default flags will add to command line.
+     *  
+     */
+    public void setDefaultflag(boolean defaultflag) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.defaultflag = booleanValueOf(defaultflag);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java
new file mode 100644
index 0000000000..cfe8984c23
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerEnum.java
@@ -0,0 +1,106 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import net.sf.antcontrib.cpptasks.arm.ADSLinker;
+import net.sf.antcontrib.cpptasks.borland.BorlandLinker;
+import net.sf.antcontrib.cpptasks.compaq.CompaqVisualFortranLinker;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
+import net.sf.antcontrib.cpptasks.gcc.GccLibrarian;
+import net.sf.antcontrib.cpptasks.gcc.GccLinker;
+import net.sf.antcontrib.cpptasks.gcc.GppLinker;
+import net.sf.antcontrib.cpptasks.gcc.LdLinker;
+import net.sf.antcontrib.cpptasks.hp.aCCLinker;
+import net.sf.antcontrib.cpptasks.ibm.VisualAgeLinker;
+import net.sf.antcontrib.cpptasks.intel.IntelLinux32Linker;
+import net.sf.antcontrib.cpptasks.intel.IntelLinux64Linker;
+import net.sf.antcontrib.cpptasks.intel.IntelWin32Linker;
+import net.sf.antcontrib.cpptasks.os390.OS390Linker;
+import net.sf.antcontrib.cpptasks.os400.IccLinker;
+import net.sf.antcontrib.cpptasks.sun.C89Linker;
+import net.sf.antcontrib.cpptasks.sun.ForteCCLinker;
+import net.sf.antcontrib.cpptasks.ti.ClxxLinker;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumeration of supported linkers
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public class LinkerEnum extends EnumeratedAttribute {
+    private final static ProcessorEnumValue[] linkers = new ProcessorEnumValue[]{
+            new ProcessorEnumValue("gcc", GccLinker.getInstance()),
+            new ProcessorEnumValue("g++", GppLinker.getInstance()),
+            new ProcessorEnumValue("ld", LdLinker.getInstance()),
+            new ProcessorEnumValue("ar", GccLibrarian.getInstance()),
+            new ProcessorEnumValue("msvc", DevStudioLinker.getInstance()),
+            new ProcessorEnumValue("bcc", BorlandLinker.getInstance()),
+            new ProcessorEnumValue("df", CompaqVisualFortranLinker
+                    .getInstance()),
+            new ProcessorEnumValue("icl", IntelWin32Linker.getInstance()),
+            new ProcessorEnumValue("ecl", IntelWin32Linker.getInstance()),
+            new ProcessorEnumValue("icc", IntelLinux32Linker.getInstance()),
+            new ProcessorEnumValue("ecc", IntelLinux64Linker.getInstance()),
+            new ProcessorEnumValue("CC", ForteCCLinker.getInstance()),
+            new ProcessorEnumValue("aCC", aCCLinker.getInstance()),
+            new ProcessorEnumValue("os390", OS390Linker.getInstance()),
+            new ProcessorEnumValue("os390batch", OS390Linker
+                    .getDataSetInstance()),
+            new ProcessorEnumValue("os400", IccLinker.getInstance()),
+            new ProcessorEnumValue("sunc89", C89Linker.getInstance()),
+            new ProcessorEnumValue("xlC", VisualAgeLinker.getInstance()),
+            new ProcessorEnumValue("cl6x", ClxxLinker.getCl6xInstance()),
+            new ProcessorEnumValue("cl55", ClxxLinker.getCl55Instance()),
+            new ProcessorEnumValue("armcc", ADSLinker.getInstance()),
+            new ProcessorEnumValue("armcpp", ADSLinker.getInstance()),
+            new ProcessorEnumValue("tcc", ADSLinker.getInstance()),
+            new ProcessorEnumValue("tcpp", ADSLinker.getInstance()),
+            // gcc cross compilers
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-gcc",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccLinker
+                            .getInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-g++",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GppLinker
+                            .getInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-ld",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.LdLinker
+                            .getInstance()),
+            new ProcessorEnumValue(
+                    "sparc-sun-solaris2-ar",
+                    net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2.GccLibrarian
+                            .getInstance()),
+            new ProcessorEnumValue("gcc-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccLinker
+                            .getInstance()),
+            new ProcessorEnumValue("g++-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GppLinker
+                            .getInstance()),
+            new ProcessorEnumValue("ld-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.LdLinker.getInstance()),
+            new ProcessorEnumValue("ar-cross",
+                    net.sf.antcontrib.cpptasks.gcc.cross.GccLibrarian
+                            .getInstance()),};
+    public Linker getLinker() {
+        return (Linker) linkers[getIndex()].getProcessor();
+    }
+    public String[] getValues() {
+        return ProcessorEnumValue.getValues(linkers);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java
new file mode 100644
index 0000000000..383bae55c9
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/LinkerParam.java
@@ -0,0 +1,33 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+/*******************************************************************************
+ * Place class description here.
+ * 
+ * @author inger
+ * @author <additional author>
+ * 
+ * @since  
+ ******************************************************************************/
+public class LinkerParam extends ProcessorParam {
+    public LinkerParam() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
new file mode 100644
index 0000000000..536d9922d3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OSFamilyEnum.java
@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of cpu types.
+ *
+ * @author Curt Arnold
+ *
+ */
+public final class OSFamilyEnum
+    extends EnumeratedAttribute {
+  /**
+   * Constructor.
+   *
+   * Set by default to "pentium3"
+   *
+   * @see java.lang.Object#Object()
+   */
+  public OSFamilyEnum() {
+    setValue("windows");
+  }
+
+  /**
+   * Gets list of acceptable values.
+   *
+   * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+   */
+  public String[] getValues() {
+    return new String[] {
+        "windows",
+        "dos",
+        "mac",
+        "unix",
+        "netware",
+        "os/2",
+        "tandem",
+        "win9x",
+        "z/os",
+        "os/400",
+        "openvms"};
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
new file mode 100644
index 0000000000..3e97fa40af
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ObjectFileCollector.java
@@ -0,0 +1,42 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Collects object files for the link step.
+ * 
+ *  
+ */
+public final class ObjectFileCollector implements FileVisitor {
+    private final Vector files;
+    private final Linker linker;
+    public ObjectFileCollector(Linker linker, Vector files) {
+        this.linker = linker;
+        this.files = files;
+    }
+    public void visit(File parentDir, String filename) throws BuildException {
+        int bid = linker.bid(filename);
+        if (bid >= 1) {
+            files.addElement(new File(parentDir, filename));
+        }
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java
new file mode 100644
index 0000000000..4a0d17953e
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OptimizationEnum.java
@@ -0,0 +1,82 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+
+/**
+ * Enumeration of optimization levels (experimental).
+ *
+ * @author Curt Arnold
+ *
+ */
+public final class OptimizationEnum
+    extends EnumeratedAttribute {
+  /**
+   * Constructor.
+   *
+   * Set by default to "speed"
+   *
+   * @see java.lang.Object#Object()
+   */
+  public OptimizationEnum() {
+    setValue("speed");
+  }
+
+  /**
+   * Gets list of acceptable values.
+   *
+   * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+   */
+  public String[] getValues() {
+    return new String[] {
+        "none",
+        "size",
+        "minimal",
+        "speed",
+        "full",
+        "aggressive",
+        "extreme",
+        "unsafe"
+    };
+  }
+
+  /**
+   * Is size optimized.
+   * @return boolean true if size is optimized.
+   */
+  public boolean isSize() {
+    return "speed".equals(getValue());
+  }
+
+  /**
+   * Is speed optimized.
+   * @return boolean true if speed is optimized.
+   */
+  public boolean isSpeed() {
+    return !isSize() && !isNoOptimization();
+  }
+
+  /**
+   * Is no optimization performed.
+   * @return boolean true if no optimization is performed.
+   */
+  public boolean isNoOptimization() {
+    return "none".equals(getValue());
+  }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
new file mode 100644
index 0000000000..fb37843fbc
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/OutputTypeEnum.java
@@ -0,0 +1,48 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumeration of supported subsystems
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public class OutputTypeEnum extends EnumeratedAttribute {
+    /**
+     * Constructor
+     * 
+     * Set by default to "executable"
+     * 
+     * @see java.lang.Object#Object()
+     */
+    public OutputTypeEnum() {
+        setValue("executable");
+    }
+    /**
+     * Gets list of acceptable values
+     * 
+     * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+     */
+    public String[] getValues() {
+        return new String[]{"executable", // executable program
+                "plugin", // plugin module
+                "shared", // dynamically linkable module
+                "static" // convenience library
+        };
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java
new file mode 100644
index 0000000000..828e2c2f48
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileDef.java
@@ -0,0 +1,215 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.types.ConditionalFileSet;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.DataType;
+/**
+ * An element that specifies a prototype file and rules for source files that
+ * should not use precompiled headers
+ * 
+ * @author Curt Arnold
+ */
+public final class PrecompileDef extends DataType {
+    private final Vector exceptSets = new Vector();
+    private String ifCond;
+    /**
+     * Directory of prototype file
+     */
+    private File prototype = new File("stdafx.cpp");
+    private String unlessCond;
+    /**
+     * Constructor
+     *  
+     */
+    public PrecompileDef() {
+    }
+    /**
+     * Method used by PrecompileExceptDef to add exception set to
+     * PrecompileDef.
+     */
+    public void appendExceptFileSet(ConditionalFileSet exceptSet) {
+        exceptSet.setProject(getProject());
+        exceptSets.addElement(exceptSet);
+    }
+    /**
+     * Adds filesets that specify files that should not be processed with
+     * precompiled headers enabled.
+     * 
+     * @param exceptSet
+     *            FileSet specify files that should not be processed with
+     *            precompiled headers enabled.
+     */
+    public PrecompileExceptDef createExcept() {
+        return new PrecompileExceptDef(this);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    public String[] getExceptFiles() {
+        PrecompileDef ref = getRef();
+        if (ref != null) {
+            return ref.getExceptFiles();
+        }
+        if (exceptSets.size() == 0) {
+            return new String[0];
+        }
+        Project p = getProject();
+        String[] exceptFiles = null;
+        Enumeration setEnum = exceptSets.elements();
+        while (setEnum.hasMoreElements()) {
+            ConditionalFileSet exceptSet = (ConditionalFileSet) setEnum
+                    .nextElement();
+            if (exceptSet.isActive()) {
+                DirectoryScanner scanner = exceptSet
+                        .getDirectoryScanner(p);
+                String[] scannerFiles = scanner.getIncludedFiles();
+                if (exceptFiles == null) {
+                    exceptFiles = scannerFiles;
+                } else {
+                    if (scannerFiles.length > 0) {
+                        String[] newFiles = new String[exceptFiles.length
+                                + scannerFiles.length];
+                        for (int i = 0; i < exceptFiles.length; i++) {
+                            newFiles[i] = exceptFiles[i];
+                        }
+                        int index = exceptFiles.length;
+                        for (int i = 0; i < scannerFiles.length; i++) {
+                            newFiles[index++] = scannerFiles[i];
+                        }
+                        exceptFiles = newFiles;
+                    }
+                }
+            }
+        }
+        if (exceptFiles == null) {
+            exceptFiles = new String[0];
+        }
+        return exceptFiles;
+    }
+    /**
+     * Gets prototype source file
+     *  
+     */
+    public File getPrototype() {
+        PrecompileDef ref = getRef();
+        if (ref != null) {
+            return ref.getPrototype();
+        }
+        return prototype;
+    }
+    private PrecompileDef getRef() {
+        if (isReference()) {
+            return ((PrecompileDef) getCheckedRef(PrecompileDef.class,
+                    "PrecompileDef"));
+        }
+        return null;
+    }
+    public boolean isActive() {    	
+        boolean isActive = CUtil.isActive(getProject(), ifCond, unlessCond);
+        if (!isActive) {
+            PrecompileDef ref = getRef();
+            if (ref != null) {
+                return ref.isActive();
+            }
+        }
+        return isActive;
+    }
+    /**
+     * Sets a description of the current data type.
+     */
+    public void setDescription(String desc) {
+        super.setDescription(desc);
+    }
+    /**
+     * Sets an id that can be used to reference this element.
+     * 
+     * @param id
+     *            id
+     */
+    public void setId(String id) {
+        //
+        //  this is actually accomplished by a different
+        //     mechanism, but we can document it
+        //
+    }
+    /**
+     * Set the 'if' condition.
+     * 
+     * The processor will be ignored unless the property is defined.
+     * 
+     * The value of property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * isActive() is evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Sets file to precompile.
+     * 
+     * Should be a source file that includes only one unguarded header file.
+     * Default value is "stdafx.cpp".
+     * 
+     * @param prototype
+     *            file path for prototype source file
+     */
+    public void setPrototype(File prototype) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        if (prototype == null) {
+            throw new NullPointerException("prototype");
+        }
+        this.prototype = prototype;
+    }
+    /**
+     * Specifies that this element should behave as if the content of the
+     * element with the matching id attribute was inserted at this location.
+     * 
+     * @param ref
+     *            Reference to other element
+     *  
+     */
+    public void setRefid(org.apache.tools.ant.types.Reference ref) {
+        super.setRefid(ref);
+    }
+    /**
+     * Set the 'unless' condition. If named property exists at execution time,
+     * the processor will be ignored.
+     * 
+     * Value of property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when isActive is called.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
new file mode 100644
index 0000000000..d6cdd6025f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/PrecompileExceptDef.java
@@ -0,0 +1,80 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.types.ConditionalFileSet;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Specifies files that should not be compiled using precompiled headers.
+ * 
+ * @author Curt Arnold
+ */
+public final class PrecompileExceptDef {
+    private ConditionalFileSet localSet = null;
+    /**
+     * Collection of <fileset>contained by definition
+     */
+    private PrecompileDef owner;
+    /**
+     * Constructor
+     *  
+     */
+    public PrecompileExceptDef(PrecompileDef owner) {
+        this.owner = owner;
+    }
+    /**
+     * Adds filesets that specify files that should not be processed using
+     * precompiled headers.
+     * 
+     * @param exceptSet
+     *            FileSet specify files that should not be processed with
+     *            precompiled headers enabled.
+     */
+    public void addFileset(ConditionalFileSet exceptSet) {
+        owner.appendExceptFileSet(exceptSet);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /**
+     * Sets the base-directory
+     */
+    public void setDir(File dir) throws BuildException {
+        if (localSet == null) {
+            localSet = new ConditionalFileSet();
+            owner.appendExceptFileSet(localSet);
+        }
+        localSet.setDir(dir);
+    }
+    /**
+     * Comma or space separated list of file patterns that should not be
+     * compiled using precompiled headers.
+     * 
+     * @param includes
+     *            the string containing the include patterns
+     */
+    public void setIncludes(String includes) {
+        if (localSet == null) {
+            localSet = new ConditionalFileSet();
+            owner.appendExceptFileSet(localSet);
+        }
+        localSet.setIncludes(includes);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java
new file mode 100644
index 0000000000..38faf427e7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorDef.java
@@ -0,0 +1,714 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalFileSet;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Reference;
+/**
+ * An abstract compiler/linker definition.
+ * 
+ * @author Curt Arnold
+ */
+public abstract class ProcessorDef extends DataType {
+    /**
+     * Returns the equivalent Boolean object for the specified value
+     * 
+     * Equivalent to Boolean.valueOf in JDK 1.4
+     * 
+     * @param val
+     *            boolean value
+     * @return Boolean.TRUE or Boolean.FALSE
+     */
+    protected static Boolean booleanValueOf(boolean val) {
+        if (val) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+    /**
+     * if true, targets will be built for debugging
+     */
+    private Boolean debug;
+    private Environment env = null;
+    /**
+     * Reference for "extends" processor definition
+     */
+    private Reference extendsRef = null;
+    /**
+     * Name of property that must be present or definition will be ignored. May
+     * be null.
+     */
+    private String ifProp;
+    /**
+     * if true, processor definition inherits values from containing <cc>
+     * element
+     */
+    private boolean inherit;
+    private Boolean libtool = null;
+    protected boolean newEnvironment = false;
+    /**
+     * Processor.
+     */
+    private Processor processor;
+    /**
+     * Collection of <compilerarg>or <linkerarg>contained by definition
+     */
+    private final Vector processorArgs = new Vector();
+    /**
+     * Collection of <compilerparam>or <linkerparam>contained by definition
+     */
+    private final Vector processorParams = new Vector();
+    /**
+     * if true, all targets will be unconditionally rebuilt
+     */
+    private Boolean rebuild;
+    /**
+     * Collection of <fileset>contained by definition
+     */
+    private final Vector srcSets = new Vector();
+    /**
+     * Name of property that if present will cause definition to be ignored.
+     * May be null.
+     */
+    private String unlessProp;
+    /**
+     * Constructor
+     *  
+     */
+    protected ProcessorDef() throws NullPointerException {
+        inherit = true;
+    }
+    /**
+     * Adds a <compilerarg>or <linkerarg>
+     * 
+     * @param arg
+     *            command line argument, must not be null
+     * @throws NullPointerException
+     *             if arg is null
+     * @throws BuildException
+     *             if this definition is a reference
+     */
+    protected void addConfiguredProcessorArg(CommandLineArgument arg)
+            throws NullPointerException, BuildException {
+        if (arg == null) {
+            throw new NullPointerException("arg");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        if(arg.getFile() == null ) {
+            processorArgs.addElement(arg);
+        }
+        else {
+            loadFile(arg.getFile());
+        }
+    }
+    /**
+     * Add a <compilerarg>or <linkerarg> if specify the file attribute
+     * 
+     * @param arg
+     *            command line argument, must not be null
+     * @throws BuildException
+     *             if the specify file not exist
+     */
+    protected void loadFile(File file)
+        throws BuildException {
+        FileReader fileReader;
+        BufferedReader in;
+        String str;
+        if (! file.exists()){
+            throw new BuildException("The file " + file + " is not existed");
+        }
+        try {
+            fileReader = new FileReader(file);
+            in = new BufferedReader(fileReader);
+            while ( (str = in.readLine()) != null ){                
+                if(str.trim() == ""){
+                    continue ;
+                }
+                str = getProject().replaceProperties(str);
+                CommandLineArgument newarg = new CommandLineArgument();
+                newarg.setValue(str.trim());
+                processorArgs.addElement(newarg);
+            }
+        }
+        catch(Exception e){
+            throw new BuildException(e.getMessage());
+        }
+    }
+    /**
+     * Adds a <compilerarg>or <linkerarg>
+     * 
+     * @param arg
+     *            command line argument, must not be null
+     * @throws NullPointerException
+     *             if arg is null
+     * @throws BuildException
+     *             if this definition is a reference
+     */
+    protected void addConfiguredProcessorParam(ProcessorParam param)
+            throws NullPointerException, BuildException {
+        if (param == null) {
+            throw new NullPointerException("param");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        processorParams.addElement(param);
+    }
+    /**
+     * Add an environment variable to the launched process.
+     */
+    public void addEnv(Environment.Variable var) {
+        if (env == null) {
+            env = new Environment();
+        }
+        env.addVariable(var);
+    }
+    /**
+     * Adds a source file set.
+     * 
+     * Files in these set will be processed by this configuration and will not
+     * participate in the auction.
+     * 
+     * @param srcSet
+     *            Fileset identifying files that should be processed by this
+     *            processor
+     * @throws BuildException
+     *             if processor definition is a reference
+     */
+    public void addFileset(ConditionalFileSet srcSet) throws BuildException {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        srcSet.setProject(getProject());
+        srcSets.addElement(srcSet);
+    }
+    /**
+     * Creates a configuration
+     * 
+     * @param baseDef
+     *            reference to def from containing <cc>element, may be null
+     * @return configuration
+     *  
+     */
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef baseDef, TargetDef targetPlatform) {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).createConfiguration(task, linkType,
+                    baseDef, targetPlatform);
+        }
+        ProcessorDef[] defaultProviders = getDefaultProviders(baseDef);
+        Processor proc = getProcessor();
+        return proc.createConfiguration(task, linkType, defaultProviders, this, targetPlatform);
+    }
+    /**
+     * Prepares list of processor arguments ( <compilerarg>, <linkerarg>) that
+     * are active for the current project settings.
+     * 
+     * @return active compiler arguments
+     */
+    public CommandLineArgument[] getActiveProcessorArgs() {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getActiveProcessorArgs();
+        }
+        Vector activeArgs = new Vector(processorArgs.size());
+        for (int i = 0; i < processorArgs.size(); i++) {
+            CommandLineArgument arg = (CommandLineArgument) processorArgs
+                    .elementAt(i);
+            if (arg.isActive(p)) {
+                activeArgs.addElement(arg);
+            }
+        }
+        CommandLineArgument[] array = new CommandLineArgument[activeArgs.size()];
+        activeArgs.copyInto(array);
+        return array;
+    }
+    /**
+     * Prepares list of processor arguments ( <compilerarg>, <linkerarg>) that
+     * are active for the current project settings.
+     * 
+     * @return active compiler arguments
+     */
+    public ProcessorParam[] getActiveProcessorParams() {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getActiveProcessorParams();
+        }
+        Vector activeParams = new Vector(processorParams.size());
+        for (int i = 0; i < processorParams.size(); i++) {
+            ProcessorParam param = (ProcessorParam) processorParams
+                    .elementAt(i);
+            if (param.isActive(p)) {
+                activeParams.addElement(param);
+            }
+        }
+        ProcessorParam[] array = new ProcessorParam[activeParams.size()];
+        activeParams.copyInto(array);
+        return array;
+    }
+    /**
+     * Gets boolean indicating debug build
+     * 
+     * @param defaultProviders
+     *            array of ProcessorDef's in descending priority
+     * @param index
+     *            index to first element in array that should be considered
+     * @return if true, built targets for debugging
+     */
+    public boolean getDebug(ProcessorDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getDebug(defaultProviders, index);
+        }
+        if (debug != null) {
+            return debug.booleanValue();
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getDebug(defaultProviders,
+                        index + 1);
+            }
+        }
+        return false;
+    }
+    /**
+     * Creates an chain of objects which provide default values in descending
+     * order of significance.
+     * 
+     * @param baseDef
+     *            corresponding ProcessorDef from CCTask, will be last element
+     *            in array unless inherit = false
+     * @return default provider array
+     *  
+     */
+    protected final ProcessorDef[] getDefaultProviders(ProcessorDef baseDef) {
+        ProcessorDef extendsDef = getExtends();
+        Vector chain = new Vector();
+        while (extendsDef != null && !chain.contains(extendsDef)) {
+            chain.addElement(extendsDef);
+            extendsDef = extendsDef.getExtends();
+        }
+        if (baseDef != null && getInherit()) {
+            chain.addElement(baseDef);
+        }
+        ProcessorDef[] defaultProviders = new ProcessorDef[chain.size()];
+        chain.copyInto(defaultProviders);
+        return defaultProviders;
+    }
+    /**
+     * Gets the ProcessorDef specified by the extends attribute
+     * 
+     * @return Base ProcessorDef, null if extends is not specified
+     * @throws BuildException
+     *             if reference is not same type object
+     */
+    public ProcessorDef getExtends() throws BuildException {
+        if (extendsRef != null) {
+            Object obj = extendsRef.getReferencedObject(getProject());
+            if (!getClass().isInstance(obj)) {
+                throw new BuildException("Referenced object "
+                        + extendsRef.getRefId() + " not correct type, is "
+                        + obj.getClass().getName() + " should be "
+                        + getClass().getName());
+            }
+            return (ProcessorDef) obj;
+        }
+        return null;
+    }
+    /**
+     * Gets the inherit attribute. If the inherit value is true, this processor
+     * definition will inherit default values from the containing <cc>element.
+     * 
+     * @return if true then properties from the containing <cc>element are
+     *         used.
+     */
+    public final boolean getInherit() {
+        return inherit;
+    }
+    public boolean getLibtool() {
+        if (libtool != null) {
+            return libtool.booleanValue();
+        }
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getLibtool();
+        }
+        ProcessorDef extendsDef = getExtends();
+        if (extendsDef != null) {
+            return extendsDef.getLibtool();
+        }
+        return false;
+    }
+    /**
+     * Obtains the appropriate processor (compiler, linker)
+     * 
+     * @return processor
+     */
+    protected Processor getProcessor() {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getProcessor();
+        }
+        //
+        //   if a processor has not been explicitly set
+        //      then may be set by an extended definition
+        if (processor == null) {
+            ProcessorDef extendsDef = getExtends();
+            if (extendsDef != null) {
+                return extendsDef.getProcessor();
+            }
+        }
+        return processor;
+    }
+    /**
+     * Gets a boolean value indicating whether all targets must be rebuilt
+     * regardless of dependency analysis.
+     * 
+     * @param defaultProviders
+     *            array of ProcessorDef's in descending priority
+     * @param index
+     *            index to first element in array that should be considered
+     * @return true if all targets should be rebuilt.
+     */
+    public boolean getRebuild(ProcessorDef[] defaultProviders, int index) {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getRebuild(defaultProviders, index);
+        }
+        if (rebuild != null) {
+            return rebuild.booleanValue();
+        } else {
+            if (defaultProviders != null && index < defaultProviders.length) {
+                return defaultProviders[index].getRebuild(defaultProviders,
+                        index + 1);
+            }
+        }
+        return false;
+    }
+    /**
+     * Returns true if the processor definition contains embedded file set
+     * definitions
+     * 
+     * @return true if processor definition contains embedded filesets
+     */
+    public boolean hasFileSets() {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).hasFileSets();
+        }
+        return srcSets.size() > 0;
+    }
+    /**
+     * Determine if this def should be used.
+     * 
+     * Definition will be active if the "if" variable (if specified) is set and
+     * the "unless" variable (if specified) is not set and that all reference
+     * or extended definitions are active
+     * 
+     * @return true if processor is active
+     * @throws IllegalStateException
+     *             if not properly initialized
+     * @throws BuildException
+     *             if "if" or "unless" variable contains suspicious values
+     *             "false" or "no" which indicates possible confusion
+     */
+    public boolean isActive() throws BuildException, IllegalStateException {
+        Project project = getProject();
+        if (!CUtil.isActive(project, ifProp, unlessProp)) {
+            return false;
+        }
+        if (isReference()) {
+            if (!((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).isActive()) {
+                return false;
+            }
+        }
+        //
+        //  walk through any extended definitions
+        //
+        ProcessorDef[] defaultProviders = getDefaultProviders(null);
+        for (int i = 0; i < defaultProviders.length; i++) {
+            if (!defaultProviders[i].isActive()) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Sets the class name for the adapter. Use the "name" attribute when the
+     * tool is supported.
+     * 
+     * @param className
+     *            full class name
+     *  
+     */
+    public void setClassname(String className) throws BuildException {
+        Object proc = null;
+        try {
+            Class implClass = ProcessorDef.class.getClassLoader().loadClass(
+                    className);
+            try {
+                Method getInstance = implClass.getMethod("getInstance",
+                        new Class[0]);
+                proc = getInstance.invoke(null, new Object[0]);
+            } catch (Exception ex) {
+                proc = implClass.newInstance();
+            }
+        } catch (Exception ex) {
+            throw new BuildException(ex);
+        }
+        setProcessor((Processor) proc);
+    }
+    /**
+     * If set true, all targets will be built for debugging.
+     * 
+     * @param debug
+     *            true if targets should be built for debugging
+     * @throws BuildException
+     *             if processor definition is a reference
+     */
+    public void setDebug(boolean debug) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.debug = booleanValueOf(debug);
+    }
+    /**
+     * Sets a description of the current data type.
+     */
+    public void setDescription(String desc) {
+        super.setDescription(desc);
+    }
+    /**
+     * Specifies that this element extends the element with id attribute with a
+     * matching value. The configuration will be constructed from the settings
+     * of this element, element referenced by extends, and the containing cc
+     * element.
+     * 
+     * @param extendsRef
+     *            Reference to the extended processor definition.
+     * @throws BuildException
+     *             if this processor definition is a reference
+     */
+    public void setExtends(Reference extendsRef) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.extendsRef = extendsRef;
+    }
+    /**
+     * Sets an id that can be used to reference this element.
+     * 
+     * @param id
+     *            id
+     */
+    public void setId(String id) {
+        //
+        //  this is actually accomplished by a different
+        //     mechanism, but we can document it
+        //
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The configuration will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setIf(String propName) {
+        ifProp = propName;
+    }
+    /**
+     * If inherit has the default value of true, defines, includes and other
+     * settings from the containing <cc>element will be inherited.
+     * 
+     * @param inherit
+     *            new value
+     * @throws BuildException
+     *             if processor definition is a reference
+     */
+    public void setInherit(boolean inherit) throws BuildException {
+        if (isReference()) {
+            throw super.tooManyAttributes();
+        }
+        this.inherit = inherit;
+    }
+    /**
+     * Set use of libtool.
+     * 
+     * If set to true, the "libtool " will be prepended to the command line
+     * 
+     * @param libtool
+     *            If true, use libtool.
+     */
+    public void setLibtool(boolean libtool) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.libtool = booleanValueOf(libtool);
+    }
+    /**
+     * Do not propagate old environment when new environment variables are
+     * specified.
+     */
+    public void setNewenvironment(boolean newenv) {
+        newEnvironment = newenv;
+    }
+    /**
+     * Sets the processor
+     * 
+     * @param processor
+     *            processor, may not be null.
+     * @throws BuildException
+     *             if ProcessorDef is a reference
+     * @throws NullPointerException
+     *             if processor is null
+     */
+    protected void setProcessor(Processor processor) throws BuildException,
+            NullPointerException {
+        if (processor == null) {
+            throw new NullPointerException("processor");
+        }
+        if (isReference()) {
+            throw super.tooManyAttributes();
+        }
+        if (env == null && !newEnvironment) {
+            this.processor = processor;
+        } else {
+            this.processor = processor.changeEnvironment(newEnvironment, env);
+        }
+    }
+    /**
+     * If set true, all targets will be unconditionally rebuilt.
+     * 
+     * @param rebuild
+     *            if true, rebuild all targets.
+     * @throws BuildException
+     *             if processor definition is a reference
+     */
+    public void setRebuild(boolean rebuild) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.rebuild = booleanValueOf(rebuild);
+    }
+    /**
+     * Specifies that this element should behave as if the content of the
+     * element with the matching id attribute was inserted at this location. If
+     * specified, no other attributes or child content should be specified,
+     * other than "if", "unless" and "description".
+     * 
+     * @param ref
+     *            Reference to other element
+     *  
+     */
+    public void setRefid(org.apache.tools.ant.types.Reference ref) {
+        super.setRefid(ref);
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the configuration will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessProp = propName;
+    }
+    /**
+     * This method calls the FileVistor's visit function for every file in the
+     * processors definition
+     * 
+     * @param visitor
+     *            object whose visit method is called for every file
+     */
+    public void visitFiles(FileVisitor visitor) {
+    	Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException(
+                    "project must be set before this call");
+        }
+        if (isReference()) {
+            ((ProcessorDef) getCheckedRef(ProcessorDef.class, "ProcessorDef"))
+                    .visitFiles(visitor);
+        }
+        //
+        //   if this processor extends another,
+        //      visit its files first
+        //
+        ProcessorDef extendsDef = getExtends();
+        if (extendsDef != null) {
+            extendsDef.visitFiles(visitor);
+        }
+        for (int i = 0; i < srcSets.size(); i++) {
+            ConditionalFileSet srcSet = (ConditionalFileSet) srcSets
+                    .elementAt(i);
+            if (srcSet.isActive()) {
+                // Find matching source files
+                DirectoryScanner scanner = srcSet.getDirectoryScanner(p);
+                // Check each source file - see if it needs compilation
+                String[] fileNames = scanner.getIncludedFiles();
+                File parentDir = scanner.getBasedir();
+                for (int j = 0; j < fileNames.length; j++) {
+                    String currentFile = fileNames[j];
+                    visitor.visit(parentDir, currentFile);
+                }
+            }
+        }
+    }
+    public Vector getSrcSets() {
+        if (isReference()) {
+            return ((ProcessorDef) getCheckedRef(ProcessorDef.class,
+                    "ProcessorDef")).getSrcSets();
+        }
+        return srcSets;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
new file mode 100644
index 0000000000..d028052232
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorEnumValue.java
@@ -0,0 +1,47 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+/**
+ * One entry in the arrays used by the CompilerEnum and LinkerEnum classes.
+ * 
+ * @author Curt Arnold
+ * @see CompilerEnum
+ * @see LinkerEnum
+ *  
+ */
+public class ProcessorEnumValue {
+    public static String[] getValues(ProcessorEnumValue[] processors) {
+        String[] values = new String[processors.length];
+        for (int i = 0; i < processors.length; i++) {
+            values[i] = processors[i].getName();
+        }
+        return values;
+    }
+    private String name;
+    private Processor processor;
+    public ProcessorEnumValue(String name, Processor processor) {
+        this.name = name;
+        this.processor = processor;
+    }
+    public String getName() {
+        return name;
+    }
+    public Processor getProcessor() {
+        return processor;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java
new file mode 100644
index 0000000000..b2d47962ed
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ProcessorParam.java
@@ -0,0 +1,100 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+/*******************************************************************************
+ * Place class description here.
+ * 
+ * @author inger
+ * @author <additional author>
+ * 
+ * @since  
+ ******************************************************************************/
+public class ProcessorParam {
+    private String ifCond;
+    private String name;
+    private String unlessCond;
+    private String value;
+    public ProcessorParam() {
+    }
+    public String getName() {
+        return name;
+    }
+    public String getValue() {
+        return value;
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     */
+    public boolean isActive(org.apache.tools.ant.Project p) {
+        if (value == null) {
+            return false;
+        }
+        if (ifCond != null && p.getProperty(ifCond) == null) {
+            return false;
+        } else if (unlessCond != null && p.getProperty(unlessCond) != null) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The argument will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Specifies relative location of argument on command line. "start" will
+     * place argument at start of command line, "mid" will place argument after
+     * all "start" arguments but before filenames, "end" will place argument
+     * after filenames.
+     *  
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the argument will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+    /**
+     * Specifies the string that should appear on the command line. The
+     * argument will be quoted if it contains embedded blanks. Use multiple
+     * arguments to avoid quoting.
+     *  
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java
new file mode 100644
index 0000000000..02da661917
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/RuntimeType.java
@@ -0,0 +1,26 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumerated attribute with the values "dynamic" and "static",
+ */
+public class RuntimeType extends EnumeratedAttribute {
+    public String[] getValues() {
+        return new String[]{"dynamic", "static"};
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java
new file mode 100644
index 0000000000..0c608b4d87
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SourceHistory.java
@@ -0,0 +1,51 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.io.IOException;
+/**
+ * The history of a source file used to build a target
+ * 
+ * @author Curt Arnold
+ */
+public final class SourceHistory {
+    private/* final */long lastModified;
+    private/* final */String relativePath;
+    /**
+     * Constructor
+     */
+    public SourceHistory(String relativePath, long lastModified) {
+        if (relativePath == null) {
+            throw new NullPointerException("relativePath");
+        }
+        this.relativePath = relativePath;
+        this.lastModified = lastModified;
+    }
+    public String getAbsolutePath(File baseDir) {
+        try {
+            return new File(baseDir, relativePath).getCanonicalPath();
+        } catch (IOException ex) {
+        }
+        return relativePath;
+    }
+    public long getLastModified() {
+        return lastModified;
+    }
+    public String getRelativePath() {
+        return relativePath;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java
new file mode 100644
index 0000000000..3dc342a38a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/SubsystemEnum.java
@@ -0,0 +1,34 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumeration of supported subsystems
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public final class SubsystemEnum extends EnumeratedAttribute {
+    private final static String[] values = new String[]{"gui", "console",
+            "other"};
+    public SubsystemEnum() {
+        setValue("gui");
+    }
+    public String[] getValues() {
+        return (String[]) values.clone();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java
new file mode 100644
index 0000000000..8e46cb7c6c
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetDef.java
@@ -0,0 +1,228 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Reference;
+
+/**
+ * Information on the execution platforms for the generated code.
+ * (Non-functional prototype)
+ *
+ */
+public final class TargetDef
+    extends DataType {
+  /**
+   * if property.
+   */
+  private String ifCond;
+
+  /**
+   * unless property.
+   */
+  private String unlessCond;
+
+  /**
+   * cpu.
+   *
+   */
+  private CPUEnum cpu;
+
+  /**
+   * architecture.
+   *
+   */
+  private ArchEnum arch;
+
+  /**
+   * OS Family.
+   *
+   */
+  private OSFamilyEnum osFamily;
+
+  /**
+   * Constructor.
+   *
+   */
+  public TargetDef() {
+  }
+
+  /**
+   * Bogus method required for documentation generation.
+   */
+  public void execute() {
+    throw new org.apache.tools.ant.BuildException(
+        "Not an actual task, but looks like one for documentation purposes");
+  }
+
+  /**
+   * Returns true if the define's if and unless conditions (if any) are
+   * satisfied.
+   * @return true if active
+   */
+  public boolean isActive() {
+    return CUtil.isActive(getProject(), ifCond, unlessCond);
+  }
+
+  /**
+   * Sets a description of the current data type.
+   * @param desc description
+   */
+  public void setDescription(final String desc) {
+    super.setDescription(desc);
+  }
+
+  /**
+   * Sets an id that can be used to reference this element.
+   *
+   * @param id
+   *            id
+   */
+  public void setId(final String id) {
+    //
+    //  this is actually accomplished by a different
+    //     mechanism, but we can document it
+    //
+  }
+
+  /**
+   * Sets the property name for the 'if' condition.
+   *
+   * The define will be ignored unless the property is defined.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") will throw an exception when
+   * evaluated.
+   *
+   * @param propName
+   *            property name
+   */
+  public void setIf(final String propName) {
+    ifCond = propName;
+  }
+
+  /**
+   * Specifies that this element should behave as if the content of the
+   * element with the matching id attribute was inserted at this location. If
+   * specified, no other attributes should be specified.
+   * @param r id of referenced target
+   */
+  public void setRefid(final Reference r) {
+    super.setRefid(r);
+  }
+
+  /**
+   * Set the property name for the 'unless' condition.
+   *
+   * If named property is set, the define will be ignored.
+   *
+   * The value of the property is insignificant, but values that would imply
+   * misinterpretation ("false", "no") of the behavior will throw an
+   * exception when evaluated.
+   *
+   * @param propName
+   *            name of property
+   */
+  public void setUnless(final String propName) {
+    unlessCond = propName;
+  }
+
+  /**
+   * Gets cpu.
+   * @return cpu, may be null.
+   *
+   */
+  public CPUEnum getCpu() {
+    if (isReference()) {
+      TargetDef refPlatform = (TargetDef)
+          getCheckedRef(TargetDef.class,
+                        "TargetDef");
+      return refPlatform.getCpu();
+    }
+    return cpu;
+  }
+
+  /**
+   * Gets arch.
+   * @return arch, may be null.
+   *
+   */
+  public ArchEnum getArch() {
+    if (isReference()) {
+      TargetDef refPlatform = (TargetDef)
+          getCheckedRef(TargetDef.class,
+                        "TargetDef");
+      return refPlatform.getArch();
+    }
+    return arch;
+  }
+
+  /**
+   * Gets operating system family.
+   * @return os family, may be null.
+   *
+   */
+  public OSFamilyEnum getOsfamily() {
+    if (isReference()) {
+      TargetDef refPlatform = (TargetDef)
+          getCheckedRef(TargetDef.class,
+                        "TargetDef");
+      return refPlatform.getOsfamily();
+    }
+    return osFamily;
+  }
+
+  /**
+   * Sets preferred cpu, but does not use cpu specific instructions.
+   * @param value new value
+   */
+  public void setCpu(final CPUEnum value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    cpu = value;
+  }
+
+  /**
+   * Sets cpu architecture, compiler may use cpu specific instructions.
+   * @param value new value
+   */
+  public void setArch(final ArchEnum value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    if (cpu != null) {
+      throw tooManyAttributes();
+    }
+    arch = value;
+  }
+
+  /**
+   * Sets operating system family.
+   * @param value new value
+   */
+  public void setOsfamily(final OSFamilyEnum value) {
+    if (isReference()) {
+      throw tooManyAttributes();
+    }
+    if (cpu != null) {
+      throw tooManyAttributes();
+    }
+    osFamily = value;
+  }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java
new file mode 100644
index 0000000000..0094c8ecec
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistory.java
@@ -0,0 +1,58 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+/**
+ * A description of a file built or to be built
+ */
+public final class TargetHistory {
+    private/* final */String config;
+    private/* final */String output;
+    private/* final */long outputLastModified;
+    private/* final */SourceHistory[] sources;
+    /**
+     * Constructor from build step
+     */
+    public TargetHistory(String config, String output, long outputLastModified,
+            SourceHistory[] sources) {
+        if (config == null) {
+            throw new NullPointerException("config");
+        }
+        if (sources == null) {
+            throw new NullPointerException("source");
+        }
+        if (output == null) {
+            throw new NullPointerException("output");
+        }
+        this.config = config;
+        this.output = output;
+        this.outputLastModified = outputLastModified;
+        this.sources = (SourceHistory[]) sources.clone();
+    }
+    public String getOutput() {
+        return output;
+    }
+    public long getOutputLastModified() {
+        return outputLastModified;
+    }
+    public String getProcessorConfiguration() {
+        return config;
+    }
+    public SourceHistory[] getSources() {
+        SourceHistory[] clone = (SourceHistory[]) sources.clone();
+        return clone;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
new file mode 100644
index 0000000000..9fb0a7b642
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetHistoryTable.java
@@ -0,0 +1,426 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+
+import org.apache.tools.ant.BuildException;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+/**
+ * A history of the compiler and linker settings used to build the files in the
+ * same directory as the history.
+ * 
+ * @author Curt Arnold
+ */
+public final class TargetHistoryTable {
+    /**
+     * This class handles populates the TargetHistory hashtable in response to
+     * SAX parse events
+     */
+    private class TargetHistoryTableHandler extends DefaultHandler {
+        private final File baseDir;
+        private String config;
+        private final Hashtable history;
+        private String output;
+        private long outputLastModified;
+        private final Vector sources = new Vector();
+        /**
+         * Constructor
+         * 
+         * @param history
+         *            hashtable of TargetHistory keyed by output name
+         * @param outputFiles
+         *            existing files in output directory
+         */
+        private TargetHistoryTableHandler(Hashtable history, File baseDir) {
+            this.history = history;
+            config = null;
+            output = null;
+            this.baseDir = baseDir;
+        }
+        public void endElement(String namespaceURI, String localName,
+                String qName) throws SAXException {
+            //
+            //   if </target> then
+            //       create TargetHistory object and add to hashtable
+            //           if corresponding output file exists and
+            //           has the same timestamp
+            //
+            if (qName.equals("target")) {
+                if (config != null && output != null) {
+                    File existingFile = new File(baseDir, output);
+                    //
+                    //   if the corresponding files doesn't exist or has a
+                    // different
+                    //      modification time, then discard this record
+                    if (existingFile.exists()) {
+                        long existingLastModified = existingFile.lastModified();
+                        //
+                        //   would have expected exact time stamps
+                        //      but have observed slight differences
+                        //      in return value for multiple evaluations of
+                        //      lastModified(). Check if times are within
+                        //      a second
+                        long diff = outputLastModified - existingLastModified;
+                        if (diff >= -500 && diff <= 500) {
+                            SourceHistory[] sourcesArray = new SourceHistory[sources
+                                    .size()];
+                            sources.copyInto(sourcesArray);
+                            TargetHistory targetHistory = new TargetHistory(
+                                    config, output, outputLastModified,
+                                    sourcesArray);
+                            history.put(output, targetHistory);
+                        }
+                    }
+                }
+                output = null;
+                sources.setSize(0);
+            } else {
+                //
+                //   reset config so targets not within a processor element
+                //      don't pick up a previous processors signature
+                //
+                if (qName.equals("processor")) {
+                    config = null;
+                }
+            }
+        }
+        /**
+         * startElement handler
+         */
+        public void startElement(String namespaceURI, String localName,
+                String qName, Attributes atts) throws SAXException {
+            //
+            //   if sourceElement
+            //
+            if (qName.equals("source")) {
+                String sourceFile = atts.getValue("file");
+                long sourceLastModified = Long.parseLong(atts
+                        .getValue("lastModified"), 16);
+                sources.addElement(new SourceHistory(sourceFile,
+                        sourceLastModified));
+            } else {
+                //
+                //   if <target> element,
+                //      grab file name and lastModified values
+                //      TargetHistory object will be created in endElement
+                //
+                if (qName.equals("target")) {
+                    sources.setSize(0);
+                    output = atts.getValue("file");
+                    outputLastModified = Long.parseLong(atts
+                            .getValue("lastModified"), 16);
+                } else {
+                    //
+                    //   if <processor> element,
+                    //       grab signature attribute
+                    //
+                    if (qName.equals("processor")) {
+                        config = atts.getValue("signature");
+                    }
+                }
+            }
+        }
+    }
+    /** Flag indicating whether the cache should be written back to file. */
+    private boolean dirty;
+    /**
+     * a hashtable of TargetHistory's keyed by output file name
+     */
+    private final Hashtable history = new Hashtable();
+    /** The file the cache was loaded from. */
+    private/* final */File historyFile;
+    private/* final */File outputDir;
+    private String outputDirPath;
+    /**
+     * Creates a target history table from history.xml in the output directory,
+     * if it exists. Otherwise, initializes the history table empty.
+     * 
+     * @param task
+     *            task used for logging history load errors
+     * @param outputDir
+     *            output directory for task
+     */
+    public TargetHistoryTable(CCTask task, File outputDir)
+            throws BuildException {
+        if (outputDir == null) {
+            throw new NullPointerException("outputDir");
+        }
+        if (!outputDir.isDirectory()) {
+            throw new BuildException("Output directory is not a directory");
+        }
+        if (!outputDir.exists()) {
+            throw new BuildException("Output directory does not exist");
+        }
+        this.outputDir = outputDir;
+        try {
+            outputDirPath = outputDir.getCanonicalPath();
+        } catch (IOException ex) {
+            outputDirPath = outputDir.toString();
+        }
+        //
+        //   load any existing history from file
+        //       suppressing any records whose corresponding
+        //       file does not exist, is zero-length or
+        //          last modified dates differ
+        historyFile = new File(outputDir, "history.xml");
+        if (historyFile.exists()) {
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setValidating(false);
+            try {
+                SAXParser parser = factory.newSAXParser();
+                parser.parse(historyFile, new TargetHistoryTableHandler(
+                        history, outputDir));
+            } catch (Exception ex) {
+                //
+                //   a failure on loading this history is not critical
+                //       but should be logged
+                task.log("Error reading history.xml: " + ex.toString());
+            }
+        } else {
+            //
+            // create empty history file for identifying new files by last
+            // modified
+            //   timestamp comperation (to compare with
+            //   System.currentTimeMillis() don't work on Unix, because it
+            //   maesure timestamps only in seconds).
+            //
+            try {
+                FileOutputStream outputStream = new FileOutputStream(
+                        historyFile);
+                byte[] historyElement = new byte[]{0x3C, 0x68, 0x69, 0x73,
+                        0x74, 0x6F, 0x72, 0x79, 0x2F, 0x3E};
+                outputStream.write(historyElement);
+                outputStream.close();
+            } catch (IOException ex) {
+                throw new BuildException("Can't create history file", ex);
+            }
+        }
+    }
+    public void commit() throws IOException {
+        //
+        //   if not dirty, no need to update file
+        //
+        if (dirty) {
+            //
+            //   build (small) hashtable of config id's in history
+            //
+            Hashtable configs = new Hashtable(20);
+            Enumeration elements = history.elements();
+            while (elements.hasMoreElements()) {
+                TargetHistory targetHistory = (TargetHistory) elements
+                        .nextElement();
+                String configId = targetHistory.getProcessorConfiguration();
+                if (configs.get(configId) == null) {
+                    configs.put(configId, configId);
+                }
+            }
+            FileOutputStream outStream = new FileOutputStream(historyFile);
+            OutputStreamWriter outWriter;
+            //
+            //   early VM's don't support UTF-8 encoding
+            //       try and fallback to the default encoding
+            //           otherwise
+            String encodingName = "UTF-8";
+            try {
+                outWriter = new OutputStreamWriter(outStream, "UTF-8");
+            } catch (UnsupportedEncodingException ex) {
+                outWriter = new OutputStreamWriter(outStream);
+                encodingName = outWriter.getEncoding();
+            }
+            BufferedWriter writer = new BufferedWriter(outWriter);
+            writer.write("<?xml version='1.0' encoding='");
+            writer.write(encodingName);
+            writer.write("'?>\n");
+            writer.write("<history>\n");
+            StringBuffer buf = new StringBuffer(200);
+            Enumeration configEnum = configs.elements();
+            while (configEnum.hasMoreElements()) {
+                String configId = (String) configEnum.nextElement();
+                buf.setLength(0);
+                buf.append("   <processor signature=\"");
+                buf.append(CUtil.xmlAttribEncode(configId));
+                buf.append("\">\n");
+                writer.write(buf.toString());
+                elements = history.elements();
+                while (elements.hasMoreElements()) {
+                    TargetHistory targetHistory = (TargetHistory) elements
+                            .nextElement();
+                    if (targetHistory.getProcessorConfiguration().equals(
+                            configId)) {
+                        buf.setLength(0);
+                        buf.append("      <target file=\"");
+                        buf.append(CUtil.xmlAttribEncode(targetHistory
+                                .getOutput()));
+                        buf.append("\" lastModified=\"");
+                        buf.append(Long.toHexString(targetHistory
+                                .getOutputLastModified()));
+                        buf.append("\">\n");
+                        writer.write(buf.toString());
+                        SourceHistory[] sourceHistories = targetHistory
+                                .getSources();
+                        for (int i = 0; i < sourceHistories.length; i++) {
+                            buf.setLength(0);
+                            buf.append("         <source file=\"");
+                            buf.append(CUtil.xmlAttribEncode(sourceHistories[i]
+                                    .getRelativePath()));
+                            buf.append("\" lastModified=\"");
+                            buf.append(Long.toHexString(sourceHistories[i]
+                                    .getLastModified()));
+                            buf.append("\"/>\n");
+                            writer.write(buf.toString());
+                        }
+                        writer.write("      </target>\n");
+                    }
+                }
+                writer.write("   </processor>\n");
+            }
+            writer.write("</history>\n");
+            writer.close();
+            dirty = false;
+        }
+    }
+    public TargetHistory get(String configId, String outputName) {
+        TargetHistory targetHistory = (TargetHistory) history.get(outputName);
+        if (targetHistory != null) {
+            if (!targetHistory.getProcessorConfiguration().equals(configId)) {
+                targetHistory = null;
+            }
+        }
+        return targetHistory;
+    }
+    public void markForRebuild(Hashtable targetInfos) {
+        Enumeration targetInfoEnum = targetInfos.elements();
+        while (targetInfoEnum.hasMoreElements()) {
+            markForRebuild((TargetInfo) targetInfoEnum.nextElement());
+        }
+    }
+    public void markForRebuild(TargetInfo targetInfo) {
+        //
+        //     if it must already be rebuilt, no need to check further
+        //
+        if (!targetInfo.getRebuild()) {
+            TargetHistory history = get(targetInfo.getConfiguration()
+                    .toString(), targetInfo.getOutput().getName());
+            if (history == null) {
+                targetInfo.mustRebuild();
+            } else {
+                SourceHistory[] sourceHistories = history.getSources();
+                File[] sources = targetInfo.getSources();
+                if (sourceHistories.length != sources.length) {
+                    targetInfo.mustRebuild();
+                } else {
+                    for (int i = 0; i < sourceHistories.length
+                            && !targetInfo.getRebuild(); i++) {
+                        //
+                        //   relative file name, must absolutize it on output
+                        // directory
+                        //
+                        boolean foundMatch = false;
+                        String historySourcePath = sourceHistories[i]
+                                .getAbsolutePath(outputDir);
+                        for (int j = 0; j < sources.length; j++) {
+                            File targetSource = sources[j];
+                            String targetSourcePath = targetSource
+                                    .getAbsolutePath();
+                            if (targetSourcePath.equals(historySourcePath)) {
+                                foundMatch = true;
+                                if (targetSource.lastModified() != sourceHistories[i]
+                                        .getLastModified()) {
+                                    targetInfo.mustRebuild();
+                                    break;
+                                }
+                            }
+                        }
+                        if (!foundMatch) {
+                            targetInfo.mustRebuild();
+                        }
+                    }
+                }
+            }
+        }
+    }
+    public void update(ProcessorConfiguration config, String[] sources) {
+        String configId = config.getIdentifier();
+        String[] onesource = new String[1];
+        String outputName;
+        for (int i = 0; i < sources.length; i++) {
+            onesource[0] = sources[i];
+            outputName = config.getOutputFileName(sources[i]);
+            update(configId, outputName, onesource);
+        }
+    }
+    private void update(String configId, String outputName, String[] sources) {
+        File outputFile = new File(outputDir, outputName);
+        //
+        //   if output file doesn't exist or predates the start of the
+        //        compile step (most likely a compilation error) then
+        //        do not write add a history entry
+        //
+        if (outputFile.exists()
+                && outputFile.lastModified() >= historyFile.lastModified()) {
+            dirty = true;
+            history.remove(outputName);
+            SourceHistory[] sourceHistories = new SourceHistory[sources.length];
+            for (int i = 0; i < sources.length; i++) {
+                File sourceFile = new File(sources[i]);
+                long lastModified = sourceFile.lastModified();
+                String relativePath = CUtil.getRelativePath(outputDirPath,
+                        sourceFile);
+                sourceHistories[i] = new SourceHistory(relativePath,
+                        lastModified);
+            }
+            TargetHistory newHistory = new TargetHistory(configId, outputName,
+                    outputFile.lastModified(), sourceHistories);
+            history.put(outputName, newHistory);
+        }
+    }
+    public void update(TargetInfo linkTarget) {
+        File outputFile = linkTarget.getOutput();
+        String outputName = outputFile.getName();
+        //
+        //   if output file doesn't exist or predates the start of the
+        //        compile or link step (most likely a compilation error) then
+        //        do not write add a history entry
+        //
+        if (outputFile.exists()
+                && outputFile.lastModified() >= historyFile.lastModified()) {
+            dirty = true;
+            history.remove(outputName);
+            SourceHistory[] sourceHistories = linkTarget
+                    .getSourceHistories(outputDirPath);
+            TargetHistory newHistory = new TargetHistory(linkTarget
+                    .getConfiguration().getIdentifier(), outputName, outputFile
+                    .lastModified(), sourceHistories);
+            history.put(outputName, newHistory);
+        }
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java
new file mode 100644
index 0000000000..3a9dd14b16
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetInfo.java
@@ -0,0 +1,127 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+/**
+ * A description of a file built or to be built
+ */
+public final class TargetInfo {
+    private static final File[] emptyFileArray = new File[0];
+    private/* final */ProcessorConfiguration config;
+    private/* final */File output;
+    private boolean rebuild;
+    private/* final */File[] sources;
+    private File[] sysSources;
+    public TargetInfo(ProcessorConfiguration config, File[] sources,
+            File[] sysSources, File output, boolean rebuild) {
+        if (config == null) {
+            throw new NullPointerException("config");
+        }
+        if (sources == null) {
+            throw new NullPointerException("sources");
+        }
+        if (output == null) {
+            throw new NullPointerException("output");
+        }
+        this.config = config;
+        this.sources = (File[]) sources.clone();
+        if (sysSources == null) {
+            this.sysSources = emptyFileArray;
+        } else {
+            this.sysSources = (File[]) sysSources.clone();
+        }
+        this.output = output;
+        this.rebuild = rebuild;
+        //
+        //   if the output doesn't exist, must rebuild it
+        //
+        if (!output.exists()) {
+            rebuild = true;
+        }
+    }
+    public String[] getAllSourcePaths() {
+        String[] paths = new String[sysSources.length + sources.length];
+        for (int i = 0; i < sysSources.length; i++) {
+            paths[i] = sysSources[i].toString();
+        }
+        int offset = sysSources.length;
+        for (int i = 0; i < sources.length; i++) {
+            paths[offset + i] = sources[i].toString();
+        }
+        return paths;
+    }
+    public File[] getAllSources() {
+        File[] allSources = new File[sources.length + sysSources.length];
+        for (int i = 0; i < sysSources.length; i++) {
+            allSources[i] = sysSources[i];
+        }
+        int offset = sysSources.length;
+        for (int i = 0; i < sources.length; i++) {
+            allSources[i + offset] = sources[i];
+        }
+        return allSources;
+    }
+    public ProcessorConfiguration getConfiguration() {
+        return config;
+    }
+    public File getOutput() {
+        return output;
+    }
+    public boolean getRebuild() {
+        return rebuild;
+    }
+    /**
+     * Returns an array of SourceHistory objects (contains relative path and
+     * last modified time) for the source[s] of this target
+     */
+    public SourceHistory[] getSourceHistories(String basePath) {
+        SourceHistory[] histories = new SourceHistory[sources.length];
+        for (int i = 0; i < sources.length; i++) {
+            String relativeName = CUtil.getRelativePath(basePath, sources[i]);
+            long lastModified = sources[i].lastModified();
+            histories[i] = new SourceHistory(relativeName, lastModified);
+        }
+        return histories;
+    }
+    public String[] getSourcePaths() {
+        String[] paths = new String[sources.length];
+        for (int i = 0; i < sources.length; i++) {
+            paths[i] = sources[i].toString();
+        }
+        return paths;
+    }
+    public File[] getSources() {
+        File[] clone = (File[]) sources.clone();
+        return clone;
+    }
+    public String[] getSysSourcePaths() {
+        String[] paths = new String[sysSources.length];
+        for (int i = 0; i < sysSources.length; i++) {
+            paths[i] = sysSources[i].toString();
+        }
+        return paths;
+    }
+    public File[] getSysSources() {
+        File[] clone = (File[]) sysSources.clone();
+        return clone;
+    }
+    public void mustRebuild() {
+        this.rebuild = true;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java
new file mode 100644
index 0000000000..2574e1561f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/TargetMatcher.java
@@ -0,0 +1,117 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.ProcessorConfiguration;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * This class matches each visited file with an appropriate compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class TargetMatcher implements FileVisitor {
+    private LinkerConfiguration linker;
+    private Vector objectFiles;
+    private File outputDir;
+    private ProcessorConfiguration[] processors;
+    private final File sourceFiles[] = new File[1];
+    private Hashtable targets;
+    private CCTask task;
+    public TargetMatcher(CCTask task, File outputDir,
+            ProcessorConfiguration[] processors, LinkerConfiguration linker,
+            Vector objectFiles, Hashtable targets) {
+        this.task = task;
+        this.outputDir = outputDir;
+        this.processors = processors;
+        this.targets = targets;
+        this.linker = linker;
+        this.objectFiles = objectFiles;
+    }
+    public void visit(File parentDir, String filename) throws BuildException {
+        //
+        //   see if any processor wants to bid
+        //       on this one
+        ProcessorConfiguration selectedCompiler = null;
+        int bid = 0;
+        if (processors != null) {
+            for (int k = 0; k < processors.length; k++) {
+                int newBid = processors[k].bid(filename);
+                if (newBid > bid) {
+                    bid = newBid;
+                    selectedCompiler = processors[k];
+                }
+            }
+        }
+        //
+        //   no processor interested in file
+        //      log diagnostic message
+        if (bid <= 0) {
+            if (linker != null) {
+                int linkerbid = linker.bid(filename);
+                if (linkerbid > 0) {
+                    File objFile = new File(parentDir, filename);
+                    objectFiles.addElement(objFile);
+                    if (linkerbid == 1) {
+                        task.log("Unrecognized file type " + objFile.toString()
+                                + " will be passed to linker");
+                    }
+                }
+            }
+        } else {
+            //
+            //  get output file name
+            //
+            String outputFileName = selectedCompiler
+                    .getOutputFileName(filename);
+            //
+            //   if there is some output for this task
+            //      (that is a source file and not an header file)
+            //
+            if (outputFileName != null) {
+                sourceFiles[0] = new File(parentDir, filename);
+                //
+                //   see if the same output file has already been registered
+                //
+                TargetInfo previousTarget = (TargetInfo) targets
+                        .get(outputFileName);
+                if (previousTarget == null) {
+                    targets.put(outputFileName, new TargetInfo(
+                            selectedCompiler, sourceFiles, null, new File(
+                                    outputDir, outputFileName),
+                            selectedCompiler.getRebuild()));
+                } else {
+                    if (!previousTarget.getSources()[0].equals(sourceFiles[0])) {
+                        StringBuffer builder = new StringBuffer(
+                                "Output filename conflict: ");
+                        builder.append(outputFileName);
+                        builder.append(" would be produced from ");
+                        builder.append(previousTarget.getSources()[0]
+                                .toString());
+                        builder.append(" and ");
+                        builder.append(filename);
+                        throw new BuildException(builder.toString());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java
new file mode 100644
index 0000000000..f55b976fef
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/VersionInfo.java
@@ -0,0 +1,550 @@
+/*
+ * 
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Reference;
+
+/**
+ * Version Information. (Non-functional prototype)
+ * 
+ */
+public class VersionInfo extends DataType {
+	/**
+	 * if property.
+	 */
+    private String ifCond;
+    /**
+     * unless property.
+     */
+    private String unlessCond;
+
+    /**
+     * extends property.
+     */
+    private String extendsId;
+    
+    /**
+     * file version.
+     *
+     */
+    private String fileVersion;
+    /**
+     * Product version.
+     *
+     */
+    private String productVersion;
+    /**
+     * file language.
+     *
+     */
+    private String language;
+    
+    /**
+     * comments.
+     *
+     */
+    private String fileComments;
+    /**
+     * Company name.
+     *
+     */
+    private String companyName;
+    /**
+     * Description.
+     *
+     */
+    private String description;
+    /**
+     * internal name.
+     */
+    private String internalName;
+    /**
+     * legal copyright.
+     *
+     */
+    private String legalCopyright;
+    /**
+     * legal trademark.
+     *
+     */
+    private String legalTrademark;
+    /**
+     * original filename.
+     *
+     */
+    private String originalFilename;
+    /**
+     * private build.
+     *
+     */
+    private String privateBuild;
+    /**
+     * product name.
+     *
+     */
+    private String productName;
+    /**
+     * Special build
+     */
+    private String specialBuild;
+    /**
+     * compatibility version
+     *
+     */
+    private String compatibilityVersion;
+	
+
+    /**
+     * Constructor.
+     *
+     */
+    public VersionInfo() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     * 
+     * @exception BuildException
+     *                throws build exception if name is not set
+     */
+    public final boolean isActive() throws BuildException {
+        return CUtil.isActive(getProject(), ifCond, unlessCond);
+    }
+    /**
+     * Sets an id that can be used to reference this element.
+     * 
+     * @param id
+     *            id
+     */
+    public void setId(String id) {
+        //
+        //  this is actually accomplished by a different
+        //     mechanism, but we can document it
+        //
+    }
+    /**
+     * Sets the name of a version info that this info extends.
+     * 
+     * @param id
+     *            id
+     */
+    public void setExtends(String id) {
+    	extendsId = id;
+    }
+
+    
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The define will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            property name
+     */
+    public final void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Specifies that this element should behave as if the content of the
+     * element with the matching id attribute was inserted at this location. If
+     * specified, no other attributes should be specified.
+     *  
+     */
+    public void setRefid(Reference r) throws BuildException {
+        super.setRefid(r);
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the define will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public final void setUnless(String propName) {
+        unlessCond = propName;
+    }
+    /**
+     * Gets file version.
+     * @return file version, may be null.
+     *
+     */
+    public String getFileversion() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getFileversion();
+        }
+    	return fileVersion;
+    }
+    /**
+     * Gets Product version.
+     * @return product version, may be null
+     */
+    public String getProductversion() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getProductversion();
+        }
+    	return productVersion;
+    }
+    /**
+     * Gets compatibility version.
+     * @return compatibility version, may be null
+     */
+    public String getCompatibilityversion() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getCompatibilityversion();
+        }
+    	return compatibilityVersion;
+    }
+    /**
+     * Gets file language, should be an IETF RFC 3066 identifier, for example, en-US.
+     * @return language, may be null.
+     */
+    public String getLanguage() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getLanguage();
+        }
+    	return language;
+    }
+    
+    /**
+     * Gets comments.
+     * @return comments, may be null.
+     */
+    public String getFilecomments() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getFilecomments();
+        }
+    	return fileComments;
+    }
+    /**
+     * Gets Company name.
+     * @return company name, may be null.
+     */
+    public String getCompanyname() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getCompanyname();
+        }
+    	return companyName;
+    }
+    /**
+     * Gets Description.
+     * @return description, may be null.
+     */
+    public String getDescription() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getDescription();
+        }
+    	return description;
+    }
+    /**
+     * Gets internal name.
+     * @return internal name, may be null.
+     */
+    public String getInternalname() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getInternalname();
+        }
+    	return internalName;
+    }
+    /**
+     * Gets legal copyright.
+     * @return legal copyright, may be null.
+     */
+    public String getLegalcopyright() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getLegalcopyright();
+        }
+    	return legalCopyright;
+    }
+    /**
+     * Gets legal trademark.
+     * @return legal trademark, may be null;
+     */
+    public String getLegaltrademark() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getLegaltrademark();
+        }
+    	return legalTrademark;
+    }
+    /**
+     * Gets original filename.
+     * @return original filename, may be null.
+     */
+    public String getOriginalfilename() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getOriginalfilename();
+        }
+    	return originalFilename;
+    }
+    /**
+     * Gets private build.
+     * @return private build, may be null.
+     */
+    public String getPrivatebuild() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getPrivatebuild();
+        }
+    	return privateBuild;
+    }
+    /**
+     * Gets product name.
+     * @return product name, may be null.
+     */
+    public String getProductname() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getProductname();
+        }
+    	return productName;
+    }
+    /**
+     * Special build
+     * @return special build, may be null.
+     */
+    public String getSpecialbuild() {
+        if (isReference()) {
+            VersionInfo refVersion = (VersionInfo) 
+				getCheckedRef(VersionInfo.class,
+                    "VersionInfo");
+            return refVersion.getSpecialbuild();
+        }
+    	return specialBuild;
+    }
+
+    /**
+     * Sets file version.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setFileversion(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	fileVersion = value;
+    }
+    /**
+     * Sets product version.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setProductversion(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	productVersion = value;
+    }
+    /**
+     * Sets compatibility version.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setCompatibilityversion(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	compatibilityVersion = value;
+    }
+    /**
+     * Sets language.
+     * @param value new value, should be an IETF RFC 3066 language identifier.
+     * @throws BuildException if specified with refid
+     */
+    public void setLanguage(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        language = value;
+    }
+    /**
+     * Sets comments.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setFilecomments(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	fileComments = value;
+    }
+
+    /**
+     * Sets company name.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setCompanyname(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	companyName = value;
+    }
+
+
+    /**
+     * Sets internal name.  Internal name will automatically be
+     * specified from build step, only set this value if
+     * intentionally overriding that value.
+     * 
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setInternalname(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	internalName = value;
+    }
+    
+    /**
+     * Sets legal copyright.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setLegalcopyright(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	legalCopyright = value;
+    }
+    /**
+     * Sets legal trademark.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setLegaltrademark(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	legalTrademark = value;
+    }
+    /**
+     * Sets original name.  Only set this value if
+     * intentionally overriding the value from the build set.
+     * 
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setOriginalfilename(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	originalFilename = value;
+    }
+    /**
+     * Sets private build.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setPrivatebuild(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	privateBuild = value;
+    }
+    /**
+     * Sets product name.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setProductname(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	productName= value;
+    }
+    /**
+     * Sets private build.
+     * @param value new value
+     * @throws BuildException if specified with refid
+     */
+    public void setSpecialbuild(String value) throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+    	specialBuild = value;
+    }
+    
+    /**
+     * Writes windows resource 
+     * @param writer writer, may not be null.
+     * @param project project, may not be null
+     * @param executableName name of executable
+     */
+    public void writeResource(final Writer writer, 
+    		final Project p, 
+			final String executableName) throws IOException {
+    	// TODO:
+    	
+    }
+    
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
new file mode 100644
index 0000000000..78489b8c31
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java
@@ -0,0 +1,215 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.arm;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the ARM C Compilers
+ * 
+ * See Doc No: ARM DUI 0151A, Issued: Nov 2001 at
+ * http://www.arm.com/arm/User_Guides?OpenDocument
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public class ADSCCompiler extends CommandLineCCompiler {
+    /**
+     * Header file extensions
+     */
+    private static final String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    /**
+     * Source file extensions
+     */
+    private static final String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cpp", ".cxx", ".c++"};
+    /**
+     * Singleton for ARM 32-bit C compiler
+     */
+    private static final ADSCCompiler armcc = new ADSCCompiler("armcc", false,
+            null);
+    /**
+     * Singleton for ARM 32-bit C++ compiler
+     */
+    private static final ADSCCompiler armcpp = new ADSCCompiler("armcpp",
+            false, null);
+    /**
+     * Singleton for ARM 16-bit C compiler
+     */
+    private static final ADSCCompiler tcc = new ADSCCompiler("tcc", false, null);
+    /**
+     * Singleton for ARM 16-bit C++ compiler
+     */
+    private static final ADSCCompiler tcpp = new ADSCCompiler("tcpp", false,
+            null);
+    /**
+     * Singleton for ARM 32-bit C compiler
+     */
+    public static ADSCCompiler getArmCC() {
+        return armcc;
+    }
+    /**
+     * Singleton for ARM 32-bit C++ compiler
+     */
+    public static ADSCCompiler getArmCpp() {
+        return armcpp;
+    }
+    /**
+     * Singleton for ARM 16-bit C compiler
+     */
+    public static ADSCCompiler getThumbCC() {
+        return tcpp;
+    }
+    /**
+     * Singleton for ARM 16-bit C++ compiler
+     */
+    public static ADSCCompiler getThumbCpp() {
+        return tcpp;
+    }
+    private static void quoteFile(StringBuffer buf, String outPath) {
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+    }
+    /**
+     * Private constructor
+     * 
+     * @param command
+     *            executable name
+     * @param newEnvironment
+     *            Change environment
+     * @param env
+     *            New environment
+     */
+    private ADSCCompiler(String command, boolean newEnvironment, Environment env) {
+        super(command, "-vsn", sourceExtensions, headerExtensions, ".o", false,
+                null, newEnvironment, env);
+    }
+    /**
+     * Adds command switches for generic configuration options
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addImpliedArgs(java.util.Vector,
+     *      boolean, boolean, boolean,
+     *      net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    protected void addImpliedArgs(Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        if (debug) {
+            args.addElement("-g");
+        }
+        //
+        //   didn't see anything about producing
+        //     anything other than executables in the docs
+        if (linkType.isExecutable()) {
+        } else if (linkType.isSharedLibrary()) {
+        }
+    }
+    /**
+     * Adds flags that customize the warnings reported
+     * 
+     * Compiler does not appear to have warning levels but ability to turn off
+     * specific errors by explicit switches, could fabricate levels by
+     * prioritizing errors.
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addWarningSwitch(java.util.Vector,
+     *      int)
+     */
+    protected void addWarningSwitch(Vector args, int warnings) {
+    }
+    /**
+     * Add command line options for preprocessor macro
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getDefineSwitch(java.lang.StringBuffer,
+     *      java.lang.String, java.lang.String)
+     */
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("-D");
+        buffer.append(define);
+        if (value != null) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    /**
+     * ARMINC environment variable contains the default include path
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getEnvironmentIncludePath()
+     */
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("ARMINC", ";");
+    }
+    /**
+     * Returns command line option to specify include directory
+     *  
+     */
+    protected String getIncludeDirSwitch(String source) {
+        StringBuffer buf = new StringBuffer("-I");
+        quoteFile(buf, source);
+        return buf.toString();
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return ADSLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return ADSLinker.getDllInstance();
+        }
+        return ADSLinker.getInstance();
+    }
+    /**
+     * Maximum command line length
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getMaximumCommandLength()
+     */
+    public int getMaximumCommandLength() {
+        return 1000;
+    }
+    /*
+     * Adds command to undefine preprocessor macro
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getUndefineSwitch(java.lang.StringBuffer,
+     *      java.lang.String)
+     */
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        buffer.append("-U");
+        buffer.append(define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
new file mode 100644
index 0000000000..0ff53d309f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java
@@ -0,0 +1,160 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.arm;
+
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for ARM Librarian
+ *
+ * @author Curt Arnold
+ */
+public class ADSLibrarian extends CommandLineLinker {
+
+    private static final ADSLibrarian instance = new ADSLibrarian();
+
+    public static ADSLibrarian getInstance() {
+      return instance;
+    }
+
+    private ADSLibrarian()
+    {
+        super("armar",null,
+          new String[] { ".o" }, new String[0], ".lib", false, null);
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long, java.util.Vector)
+     */
+    protected void addBase(long base, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean, java.util.Vector)
+     */
+    protected void addFixed(Boolean fixed, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean, net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
+     */
+    protected void addImpliedArgs(
+        boolean debug,
+        LinkType linkType,
+        Vector args,
+        Boolean defaultflag) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean, java.util.Vector)
+     */
+    protected void addIncremental(boolean incremental, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean, java.util.Vector)
+     */
+    protected void addMap(boolean map, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int, java.util.Vector)
+     */
+    protected void addStack(int stack, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
+     */
+    protected String getCommandFileSwitch(String commandFile) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
+     */
+    public File[] getLibraryPath() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
+     */
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return new String[0];
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType linkType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
+     */
+    protected int getMaximumCommandLength() {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
+     */
+    protected String[] getOutputFileSwitch(String outputFile) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
+     */
+    public boolean isCaseSensitive() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
new file mode 100644
index 0000000000..042eb217ec
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/arm/ADSLinker.java
@@ -0,0 +1,166 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.arm;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for the ARM Linker
+ * 
+ * @author CurtA
+ */
+public class ADSLinker extends CommandLineLinker {
+    private static final ADSLinker dllInstance = new ADSLinker(".o");
+    private static final ADSLinker instance = new ADSLinker(".axf");
+    public static ADSLinker getDllInstance() {
+        return dllInstance;
+    }
+    public static ADSLinker getInstance() {
+        return instance;
+    }
+    private ADSLinker(String outputSuffix) {
+        super("armlink", "-vsn", new String[]{".o", ".lib", ".res"},
+                new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, null);
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long,
+     *      java.util.Vector)
+     */
+    protected void addBase(long base, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean,
+     *      java.util.Vector)
+     */
+    protected void addFixed(Boolean fixed, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean,
+     *      net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
+     */
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (debug) {
+            args.addElement("-debug");
+        }
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean,
+     *      java.util.Vector)
+     */
+    protected void addIncremental(boolean incremental, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean,
+     *      java.util.Vector)
+     */
+    protected void addMap(boolean map, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int,
+     *      java.util.Vector)
+     */
+    protected void addStack(int stack, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+        // TODO Auto-generated method stub
+
+    }
+    
+    /**
+     * May have to make this String array return
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
+     */
+    protected String getCommandFileSwitch(String commandFile) {
+        return "-via" + commandFile;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
+     */
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("ARMLIB", ";");
+    }
+    /*
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
+     */
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+    	//
+    	//  TODO: looks like bad extension
+    	//
+        return new String[]{".o"};
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType linkType) {
+        return this;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
+     */
+    protected int getMaximumCommandLength() {
+        return 1024;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
+     */
+    protected String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-output", outputFile};
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
+     */
+    public boolean isCaseSensitive() {
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
new file mode 100644
index 0000000000..3304c9a860
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java
@@ -0,0 +1,135 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.PrecompilingCommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Borland(r) C/C++ compiler.
+ * 
+ * @author Curt Arnold
+ */
+public class BorlandCCompiler extends PrecompilingCommandLineCCompiler {
+    private static final String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private static final String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cpp", ".cxx", ".c++"};
+    private static final BorlandCCompiler instance = new BorlandCCompiler(
+            false, null);
+    public static BorlandCCompiler getInstance() {
+        return instance;
+    }
+    private BorlandCCompiler(boolean newEnvironment, Environment env) {
+        super("bcc32", "--version", sourceExtensions, headerExtensions, ".obj", false,
+                null, newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        args.addElement("-c");
+        //
+        //  turn off compiler autodependency since
+        //     we do it ourselves
+        args.addElement("-X");
+        if (exceptions) {
+            args.addElement("-x");
+        } else {
+            args.addElement("-x-");
+        }
+        if (multithreaded) {
+            args.addElement("-tWM");
+        }
+        if (debug) {
+            args.addElement("-Od");
+            args.addElement("-v");
+        } else {
+        	if (optimization != null) {
+        		if (optimization.isSpeed()) {
+        			args.addElement("-O1");
+        		} else {
+        			if (optimization.isSpeed()) {
+        				args.addElement("-O2");
+        			} else {
+        				if (optimization.isNoOptimization()) {
+        					args.addElement("-Od");
+        				}
+        			}
+        		}
+        	}
+        }
+        if (rtti != null && !rtti.booleanValue()) {
+        	args.addElement("-RT-");
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        BorlandProcessor.addWarningSwitch(args, level);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new BorlandCCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    protected CompilerConfiguration createPrecompileGeneratingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude) {
+        String[] additionalArgs = new String[]{"-H=" + lastInclude, "-Hc"};
+        return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
+                null, true);
+    }
+    protected CompilerConfiguration createPrecompileUsingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude, String[] exceptFiles) {
+        String[] additionalArgs = new String[]{"-Hu"};
+        return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
+                exceptFiles, false);
+    }
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        BorlandProcessor.getDefineSwitch(buffer, define, value);
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return BorlandProcessor.getEnvironmentPath("bcc32", 'I',
+                new String[]{"..\\include"});
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return BorlandProcessor.getIncludeDirSwitch("-I", includeDir);
+    }
+    public Linker getLinker(LinkType type) {
+        return BorlandLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        BorlandProcessor.getUndefineSwitch(buffer, define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
new file mode 100644
index 0000000000..19daedd203
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java
@@ -0,0 +1,70 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.parser.AbstractParser;
+import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
+import net.sf.antcontrib.cpptasks.parser.LetterState;
+import net.sf.antcontrib.cpptasks.parser.WhitespaceOrLetterState;
+/**
+ * A parser that paths from a borland cfg file
+ * 
+ * @author Curt Arnold
+ */
+public final class BorlandCfgParser extends AbstractParser {
+    private AbstractParserState newLineState;
+    private final Vector path = new Vector();
+    /**
+     * 
+     *  
+     */
+    public BorlandCfgParser(char switchChar) {
+        //
+        //   a quoted path (-I"some path")
+        //      doesn't end till a close quote and will be abandoned
+        //      if a new line is encountered first
+        //
+        AbstractParserState quote = new CfgFilenameState(this, new char[]{'"'});
+        //
+        //    an unquoted path (-Ic:\borland\include)
+        //      ends at the first space or new line
+        AbstractParserState unquote = new CfgFilenameState(this, new char[]{
+                ' ', '\n', '\r'});
+        AbstractParserState quoteBranch = new QuoteBranchState(this, quote,
+                unquote);
+        AbstractParserState toNextSwitch = new ConsumeToSpaceOrNewLine(this);
+        AbstractParserState switchState = new LetterState(this, switchChar,
+                quoteBranch, toNextSwitch);
+        newLineState = new WhitespaceOrLetterState(this, '-', switchState);
+    }
+    public void addFilename(String include) {
+        path.addElement(include);
+    }
+    public AbstractParserState getNewLineState() {
+        return newLineState;
+    }
+    public String[] parsePath(Reader reader) throws IOException {
+        path.setSize(0);
+        super.parse(reader);
+        String[] retval = new String[path.size()];
+        path.copyInto(retval);
+        return retval;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
new file mode 100644
index 0000000000..5fb3eb0827
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java
@@ -0,0 +1,200 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.File;
+import java.io.IOException;
+import java.util.Vector;
+import org.apache.tools.ant.BuildException;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for the Borland(r) tlib Librarian
+ * 
+ * @author Curt Arnold
+ */
+public class BorlandLibrarian extends CommandLineLinker {
+    private static final BorlandLibrarian instance = new BorlandLibrarian();
+    public static BorlandLibrarian getInstance() {
+        return instance;
+    }
+    private BorlandLibrarian() {
+        super("tlib", "--version", new String[]{".obj"}, new String[0], ".lib", false,
+                null);
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    protected String getCommandFileSwitch(String cmdFile) {
+        return BorlandProcessor.getCommandFileSwitch(cmdFile);
+    }
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("LIB", ";");
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return BorlandProcessor.getLibraryPatterns(libnames, libType);
+    }
+    public Linker getLinker(LinkType type) {
+        return BorlandLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    public String[] getOutputFileSwitch(String outFile) {
+        return BorlandProcessor.getOutputFileSwitch(outFile);
+    }
+    public boolean isCaseSensitive() {
+        return BorlandProcessor.isCaseSensitive();
+    }
+    /**
+     * Gets identifier for the linker.
+     * 
+     * TLIB will lockup when attempting to get version
+     * information.  Since the Librarian version isn't critical
+     * just return a stock response.
+     */
+    public String getIdentifier() {
+    	return "TLIB 4.5 Copyright (c) 1987, 1999 Inprise Corporation";
+    }
+    
+    /**
+     * Prepares argument list for exec command.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param sourceFiles
+     *            linker input files (.obj, .o, .res)
+     * @param args
+     *            linker arguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareArguments(
+    		CCTask task,
+    		String outputDir, 
+			String outputName,
+            String[] sourceFiles, 
+			CommandLineLinkerConfiguration config) {
+    	String[] preargs = config.getPreArguments();
+        String[] endargs = config.getEndArguments();
+        StringBuffer buf = new StringBuffer();
+        Vector execArgs = new Vector(preargs.length + endargs.length + 10
+                + sourceFiles.length);
+        
+        execArgs.addElement(this.getCommand());
+        String outputFileName = new File(outputDir, outputName).toString();
+        execArgs.addElement(quoteFilename(buf, outputFileName));
+
+        for (int i = 0; i < preargs.length; i++) {
+            execArgs.addElement(preargs[i]);
+        }
+
+        //
+        //   add a place-holder for page size
+        //
+        int pageSizeIndex = execArgs.size();
+        execArgs.addElement(null);
+        
+        int objBytes = 0;
+        
+        for (int i = 0; i < sourceFiles.length; i++) {
+            String last4 = sourceFiles[i]
+                    .substring(sourceFiles[i].length() - 4).toLowerCase();
+            if (last4.equals(".def")) {
+            } else {
+                if (last4.equals(".res")) {
+                } else {
+                    if (last4.equals(".lib")) {
+                    } else {
+                        execArgs.addElement("+" + quoteFilename(buf, sourceFiles[i]));
+                        objBytes += new File(sourceFiles[i]).length();
+                    }
+                }
+            }
+        }
+        
+        for (int i = 0; i < endargs.length; i++) {
+            execArgs.addElement(endargs[i]);
+        }
+        
+        String[] execArguments = new String[execArgs.size()];
+        execArgs.copyInto(execArguments);
+
+    	int minPageSize = objBytes >> 16;
+    	int pageSize = 0;
+    	for(int i = 4; i <= 15; i++) {
+    		pageSize = 1 << i;
+    		if (pageSize > minPageSize) break;
+    	}
+        execArguments[pageSizeIndex] = "/P" + Integer.toString(pageSize);
+        
+        return execArguments;
+    }
+    
+    /**
+     * Prepares argument list to execute the linker using a response file.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param args
+     *            output of prepareArguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareResponseFile(File outputFile, String[] args)
+            throws IOException {
+    	return BorlandProcessor.prepareResponseFile(outputFile, args, " & \n");
+    }
+    
+    /**
+     * Builds a library
+     *
+     */
+    public void link(CCTask task,
+                     File outputFile,
+                     String[] sourceFiles,
+                     CommandLineLinkerConfiguration config)
+                     throws BuildException
+    {
+    	//
+    	//  delete any existing library
+    	outputFile.delete();
+    	//
+    	//  build a new library
+    	super.link(task, outputFile, sourceFiles, config);
+    }
+    
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
new file mode 100644
index 0000000000..f425c528bd
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java
@@ -0,0 +1,264 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for the Borland(r) ilink32 linker
+ * 
+ * @author Curt Arnold
+ */
+public final class BorlandLinker extends CommandLineLinker {
+    private static final BorlandLinker dllLinker = new BorlandLinker(".dll");
+    private static final BorlandLinker instance = new BorlandLinker(".exe");
+    public static BorlandLinker getInstance() {
+        return instance;
+    }
+    private BorlandLinker(String outputSuffix) {
+        super("ilink32", "-r", new String[]{".obj", ".lib", ".res"},
+                new String[]{".map", ".pdb", ".lnk"}, outputSuffix, false, null);
+    }
+    protected void addBase(long base, Vector args) {
+        if (base >= 0) {
+            String baseAddr = Long.toHexString(base);
+            args.addElement("-b:" + baseAddr);
+        }
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (linkType.isExecutable()) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("/ap");
+            } else {
+                if (linkType.isSubsystemGUI()) {
+                    args.addElement("/Tpe");
+                }
+            }
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("/Tpd");
+            args.addElement("/Gi");
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    protected void addMap(boolean map, Vector args) {
+        if (!map) {
+            args.addElement("-x");
+        }
+    }
+    protected void addStack(int stack, Vector args) {
+        if (stack >= 0) {
+            String stackStr = Integer.toHexString(stack);
+            args.addElement("-S:" + stackStr);
+        }
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public String getIdentifier() {
+        return "Borland Linker";
+    }
+    public File[] getLibraryPath() {
+        return BorlandProcessor.getEnvironmentPath("ilink32", 'L',
+                new String[]{"..\\lib"});
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return BorlandProcessor.getLibraryPatterns(libnames, libType);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return BorlandLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    public String[] getOutputFileSwitch(String outFile) {
+        return BorlandProcessor.getOutputFileSwitch(outFile);
+    }
+    protected String getStartupObject(LinkType linkType) {
+        if (linkType.isSharedLibrary()) {
+            return "c0d32.obj";
+        }
+        if (linkType.isSubsystemGUI()) {
+            return "c0w32.obj";
+        }
+        if (linkType.isSubsystemConsole()) {
+            return "c0x32.obj";
+        }
+        return null;
+    }
+    public boolean isCaseSensitive() {
+        return BorlandProcessor.isCaseSensitive();
+    }
+    /**
+     * Prepares argument list for exec command.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param sourceFiles
+     *            linker input files (.obj, .o, .res)
+     * @param args
+     *            linker arguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareArguments(
+    		CCTask task,
+    		String outputDir, 
+			String outputName,
+            String[] sourceFiles, 
+			CommandLineLinkerConfiguration config) {
+        String[] preargs = config.getPreArguments();
+        String[] endargs = config.getEndArguments();
+        Vector execArgs = new Vector(preargs.length + endargs.length + 10
+                + sourceFiles.length);
+        execArgs.addElement(this.getCommand());
+        for (int i = 0; i < preargs.length; i++) {
+            execArgs.addElement(preargs[i]);
+        }
+        for (int i = 0; i < endargs.length; i++) {
+            execArgs.addElement(endargs[i]);
+        }
+        //
+        //  see if the input files have any known startup obj files
+        //
+        String startup = null;
+        for (int i = 0; i < sourceFiles.length; i++) {
+            String filename = new File(sourceFiles[i]).getName().toLowerCase();
+            if (startup != null && filename.substring(0, 2).equals("c0")
+                    && filename.substring(3, 5).equals("32")
+                    && filename.substring(filename.length() - 4).equals(".obj")) {
+                startup = sourceFiles[i];
+            }
+        }
+        //
+        //  c0w32.obj, c0x32.obj or c0d32.obj depending on
+        //        link type
+        if (startup == null) {
+            startup = config.getStartupObject();
+        }
+        execArgs.addElement(startup);
+        Vector resFiles = new Vector();
+        Vector libFiles = new Vector();
+        String defFile = null;
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < sourceFiles.length; i++) {
+            String last4 = sourceFiles[i]
+                    .substring(sourceFiles[i].length() - 4).toLowerCase();
+            if (last4.equals(".def")) {
+                defFile = quoteFilename(buf, sourceFiles[i]);
+            } else {
+                if (last4.equals(".res")) {
+                    resFiles.addElement(quoteFilename(buf, sourceFiles[i]));
+                } else {
+                    if (last4.equals(".lib")) {
+                        libFiles.addElement(quoteFilename(buf, sourceFiles[i]));
+                    } else {
+                        execArgs.addElement(quoteFilename(buf, sourceFiles[i]));
+                    }
+                }
+            }
+        }
+        //
+        //   output file name
+        //
+        String outputFileName = new File(outputDir, outputName).toString();
+        execArgs.addElement("," + quoteFilename(buf, outputFileName));
+        if (config.getMap()) {
+            int lastPeriod = outputFileName.lastIndexOf('.');
+            String mapName;
+            if (lastPeriod < outputFileName.length() - 4) {
+                mapName = outputFileName + ".map";
+            } else {
+                mapName = outputFileName.substring(0, lastPeriod) + ".map";
+            }
+            execArgs.addElement("," + quoteFilename(buf, mapName) + ",");
+        } else {
+            execArgs.addElement(",,");
+        }
+        //
+        //   add all the libraries
+        //
+        Enumeration libEnum = libFiles.elements();
+        boolean hasImport32 = false;
+        boolean hasCw32 = false;
+        while (libEnum.hasMoreElements()) {
+            String libName = (String) libEnum.nextElement();
+            if (libName.equalsIgnoreCase("import32.lib")) {
+            	hasImport32 = true;
+            }
+            if (libName.equalsIgnoreCase("cw32.lib")) {
+            	hasImport32 = true;
+            }
+            execArgs.addElement(quoteFilename(buf, libName));
+        }
+        if (!hasCw32) {
+        	execArgs.addElement(quoteFilename(buf, "cw32.lib"));
+        }
+        if (!hasImport32) {
+        	execArgs.addElement(quoteFilename(buf, "import32.lib"));
+        }
+        if (defFile == null) {
+            execArgs.addElement(",,");
+        } else {
+            execArgs.addElement("," + quoteFilename(buf, defFile) + ",");
+        }
+        Enumeration resEnum = resFiles.elements();
+        while (resEnum.hasMoreElements()) {
+            String resName = (String) resEnum.nextElement();
+            execArgs.addElement(quoteFilename(buf, resName));
+        }
+        String[] execArguments = new String[execArgs.size()];
+        execArgs.copyInto(execArguments);
+        return execArguments;
+    }
+    /**
+     * Prepares argument list to execute the linker using a response file.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param args
+     *            output of prepareArguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareResponseFile(File outputFile, String[] args)
+            throws IOException {
+    	return BorlandProcessor.prepareResponseFile(outputFile, args, " + \n");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
new file mode 100644
index 0000000000..d53f00cc12
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java
@@ -0,0 +1,219 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Vector;
+import java.io.FileWriter;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+/**
+ * A add-in class for Borland(r) processor adapters
+ * 
+ *  
+ */
+public final class BorlandProcessor {
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("-w-");
+                break;
+            case 5 :
+                args.addElement("-w!");
+                break;
+            default :
+                args.addElement("-w");
+                break;
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        quoteFile(buf, cmdFile);
+        return buf.toString();
+    }
+    public static void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("-D");
+        buffer.append(define);
+        if (value != null && value.length() > 0) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    /**
+     * This method extracts path information from the appropriate .cfg file in
+     * the install directory.
+     * 
+     * @param toolName
+     *            Tool name, for example, "bcc32", "brc32", "ilink32"
+     * @param switchChar
+     *            Command line switch character, for example "L" for libraries
+     * @param defaultRelativePaths
+     *            default paths relative to executable directory
+     * @return path
+     */
+    public static File[] getEnvironmentPath(String toolName, char switchChar,
+            String[] defaultRelativePath) {
+        if (toolName == null) {
+            throw new NullPointerException("toolName");
+        }
+        if (defaultRelativePath == null) {
+            throw new NullPointerException("defaultRelativePath");
+        }
+        String[] path = defaultRelativePath;
+        File exeDir = CUtil.getExecutableLocation(toolName + ".exe");
+        if (exeDir != null) {
+            File cfgFile = new File(exeDir, toolName + ".cfg");
+            if (cfgFile.exists()) {
+                try {
+                    Reader reader = new BufferedReader(new FileReader(cfgFile));
+                    BorlandCfgParser cfgParser = new BorlandCfgParser(
+                            switchChar);
+                    path = cfgParser.parsePath(reader);
+                    reader.close();
+                } catch (IOException ex) {
+                    //
+                    //  could be logged
+                    //
+                }
+            }
+        } else {
+            //
+            //  if can't find the executable,
+            //     assume current directory to resolve relative paths
+            //
+            exeDir = new File(System.getProperty("user.dir"));
+        }
+        int nonExistant = 0;
+        File[] resourcePath = new File[path.length];
+        for (int i = 0; i < path.length; i++) {
+            resourcePath[i] = new File(path[i]);
+            if (!resourcePath[i].isAbsolute()) {
+                resourcePath[i] = new File(exeDir, path[i]);
+            }
+            //
+            //  if any of the entries do not exist or are
+            //     not directories, null them out
+            if (!(resourcePath[i].exists() && resourcePath[i].isDirectory())) {
+                resourcePath[i] = null;
+                nonExistant++;
+            }
+        }
+        //
+        //  if there were some non-existant or non-directory
+        //    entries in the configuration file then
+        //    create a shorter array
+        if (nonExistant > 0) {
+            File[] culled = new File[resourcePath.length - nonExistant];
+            int index = 0;
+            for (int i = 0; i < resourcePath.length; i++) {
+                if (resourcePath[i] != null) {
+                    culled[index++] = resourcePath[i];
+                }
+            }
+            resourcePath = culled;
+        }
+        return resourcePath;
+    }
+    public static String getIncludeDirSwitch(String includeOption,
+            String includeDir) {
+        StringBuffer buf = new StringBuffer(includeOption);
+        quoteFile(buf, includeDir);
+        return buf.toString();
+    }
+    public static String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length];
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(libnames[i]);
+            buf.append(".lib");
+            patterns[i] = buf.toString();
+        }
+        return patterns;
+    }
+    public static String[] getOutputFileSwitch(String outFile) {
+        return new String[0];
+    }
+    public static void getUndefineSwitch(StringBuffer buffer, String define) {
+        buffer.append("-U");
+        buffer.append(define);
+    }
+    public static boolean isCaseSensitive() {
+        return false;
+    }
+    private static void quoteFile(StringBuffer buf, String outPath) {
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+    }
+    
+    /**
+     * Prepares argument list to execute the linker using a response file.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param args
+     *            output of prepareArguments
+     * @return arguments for runTask
+     */
+    public static String[] prepareResponseFile(File outputFile, 
+    		String[] args,
+			String continuation)
+            throws IOException {
+        String baseName = outputFile.getName();
+        File commandFile = new File(outputFile.getParent(), baseName + ".lnk");
+        FileWriter writer = new FileWriter(commandFile);
+        for (int i = 1; i < args.length - 1; i++) {
+            writer.write(args[i]);
+            //
+            //  if either the current argument ends with
+            //     or next argument starts with a comma then
+            //      don't split the line
+            if (args[i].endsWith(",") || args[i + 1].startsWith(",")) {
+                writer.write(' ');
+            } else {
+                //
+                //  split the line to make it more readable
+                //
+                writer.write(continuation);
+            }
+        }
+        //
+        //  write the last argument
+        //
+        if (args.length > 1) {
+            writer.write(args[args.length - 1]);
+        }
+        writer.close();
+        String[] execArgs = new String[2];
+        execArgs[0] = args[0];
+        execArgs[1] = getCommandFileSwitch(commandFile.toString());
+        return execArgs;
+    }
+    
+    private BorlandProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
new file mode 100644
index 0000000000..5e8609797e
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java
@@ -0,0 +1,130 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.compiler.ProgressMonitor;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Borland(r) brc32 Resource compiler.
+ * 
+ * @author Curt Arnold
+ */
+public class BorlandResourceCompiler extends CommandLineCompiler {
+    private static final BorlandResourceCompiler instance = new BorlandResourceCompiler(
+            false, null);
+    public static BorlandResourceCompiler getInstance() {
+        return instance;
+    }
+    private BorlandResourceCompiler(boolean newEnvironment, Environment env) {
+        super("brc32", "c:\\__bogus\\__bogus.rc", new String[]{".rc"},
+                new String[]{".h", ".hpp", ".inl"}, ".res", false, null,
+                newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        //
+        //  compile only
+        //
+        args.addElement("-r");
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new BorlandResourceCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    public void compile(CCTask task, File outputDir, String[] sourceFiles,
+            String[] args, String[] endArgs, boolean relentless,
+            CommandLineCompilerConfiguration config, ProgressMonitor monitor)
+            throws BuildException {
+        super.compile(task, outputDir, sourceFiles, args, endArgs, relentless,
+                config, monitor);
+    }
+    /**
+     * The include parser for C will work just fine, but we didn't want to
+     * inherit from CommandLineCCompiler
+     */
+    protected Parser createParser(File source) {
+        return new CParser();
+    }
+    protected int getArgumentCountPerInputFile() {
+        return 2;
+    }
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("-d");
+        buffer.append(define);
+        if (value != null && value.length() > 0) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return BorlandProcessor.getEnvironmentPath("brc32", 'i',
+                new String[]{"..\\include"});
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return BorlandProcessor.getIncludeDirSwitch("-i", includeDir);
+    }
+    protected String getInputFileArgument(File outputDir, String filename,
+            int index) {
+        if (index == 0) {
+            String outputFileName = getOutputFileName(filename);
+            String fullOutputName = new File(outputDir, outputFileName)
+                    .toString();
+            return "-fo" + fullOutputName;
+        }
+        return filename;
+    }
+    public Linker getLinker(LinkType type) {
+        return BorlandLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    protected int getMaximumInputFilesPerCommand() {
+        return 1;
+    }
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+            String inputFile) {
+        String arg1 = getInputFileArgument(outputDir, inputFile, 0);
+        String arg2 = getInputFileArgument(outputDir, inputFile, 1);
+        return arg1.length() + arg2.length() + 2;
+    }
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
new file mode 100644
index 0000000000..a3651d3b25
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java
@@ -0,0 +1,46 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import net.sf.antcontrib.cpptasks.parser.AbstractParser;
+import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
+import net.sf.antcontrib.cpptasks.parser.FilenameState;
+public class CfgFilenameState extends FilenameState {
+    private char terminator;
+    public CfgFilenameState(AbstractParser parser, char[] terminators) {
+        super(parser, terminators);
+        terminator = terminators[0];
+    }
+    public AbstractParserState consume(char ch) {
+        //
+        //   if a ';' is encountered then
+        //      close the previous filename by sending a
+        //         recognized terminator to our super class
+        //      and stay in this state for more filenamese
+        if (ch == ';') {
+            super.consume(terminator);
+            return this;
+        }
+        AbstractParserState newState = super.consume(ch);
+        //
+        //   change null (consume to end of line)
+        //      to look for next switch character
+        if (newState == null) {
+            newState = getParser().getNewLineState();
+        }
+        return newState;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
new file mode 100644
index 0000000000..d1dd072cce
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java
@@ -0,0 +1,30 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import net.sf.antcontrib.cpptasks.parser.AbstractParser;
+import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
+public class ConsumeToSpaceOrNewLine extends AbstractParserState {
+    public ConsumeToSpaceOrNewLine(AbstractParser parser) {
+        super(parser);
+    }
+    public AbstractParserState consume(char ch) {
+        if (ch == ' ' || ch == '\t' || ch == '\n') {
+            return getParser().getNewLineState();
+        }
+        return this;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
new file mode 100644
index 0000000000..89724b26e5
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java
@@ -0,0 +1,35 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.borland;
+import net.sf.antcontrib.cpptasks.parser.AbstractParser;
+import net.sf.antcontrib.cpptasks.parser.AbstractParserState;
+public class QuoteBranchState extends AbstractParserState {
+    private AbstractParserState quote;
+    private AbstractParserState unquote;
+    public QuoteBranchState(AbstractParser parser, AbstractParserState quote,
+            AbstractParserState unquote) {
+        super(parser);
+        this.quote = quote;
+        this.unquote = unquote;
+    }
+    public AbstractParserState consume(char ch) {
+        if (ch == '"') {
+            return quote;
+        }
+        return unquote.consume(ch);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
new file mode 100644
index 0000000000..e1d3deb8b6
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java
@@ -0,0 +1,138 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compaq;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineFortranCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Compaq(r) Visual Fortran compiler.
+ * 
+ * @author Curt Arnold
+ */
+public class CompaqVisualFortranCompiler extends CommandLineFortranCompiler {
+    private static final CompaqVisualFortranCompiler[] instance = new CompaqVisualFortranCompiler[]{new CompaqVisualFortranCompiler(
+            false, null)};
+    public static CompaqVisualFortranCompiler getInstance() {
+        return instance[0];
+    }
+    private CompaqVisualFortranCompiler(boolean newEnvironment, Environment env) {
+        super("DF", null, new String[]{".f90", ".for", ".f"}, new String[]{
+                ".i", ".i90", ".fpp", ".inc", ".bak", ".exe"}, ".obj", false,
+                null, newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        args.addElement("/nologo");
+        args.addElement("/compile_only");
+        if (debug) {
+            args.addElement("/debug:full");
+            args.addElement("/define:_DEBUG");
+        } else {
+            args.addElement("/debug:none");
+            args.addElement("/define:NDEBUG");
+        }
+        if (multithreaded) {
+            args.addElement("/threads");
+            args.addElement("/define:_MT");
+        } else {
+            args.addElement("/nothreads");
+        }
+        boolean staticRuntime = linkType.isStaticRuntime();
+        if (staticRuntime) {
+            args.addElement("/libs:static");
+        } else {
+            args.addElement("/libs:dll");
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("/dll");
+            args.addElement("/define:_DLL");
+        }
+    }
+    public void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("/nowarn");
+                break;
+            case 1 :
+                break;
+            case 2 :
+                break;
+            case 3 :
+                args.addElement("/warn:usage");
+                break;
+            case 4 :
+                args.addElement("/warn:all");
+                break;
+            case 5 :
+                args.addElement("/warn:errors");
+                break;
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new CompaqVisualFortranCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    protected void getDefineSwitch(StringBuffer buf, String define, String value) {
+        buf.append("/define:");
+        buf.append(define);
+        if (value != null && value.length() > 0) {
+            buf.append('=');
+            buf.append(value);
+        }
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        StringBuffer buf = new StringBuffer("/include:");
+        if (includeDir.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(includeDir);
+            buf.append('"');
+        } else {
+            buf.append(includeDir);
+        }
+        return buf.toString();
+    }
+    public Linker getLinker(LinkType type) {
+        return CompaqVisualFortranLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    protected void getUndefineSwitch(StringBuffer buf, String define) {
+        buf.append("/undefine:");
+        buf.append(define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
new file mode 100644
index 0000000000..eb4a40769e
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java
@@ -0,0 +1,82 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compaq;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioLibrarian;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for the Compaq(r) Visual Fortran Librarian
+ * 
+ * @author Curt Arnold
+ */
+public class CompaqVisualFortranLibrarian extends CommandLineLinker {
+    private static final CompaqVisualFortranLibrarian instance = new CompaqVisualFortranLibrarian();
+    public static CompaqVisualFortranLibrarian getInstance() {
+        return instance;
+    }
+    private CompaqVisualFortranLibrarian() {
+        super("lib", "/bogus", new String[]{".obj"}, new String[0], ".lib",
+                false, null);
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        args.addElement("/nologo");
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    protected String getCommandFileSwitch(String commandFile) {
+        return DevStudioProcessor.getCommandFileSwitch(commandFile);
+    }
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return new String[0];
+    }
+    public Linker getLinker(LinkType type) {
+        return CompaqVisualFortranLinker.getInstance().getLinker(type);
+    }
+    protected int getMaximumCommandLength() {
+        return DevStudioLibrarian.getInstance().getMaximumCommandLength();
+    }
+    protected String[] getOutputFileSwitch(String outputFile) {
+        return DevStudioLibrarian.getInstance().getOutputFileSwitch(outputFile);
+    }
+    public boolean isCaseSensitive() {
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
new file mode 100644
index 0000000000..d83e3b213d
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java
@@ -0,0 +1,77 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compaq;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleLinker;
+/**
+ * Adapter for the Compaq(r) Visual Fortran linker.
+ * 
+ * @author Curt Arnold
+ */
+public final class CompaqVisualFortranLinker extends DevStudioCompatibleLinker {
+    private static final CompaqVisualFortranLinker dllLinker = new CompaqVisualFortranLinker(
+            ".dll");
+    private static final CompaqVisualFortranLinker instance = new CompaqVisualFortranLinker(
+            ".exe");
+    public static CompaqVisualFortranLinker getInstance() {
+        return instance;
+    }
+    private CompaqVisualFortranLinker(String outputSuffix) {
+        super("DF", "__bogus__.xxx", outputSuffix);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
+        args.addElement("/NOLOGO");
+        boolean staticRuntime = linkType.isStaticRuntime();
+        if (staticRuntime) {
+            args.addElement("/libs:static");
+        } else {
+            args.addElement("/libs:dll");
+        }
+        if (debug) {
+            args.addElement("/debug");
+        } else {
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("/dll");
+        } else {
+            args.addElement("/exe");
+        }
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return CompaqVisualFortranLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        StringBuffer buf = new StringBuffer("/OUT:");
+        if (outputFile.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(outputFile);
+            buf.append('"');
+        } else {
+            buf.append(outputFile);
+        }
+        return new String[]{buf.toString()};
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java
new file mode 100644
index 0000000000..90c539c965
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java
@@ -0,0 +1,75 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.AslcompilerDef;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+
+/**
+ * An abstract asl compiler implementation.
+ * 
+ */
+public abstract class AbstractAslcompiler extends AbstractProcessor
+implements Aslcompiler {
+    private String outputSuffix;
+    protected AbstractAslcompiler(String[] sourceExtensions,
+            String[] headerExtensions, String outputSuffix) {
+        super(sourceExtensions, headerExtensions);
+        this.outputSuffix = outputSuffix;
+    }    
+    abstract protected AslcompilerConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            AslcompilerDef specificConfig, TargetDef targetPlatform);
+    
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            ProcessorDef specificConfig, TargetDef targetPlatform) {
+        if (specificConfig == null) {
+            throw new NullPointerException("specificConfig");
+        }
+        return createConfiguration(task, linkType, baseConfigs,
+                (AslcompilerDef) specificConfig, targetPlatform);
+    }
+    
+    public String getOutputFileName(String inputFile) {
+        if (bid(inputFile) > 1) {
+            String baseName = getBaseOutputName(inputFile);
+            return baseName + outputSuffix;
+        }
+        return null;
+    }
+    protected String getBaseOutputName(String inputFile) {
+        int lastSlash = inputFile.lastIndexOf('/');
+        int lastReverse = inputFile.lastIndexOf('\\');
+        int lastSep = inputFile.lastIndexOf(File.separatorChar);
+        if (lastReverse > lastSlash) {
+            lastSlash = lastReverse;
+        }
+        if (lastSep > lastSlash) {
+            lastSlash = lastSep;
+        }
+        int lastPeriod = inputFile.lastIndexOf('.');
+        if (lastPeriod < 0) {
+            lastPeriod = inputFile.length();
+        }
+        return inputFile.substring(lastSlash + 1, lastPeriod);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java
new file mode 100644
index 0000000000..1d49232a05
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java
@@ -0,0 +1,72 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.AssemblerDef;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+/**
+ * An abstract assembler implementation.
+ * 
+ */
+public abstract class AbstractAssembler extends AbstractProcessor
+implements Assembler {
+    private String outputSuffix;
+    protected AbstractAssembler(String[] sourceExtensions,
+            String[] headerExtensions, String outputSuffix) {
+        super(sourceExtensions, headerExtensions);
+        this.outputSuffix = outputSuffix;
+    }    
+    abstract protected AssemblerConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            AssemblerDef specificConfig, TargetDef targetPlatform);
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            ProcessorDef specificConfig, TargetDef targetPlatform) {
+        if (specificConfig == null) {
+            throw new NullPointerException("specificConfig");
+        }
+        return createConfiguration(task, linkType, baseConfigs,
+                (AssemblerDef) specificConfig, targetPlatform);
+    }
+    public String getOutputFileName(String inputFile) {
+        if (bid(inputFile) > 1) {
+            String baseName = getBaseOutputName(inputFile);
+            return baseName + outputSuffix;
+        }
+        return null;
+    }
+    protected String getBaseOutputName(String inputFile) {
+        int lastSlash = inputFile.lastIndexOf('/');
+        int lastReverse = inputFile.lastIndexOf('\\');
+        int lastSep = inputFile.lastIndexOf(File.separatorChar);
+        if (lastReverse > lastSlash) {
+            lastSlash = lastReverse;
+        }
+        if (lastSep > lastSlash) {
+            lastSlash = lastSep;
+        }
+        int lastPeriod = inputFile.lastIndexOf('.');
+        if (lastPeriod < 0) {
+            lastPeriod = inputFile.length();
+        }
+        return inputFile.substring(lastSlash + 1, lastPeriod);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
new file mode 100644
index 0000000000..f16ec6caf3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java
@@ -0,0 +1,205 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.CompilerDef;
+import net.sf.antcontrib.cpptasks.DependencyInfo;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+import net.sf.antcontrib.cpptasks.TargetDef;
+
+/**
+ * An abstract compiler implementation.
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public abstract class AbstractCompiler extends AbstractProcessor
+        implements
+            Compiler {
+    private static final String[] emptyIncludeArray = new String[0];
+    private String outputSuffix;
+    protected AbstractCompiler(String[] sourceExtensions,
+            String[] headerExtensions, String outputSuffix) {
+        super(sourceExtensions, headerExtensions);
+        this.outputSuffix = outputSuffix;
+    }
+    /**
+     * Checks file name to see if parse should be attempted
+     * 
+     * Default implementation returns false for files with extensions '.dll',
+     * 'tlb', '.res'
+     *  
+     */
+    protected boolean canParse(File sourceFile) {
+        String sourceName = sourceFile.toString();
+        int lastPeriod = sourceName.lastIndexOf('.');
+        if (lastPeriod >= 0 && lastPeriod == sourceName.length() - 4) {
+            String ext = sourceName.substring(lastPeriod).toUpperCase();
+            if (ext.equals(".DLL") || ext.equals(".TLB") || ext.equals(".RES")) {
+                return false;
+            }
+        }
+        return true;
+    }
+    abstract protected CompilerConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            CompilerDef specificConfig, TargetDef targetPlatform);
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            ProcessorDef specificConfig, TargetDef targetPlatform) {
+        if (specificConfig == null) {
+            throw new NullPointerException("specificConfig");
+        }
+        return createConfiguration(task, linkType, baseConfigs,
+                (CompilerDef) specificConfig, targetPlatform);
+    }
+    abstract protected Parser createParser(File sourceFile);
+    protected String getBaseOutputName(String inputFile) {
+        int lastSlash = inputFile.lastIndexOf('/');
+        int lastReverse = inputFile.lastIndexOf('\\');
+        int lastSep = inputFile.lastIndexOf(File.separatorChar);
+        if (lastReverse > lastSlash) {
+            lastSlash = lastReverse;
+        }
+        if (lastSep > lastSlash) {
+            lastSlash = lastSep;
+        }
+        int lastPeriod = inputFile.lastIndexOf('.');
+        if (lastPeriod < 0) {
+            lastPeriod = inputFile.length();
+        }
+        return inputFile.substring(lastSlash + 1, lastPeriod);
+    }
+    public String getOutputFileName(String inputFile) {
+        //
+        //  if a recognized input file
+        //
+        if (bid(inputFile) > 1) {
+            String baseName = getBaseOutputName(inputFile);
+            return baseName + outputSuffix;
+        }
+        return null;
+    }
+    /**
+     * Returns dependency info for the specified source file
+     * 
+     * @param task
+     *            task for any diagnostic output
+     * @param source
+     *            file to be parsed
+     * @param includePath
+     *            include path to be used to resolve included files
+     * 
+     * @param sysIncludePath
+     *            sysinclude path from build file, files resolved using
+     *            sysInclude path will not participate in dependency analysis
+     * 
+     * @param envIncludePath
+     *            include path from environment variable, files resolved with
+     *            envIncludePath will not participate in dependency analysis
+     * 
+     * @param baseDir
+     *            used to produce relative paths in DependencyInfo
+     * @param includePathIdentifier
+     *            used to distinguish DependencyInfo's from different include
+     *            path settings
+     * 
+     * @author Curt Arnold
+     */
+    public final DependencyInfo parseIncludes(CCTask task, File source,
+            File[] includePath, File[] sysIncludePath, File[] envIncludePath,
+            File baseDir, String includePathIdentifier) {
+        //
+        //  if any of the include files can not be identified
+        //      change the sourceLastModified to Long.MAX_VALUE to
+        //      force recompilation of anything that depends on it
+        long sourceLastModified = source.lastModified();
+        File[] sourcePath = new File[1];
+        sourcePath[0] = new File(source.getParent());
+        Vector onIncludePath = new Vector();
+        Vector onSysIncludePath = new Vector();
+        String baseDirPath;
+        try {
+            baseDirPath = baseDir.getCanonicalPath();
+        } catch (IOException ex) {
+            baseDirPath = baseDir.toString();
+        }
+        String relativeSource = CUtil.getRelativePath(baseDirPath, source);
+        String[] includes = emptyIncludeArray;
+        if (canParse(source)) {
+            Parser parser = createParser(source);
+            try {
+                Reader reader = new BufferedReader(new FileReader(source));
+                parser.parse(reader);
+                includes = parser.getIncludes();
+            } catch (IOException ex) {
+                task.log("Error parsing " + source.toString() + ":"
+                        + ex.toString());
+                includes = new String[0];
+            }
+        }
+        for (int i = 0; i < includes.length; i++) {
+            String includeName = includes[i];
+            if (!resolveInclude(includeName, sourcePath, onIncludePath)) {
+                if (!resolveInclude(includeName, includePath, onIncludePath)) {
+                    if (!resolveInclude(includeName, sysIncludePath,
+                            onSysIncludePath)) {
+                        if (!resolveInclude(includeName, envIncludePath,
+                                onSysIncludePath)) {
+                            //
+                            //  this should be enough to require us to reparse
+                            //     the file with the missing include for dependency
+                            //     information without forcing a rebuild
+                            sourceLastModified++;
+                        }
+                    }
+                }
+            }
+        }
+        for (int i = 0; i < onIncludePath.size(); i++) {
+            String relativeInclude = CUtil.getRelativePath(baseDirPath,
+                    (File) onIncludePath.elementAt(i));
+            onIncludePath.setElementAt(relativeInclude, i);
+        }
+        for (int i = 0; i < onSysIncludePath.size(); i++) {
+            String relativeInclude = CUtil.getRelativePath(baseDirPath,
+                    (File) onSysIncludePath.elementAt(i));
+            onSysIncludePath.setElementAt(relativeInclude, i);
+        }
+        return new DependencyInfo(includePathIdentifier, relativeSource,
+                sourceLastModified, onIncludePath, onSysIncludePath);
+    }
+    protected boolean resolveInclude(String includeName, File[] includePath,
+            Vector onThisPath) {
+        for (int i = 0; i < includePath.length; i++) {
+            File includeFile = new File(includePath[i], includeName);
+            if (includeFile.exists()) {
+                onThisPath.addElement(includeFile);
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
new file mode 100644
index 0000000000..20580e5d33
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java
@@ -0,0 +1,85 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.LinkerDef;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * An abstract Linker implementation.
+ * 
+ * @author Adam Murdoch
+ */
+public abstract class AbstractLinker extends AbstractProcessor
+        implements
+            Linker {
+    public AbstractLinker(String[] objExtensions, String[] ignoredExtensions) {
+        super(objExtensions, ignoredExtensions);
+    }
+    /**
+     * Returns the bid of the processor for the file.
+     * 
+     * A linker will bid 1 on any unrecognized file type.
+     * 
+     * @param inputFile
+     *            filename of input file
+     * @return bid for the file, 0 indicates no interest, 1 indicates that the
+     *         processor recognizes the file but doesn't process it (header
+     *         files, for example), 100 indicates strong interest
+     */
+    public int bid(String inputFile) {
+        int bid = super.bid(inputFile);
+        switch (bid) {
+            //
+            //  unrecognized extension, take the file
+            //
+            case 0 :
+                return 1;
+            //
+            //   discard the ignored extensions
+            //
+            case 1 :
+                return 0;
+        }
+        return bid;
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        return this;
+    }
+    abstract protected LinkerConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            LinkerDef specificConfig, TargetDef targetPlatform);
+    public ProcessorConfiguration createConfiguration(CCTask task,
+            LinkType linkType, ProcessorDef[] baseConfigs,
+            ProcessorDef specificConfig,
+			TargetDef targetPlatform) {
+        if (specificConfig == null) {
+            throw new NullPointerException("specificConfig");
+        }
+        return createConfiguration(task, linkType, baseConfigs,
+                (LinkerDef) specificConfig, targetPlatform);
+    }
+    public String getLibraryKey(File libfile) {
+        return libfile.getName();
+    }
+    public abstract String getOutputFileName(String fileName);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
new file mode 100644
index 0000000000..b6456d5e3e
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java
@@ -0,0 +1,129 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import org.apache.tools.ant.types.Environment;
+/**
+ * An abstract processor (compiler/linker) implementation.
+ * 
+ * @author Curt Arnold
+ */
+public abstract class AbstractProcessor implements Processor, Cloneable {
+    /**
+     * default bid for a file name that the processor recognizes but does not
+     * process and does not want to fall through to the linker
+     */
+    public final static int DEFAULT_DISCARD_BID = 1;
+    /**
+     * default bid for a file name that the processor desires to process
+     */
+    public final static int DEFAULT_PROCESS_BID = 100;
+    /**
+     * Determines the identification of a command line processor by capture the
+     * first line of its output for a specific command.
+     * 
+     * @param command
+     *            array of command line arguments starting with executable
+     *            name. For example, { "cl" }
+     * @param fallback
+     *            start of identifier if there is an error in executing the
+     *            command
+     * @return identifier for the processor
+     */
+    protected static String getIdentifier(String[] command, String fallback) {
+        String identifier = fallback;
+        try {
+            String[] cmdout = CaptureStreamHandler.run(command);
+            if (cmdout.length > 0) {
+                identifier = cmdout[0];
+            }
+        } catch (Throwable ex) {
+            identifier = fallback + ":" + ex.toString();
+        }
+        return identifier;
+    }
+    private final String[] headerExtensions;
+    private final String[] sourceExtensions;
+    protected AbstractProcessor(String[] sourceExtensions,
+            String[] headerExtensions) {
+        this.sourceExtensions = (String[]) sourceExtensions.clone();
+        this.headerExtensions = (String[]) headerExtensions.clone();
+    }
+    /**
+     * Returns the bid of the processor for the file.
+     * 
+     * @param inputFile
+     *            filename of input file
+     * @return bid for the file, 0 indicates no interest, 1 indicates that the
+     *         processor recognizes the file but doesn't process it (header
+     *         files, for example), 100 indicates strong interest
+     */
+    public int bid(String inputFile) {
+        String lower = inputFile.toLowerCase();
+        for (int i = 0; i < sourceExtensions.length; i++) {
+            if (lower.endsWith(sourceExtensions[i])) {
+                return DEFAULT_PROCESS_BID;
+            }
+        }
+        for (int i = 0; i < headerExtensions.length; i++) {
+            if (lower.endsWith(headerExtensions[i])) {
+                return DEFAULT_DISCARD_BID;
+            }
+        }
+        return 0;
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        return this;
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+    public String[] getHeaderExtensions() {
+        return (String[]) this.headerExtensions.clone();
+    }
+    abstract public String getIdentifier();
+    /**
+     * Gets the target operating system architecture
+     * 
+     * @return String target operating system architecture
+     */
+    protected String getOSArch() {
+        return System.getProperty("os.arch");
+    }
+    /**
+     * Gets the target operating system name
+     * 
+     * @return String target operating system name
+     */
+    protected String getOSName() {
+        return System.getProperty("os.name");
+    }
+    public String[] getSourceExtensions() {
+        return (String[]) this.sourceExtensions.clone();
+    }
+    /**
+     * Returns true if the target operating system is Mac OS X or Darwin.
+     * 
+     * @return boolean
+     */
+    protected boolean isDarwin() {
+        String osName = getOSName();
+        return "Mac OS X".equals(osName);
+    }
+    public final String toString() {
+        return getIdentifier();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java
new file mode 100644
index 0000000000..a210e1c684
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java
@@ -0,0 +1,23 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+/**
+ * A asl compiler.
+ * 
+ */
+public interface Aslcompiler extends Processor {
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java
new file mode 100644
index 0000000000..62ac2760c6
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java
@@ -0,0 +1,29 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for an ASL compiler
+ *
+ */
+public interface AslcompilerConfiguration extends ProcessorConfiguration {
+    void aslcompiler(CCTask task, File outputDir, String[] sourceFiles) throws BuildException;
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java
new file mode 100644
index 0000000000..1b6d7b5d11
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Assembler.java
@@ -0,0 +1,23 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+/**
+ * A assembler.
+ * 
+ */
+public interface Assembler extends Processor {
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java
new file mode 100644
index 0000000000..9411551b47
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java
@@ -0,0 +1,29 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for an assembler
+ *
+ */
+public interface AssemblerConfiguration extends ProcessorConfiguration {
+    void assembler(CCTask task, File outputDir, String[] sourceFiles) throws BuildException;
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
new file mode 100644
index 0000000000..1b89a70a58
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java
@@ -0,0 +1,122 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.util.Vector;
+
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
+/**
+ * Implements ExecuteStreamHandler to capture the output of a Execute to an
+ * array of strings
+ * 
+ * @author Curt Arnold
+ */
+public class CaptureStreamHandler implements ExecuteStreamHandler {
+    /**
+     * Runs an executable and captures the output in a String array
+     * 
+     * @param cmdline
+     *            command line arguments
+     * @return output of process
+     */
+    public static String[] run(String[] cmdline) {
+        CaptureStreamHandler handler = new CaptureStreamHandler();
+        Execute exec = new Execute(handler);
+        exec.setCommandline(cmdline);
+        try {
+            int status = exec.execute();
+        } catch (IOException ex) {
+        }
+        return handler.getOutput();
+    }
+    private InputStream errorStream;
+    private InputStream fromProcess;
+    public CaptureStreamHandler() {
+    }
+    public String[] getOutput() {
+        String[] output;
+        if (fromProcess != null) {
+            Vector lines = new Vector(10);
+            try {
+                BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(errorStream));
+                for (int i = 0; i < 2; i++) {
+                    for (int j = 0; j < 100; j++) {
+                        String line = reader.readLine();
+                        if (line == null) {
+                            reader = new BufferedReader(new InputStreamReader(
+                                    fromProcess));
+                            break;
+                        }
+                        lines.addElement(line);
+                    }
+                }
+            } catch (IOException ex) {
+            }
+            output = new String[lines.size()];
+            lines.copyInto(output);
+            return output;
+        }
+        output = new String[0];
+        return output;
+    }
+    /**
+     * Install a handler for the error stream of the subprocess.
+     * 
+     * @param is
+     *            input stream to read from the error stream from the
+     *            subprocess
+     */
+    public void setProcessErrorStream(InputStream is) throws IOException {
+        errorStream = is;
+    }
+    /**
+     * Install a handler for the input stream of the subprocess.
+     * 
+     * @param os
+     *            output stream to write to the standard input stream of the
+     *            subprocess
+     */
+    public void setProcessInputStream(OutputStream os) throws IOException {
+        os.close();
+    }
+    /**
+     * Install a handler for the output stream of the subprocess.
+     * 
+     * @param is
+     *            input stream to read from the error stream from the
+     *            subprocess
+     */
+    public void setProcessOutputStream(InputStream is) throws IOException {
+        fromProcess = is;
+    }
+    /**
+     * Start handling of the streams.
+     */
+    public void start() throws IOException {
+    }
+    /**
+     * Stop handling of the streams - will not be restarted.
+     */
+    public void stop() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java
new file mode 100644
index 0000000000..88dda5796f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java
@@ -0,0 +1,226 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.AslcompilerDef;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * An abstract ASL Compiler implementation which uses an external program to
+ * perform the ASL compile.
+ * 
+ */
+public abstract class CommandLineAslcompiler extends AbstractAslcompiler{
+
+    private String command;
+    private String identifier;
+    private String identifierArg;
+    
+    protected CommandLineAslcompiler(String command, String identifierArg,
+            String[] sourceExtensions, String[] headerExtensions,
+            String outputSuffix) {
+        super(sourceExtensions, headerExtensions, outputSuffix);
+        this.command = command;
+        this.identifierArg = identifierArg;
+    }
+    
+    abstract protected void addImpliedArgs(Vector args, boolean debug,
+        Boolean defaultflag);
+   
+    /**
+     * Compile a ACPI source file
+     * 
+     */
+    public void aslcompiler(CCTask task, File outputDir, String[] sourceFiles,
+        String[] args, String[] endArgs) throws BuildException{
+        String command = getCommand();
+        int baseLength = command.length() + args.length + endArgs.length; 
+        for (int i = 0; i < args.length; i++) {
+          baseLength += args[i].length();
+        }
+        for (int i = 0; i < endArgs.length; i++) {
+            baseLength += endArgs[i].length();
+        }
+        if (baseLength > getMaximumCommandLength()) {
+            throw new BuildException(
+                "Command line is over maximum length without sepcifying source file");
+        }
+        int maxInputFilesPerCommand = getMaximumInputFilesPerCommand();
+        int argumentCountPerInputFile = getArgumentCountPerInputFIle();
+        for (int sourceIndex = 0; sourceIndex < sourceFiles.length;) {
+            int cmdLength = baseLength;
+            int firstFileNextExec;
+            for (firstFileNextExec = sourceIndex; firstFileNextExec < sourceFiles.length
+                && (firstFileNextExec - sourceIndex) < maxInputFilesPerCommand; firstFileNextExec++) {
+                cmdLength += getTotalArgumentLengthForInputFile(outputDir, 
+                    sourceFiles[firstFileNextExec]);  
+                if (cmdLength >= getMaximumCommandLength()) 
+                    break;
+            }
+            if (firstFileNextExec == sourceIndex) {
+                throw new BuildException(
+                    "Extremely long file name, can't fit on command line");
+            }
+            int argCount = args.length + 1 + endArgs.length
+                    + (firstFileNextExec - sourceIndex)
+                    * argumentCountPerInputFile;
+            String[] commandline = new String[argCount];
+            int index = 0;
+            commandline[index++] = command;
+            for (int j = 0; j < args.length; j++) {
+                commandline[index++] = args[j];
+            }
+            for (int j = sourceIndex; j < firstFileNextExec; j++) {
+                for (int k = 0; k < argumentCountPerInputFile; k++) {
+                    commandline[index++] = getInputFileArgument(outputDir, 
+                            sourceFiles[j], k);                    
+                }
+            }
+            for (int j = 0; j < endArgs.length; j++) {
+                commandline[index++] = endArgs[j];
+            }
+            int retval = runCommand(task, outputDir, commandline);
+            // if with monitor, add more code
+            if (retval != 0) {
+               throw new BuildException(this.getCommand()
+                       + " failed with return code " + retval,
+                       task.getLocation());
+            }
+            sourceIndex = firstFileNextExec;
+        }
+    }
+    
+    protected AslcompilerConfiguration createConfiguration(final CCTask task,
+          final LinkType linkType, 
+          final ProcessorDef[] baseDefs, 
+          final AslcompilerDef specificDef,
+          final TargetDef targetPlatform) {
+        Vector args = new Vector();
+        AslcompilerDef[] defaultProviders = new AslcompilerDef[baseDefs.length +1];
+        for (int i = 0; i < baseDefs.length; i++) {
+            defaultProviders[i + 1] = (AslcompilerDef) baseDefs[i];
+        }
+        defaultProviders[0] = specificDef;
+        Vector cmdArgs = new Vector();
+        //
+        //  add command line arguments inherited from <cc> element
+        //    any "extends" and finally and specific AslcompilerDef
+        //
+        CommandLineArgument[] commandArgs;
+        for (int i = defaultProviders.length - 1; i >=0; i--){
+            commandArgs = defaultProviders[i].getActiveProcessorArgs();
+            for (int j = 0; j < commandArgs.length; j++) {
+                if (commandArgs[j].getLocation() == 0) {
+                    args.addElement(commandArgs[j].getValue());
+                }
+                else {
+                    cmdArgs.addElement(commandArgs[j]);
+                }
+            }
+        }
+        // omit param
+        boolean debug = specificDef.getDebug(baseDefs, 0);
+        Boolean defaultflag = specificDef.getDefaultflag(defaultProviders, 1);
+        this.addImpliedArgs(args, debug, defaultflag);
+        Enumeration argEnum = cmdArgs.elements();
+        int endCount = 0;
+        while( argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+            switch (arg.getLocation()) {
+                case 1 :
+                    args.addElement(arg.getValue());
+                    break;
+                case 2 :
+                    endCount++;
+                    break;
+            }
+        }
+        String[] endArgs = new String[endCount];
+        argEnum = cmdArgs.elements();
+        int index = 0;
+        while (argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum.nextElement();
+            if (arg.getLocation() == 2) {
+                endArgs[index++] = arg.getValue();
+            }
+        }
+        String[] argArray = new String[args.size()];
+        args.copyInto(argArray);
+        return new CommandLineAslcompilerConfiguration(this, argArray, true, endArgs);
+    }
+    
+    protected int getArgumentCountPerInputFile() {
+        return 1;
+    }
+    
+    public String getIdentifier() {
+        if (identifier == null) {
+            if (identifierArg == null) {
+               identifier = getIdentifier(new String[]{command}, command);
+            }
+            else {
+                identifier = getIdentifier(
+                    new String[]{command, identifierArg}, command);
+            }
+        }
+        return identifier;
+    }
+    
+    public final String getCommand() {
+      return command;
+    }
+    abstract public int getMaximumCommandLength();
+    public void setCommand(String command) {
+      this.command = command;
+    }
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+        String inputFile) {
+        return inputFile.length() + 1;
+    }
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline) 
+            throws BuildException {
+        return CUtil.runCommand(task, workingDir, cmdline, false, null);
+      
+    }
+    protected int getMaximumInputFilesPerCommand(){
+        return 1;
+    }
+    protected int getArgumentCountPerInputFIle(){
+        return 1;
+    }
+    protected String getInputFileArgument(File outputDir, String filename, int index) {
+        //
+        //   if there is an embedded space,
+        //      must enclose in quotes
+        if (filename.indexOf(' ') >= 0) {
+            StringBuffer buf = new StringBuffer("\"");
+            buf.append(filename);
+            buf.append("\"");
+            return buf.toString();
+        }
+        return filename;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java
new file mode 100644
index 0000000000..9a3457dafb
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java
@@ -0,0 +1,93 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+
+/**
+ * A configuration for an ASL compiler
+ * 
+ */
+public final class CommandLineAslcompilerConfiguration implements
+                AslcompilerConfiguration {
+
+    private String[] args;
+
+    private CommandLineAslcompiler acpi;
+
+    private String[] endArgs;
+
+    private boolean rebuild;
+
+    public CommandLineAslcompilerConfiguration (CommandLineAslcompiler acpi,
+                    String[] args, boolean rebuild, String[] endArgs) {
+        if (acpi == null) {
+            throw new NullPointerException("acpi");
+        }
+        if (args == null) {
+            this.args = new String[0];
+        } else {
+            this.args = (String[]) args.clone();
+        }
+        this.acpi = acpi;
+        this.rebuild = rebuild;
+        this.endArgs = (String[]) endArgs.clone();
+    }
+
+    public int bid (String inputFile) {
+        int acpiBid = acpi.bid(inputFile);
+        return acpiBid;
+    }
+
+    public void aslcompiler (CCTask task, File outputDir, String[] sourceFiles)
+                    throws BuildException {
+        try {
+            acpi.aslcompiler(task, outputDir, sourceFiles, args, endArgs);
+        } catch (BuildException ex) {
+            throw ex;
+        }
+    }
+
+    public String getIdentifier () {
+        return acpi.getCommand();
+    }
+
+    public ProcessorParam[] getParams () {
+        return new ProcessorParam[0];
+    }
+
+    public boolean getRebuild () {
+        return rebuild;
+    }
+
+    public String[] getPreArguments () {
+        return (String[]) args.clone();
+    }
+
+    public String[] getEndArguments () {
+        return (String[]) endArgs.clone();
+    }
+
+    public String getOutputFileName (String inputFile) {
+        return acpi.getOutputFileName(inputFile);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java
new file mode 100644
index 0000000000..f01fc5ee61
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java
@@ -0,0 +1,326 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.AssemblerDef;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ * An abstract Assembler implementation which uses an external program to
+ * perform the assemble.
+ * 
+ */
+public abstract class CommandLineAssembler extends AbstractAssembler {
+
+    private String command;
+
+    private String identifier;
+
+    private String identifierArg;
+
+    protected CommandLineAssembler (String command, String identifierArg,
+                    String[] sourceExtensions, String[] headerExtensions,
+                    String outputSuffix) {
+        super(sourceExtensions, headerExtensions, outputSuffix);
+        this.command = command;
+        this.identifierArg = identifierArg;
+    }
+
+    abstract protected void addImpliedArgs(Vector args, boolean debug,
+                    Boolean defaultflag);
+
+    /**
+     * Adds command-line arguments for include directories.
+     * 
+     * If relativeArgs is not null will add corresponding relative paths include
+     * switches to that vector (for use in building a configuration identifier
+     * that is consistent between machines).
+     * 
+     * @param baseDirPaths
+     *            A vector containing the parts of the working directory,
+     *            produced by CUtil.DecomposeFile.
+     * @param includeDirs
+     *            Array of include directory paths
+     * @param args
+     *            Vector of command line arguments used to execute the task
+     * @param relativeArgs
+     *            Vector of command line arguments used to build the
+     *            configuration identifier
+     */
+    protected void addIncludes(String baseDirPath, File[] includeDirs,
+                    Vector args, Vector relativeArgs, StringBuffer includePathId) {
+        for (int i = 0; i < includeDirs.length; i++) {
+            args.addElement(getIncludeDirSwitch(includeDirs[i]
+                            .getAbsolutePath()));
+            if (relativeArgs != null) {
+                String relative = CUtil.getRelativePath(baseDirPath,
+                                includeDirs[i]);
+                relativeArgs.addElement(getIncludeDirSwitch(relative));
+                if (includePathId != null) {
+                    if (includePathId.length() == 0) {
+                        includePathId.append("/I");
+                    } else {
+                        includePathId.append(" /I");
+                    }
+                    includePathId.append(relative);
+                }
+            }
+        }
+    }
+
+    abstract protected String getIncludeDirSwitch(String source);
+
+    /**
+     * Assembles a source file
+     * 
+     */
+    public void assembler(CCTask task, File outputDir, String[] sourceFiles,
+                    String[] args, String[] endArgs) throws BuildException {
+        String command = getCommand();
+        int baseLength = command.length() + args.length + endArgs.length;
+        for (int i = 0; i < args.length; i++) {
+            baseLength += args[i].length();
+        }
+        for (int i = 0; i < endArgs.length; i++) {
+            baseLength += endArgs[i].length();
+        }
+        if (baseLength > getMaximumCommandLength()) {
+            throw new BuildException(
+                            "Command line is over maximum length without sepcifying source file");
+        }
+        int maxInputFilesPerCommand = getMaximumInputFilesPerCommand();
+        int argumentCountPerInputFile = getArgumentCountPerInputFIle();
+        for (int sourceIndex = 0; sourceIndex < sourceFiles.length;) {
+            int cmdLength = baseLength;
+            int firstFileNextExec;
+            for (firstFileNextExec = sourceIndex; firstFileNextExec < sourceFiles.length
+                            && (firstFileNextExec - sourceIndex) < maxInputFilesPerCommand; firstFileNextExec++) {
+                cmdLength += getTotalArgumentLengthForInputFile(outputDir,
+                                sourceFiles[firstFileNextExec]);
+                if (cmdLength >= getMaximumCommandLength())
+                    break;
+            }
+            if (firstFileNextExec == sourceIndex) {
+                throw new BuildException(
+                                "Extremely long file name, can't fit on command line");
+            }
+            int argCount = args.length + 1 + endArgs.length
+                            + (firstFileNextExec - sourceIndex)
+                            * argumentCountPerInputFile;
+            String[] commandline = new String[argCount];
+            int index = 0;
+            commandline[index++] = command;
+            for (int j = 0; j < args.length; j++) {
+                commandline[index++] = args[j];
+            }
+            for (int j = sourceIndex; j < firstFileNextExec; j++) {
+                for (int k = 0; k < argumentCountPerInputFile; k++) {
+                    commandline[index++] = getInputFileArgument(outputDir,
+                                    sourceFiles[j], k);
+                }
+            }
+            for (int j = 0; j < endArgs.length; j++) {
+                commandline[index++] = endArgs[j];
+            }
+            int retval = runCommand(task, outputDir, commandline);
+            // if with monitor, add more code
+            if (retval != 0) {
+                throw new BuildException(this.getCommand()
+                                + " failed with return code " + retval, task
+                                .getLocation());
+            }
+            sourceIndex = firstFileNextExec;
+        }
+    }
+
+    protected AssemblerConfiguration createConfiguration(final CCTask task,
+                    final LinkType linkType, final ProcessorDef[] baseDefs,
+                    final AssemblerDef specificDef,
+                    final TargetDef targetPlatform) {
+        Vector args = new Vector();
+        AssemblerDef[] defaultProviders = new AssemblerDef[baseDefs.length + 1];
+        for (int i = 0; i < baseDefs.length; i++) {
+            defaultProviders[i + 1] = (AssemblerDef) baseDefs[i];
+        }
+        defaultProviders[0] = specificDef;
+        Vector cmdArgs = new Vector();
+        //
+        // add command line arguments inherited from <cc> element
+        // any "extends" and finally and specific AssemblerDef
+        //
+        CommandLineArgument[] commandArgs;
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            commandArgs = defaultProviders[i].getActiveProcessorArgs();
+            for (int j = 0; j < commandArgs.length; j++) {
+                if (commandArgs[j].getLocation() == 0) {
+                    args.addElement(commandArgs[j].getValue());
+                } else {
+                    cmdArgs.addElement(commandArgs[j]);
+                }
+            }
+        }
+        // omit param
+        boolean debug = specificDef.getDebug(baseDefs, 0);
+        Boolean defaultflag = specificDef.getDefaultflag(defaultProviders, 1);
+        this.addImpliedArgs(args, debug, defaultflag);
+        //
+        // Want to have distinct set of arguments with relative
+        // path names for includes that are used to build
+        // the configuration identifier
+        //
+        Vector relativeArgs = (Vector) args.clone();
+        //
+        // add all active include an
+        //
+        StringBuffer includePathIdentifier = new StringBuffer();
+        File baseDir = specificDef.getProject().getBaseDir();
+        String baseDirPath;
+        try {
+            baseDirPath = baseDir.getCanonicalPath();
+        } catch (IOException ex) {
+            baseDirPath = baseDir.toString();
+        }
+        Vector includePath = new Vector();
+        Vector sysIncludePath = new Vector();
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            String[] incPath = defaultProviders[i].getActiveIncludePaths();
+            for (int j = 0; j < incPath.length; j++) {
+                includePath.addElement(incPath[j]);
+            }
+            incPath = defaultProviders[i].getActiveSysIncludePaths();
+            for (int j = 0; j < incPath.length; j++) {
+                sysIncludePath.addElement(incPath[j]);
+            }
+        }
+        File[] incPath = new File[includePath.size()];
+        for (int i = 0; i < includePath.size(); i++) {
+            incPath[i] = new File((String) includePath.elementAt(i));
+        }
+        File[] sysIncPath = new File[sysIncludePath.size()];
+        for (int i = 0; i < sysIncludePath.size(); i++) {
+            sysIncPath[i] = new File((String) sysIncludePath.elementAt(i));
+        }
+        addIncludes(baseDirPath, incPath, args, relativeArgs,
+                        includePathIdentifier);
+        addIncludes(baseDirPath, sysIncPath, args, null, null);
+        StringBuffer buf = new StringBuffer(getIdentifier());
+        for (int i = 0; i < relativeArgs.size(); i++) {
+            buf.append(relativeArgs.elementAt(i));
+            buf.append(' ');
+        }
+        buf.setLength(buf.length() - 1);
+        Enumeration argEnum = cmdArgs.elements();
+        int endCount = 0;
+        while (argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum
+                            .nextElement();
+            switch (arg.getLocation()) {
+            case 1:
+                args.addElement(arg.getValue());
+                break;
+            case 2:
+                endCount++;
+                break;
+            }
+        }
+        String[] endArgs = new String[endCount];
+        argEnum = cmdArgs.elements();
+        int index = 0;
+        while (argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum
+                            .nextElement();
+            if (arg.getLocation() == 2) {
+                endArgs[index++] = arg.getValue();
+            }
+        }
+        String[] argArray = new String[args.size()];
+        args.copyInto(argArray);
+        return new CommandLineAssemblerConfiguration(this, incPath, sysIncPath,
+                        new File[0], argArray, true, endArgs, new String[0]);
+    }
+
+    protected int getArgumentCountPerInputFile() {
+        return 1;
+    }
+
+    protected abstract File[] getEnvironmentIncludePath();
+
+    public String getIdentifier() {
+        if (identifier == null) {
+            if (identifierArg == null) {
+                identifier = getIdentifier(new String[] { command }, command);
+            } else {
+                identifier = getIdentifier(new String[] { command,
+                                identifierArg }, command);
+            }
+        }
+        return identifier;
+    }
+
+    public final String getCommand() {
+        return command;
+    }
+
+    abstract public int getMaximumCommandLength();
+
+    public void setCommand(String command) {
+        this.command = command;
+    }
+
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+                    String inputFile) {
+        return inputFile.length() + 1;
+    }
+
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+                    throws BuildException {
+        return CUtil.runCommand(task, workingDir, cmdline, false, null);
+    }
+
+    protected int getMaximumInputFilesPerCommand() {
+        return Integer.MAX_VALUE;
+    }
+
+    protected int getArgumentCountPerInputFIle() {
+        return 1;
+    }
+
+    protected String getInputFileArgument(File outputDir, String filename,
+                    int index) {
+        //
+        // if there is an embedded space,
+        // must enclose in quotes
+        if (filename.indexOf(' ') >= 0) {
+            StringBuffer buf = new StringBuffer("\"");
+            buf.append(filename);
+            buf.append("\"");
+            return buf.toString();
+        }
+        return filename;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java
new file mode 100644
index 0000000000..542d441559
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java
@@ -0,0 +1,123 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+
+/**
+ * A configuration for an assember
+ * 
+ */
+public final class CommandLineAssemblerConfiguration implements
+                AssemblerConfiguration {
+
+    private String[] args;
+
+    private CommandLineAssembler assembler;
+
+    private String[] endArgs;
+
+    //
+    // include path from environment variable
+    // not explicitly stated in Ant script
+    //
+    private File[] envIncludePath;
+
+    private String[] exceptFiles;
+
+    private File[] includePath;
+
+    private boolean rebuild;
+
+    private File[] sysIncludePath;
+
+    public CommandLineAssemblerConfiguration (CommandLineAssembler assembler,
+                    File[] includePath, File[] sysIncludePath,
+                    File[] envIncludePath, String[] args, boolean rebuild,
+                    String[] endArgs, String[] exceptFiles) {
+        if (assembler == null) {
+            throw new NullPointerException("assembler");
+        }
+        if (args == null) {
+            this.args = new String[0];
+        } else {
+            this.args = (String[]) args.clone();
+        }
+        if (includePath == null) {
+            this.includePath = new File[0];
+        } else {
+            this.includePath = (File[]) includePath.clone();
+        }
+        if (sysIncludePath == null) {
+            this.sysIncludePath = new File[0];
+        } else {
+            this.sysIncludePath = (File[]) sysIncludePath.clone();
+        }
+        if (envIncludePath == null) {
+            this.envIncludePath = new File[0];
+        } else {
+            this.envIncludePath = (File[]) envIncludePath.clone();
+        }
+        this.assembler = assembler;
+        this.rebuild = rebuild;
+        this.endArgs = (String[]) endArgs.clone();
+        this.exceptFiles = (String[]) exceptFiles.clone();
+    }
+
+    public int bid(String inputFile) {
+        int assembleBid = assembler.bid(inputFile);
+        return assembleBid;
+    }
+
+    public void assembler(CCTask task, File outputDir, String[] sourceFiles)
+                    throws BuildException {
+        try {
+            assembler.assembler(task, outputDir, sourceFiles, args, endArgs);
+        } catch (BuildException ex) {
+            throw ex;
+        }
+    }
+
+    public String getOutputFileName(String inputFile) {
+        return assembler.getOutputFileName(inputFile);
+    }
+
+    public String getIdentifier() {
+        return assembler.getCommand();
+    }
+
+    public ProcessorParam[] getParams() {
+        return new ProcessorParam[0];
+    }
+
+    public boolean getRebuild() {
+        return rebuild;
+    }
+
+    public String[] getPreArguments() {
+        return (String[]) args.clone();
+    }
+
+    public String[] getEndArguments() {
+        return (String[]) endArgs.clone();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
new file mode 100644
index 0000000000..442d6b8187
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java
@@ -0,0 +1,42 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * An abstract Compiler implementation which uses an external program to
+ * perform the compile.
+ * 
+ * @author Adam Murdoch
+ */
+public abstract class CommandLineCCompiler extends CommandLineCompiler {
+    protected CommandLineCCompiler(String command, String identifierArg,
+            String[] sourceExtensions, String[] headerExtensions,
+            String outputSuffix, boolean libtool,
+            CommandLineCCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                outputSuffix, libtool, libtoolCompiler, newEnvironment, env);
+    }
+    protected Parser createParser(File source) {
+        return new CParser();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
new file mode 100644
index 0000000000..3f45ce539d
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java
@@ -0,0 +1,435 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.CompilerDef;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+import net.sf.antcontrib.cpptasks.types.UndefineArgument;
+import net.sf.antcontrib.cpptasks.TargetDef;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;;
+/**
+ * An abstract Compiler implementation which uses an external program to
+ * perform the compile.
+ * 
+ * @author Adam Murdoch
+ */
+public abstract class CommandLineCompiler extends AbstractCompiler {
+    private String command;
+    private final Environment env;
+    private String identifier;
+    private String identifierArg;
+    private boolean libtool;
+    private CommandLineCompiler libtoolCompiler;
+    private final boolean newEnvironment;
+    protected CommandLineCompiler(String command, String identifierArg,
+            String[] sourceExtensions, String[] headerExtensions,
+            String outputSuffix, boolean libtool,
+            CommandLineCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(sourceExtensions, headerExtensions, outputSuffix);
+        this.command = command;
+        if (libtool && libtoolCompiler != null) {
+            throw new java.lang.IllegalArgumentException(
+                    "libtoolCompiler should be null when libtool is true");
+        }
+        this.libtool = libtool;
+        this.libtoolCompiler = libtoolCompiler;
+        this.identifierArg = identifierArg;
+        this.newEnvironment = newEnvironment;
+        this.env = env;
+    }
+    abstract protected void addImpliedArgs(Vector args, boolean debug,
+            boolean multithreaded, boolean exceptions, LinkType linkType,
+			Boolean rtti, OptimizationEnum optimization, Boolean defaultflag);
+    /**
+     * Adds command-line arguments for include directories.
+     * 
+     * If relativeArgs is not null will add corresponding relative paths
+     * include switches to that vector (for use in building a configuration
+     * identifier that is consistent between machines).
+     * 
+     * @param baseDirPaths
+     *            A vector containing the parts of the working directory,
+     *            produced by CUtil.DecomposeFile.
+     * @param includeDirs
+     *            Array of include directory paths
+     * @param args
+     *            Vector of command line arguments used to execute the task
+     * @param relativeArgs
+     *            Vector of command line arguments used to build the
+     *            configuration identifier
+     */
+    protected void addIncludes(String baseDirPath, File[] includeDirs,
+            Vector args, Vector relativeArgs, StringBuffer includePathId) {
+        for (int i = 0; i < includeDirs.length; i++) {
+            args.addElement(getIncludeDirSwitch(includeDirs[i]
+                    .getAbsolutePath()));
+            if (relativeArgs != null) {
+                String relative = CUtil.getRelativePath(baseDirPath,
+                        includeDirs[i]);
+                relativeArgs.addElement(getIncludeDirSwitch(relative));
+                if (includePathId != null) {
+                    if (includePathId.length() == 0) {
+                        includePathId.append("/I");
+                    } else {
+                        includePathId.append(" /I");
+                    }
+                    includePathId.append(relative);
+                }
+            }
+        }
+    }
+    abstract protected void addWarningSwitch(Vector args, int warnings);
+    protected void buildDefineArguments(CompilerDef[] defs, Vector args) {
+        //
+        //   assume that we aren't inheriting defines from containing <cc>
+        //
+        UndefineArgument[] merged = defs[0].getActiveDefines();
+        for (int i = 1; i < defs.length; i++) {
+            //
+            //  if we are inheriting, merge the specific defines with the
+            //      containing defines
+            merged = UndefineArgument.merge(defs[i].getActiveDefines(), merged);
+        }
+        StringBuffer buf = new StringBuffer(30);
+        for (int i = 0; i < merged.length; i++) {
+            buf.setLength(0);
+            UndefineArgument current = merged[i];
+            if (current.isDefine()) {
+                getDefineSwitch(buf, current.getName(), current.getValue());
+            } else {
+                getUndefineSwitch(buf, current.getName());
+            }
+            args.addElement(buf.toString());
+        }
+    }
+    /**
+     * Compiles a source file.
+     * 
+     * @author Curt Arnold
+     */
+    public void compile(CCTask task, File outputDir, String[] sourceFiles,
+            String[] args, String[] endArgs, boolean relentless,
+            CommandLineCompilerConfiguration config, ProgressMonitor monitor)
+            throws BuildException {
+        BuildException exc = null;
+        //
+        //   determine length of executable name and args
+        //
+        String command = getCommand();
+        int baseLength = command.length() + args.length + endArgs.length;
+        if (libtool) {
+            baseLength += 8;
+        }
+        for (int i = 0; i < args.length; i++) {
+            baseLength += args[i].length();
+        }
+        for (int i = 0; i < endArgs.length; i++) {
+            baseLength += endArgs[i].length();
+        }
+        if (baseLength > getMaximumCommandLength()) {
+            throw new BuildException(
+                    "Command line is over maximum length without specifying source file");
+        }
+        //
+        //  typically either 1 or Integer.MAX_VALUE
+        //
+        int maxInputFilesPerCommand = getMaximumInputFilesPerCommand();
+        int argumentCountPerInputFile = getArgumentCountPerInputFile();
+        for (int sourceIndex = 0; sourceIndex < sourceFiles.length;) {
+            int cmdLength = baseLength;
+            int firstFileNextExec;
+            for (firstFileNextExec = sourceIndex; firstFileNextExec < sourceFiles.length
+                    && (firstFileNextExec - sourceIndex) < maxInputFilesPerCommand; firstFileNextExec++) {
+                cmdLength += getTotalArgumentLengthForInputFile(outputDir,
+                        sourceFiles[firstFileNextExec]);
+                if (cmdLength >= getMaximumCommandLength())
+                    break;
+            }
+            if (firstFileNextExec == sourceIndex) {
+                throw new BuildException(
+                        "Extremely long file name, can't fit on command line");
+            }
+            int argCount = args.length + 1 + endArgs.length
+                    + (firstFileNextExec - sourceIndex)
+                    * argumentCountPerInputFile;
+            if (libtool) {
+                argCount++;
+            }
+            String[] commandline = new String[argCount];
+            int index = 0;
+            if (libtool) {
+                commandline[index++] = "libtool";
+            }
+            commandline[index++] = command;
+            for (int j = 0; j < args.length; j++) {
+                commandline[index++] = args[j];
+            }
+            for (int j = sourceIndex; j < firstFileNextExec; j++) {
+                for (int k = 0; k < argumentCountPerInputFile; k++) {
+                    commandline[index++] = getInputFileArgument(outputDir,
+                            sourceFiles[j], k);
+                }
+            }
+            for (int j = 0; j < endArgs.length; j++) {
+                commandline[index++] = endArgs[j];
+            }
+            int retval = runCommand(task, outputDir, commandline);
+            if (monitor != null) {
+                String[] fileNames = new String[firstFileNextExec - sourceIndex];
+                for (int j = 0; j < fileNames.length; j++) {
+                    fileNames[j] = sourceFiles[sourceIndex + j];
+                }
+                monitor.progress(fileNames);
+            }
+            //
+            //   if the process returned a failure code and
+            //      we aren't holding an exception from an earlier
+            //      interation
+            if (retval != 0 && exc == null) {
+                //
+                //   construct the exception
+                //
+                exc = new BuildException(this.getCommand()
+                        + " failed with return code " + retval, task
+                        .getLocation());
+                //
+                //   and throw it now unless we are relentless
+                //
+                if (!relentless) {
+                    throw exc;
+                }
+            }
+            sourceIndex = firstFileNextExec;
+        }
+        //
+        //   if the compiler returned a failure value earlier
+        //      then throw an exception
+        if (exc != null) {
+            throw exc;
+        }
+    }
+    protected CompilerConfiguration createConfiguration(final CCTask task,
+            final LinkType linkType, 
+			final ProcessorDef[] baseDefs, 
+			final CompilerDef specificDef,
+			final TargetDef targetPlatform) {
+        Vector args = new Vector();
+        CompilerDef[] defaultProviders = new CompilerDef[baseDefs.length + 1];
+        for (int i = 0; i < baseDefs.length; i++) {
+            defaultProviders[i + 1] = (CompilerDef) baseDefs[i];
+        }
+        defaultProviders[0] = specificDef;
+        Vector cmdArgs = new Vector();
+        //
+        //   add command line arguments inherited from <cc> element
+        //     any "extends" and finally the specific CompilerDef
+        CommandLineArgument[] commandArgs;
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            commandArgs = defaultProviders[i].getActiveProcessorArgs();
+            for (int j = 0; j < commandArgs.length; j++) {
+                if (commandArgs[j].getLocation() == 0) {
+                    args.addElement(commandArgs[j].getValue());
+                } else {
+                    cmdArgs.addElement(commandArgs[j]);
+                }
+            }
+        }
+        Vector params = new Vector();
+        //
+        //   add command line arguments inherited from <cc> element
+        //     any "extends" and finally the specific CompilerDef
+        ProcessorParam[] paramArray;
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            paramArray = defaultProviders[i].getActiveProcessorParams();
+            for (int j = 0; j < paramArray.length; j++) {
+                params.add(paramArray[j]);
+            }
+        }
+        paramArray = (ProcessorParam[]) (params
+                .toArray(new ProcessorParam[params.size()]));
+        boolean multithreaded = specificDef.getMultithreaded(defaultProviders,
+                1);
+        boolean debug = specificDef.getDebug(baseDefs, 0);
+        boolean exceptions = specificDef.getExceptions(defaultProviders, 1);
+        Boolean rtti = specificDef.getRtti(defaultProviders, 1);
+        Boolean defaultflag = specificDef.getDefaultflag(defaultProviders, 1);
+        OptimizationEnum optimization = specificDef.getOptimization(defaultProviders, 1);
+        this.addImpliedArgs(args, debug, multithreaded, exceptions, linkType, rtti, optimization, defaultflag);
+        //
+        //    add all appropriate defines and undefines
+        //
+        buildDefineArguments(defaultProviders, args);
+        //
+        //   Want to have distinct set of arguments with relative
+        //      path names for includes that are used to build
+        //      the configuration identifier
+        //
+        Vector relativeArgs = (Vector) args.clone();
+        //
+        //    add all active include and sysincludes
+        //
+        StringBuffer includePathIdentifier = new StringBuffer();
+        File baseDir = specificDef.getProject().getBaseDir();
+        String baseDirPath;
+        try {
+            baseDirPath = baseDir.getCanonicalPath();
+        } catch (IOException ex) {
+            baseDirPath = baseDir.toString();
+        }
+        Vector includePath = new Vector();
+        Vector sysIncludePath = new Vector();
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            String[] incPath = defaultProviders[i].getActiveIncludePaths();
+            for (int j = 0; j < incPath.length; j++) {
+                includePath.addElement(incPath[j]);
+            }
+            incPath = defaultProviders[i].getActiveSysIncludePaths();
+            for (int j = 0; j < incPath.length; j++) {
+                sysIncludePath.addElement(incPath[j]);
+            }
+        }
+        File[] incPath = new File[includePath.size()];
+        for (int i = 0; i < includePath.size(); i++) {
+            incPath[i] = new File((String) includePath.elementAt(i));
+        }
+        File[] sysIncPath = new File[sysIncludePath.size()];
+        for (int i = 0; i < sysIncludePath.size(); i++) {
+            sysIncPath[i] = new File((String) sysIncludePath.elementAt(i));
+        }
+        addIncludes(baseDirPath, incPath, args, relativeArgs,
+                includePathIdentifier);
+        addIncludes(baseDirPath, sysIncPath, args, null, null);
+        StringBuffer buf = new StringBuffer(getIdentifier());
+        for (int i = 0; i < relativeArgs.size(); i++) {
+            buf.append(relativeArgs.elementAt(i));
+            buf.append(' ');
+        }
+        buf.setLength(buf.length() - 1);
+        String configId = buf.toString();
+        int warnings = specificDef.getWarnings(defaultProviders, 0);
+        addWarningSwitch(args, warnings);
+        Enumeration argEnum = cmdArgs.elements();
+        int endCount = 0;
+        while (argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum
+                    .nextElement();
+            switch (arg.getLocation()) {
+                case 1 :
+                    args.addElement(arg.getValue());
+                    break;
+                case 2 :
+                    endCount++;
+                    break;
+            }
+        }
+        String[] endArgs = new String[endCount];
+        argEnum = cmdArgs.elements();
+        int index = 0;
+        while (argEnum.hasMoreElements()) {
+            CommandLineArgument arg = (CommandLineArgument) argEnum
+                    .nextElement();
+            if (arg.getLocation() == 2) {
+                endArgs[index++] = arg.getValue();
+            }
+        }
+        String[] argArray = new String[args.size()];
+        args.copyInto(argArray);
+        boolean rebuild = specificDef.getRebuild(baseDefs, 0);
+        File[] envIncludePath = getEnvironmentIncludePath();
+        return new CommandLineCompilerConfiguration(this, configId, incPath,
+                sysIncPath, envIncludePath, includePathIdentifier.toString(),
+                argArray, paramArray, rebuild, endArgs);
+    }
+    protected int getArgumentCountPerInputFile() {
+        return 1;
+    }
+    protected final String getCommand() {
+        return command;
+    }
+    abstract protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value);
+    protected abstract File[] getEnvironmentIncludePath();
+    public String getIdentifier() {
+        if (identifier == null) {
+            if (identifierArg == null) {
+                identifier = getIdentifier(new String[]{command}, command);
+            } else {
+                identifier = getIdentifier(
+                        new String[]{command, identifierArg}, command);
+            }
+        }
+        return identifier;
+    }
+    abstract protected String getIncludeDirSwitch(String source);
+    protected String getInputFileArgument(File outputDir, String filename,
+            int index) {
+        //
+        //   if there is an embedded space,
+        //      must enclose in quotes
+        if (filename.indexOf(' ') >= 0) {
+            StringBuffer buf = new StringBuffer("\"");
+            buf.append(filename);
+            buf.append("\"");
+            return buf.toString();
+        }
+        return filename;
+    }
+    protected final boolean getLibtool() {
+        return libtool;
+    }
+    /**
+     * Obtains the same compiler, but with libtool set
+     * 
+     * Default behavior is to ignore libtool
+     */
+    public final CommandLineCompiler getLibtoolCompiler() {
+        if (libtoolCompiler != null) {
+            return libtoolCompiler;
+        }
+        return this;
+    }
+    abstract public int getMaximumCommandLength();
+    protected int getMaximumInputFilesPerCommand() {
+        return Integer.MAX_VALUE;
+    }
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+            String inputFile) {
+        return inputFile.length() + 1;
+    }
+    abstract protected void getUndefineSwitch(StringBuffer buffer, String define);
+    /**
+     * This method is exposed so test classes can overload and test the
+     * arguments without actually spawning the compiler
+     */
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+            throws BuildException {
+        return CUtil.runCommand(task, workingDir, cmdline, newEnvironment, env);
+    }
+    protected final void setCommand(String command) {
+        this.command = command;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
new file mode 100644
index 0000000000..4c53df105b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java
@@ -0,0 +1,216 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CompilerParam;
+import net.sf.antcontrib.cpptasks.DependencyInfo;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for a C++ compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class CommandLineCompilerConfiguration
+        implements
+            CompilerConfiguration {
+    private/* final */String[] args;
+    private/* final */CommandLineCompiler compiler;
+    private String[] endArgs;
+    //
+    //    include path from environment variable not
+    //       explicitly stated in Ant script
+    private/* final */File[] envIncludePath;
+    private String[] exceptFiles;
+    private/* final */String identifier;
+    private/* final */File[] includePath;
+    private/* final */String includePathIdentifier;
+    private boolean isPrecompiledHeaderGeneration;
+    private/* final */ProcessorParam[] params;
+    private/* final */boolean rebuild;
+    private/* final */File[] sysIncludePath;
+    public CommandLineCompilerConfiguration(CommandLineCompiler compiler,
+            String identifier, File[] includePath, File[] sysIncludePath,
+            File[] envIncludePath, String includePathIdentifier, String[] args,
+            ProcessorParam[] params, boolean rebuild, String[] endArgs) {
+        if (compiler == null) {
+            throw new NullPointerException("compiler");
+        }
+        if (identifier == null) {
+            throw new NullPointerException("identifier");
+        }
+        if (includePathIdentifier == null) {
+            throw new NullPointerException("includePathIdentifier");
+        }
+        if (args == null) {
+            this.args = new String[0];
+        } else {
+            this.args = (String[]) args.clone();
+        }
+        if (includePath == null) {
+            this.includePath = new File[0];
+        } else {
+            this.includePath = (File[]) includePath.clone();
+        }
+        if (sysIncludePath == null) {
+            this.sysIncludePath = new File[0];
+        } else {
+            this.sysIncludePath = (File[]) sysIncludePath.clone();
+        }
+        if (envIncludePath == null) {
+            this.envIncludePath = new File[0];
+        } else {
+            this.envIncludePath = (File[]) envIncludePath.clone();
+        }
+        this.compiler = compiler;
+        this.params = (ProcessorParam[]) params.clone();
+        this.rebuild = rebuild;
+        this.identifier = identifier;
+        this.includePathIdentifier = includePathIdentifier;
+        this.endArgs = (String[]) endArgs.clone();
+        exceptFiles = null;
+        isPrecompiledHeaderGeneration = false;
+    }
+    public CommandLineCompilerConfiguration(
+            CommandLineCompilerConfiguration base, String[] additionalArgs,
+            String[] exceptFiles, boolean isPrecompileHeaderGeneration) {
+        compiler = base.compiler;
+        identifier = base.identifier;
+        rebuild = base.rebuild;
+        includePath = (File[]) base.includePath.clone();
+        sysIncludePath = (File[]) base.sysIncludePath.clone();
+        endArgs = (String[]) base.endArgs.clone();
+        envIncludePath = (File[]) base.envIncludePath.clone();
+        includePathIdentifier = base.includePathIdentifier;
+        if (exceptFiles != null) {
+            this.exceptFiles = (String[]) exceptFiles.clone();
+        }
+        this.isPrecompiledHeaderGeneration = isPrecompileHeaderGeneration;
+        args = new String[base.args.length + additionalArgs.length];
+        for (int i = 0; i < base.args.length; i++) {
+            args[i] = base.args[i];
+        }
+        int index = base.args.length;
+        for (int i = 0; i < additionalArgs.length; i++) {
+            args[index++] = additionalArgs[i];
+        }
+    }
+    public int bid(String inputFile) {
+        int compilerBid = compiler.bid(inputFile);
+        if (compilerBid > 0 && exceptFiles != null) {
+            for (int i = 0; i < exceptFiles.length; i++) {
+                if (inputFile.equals(exceptFiles[i])) {
+                    return 0;
+                }
+            }
+        }
+        return compilerBid;
+    }
+    public void compile(CCTask task, File outputDir, String[] sourceFiles,
+            boolean relentless, ProgressMonitor monitor) throws BuildException {
+        if (monitor != null) {
+            monitor.start(this);
+        }
+        try {
+            compiler.compile(task, outputDir, sourceFiles, args, endArgs,
+                    relentless, this, monitor);
+            if (monitor != null) {
+                monitor.finish(this, true);
+            }
+        } catch (BuildException ex) {
+            if (monitor != null) {
+                monitor.finish(this, false);
+            }
+            throw ex;
+        }
+    }
+    /**
+     * 
+     * This method may be used to get two distinct compiler configurations, one
+     * for compiling the specified file and producing a precompiled header
+     * file, and a second for compiling other files using the precompiled
+     * header file.
+     * 
+     * The last (preferrably only) include directive in the prototype file will
+     * be used to mark the boundary between pre-compiled and normally compiled
+     * headers.
+     * 
+     * @param prototype
+     *            A source file (for example, stdafx.cpp) that is used to build
+     *            the precompiled header file. @returns null if precompiled
+     *            headers are not supported or a two element array containing
+     *            the precompiled header generation configuration and the
+     *            consuming configuration
+     *  
+     */
+    public CompilerConfiguration[] createPrecompileConfigurations(
+            File prototype, String[] nonPrecompiledFiles) {
+        if (compiler instanceof PrecompilingCompiler) {
+            return ((PrecompilingCompiler) compiler)
+                    .createPrecompileConfigurations(this, prototype,
+                            nonPrecompiledFiles);
+        }
+        return null;
+    }
+    /**
+     * Returns a string representation of this configuration. Should be
+     * canonical so that equivalent configurations will have equivalent string
+     * representations
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+    public String getIncludePathIdentifier() {
+        return includePathIdentifier;
+    }
+    public String getOutputFileName(String inputFile) {
+        return compiler.getOutputFileName(inputFile);
+    }
+    public CompilerParam getParam(String name) {
+        for (int i = 0; i < params.length; i++) {
+            if (name.equals(params[i].getName()))
+                return (CompilerParam) params[i];
+        }
+        return null;
+    }
+    public ProcessorParam[] getParams() {
+        return params;
+    }
+    public boolean getRebuild() {
+        return rebuild;
+    }
+    public boolean isPrecompileGeneration() {
+        return isPrecompiledHeaderGeneration;
+    }
+    public DependencyInfo parseIncludes(CCTask task, File baseDir, File source) {
+        return compiler.parseIncludes(task, source, includePath,
+                sysIncludePath, envIncludePath, baseDir,
+                getIncludePathIdentifier());
+    }
+    public String toString() {
+        return identifier;
+    }
+    public String[] getPreArguments() {
+    	return (String[]) args.clone();
+    }
+    public String[] getEndArguments() {
+    	return (String[]) endArgs.clone();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
new file mode 100644
index 0000000000..d01cb9e356
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java
@@ -0,0 +1,42 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.parser.FortranParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * An abstract Compiler implementation which uses an external program to
+ * perform the compile.
+ * 
+ * @author Curt Arnold
+ */
+public abstract class CommandLineFortranCompiler extends CommandLineCompiler {
+    protected CommandLineFortranCompiler(String command, String identifierArg,
+            String[] sourceExtensions, String[] headerExtensions,
+            String outputSuffix, boolean libtool,
+            CommandLineFortranCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                outputSuffix, libtool, libtoolCompiler, newEnvironment, env);
+    }
+    protected Parser createParser(File source) {
+        return new FortranParser();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
new file mode 100644
index 0000000000..4161469a8f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java
@@ -0,0 +1,404 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.LinkerDef;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.TargetDef;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+
+
+/**
+ * An abstract Linker implementation that performs the link via an external
+ * command.
+ *
+ * @author Adam Murdoch
+ */
+public abstract class CommandLineLinker extends AbstractLinker
+{
+    private String command;
+    private Environment env = null;
+    private String identifier;
+    private String identifierArg;
+    private boolean isLibtool;
+    private String[] librarySets;
+    private CommandLineLinker libtoolLinker;
+    private boolean newEnvironment = false;
+    private String outputSuffix;
+
+
+    /** Creates a comand line linker invocation */
+    public CommandLineLinker(String command,
+        String identifierArg,
+        String[] extensions,
+        String[] ignoredExtensions, String outputSuffix,
+        boolean isLibtool, CommandLineLinker libtoolLinker)
+    {
+        super(extensions, ignoredExtensions);
+        this.command = command;
+        this.identifierArg = identifierArg;
+        this.outputSuffix = outputSuffix;
+        this.isLibtool = isLibtool;
+        this.libtoolLinker = libtoolLinker;
+    }
+    protected abstract void addBase(long base, Vector args);
+
+    protected abstract void addFixed(Boolean fixed, Vector args);
+
+    abstract protected void addImpliedArgs(boolean debug,
+      LinkType linkType, Vector args, Boolean defaultflag);
+    protected abstract void addIncremental(boolean incremental, Vector args);
+
+      //
+      //  Windows processors handle these through file list
+      //
+    protected String[] addLibrarySets(CCTask task, LibrarySet[] libsets, Vector preargs,
+        Vector midargs, Vector endargs) {
+        return null;
+    }
+    protected abstract void addMap(boolean map, Vector args);
+    protected abstract void addStack(int stack, Vector args);
+    protected abstract void addEntry(String entry, Vector args);
+    
+    protected LinkerConfiguration createConfiguration(
+      CCTask task,
+      LinkType linkType,
+      ProcessorDef[] baseDefs, LinkerDef specificDef, TargetDef targetPlatform) {
+
+      Vector preargs = new Vector();
+      Vector midargs = new Vector();
+      Vector endargs = new Vector();
+      Vector[] args = new Vector[] { preargs, midargs, endargs };
+
+      LinkerDef[] defaultProviders = new LinkerDef[baseDefs.length+1];
+      defaultProviders[0] = specificDef;
+      for(int i = 0; i < baseDefs.length; i++) {
+        defaultProviders[i+1] = (LinkerDef) baseDefs[i];
+      }
+      //
+      //   add command line arguments inherited from <cc> element
+      //     any "extends" and finally the specific CompilerDef
+      CommandLineArgument[] commandArgs;
+      for(int i = defaultProviders.length-1; i >= 0; i--) {
+        commandArgs = defaultProviders[i].getActiveProcessorArgs();
+        for(int j = 0; j < commandArgs.length; j++) {
+          args[commandArgs[j].getLocation()].
+                addElement(commandArgs[j].getValue());
+        }
+      }
+
+        Vector params = new Vector();
+        //
+        //   add command line arguments inherited from <cc> element
+        //     any "extends" and finally the specific CompilerDef
+        ProcessorParam[] paramArray;
+        for (int i = defaultProviders.length - 1; i >= 0; i--) {
+            paramArray = defaultProviders[i].getActiveProcessorParams();
+            for (int j = 0; j < paramArray.length; j++) {
+                params.add(paramArray[j]);
+            }
+        }
+
+        paramArray = (ProcessorParam[])(params.toArray(new ProcessorParam[params.size()]));
+
+        boolean debug = specificDef.getDebug(baseDefs,0);
+
+      
+      String startupObject = getStartupObject(linkType);
+      Boolean defaultflag = specificDef.getDefaultflag(defaultProviders, 1);
+      addImpliedArgs(debug, linkType, preargs, defaultflag);
+      addIncremental(specificDef.getIncremental(defaultProviders,1), preargs);
+      addFixed(specificDef.getFixed(defaultProviders,1), preargs);
+      addMap(specificDef.getMap(defaultProviders,1), preargs);
+      addBase(specificDef.getBase(defaultProviders,1), preargs);
+      addStack(specificDef.getStack(defaultProviders,1), preargs);
+      addEntry(specificDef.getEntry(defaultProviders, 1), preargs);
+
+      String[] libnames = null;
+      LibrarySet[] libsets = specificDef.getActiveLibrarySets(defaultProviders,1);
+      if (libsets.length > 0) {
+        libnames = addLibrarySets(task, libsets, preargs, midargs, endargs);
+      }
+
+      StringBuffer buf = new StringBuffer(getIdentifier());
+      for (int i = 0; i < 3; i++) {
+        Enumeration argenum = args[i].elements();
+        while (argenum.hasMoreElements()) {
+           buf.append(' ');
+           buf.append(argenum.nextElement().toString());
+        }
+      }
+      String configId = buf.toString();
+
+      String[][] options = new String[][] {
+        new String[args[0].size() + args[1].size()],
+        new String[args[2].size()] };
+      args[0].copyInto(options[0]);
+      int offset = args[0].size();
+      for (int i = 0; i < args[1].size(); i++) {
+        options[0][i+offset] = (String) args[1].elementAt(i);
+      }
+      args[2].copyInto(options[1]);
+
+
+      boolean rebuild = specificDef.getRebuild(baseDefs,0);
+      boolean map = specificDef.getMap(defaultProviders,1);
+
+      //task.log("libnames:"+libnames.length, Project.MSG_VERBOSE);
+      return new CommandLineLinkerConfiguration(this,configId,options,
+              paramArray,
+              rebuild,map,libnames, startupObject);
+    }
+
+    /**
+     * Allows drived linker to decorate linker option.
+     * Override by GccLinker to prepend a "-Wl," to
+     * pass option to through gcc to linker.
+     *
+     * @param buf buffer that may be used and abused in the decoration process,
+     * must not be null.
+     * @param arg linker argument
+     */
+    protected String decorateLinkerOption(StringBuffer buf, String arg) {
+      return arg;
+    }
+
+    protected final String getCommand() {
+      return command;
+    }
+    protected abstract String getCommandFileSwitch(String commandFile);
+
+
+     public String getIdentifier() {
+      if(identifier == null) {
+        if (identifierArg == null) {
+          identifier = getIdentifier(new String[] { command }, command);
+        } else {
+          identifier = getIdentifier(new String[] { command, identifierArg },
+            command);
+        }
+      }
+      return identifier;
+    }
+    public final CommandLineLinker getLibtoolLinker() {
+      if (libtoolLinker != null) {
+        return libtoolLinker;
+      }
+      return this;
+    }
+    protected abstract int getMaximumCommandLength();
+
+    public String getOutputFileName(String baseName) {
+        return baseName + outputSuffix;
+    }
+
+    protected String[] getOutputFileSwitch(CCTask task, String outputFile) {
+        return getOutputFileSwitch(outputFile);
+    }
+    protected abstract String[] getOutputFileSwitch(String outputFile);
+    protected String getStartupObject(LinkType linkType) {
+      return null;
+    }
+
+    /**
+     * Performs a link using a command line linker
+     *
+     */
+    public void link(CCTask task,
+                     File outputFile,
+                     String[] sourceFiles,
+                     CommandLineLinkerConfiguration config)
+                     throws BuildException
+    {
+        File parentDir = new File(outputFile.getParent());
+        String parentPath;
+        try {
+          parentPath = parentDir.getCanonicalPath();
+        } catch(IOException ex) {
+          parentPath = parentDir.getAbsolutePath();
+        }
+        String[] execArgs = prepareArguments(task, parentPath,outputFile.getName(),
+            sourceFiles, config);
+        int commandLength = 0;
+        for(int i = 0; i < execArgs.length; i++) {
+          commandLength += execArgs[i].length() + 1;
+        }
+
+        //
+        //   if command length exceeds maximum
+        //       (1024 for Windows) then create a temporary
+        //       file containing everything but the command name
+        if(commandLength >= this.getMaximumCommandLength()) {
+          try {
+            execArgs = prepareResponseFile(outputFile,execArgs);
+          }
+          catch(IOException ex) {
+            throw new BuildException(ex);
+          }
+        }
+        
+        int retval = runCommand(task,parentDir,execArgs);        
+        //
+        //   if the process returned a failure code then
+        //       throw an BuildException
+        //
+        if(retval != 0) {
+          //
+          //   construct the exception
+          //
+          throw new BuildException(this.getCommand() + " failed with return code " + retval, task.getLocation());
+        }
+        
+    }
+
+
+    /**
+     * Prepares argument list for exec command.  Will return null
+     * if command line would exceed allowable command line buffer.
+     *
+     * @param outputFile linker output file
+     * @param sourceFiles linker input files (.obj, .o, .res)
+     * @param args linker arguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareArguments(
+        CCTask task,
+        String outputDir,
+        String outputFile,
+        String[] sourceFiles,
+        CommandLineLinkerConfiguration config) {
+                        
+        String[] preargs = config.getPreArguments();
+        String[] endargs = config.getEndArguments();
+        String outputSwitch[] =  getOutputFileSwitch(task, outputFile);
+        int allArgsCount = preargs.length + 1 + outputSwitch.length +
+                sourceFiles.length + endargs.length;
+        if (isLibtool) {
+          allArgsCount++;
+        }
+        String[] allArgs = new String[allArgsCount];
+        int index = 0;
+        if (isLibtool) {
+          allArgs[index++] = "libtool";
+        }
+        allArgs[index++] = this.getCommand();
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < preargs.length; i++) {
+          allArgs[index++] = decorateLinkerOption(buf, preargs[i]);
+        }
+        for (int i = 0; i < outputSwitch.length; i++) {
+          allArgs[index++] = outputSwitch[i];
+        }
+        for (int i = 0; i < sourceFiles.length; i++) {
+          allArgs[index++] = prepareFilename(buf,outputDir,sourceFiles[i]);
+        }
+        for (int i = 0; i < endargs.length; i++) {
+          allArgs[index++] = decorateLinkerOption(buf, endargs[i]);
+        }
+        return allArgs;
+    }
+
+    /**
+     * Processes filename into argument form
+     *
+     */
+    protected String prepareFilename(StringBuffer buf,
+      String outputDir, String sourceFile) {
+      String relativePath = CUtil.getRelativePath(outputDir,
+        new File(sourceFile));
+      return quoteFilename(buf,relativePath);
+    }
+
+    /**
+     * Prepares argument list to execute the linker using a
+     * response file.
+     *
+     * @param outputFile linker output file
+     * @param args output of prepareArguments
+     * @return arguments for runTask
+     */
+    protected String[] prepareResponseFile(File outputFile,String[] args) throws IOException
+    {
+        String baseName = outputFile.getName();
+        File commandFile = new File(outputFile.getParent(),baseName + ".rsp");
+        FileWriter writer = new FileWriter(commandFile);
+        int execArgCount = 1;
+        if (isLibtool) {
+          execArgCount++;
+        }
+        String[] execArgs = new String[execArgCount+1];
+        for (int i = 0; i < execArgCount; i++) {
+          execArgs[i] = args[i];
+        }
+        execArgs[execArgCount] = getCommandFileSwitch(commandFile.toString());
+        for(int i = execArgCount; i < args.length; i++) {
+        	//
+        	//   if embedded space and not quoted then
+        	//       quote argument
+          if (args[i].indexOf(" ") >= 0 && args[i].charAt(0) != '\"') {
+          	writer.write('\"');
+          	writer.write(args[i]);
+          	writer.write("\"\n");
+          } else {
+          	writer.write(args[i]);
+            writer.write('\n');
+          }
+        }
+        writer.close();
+        return execArgs;
+    }
+
+
+    protected String quoteFilename(StringBuffer buf,String filename) {
+      if(filename.indexOf(' ') >= 0) {
+        buf.setLength(0);
+        buf.append('\"');
+        buf.append(filename);
+        buf.append('\"');
+        return buf.toString();
+      }
+      return filename;
+    }
+
+    /**
+     * This method is exposed so test classes can overload
+     * and test the arguments without actually spawning the
+     * compiler
+     */
+    protected int runCommand(CCTask task, File workingDir,String[] cmdline)
+      throws BuildException {
+      return CUtil.runCommand(task,workingDir,cmdline, newEnvironment, env);
+    }
+
+    protected final void setCommand(String command) {
+        this.command = command;
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
new file mode 100644
index 0000000000..b3a7290b00
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java
@@ -0,0 +1,119 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+import net.sf.antcontrib.cpptasks.TargetInfo;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for a command line linker
+ * 
+ * @author Curt Arnold
+ */
+public final class CommandLineLinkerConfiguration
+        implements
+            LinkerConfiguration {
+    private/* final */String[][] args;
+    private/* final */String identifier;
+    private String[] libraryNames;
+    private/* final */CommandLineLinker linker;
+    private/* final */boolean map;
+    private/* final */ProcessorParam[] params;
+    private/* final */boolean rebuild;
+    private String startupObject;
+    public CommandLineLinkerConfiguration(CommandLineLinker linker,
+            String identifier, String[][] args, ProcessorParam[] params,
+            boolean rebuild, boolean map, String[] libraryNames,
+            String startupObject) {
+        if (linker == null) {
+            throw new NullPointerException("linker");
+        }
+        if (args == null) {
+            throw new NullPointerException("args");
+        } else {
+            this.args = (String[][]) args.clone();
+        }
+        this.linker = linker;
+        this.params = (ProcessorParam[]) params.clone();
+        this.rebuild = rebuild;
+        this.identifier = identifier;
+        this.map = map;
+        if (libraryNames == null) {
+            this.libraryNames = new String[0];
+        } else {
+            this.libraryNames = (String[]) libraryNames.clone();
+        }
+        this.startupObject = startupObject;
+    }
+    public int bid(String filename) {
+        return linker.bid(filename);
+    }
+    public String[] getEndArguments() {
+        String[] clone = (String[]) args[1].clone();
+        return clone;
+    }
+    /**
+     * Returns a string representation of this configuration. Should be
+     * canonical so that equivalent configurations will have equivalent string
+     * representations
+     */
+    public String getIdentifier() {
+        return identifier;
+    }
+    public String[] getLibraryNames() {
+        String[] clone = (String[]) libraryNames.clone();
+        return clone;
+    }
+    public boolean getMap() {
+        return map;
+    }
+    public String getOutputFileName(String inputFile) {
+        return linker.getOutputFileName(inputFile);
+    }
+    public LinkerParam getParam(String name) {
+        for (int i = 0; i < params.length; i++) {
+            if (name.equals(params[i].getName()))
+                return (LinkerParam) params[i];
+        }
+        return null;
+    }
+    public ProcessorParam[] getParams() {
+        return params;
+    }
+    public String[] getPreArguments() {
+        String[] clone = (String[]) args[0].clone();
+        return clone;
+    }
+    public boolean getRebuild() {
+        return rebuild;
+    }
+    public String getStartupObject() {
+        return startupObject;
+    }
+    public void link(CCTask task, TargetInfo linkTarget) throws BuildException {
+        //
+        //  AllSourcePath's include any syslibsets
+        //
+        String[] sourcePaths = linkTarget.getAllSourcePaths();
+        linker.link(task, linkTarget.getOutput(), sourcePaths, this);
+    }
+    public String toString() {
+        return identifier;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java
new file mode 100644
index 0000000000..bbb6c99c5d
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Compiler.java
@@ -0,0 +1,24 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+/**
+ * A compiler.
+ * 
+ * @author Adam Murdoch
+ */
+public interface Compiler extends Processor {
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
new file mode 100644
index 0000000000..72abb8b5f4
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java
@@ -0,0 +1,64 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CompilerParam;
+import net.sf.antcontrib.cpptasks.DependencyInfo;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for a compiler
+ * 
+ * @author Curt Arnold
+ */
+public interface CompilerConfiguration extends ProcessorConfiguration {
+    void compile(CCTask task, File outputDir, String[] sourceFiles,
+            boolean relentless, ProgressMonitor monitor) throws BuildException;
+    /**
+     * 
+     * This method may be used to get two distinct compiler configurations, one
+     * for compiling the specified file and producing a precompiled header
+     * file, and a second for compiling other files using the precompiled
+     * header file.
+     * 
+     * The last (preferrably only) include directive in the prototype file will
+     * be used to mark the boundary between pre-compiled and normally compiled
+     * headers.
+     * 
+     * @param prototype
+     *            A source file (for example, stdafx.cpp) that is used to build
+     *            the precompiled header file. @returns null if precompiled
+     *            headers are not supported or a two element array containing
+     *            the precompiled header generation configuration and the
+     *            consuming configuration
+     *  
+     */
+    CompilerConfiguration[] createPrecompileConfigurations(File prototype,
+            String[] nonPrecompiledFiles);
+    /**
+     * Returns an digest for the include path for the configuration.
+     * 
+     * This is used to determine if cached dependency information is invalid
+     * because the include paths have changed
+     */
+    String getIncludePathIdentifier();
+    public CompilerParam getParam(String name);
+    boolean isPrecompileGeneration();
+    DependencyInfo parseIncludes(CCTask task, File baseDir, File source);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java
new file mode 100644
index 0000000000..7d6041ff93
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkType.java
@@ -0,0 +1,134 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import net.sf.antcontrib.cpptasks.OutputTypeEnum;
+import net.sf.antcontrib.cpptasks.SubsystemEnum;
+/**
+ * This class represents the target platform for the compile and link step. The
+ * name is an anachronism and should be changed.
+ * 
+ * @author Curt Arnold
+ */
+public class LinkType {
+    private OutputTypeEnum outputType = new OutputTypeEnum();
+    private boolean staticRuntime = false;
+    private SubsystemEnum subsystem = new SubsystemEnum();
+    /**
+     * Constructor
+     * 
+     * By default, an gui executable with a dynamically linked runtime
+     *  
+     */
+    public LinkType() {
+    }
+    /**
+     * Gets whether the link should produce an executable
+     * 
+     * @return boolean
+     */
+    public boolean isExecutable() {
+        String value = outputType.getValue();
+        return value.equals("executable");
+    }
+    /**
+     * Gets whether the link should produce a plugin module.
+     * 
+     * @return boolean
+     */
+    public boolean isPluginModule() {
+        String value = outputType.getValue();
+        return value.equals("plugin");
+    }
+    /**
+     * Gets whether the link should produce a shared library.
+     * 
+     * @return boolean
+     */
+    public boolean isSharedLibrary() {
+        String value = outputType.getValue();
+        return value.equals("shared") || value.equals("plugin");
+    }
+    /**
+     * Gets whether the link should produce a static library.
+     * 
+     * @return boolean
+     */
+    public boolean isStaticLibrary() {
+        String value = outputType.getValue();
+        return value.equals("static");
+    }
+    /**
+     * Gets whether the module should use a statically linked runtime library.
+     * 
+     * @return boolean
+     */
+    public boolean isStaticRuntime() {
+        return staticRuntime;
+    }
+    /**
+     * Gets whether the link should produce a module for a console subsystem.
+     * 
+     * @return boolean
+     */
+    public boolean isSubsystemConsole() {
+        String value = subsystem.getValue();
+        return value.equals("console");
+    }
+    /**
+     * Gets whether the link should produce a module for a graphical user
+     * interface subsystem.
+     * 
+     * @return boolean
+     */
+    public boolean isSubsystemGUI() {
+        String value = subsystem.getValue();
+        return value.equals("gui");
+    }
+    /**
+     * Sets the output type (execuable, shared, etc).
+     * 
+     * @param outputType,
+     *            may not be null
+     */
+    public void setOutputType(OutputTypeEnum outputType) {
+        if (outputType == null) {
+            throw new IllegalArgumentException("outputType");
+        }
+        this.outputType = outputType;
+    }
+    /**
+     * Requests use of a static runtime library.
+     * 
+     * @param staticRuntime
+     *            if true, use static runtime library if possible.
+     */
+    public void setStaticRuntime(boolean staticRuntime) {
+        this.staticRuntime = staticRuntime;
+    }
+    /**
+     * Sets the subsystem (gui, console, etc).
+     * 
+     * @param subsystem
+     *            subsystem, may not be null
+     */
+    public void setSubsystem(SubsystemEnum subsystem) {
+        if (subsystem == null) {
+            throw new IllegalArgumentException("subsystem");
+        }
+        this.subsystem = subsystem;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java
new file mode 100644
index 0000000000..776a808ac7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Linker.java
@@ -0,0 +1,57 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+/**
+ * A linker for executables, and static and dynamic libraries.
+ * 
+ * @author Adam Murdoch
+ */
+public interface Linker extends Processor {
+    /**
+     * Extracts the significant part of a library name to ensure there aren't
+     * collisions
+     */
+    String getLibraryKey(File libname);
+    /**
+     * returns the library path for the linker
+     */
+    File[] getLibraryPath();
+    /**
+     * Returns a set of filename patterns corresponding to library names.
+     * 
+     * For example, "advapi32" would be expanded to "advapi32.dll" by
+     * DevStudioLinker and to "libadvapi32.a" and "libadvapi32.so" by
+     * GccLinker.
+     * 
+     * @param libnames
+     *            array of library names
+     */
+    String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libraryType);
+    /**
+     * Gets the linker for the specified link type.
+     * 
+     * @return appropriate linker or null, will return this if this linker can
+     *         handle the specified link type
+     */
+    Linker getLinker(LinkType linkType);
+    /**
+     * Returns true if the linker is case-sensitive
+     */
+    boolean isCaseSensitive();
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
new file mode 100644
index 0000000000..c2d62c4137
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java
@@ -0,0 +1,31 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.TargetInfo;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * A configuration for a linker
+ * 
+ * @author Curt Arnold
+ */
+public interface LinkerConfiguration extends ProcessorConfiguration {
+    public LinkerParam getParam(String name);
+    void link(CCTask task, TargetInfo linkTarget) throws BuildException;
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
new file mode 100644
index 0000000000..eb64119299
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java
@@ -0,0 +1,43 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * A command line C compiler that can utilize precompilation of header files
+ * 
+ * @author Curt Arnold
+ */
+public abstract class PrecompilingCommandLineCCompiler
+        extends
+            PrecompilingCommandLineCompiler {
+    protected PrecompilingCommandLineCCompiler(String command,
+            String identifierArg, String[] sourceExtensions,
+            String[] headerExtensions, String outputSuffix, boolean libtool,
+            PrecompilingCommandLineCCompiler libtoolCompiler,
+            boolean newEnvironment, Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                outputSuffix, libtool, libtoolCompiler, newEnvironment, env);
+    }
+    protected Parser createParser(File source) {
+        return new CParser();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
new file mode 100644
index 0000000000..6e3c145675
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java
@@ -0,0 +1,104 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+/**
+ * A command line C compiler that can utilize precompilation of header files
+ * 
+ * @author Curt Arnold
+ */
+public abstract class PrecompilingCommandLineCompiler
+        extends
+            CommandLineCompiler implements PrecompilingCompiler {
+    protected PrecompilingCommandLineCompiler(String command,
+            String identifierArg, String[] sourceExtensions,
+            String[] headerExtensions, String outputSuffix, boolean libtool,
+            PrecompilingCommandLineCompiler libtoolCompiler,
+            boolean newEnvironment, Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                outputSuffix, libtool, libtoolCompiler, newEnvironment, env);
+    }
+    /**
+     * 
+     * This method may be used to get two distinct compiler configurations, one
+     * for compiling the specified file and producing a precompiled header
+     * file, and a second for compiling other files using the precompiled
+     * header file.
+     * 
+     * The last (preferrably only) include directive in the prototype file will
+     * be used to mark the boundary between pre-compiled and normally compiled
+     * headers.
+     * 
+     * @param config
+     *            base configuration
+     * @param prototype
+     *            A source file (for example, stdafx.cpp) that is used to build
+     *            the precompiled header file. @returns null if precompiled
+     *            headers are not supported or a two element array containing
+     *            the precompiled header generation configuration and the
+     *            consuming configuration
+     *  
+     */
+    public CompilerConfiguration[] createPrecompileConfigurations(
+            CompilerConfiguration config, File prototype, String[] exceptFiles) {
+        //
+        //   cast should success or someone is passing us a configuration
+        //      that was prepared by another processor
+        //
+        CommandLineCompilerConfiguration cmdLineConfig = (CommandLineCompilerConfiguration) config;
+        //
+        //   parse prototype file to determine last header
+        //
+        Parser parser = createParser(prototype);
+        String[] includes;
+        try {
+            Reader reader = new BufferedReader(new FileReader(prototype));
+            parser.parse(reader);
+            includes = parser.getIncludes();
+        } catch (IOException ex) {
+            throw new BuildException(
+                    "Error parsing precompiled header protoype: "
+                            + prototype.toString() + ":" + ex.toString());
+        }
+        if (includes.length == 0) {
+            throw new BuildException("Precompiled header prototype: "
+                    + prototype.toString()
+                    + " does not contain any include directives.");
+        }
+        CompilerConfiguration[] configs = new CompilerConfiguration[2];
+        configs[0] = createPrecompileGeneratingConfig(cmdLineConfig, prototype,
+                includes[0]);
+        configs[1] = createPrecompileUsingConfig(cmdLineConfig, prototype,
+                includes[0], exceptFiles);
+        return configs;
+    }
+    abstract protected CompilerConfiguration createPrecompileGeneratingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude);
+    abstract protected CompilerConfiguration createPrecompileUsingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude, String[] exceptFiles);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
new file mode 100644
index 0000000000..e60b1da8e6
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java
@@ -0,0 +1,49 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import java.io.File;
+/**
+ * A compiler that can utilize precompilation of header files
+ * 
+ * @author Curt Arnold
+ */
+public interface PrecompilingCompiler {
+    /**
+     * 
+     * This method may be used to get two distinct compiler configurations, one
+     * for compiling the specified file and producing a precompiled header
+     * file, and a second for compiling other files using the precompiled
+     * header file.
+     * 
+     * The last (preferrably only) include directive in the prototype file will
+     * be used to mark the boundary between pre-compiled and normally compiled
+     * headers.
+     * 
+     * @param config
+     *            base configuration
+     * @param prototype
+     *            A source file (for example, stdafx.cpp) that is used to build
+     *            the precompiled header file. @returns null if precompiled
+     *            headers are not supported or a two element array containing
+     *            the precompiled header generation configuration and the
+     *            consuming configuration
+     *  
+     */
+    CompilerConfiguration[] createPrecompileConfigurations(
+            CompilerConfiguration config, File prototype,
+            String[] nonPrecompiledFiles);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java
new file mode 100644
index 0000000000..6fb74e9ea3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/Processor.java
@@ -0,0 +1,73 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.TargetDef;
+import org.apache.tools.ant.types.Environment;
+/**
+ * A processor. Base interface for Compiler and Linker
+ * 
+ * @author Curt Arnold
+ */
+public interface Processor {
+    /**
+     * Returns a bid indicating the desire of this compiler to process the
+     * file.
+     * 
+     * @param inputFile
+     *            input file
+     * @return 0 = no interest, 100 = high interest
+     */
+    int bid(String inputFile);
+    Processor changeEnvironment(boolean newEnvironment, Environment env);
+    /**
+     * Returns the compiler configuration for <cc>or <compiler>element.
+     * 
+     * @param defaultProviders
+     *            When specificConfig corresponds to a <compiler>or linker
+     *            element, defaultProvider will be a zero to two element array.
+     *            If there is an extends attribute, the first element will be
+     *            the referenced ProcessorDef, unless inherit = false, the last
+     *            element will be the containing <cc>element
+     * @param specificConfig
+     *            A <cc>or <compiler>element.
+     * @return resulting configuration
+     */
+    ProcessorConfiguration createConfiguration(CCTask task, LinkType linkType,
+            ProcessorDef[] defaultProviders, ProcessorDef specificConfig,
+			TargetDef targetPlatform);
+    /**
+     * Retrieve an identifier that identifies the specific version of the
+     * compiler. Compilers with the same identifier should produce the same
+     * output files for the same input files and command line switches.
+     */
+    String getIdentifier();
+    /**
+     * Gets the linker that is associated with this processors
+     */
+    Linker getLinker(LinkType type);
+    /**
+     * Output file name (no path components) corresponding to source file
+     * 
+     * @param inputFile
+     *            input file
+     * @return output file name or null if no output file or name not
+     *         determined by input file
+     */
+    String getOutputFileName(String inputFile);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
new file mode 100644
index 0000000000..dd75483d6d
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+import net.sf.antcontrib.cpptasks.ProcessorParam;
+/**
+ * A configuration for a C++ compiler, linker or other processor
+ * 
+ * @author Curt Arnold
+ */
+public interface ProcessorConfiguration {
+    /**
+     * An indication of how much this compiler would like to process this file
+     * 
+     * @return 0 is no interest to process, 100 is strong interest to process
+     */
+    int bid(String filename);
+    /**
+     * Returns a string representation of this configuration. Should be
+     * canonical so that equivalent configurations will have equivalent string
+     * representations
+     */
+    String getIdentifier();
+    /**
+     * Output file name (no path components) corresponding to source file
+     * 
+     * @param inputFile
+     *            input file
+     * @return output file name or null if no output file or name not
+     *         determined by input file
+     */
+    String getOutputFileName(String inputFile);
+    ProcessorParam[] getParams();
+    /**
+     * If true, all files using this configuration should be rebuilt and any
+     * existing output files should be ignored
+     */
+    boolean getRebuild();
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
new file mode 100644
index 0000000000..2206ed874e
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java
@@ -0,0 +1,31 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.compiler;
+/**
+ * Interface to receive notification of compile progress
+ * 
+ * @author Curt Arnold
+ */
+public interface ProgressMonitor {
+    public void finish(ProcessorConfiguration config, boolean normal);
+    /**
+     * Called to notify monitor of progress
+     *  
+     */
+    void progress(String[] sources);
+    public void start(ProcessorConfiguration config);
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java
new file mode 100644
index 0000000000..f0be5945a3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java
@@ -0,0 +1,70 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineAslcompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+/**
+ * Adaptor for Microsoft ASL compiler.
+ * 
+ */
+public final class DevStudioAslcompiler extends CommandLineAslcompiler {
+    private final static String[] sourceExtensions = new String[] { ".asl" };
+
+    private final static String[] headerExtensions = new String[] {};
+
+    private final static String[] defaultflags = new String[] {};
+
+    private static final DevStudioAslcompiler instance = new DevStudioAslcompiler(
+                    "asl", sourceExtensions, headerExtensions, false);
+
+    /**
+     * Gets asl adapter
+     */
+    public static DevStudioAslcompiler getInstance() {
+        return instance;
+    }
+
+    /**
+     * Private constructor. Use DevStudioAslcompiler.getInstance() to get
+     * singleton instance of this class.
+     */
+    private DevStudioAslcompiler (String command, String[] sourceExtensions,
+                    String[] headerExtensions, boolean isLibtool) {
+        super(command, null, sourceExtensions, headerExtensions, ".aml");
+    }
+
+    public void addImpliedArgs(Vector args, boolean debug, Boolean defaultflag) {
+        if (defaultflag != null && defaultflag.booleanValue()) {
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+    }
+
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+
+    public Linker getLinker(LinkType linkType) {
+        return DevStudioLinker.getInstance().getLinker(linkType);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java
new file mode 100644
index 0000000000..23d319ecd9
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java
@@ -0,0 +1,84 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineAssembler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+/**
+ * Adaptor for Microsoft MASM
+ * 
+ */
+public final class DevStudioAssembler extends CommandLineAssembler {
+    private final static String[] sourceExtensions = new String[] { ".asm" };
+
+    private final static String[] headerExtensions = new String[] { ".h",
+                    ".inc" };
+
+    private final static String[] defaultflags = new String[] { "/nologo", "/c" };
+
+    private static final DevStudioAssembler instance = new DevStudioAssembler(
+                    "ml", sourceExtensions, headerExtensions, false);
+
+    /**
+     * Gets masm adapter
+     */
+    public static DevStudioAssembler getInstance() {
+        return instance;
+    }
+
+    /**
+     * Private constructor. Use DevStudioAssembler.getInstance() to get
+     * singleton instance of this class.
+     */
+    private DevStudioAssembler (String command, String[] sourceExtensions,
+                    String[] headerExtensions, boolean isLibtool) {
+        super(command, null, sourceExtensions, headerExtensions, ".obj");
+    }
+
+    public void addImpliedArgs(Vector args, boolean debug, Boolean defaultflag) {
+        if (defaultflag != null && defaultflag.booleanValue()) {
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+        if (debug) {
+            args.addElement("Zi");
+        }
+    }
+
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+
+    public Linker getLinker(LinkType linkType) {
+        return DevStudioLinker.getInstance().getLinker(linkType);
+    }
+
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+
+    protected String getIncludeDirSwitch(String includeDir) {
+        return "/I" + includeDir.replace('/', '\\');
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
new file mode 100644
index 0000000000..3bb5181250
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
@@ -0,0 +1,50 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Microsoft(r) C/C++ Optimizing Compiler
+ * 
+ * @author Adam Murdoch
+ */
+public final class DevStudioCCompiler extends DevStudioCompatibleCCompiler {
+    private static final DevStudioCCompiler instance = new DevStudioCCompiler(
+            "cl", false, null);
+    public static DevStudioCCompiler getInstance() {
+        return instance;
+    }
+    private DevStudioCCompiler(String command, boolean newEnvironment,
+            Environment env) {
+        super(command, "/bogus", newEnvironment, env);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new DevStudioCCompiler(getCommand(), newEnvironment, env);
+        }
+        return this;
+    }
+    public Linker getLinker(LinkType type) {
+        return DevStudioLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 4096;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
new file mode 100644
index 0000000000..5e29a323c7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java
@@ -0,0 +1,136 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.CompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.PrecompilingCommandLineCCompiler;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * An abstract base class for compilers that are basically command line
+ * compatible with Microsoft(r) C/C++ Optimizing Compiler
+ *
+ * @author Curt Arnold
+ */
+public abstract class DevStudioCompatibleCCompiler
+        extends
+            PrecompilingCommandLineCCompiler {
+    private static String[] mflags = new String[]{
+    //
+            //   first four are single-threaded
+            //      (runtime=static,debug=false), (..,debug=true),
+            //      (runtime=dynamic,debug=true), (..,debug=false), (not supported)
+            //    next four are multi-threaded, same sequence
+            "/ML", "/MLd", null, null, "/MT", "/MTd", "/MD", "/MDd"};
+    private static String[] defaultflags = new String[]{"/nologo", "/c"};
+    protected DevStudioCompatibleCCompiler(String command,
+            String identifierArg, boolean newEnvironment, Environment env) {
+        super(command, identifierArg, new String[]{".c", ".cc", ".cpp", ".cxx",
+                ".c++"}, new String[]{".h", ".hpp", ".inl"}, ".obj", false,
+                null, newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args,
+                    final boolean debug,
+            final boolean multithreaded,
+                        final boolean exceptions,
+                        final LinkType linkType,
+                        final Boolean rtti,
+                        final OptimizationEnum optimization,
+                        final Boolean defaultflag) {
+        if (defaultflag != null && defaultflag.booleanValue()) {
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+        if (exceptions) {
+            args.addElement("/GX");
+        }
+        int mindex = 0;
+        if (multithreaded) {
+            mindex += 4;
+        }
+        boolean staticRuntime = linkType.isStaticRuntime();
+        if (!staticRuntime) {
+            mindex += 2;
+        }
+        if (debug) {
+            mindex += 1;
+            args.addElement("/Zi");
+            args.addElement("/Od");
+            args.addElement("/GZ");
+            args.addElement("/D_DEBUG");
+        } else {
+                if (optimization != null) {
+                   if (optimization.isSize()) {
+                     args.addElement("/O1");
+                   }
+                   if (optimization.isSpeed()) {
+                     args.addElement("/O2");
+                   }
+                }
+            args.addElement("/DNDEBUG");
+        }
+        String mflag = mflags[mindex];
+        if (mflag == null) {
+            throw new BuildException(
+                    "multithread='false' and runtime='dynamic' not supported");
+        }
+        args.addElement(mflag);
+        if (rtti != null && rtti.booleanValue()) {
+                args.addElement("/GR");
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        DevStudioProcessor.addWarningSwitch(args, level);
+    }
+    protected CompilerConfiguration createPrecompileGeneratingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude) {
+        String[] additionalArgs = new String[]{
+                "/Fp" + CUtil.getBasename(prototype) + ".pch", "/Yc"};
+        return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
+                null, true);
+    }
+    protected CompilerConfiguration createPrecompileUsingConfig(
+            CommandLineCompilerConfiguration baseConfig, File prototype,
+            String lastInclude, String[] exceptFiles) {
+        String[] additionalArgs = new String[]{
+                "/Fp" + CUtil.getBasename(prototype) + ".pch",
+                "/Yu" + lastInclude};
+        return new CommandLineCompilerConfiguration(baseConfig, additionalArgs,
+                exceptFiles, false);
+    }
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        DevStudioProcessor.getDefineSwitch(buffer, define, value);
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
+    }
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        DevStudioProcessor.getUndefineSwitch(buffer, define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
new file mode 100644
index 0000000000..40bef6e239
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java
@@ -0,0 +1,86 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+/**
+ * Abstract base adapter for librarians with command line options compatible
+ * with the Microsoft(r) Library Manager
+ * 
+ * @author Curt Arnold
+ */
+public abstract class DevStudioCompatibleLibrarian extends CommandLineLinker {
+    private static String[] defaultflags = new String[]{"/nologo"};
+    public DevStudioCompatibleLibrarian(String command, String identifierArg) {
+        super(command, identifierArg, new String[]{".obj"}, new String[0],
+                ".lib", false, null);
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, 
+        Vector args, Boolean defaultflag) {
+        if(defaultflag != null && defaultflag.booleanValue()){
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    protected String getCommandFileSwitch(String cmdFile) {
+        return "@" + cmdFile;
+    }
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return new String[0];
+    }
+    public int getMaximumCommandLength() {
+        return 4096;
+    }
+    public String[] getOutputFileSwitch(String outFile) {
+        StringBuffer buf = new StringBuffer("/OUT:");
+        if (outFile.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(outFile);
+            buf.append('"');
+        } else {
+            buf.append(outFile);
+        }
+        return new String[]{buf.toString()};
+    }
+    public boolean isCaseSensitive() {
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
new file mode 100644
index 0000000000..9e156b0426
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java
@@ -0,0 +1,127 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+/**
+ * Abstract base class for linkers that try to mimic the command line arguments
+ * for the Microsoft (r) Incremental Linker
+ * 
+ * @author Curt Arnold
+ */
+public abstract class DevStudioCompatibleLinker extends CommandLineLinker {
+    private static String[] defaultflags = new String[]{"/NOLOGO"};
+    public DevStudioCompatibleLinker(String command, String identifierArg,
+            String outputSuffix) {
+        super(command, identifierArg, new String[]{".obj", ".lib", ".res"},
+                new String[]{".map", ".pdb", ".lnk", ".dll"}, outputSuffix,
+                false, null);
+    }
+    protected void addBase(long base, Vector args) {
+        if (base >= 0) {
+            String baseAddr = Long.toHexString(base);
+            args.addElement("/BASE:0x" + baseAddr);
+        }
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+        if (fixed != null) {
+            if (fixed.booleanValue()) {
+                args.addElement("/FIXED");
+            } else {
+                args.addElement("/FIXED:NO");
+            }
+        }
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType,
+        Vector args, Boolean defaultflag) {
+        if(defaultflag != null && defaultflag.booleanValue()){
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+        if (debug) {
+            args.addElement("/DEBUG");
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("/DLL");
+        }
+        /*
+         * if(linkType.isSubsystemGUI()) {
+         * args.addElement("/SUBSYSTEM:WINDOWS"); } else {
+         * if(linkType.isSubsystemConsole()) {
+         * args.addElement("/SUBSYSTEM:CONSOLE"); } }
+         */
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+        if (incremental) {
+            args.addElement("/INCREMENTAL:YES");
+        } else {
+            args.addElement("/INCREMENTAL:NO");
+        }
+    }
+    protected void addMap(boolean map, Vector args) {
+        if (map) {
+            args.addElement("/MAP");
+        }
+    }
+    protected void addStack(int stack, Vector args) {
+        if (stack >= 0) {
+            String stackStr = Integer.toHexString(stack);
+            args.addElement("/STACK:0x" + stackStr);
+        }
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    	if (entry != null) {
+    		args.addElement("/ENTRY:" + entry);
+    	}
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("LIB", ";");
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length];
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(libnames[i]);
+            buf.append(".lib");
+            patterns[i] = buf.toString();
+        }
+        return patterns;
+    }
+    public int getMaximumCommandLength() {
+        return 4096;
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"/OUT:" + outputFile};
+    }
+    public boolean isCaseSensitive() {
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
new file mode 100644
index 0000000000..06eac71e19
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java
@@ -0,0 +1,36 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+/**
+ * Adapter for the Microsoft (r) Library Manager
+ * 
+ * @author Curt Arnold
+ */
+public final class DevStudioLibrarian extends DevStudioCompatibleLibrarian {
+    private static final DevStudioLibrarian instance = new DevStudioLibrarian();
+    public static DevStudioLibrarian getInstance() {
+        return instance;
+    }
+    private DevStudioLibrarian() {
+        super("lib", "/bogus");
+    }
+    public Linker getLinker(LinkType type) {
+        return DevStudioLinker.getInstance().getLinker(type);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
new file mode 100644
index 0000000000..7ae0178a8b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java
@@ -0,0 +1,44 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+/**
+ * Adapter for the Microsoft (r) Incremental Linker
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public final class DevStudioLinker extends DevStudioCompatibleLinker {
+    private static final DevStudioLinker dllLinker = new DevStudioLinker(".dll");
+    private static final DevStudioLinker instance = new DevStudioLinker(".exe");
+    public static DevStudioLinker getInstance() {
+        return instance;
+    }
+    private DevStudioLinker(String outputSuffix) {
+        super("link", "/DLL", outputSuffix);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        if (type.isStaticLibrary()) {
+            return DevStudioLibrarian.getInstance();
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
new file mode 100644
index 0000000000..7df898b92f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java
@@ -0,0 +1,113 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * Adapter for the Microsoft (r) MIDL Compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class DevStudioMIDLCompiler extends CommandLineCompiler {
+    private static final DevStudioMIDLCompiler instance = new DevStudioMIDLCompiler(
+            false, null);
+    public static DevStudioMIDLCompiler getInstance() {
+        return instance;
+    }
+    private DevStudioMIDLCompiler(boolean newEnvironment, Environment env) {
+        super("midl", null, new String[]{".idl", ".odl"}, new String[]{},
+                ".tlb", false, null, newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        DevStudioProcessor.addWarningSwitch(args, level);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new DevStudioMIDLCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    /**
+     * The include parser for C will work just fine, but we didn't want to
+     * inherit from CommandLineCCompiler
+     */
+    protected Parser createParser(File source) {
+        return new CParser();
+    }
+    protected int getArgumentCountPerInputFile() {
+        return 3;
+    }
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        DevStudioProcessor.getDefineSwitch(buffer, define, value);
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
+    }
+    protected String getInputFileArgument(File outputDir, String filename,
+            int index) {
+        switch (index) {
+            case 0 :
+                return "/tlb";
+            case 1 :
+                return new File(outputDir, getOutputFileName(filename))
+                        .getAbsolutePath();
+        }
+        return filename;
+    }
+    public Linker getLinker(LinkType type) {
+        return DevStudioLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    protected int getMaximumInputFilesPerCommand() {
+        return 1;
+    }
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+            String inputFile) {
+        String arg1 = getInputFileArgument(outputDir, inputFile, 0);
+        String arg2 = getInputFileArgument(outputDir, inputFile, 1);
+        String arg3 = getInputFileArgument(outputDir, inputFile, 2);
+        return arg1.length() + arg2.length() + arg3.length() + 3;
+    }
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        DevStudioProcessor.getUndefineSwitch(buffer, define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
new file mode 100644
index 0000000000..6b2af7ed54
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java
@@ -0,0 +1,90 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.util.Vector;
+/**
+ * A add-in class for Microsoft Developer Studio processors
+ * 
+ *  
+ */
+public class DevStudioProcessor {
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("/W0");
+                break;
+            case 1 :
+                args.addElement("/W1");
+                break;
+            case 2 :
+                break;
+            case 3 :
+                args.addElement("/W3");
+                break;
+            case 4 :
+                args.addElement("/W4");
+                break;
+            case 5 :
+                args.addElement("/WX");
+                break;
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        if (cmdFile.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(cmdFile.replace('/', '\\'));
+            buf.append('\"');
+        } else {
+            buf.append(cmdFile);
+        }
+        return buf.toString();
+    }
+    public static void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("/D");
+        buffer.append(define);
+        if (value != null && value.length() > 0) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return "/I" + includeDir.replace('/', '\\');
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        StringBuffer buf = new StringBuffer("/Fo");
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+        String[] retval = new String[]{buf.toString()};
+        return retval;
+    }
+    public static void getUndefineSwitch(StringBuffer buffer, String define) {
+        buffer.append("/U");
+        buffer.append(define);
+    }
+    public static boolean isCaseSensitive() {
+        return false;
+    }
+    private DevStudioProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
new file mode 100644
index 0000000000..d6e2fd4442
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java
@@ -0,0 +1,117 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.devstudio;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Microsoft (r) Windows 32 Resource Compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class DevStudioResourceCompiler extends CommandLineCompiler {
+    private static final DevStudioResourceCompiler instance = new DevStudioResourceCompiler(
+            false, null);
+    public static DevStudioResourceCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private DevStudioResourceCompiler(boolean newEnvironment, Environment env) {
+        super("rc", null, new String[]{".rc"}, new String[]{".h", ".hpp",
+                ".inl"}, ".res", false, null, newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        if (debug) {
+            args.addElement("/D_DEBUG");
+        } else {
+            args.addElement("/DNDEBUG");
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new DevStudioResourceCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    /**
+     * The include parser for C will work just fine, but we didn't want to
+     * inherit from CommandLineCCompiler
+     */
+    protected Parser createParser(File source) {
+        return new CParser();
+    }
+    protected int getArgumentCountPerInputFile() {
+        return 2;
+    }
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        DevStudioProcessor.getDefineSwitch(buffer, define, value);
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ";");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
+    }
+    protected String getInputFileArgument(File outputDir, String filename,
+            int index) {
+        if (index == 0) {
+            String outputFileName = getOutputFileName(filename);
+            String fullOutputName = new File(outputDir, outputFileName)
+                    .toString();
+            return "/fo" + fullOutputName;
+        }
+        return filename;
+    }
+    public Linker getLinker(LinkType type) {
+        return DevStudioLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    protected int getMaximumInputFilesPerCommand() {
+        return 1;
+    }
+    protected int getTotalArgumentLengthForInputFile(File outputDir,
+            String inputFile) {
+        String arg1 = getInputFileArgument(outputDir, inputFile, 0);
+        String arg2 = getInputFileArgument(outputDir, inputFile, 1);
+        return arg1.length() + arg2.length() + 2;
+    }
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        DevStudioProcessor.getUndefineSwitch(buffer, define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
new file mode 100644
index 0000000000..f7bb2eab95
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java
@@ -0,0 +1,106 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the "ar" tool
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public abstract class AbstractArLibrarian extends CommandLineLinker {
+    private/* final */
+    String outputPrefix;
+    private static String[] defaultflags = new String[]{};
+    protected AbstractArLibrarian(String command, String identificationArg,
+            String[] inputExtensions, String[] ignoredExtensions,
+            String outputPrefix, String outputExtension, boolean isLibtool,
+            AbstractArLibrarian libtoolLibrarian) {
+        super(command, identificationArg, inputExtensions, ignoredExtensions,
+                outputExtension, isLibtool, libtoolLibrarian);
+        this.outputPrefix = outputPrefix;
+    }
+    public void addBase(long base, Vector args) {
+    }
+    public void addFixed(Boolean fixed, Vector args) {
+    }
+    public void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if(defaultflag != null && defaultflag.booleanValue()){
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+    }
+    public void addIncremental(boolean incremental, Vector args) {
+    }
+    public void addMap(boolean map, Vector args) {
+    }
+    public void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return null;
+    }
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+    	return new String[0];
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    public String getOutputFileName(String baseName) {
+        return outputPrefix + super.getOutputFileName(baseName);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return GccProcessor.getOutputFileSwitch("rvs", outputFile);
+    }
+    public boolean isCaseSensitive() {
+        return true;
+    }
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        //
+        //   if there is an existing library then
+        //      we must delete it before executing "ar"
+        if (outputFile.exists()) {
+            if (!outputFile.delete()) {
+                throw new BuildException("Unable to delete "
+                        + outputFile.getAbsolutePath());
+            }
+        }
+        //
+        //   delegate to CommandLineLinker
+        //
+        super.link(task, outputFile, sourceFiles, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
new file mode 100644
index 0000000000..f6e376643f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java
@@ -0,0 +1,323 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Abstract adapter for ld-like linkers
+ * 
+ * @author Curt Arnold
+ */
+public abstract class AbstractLdLinker extends CommandLineLinker {
+    private String outputPrefix;
+    private static String[] defaultflags = new String[]{};
+    protected AbstractLdLinker(String command, String identifierArg,
+            String[] extensions, String[] ignoredExtensions,
+            String outputPrefix, String outputSuffix, boolean isLibtool,
+            AbstractLdLinker libtoolLinker) {
+        super(command, identifierArg, extensions, ignoredExtensions,
+                outputSuffix, isLibtool, libtoolLinker);
+        this.outputPrefix = outputPrefix;
+    }
+    public void addBase(long base, Vector args) {
+    	if (base >= 0) {
+    		args.addElement("--image-base");
+    		args.addElement(Long.toHexString(base));
+    	}
+    }
+    public void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if(defaultflag != null && defaultflag.booleanValue()){
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+        if (debug) {
+            args.addElement("-g");
+        }
+        if (isDarwin()) {
+            if (linkType.isPluginModule()) {
+                args.addElement("-bundle");
+            } else {
+                if (linkType.isSharedLibrary()) {
+                    args.addElement("-prebind");
+                    args.addElement("-dynamiclib");
+                }
+            }
+        } else {
+            if (linkType.isStaticRuntime()) {
+                args.addElement("-static");
+            }
+            if (linkType.isPluginModule()) {
+                args.addElement("-shared");
+            } else {
+                if (linkType.isSharedLibrary()) {
+                    args.addElement("-shared");
+                }
+            }
+        }
+    }
+    public void addIncremental(boolean incremental, Vector args) {
+    	if (incremental) {
+    		args.addElement("-i");
+    	}
+    }
+    protected int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    public String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        Vector libnames = new Vector();
+        super.addLibrarySets(task, libsets, preargs, midargs, endargs);
+        LibraryTypeEnum previousLibraryType = null;
+        for (int i = 0; i < libsets.length; i++) {
+            LibrarySet set = libsets[i];
+            File libdir = set.getDir(null);
+            String[] libs = set.getLibs();
+            if (libdir != null) {
+            	if (set.getType() != null && 
+            			"framework".equals(set.getType().getValue()) &&
+						isDarwin()) {
+            		endargs.addElement("-F" + libdir.getAbsolutePath());            		
+            	} else {
+            		endargs.addElement("-L" + libdir.getAbsolutePath());
+            	}
+            }
+            //
+            //  if there has been a change of library type
+            //
+            if (set.getType() != previousLibraryType) {
+            	if (set.getType() != null && "static".equals(set.getType().getValue())) {
+            		endargs.addElement("-Bstatic");
+            		previousLibraryType = set.getType();
+            	} else {
+            		if (set.getType() == null || 
+            				!"framework".equals(set.getType().getValue()) ||
+							!isDarwin()) {
+            			endargs.addElement("-Bdynamic");
+            			previousLibraryType = set.getType();
+            		}
+            	}
+            }
+            StringBuffer buf = new StringBuffer("-l");
+            if (set.getType() != null && 
+            		"framework".equals(set.getType().getValue()) && 
+					isDarwin()) {
+            	buf.setLength(0);
+            	buf.append("-framework ");
+            }
+            int initialLength = buf.length();
+            for (int j = 0; j < libs.length; j++) {
+                //
+                //  reset the buffer to just "-l"
+                //
+                buf.setLength(initialLength);
+                //
+                //  add the library name
+                buf.append(libs[j]);
+                libnames.addElement(libs[j]);
+                //
+                //  add the argument to the list
+                endargs.addElement(buf.toString());
+            }
+        }
+        String rc[] = new String[libnames.size()];
+        for (int i = 0; i < libnames.size(); i++) {
+            rc[i] = (String) libnames.elementAt(i);
+        }
+        return rc;
+    }
+    public void addMap(boolean map, Vector args) {
+    	if (map) {
+    		args.addElement("-M");
+    	}
+    }
+    public void addStack(int stack, Vector args) {
+    	if (stack > 0) {
+    		args.addElement("--stack");
+    		args.addElement(Integer.toString(stack));
+    	}
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    	if (entry != null) {
+    		args.addElement("-e");
+    		args.addElement(entry);
+    	}
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        throw new IllegalStateException("ld does not support command files");
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("LIB", ":");
+    }
+    public String getLibraryKey(File libfile) {
+        String libname = libfile.getName();
+        int lastDot = libname.lastIndexOf('.');
+        if (lastDot >= 0) {
+            return libname.substring(0, lastDot);
+        }
+        return libname;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        int patternCount = libnames.length;
+        if (libType == null) {
+        	patternCount *= 2;
+        }
+        String[] patterns = new String[patternCount];
+        int offset = 0;
+        if (libType == null || "static".equals(libType.getValue())) {
+        	offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        }
+        if (libType != null && "framework".equals(libType.getValue()) && isDarwin()) {
+        	for(int i = 0; i < libnames.length; i++) {
+        		buf.setLength(0);
+        		buf.append(libnames[i]);
+        		buf.append(".framework/");
+        		buf.append(libnames[i]);
+        		patterns[offset++] = buf.toString();
+        	}
+        } else {
+        	if (libType == null || !"static".equals(libType.getValue())) {
+        		if (isHPUX()) {
+        			offset = addLibraryPatterns(libnames, buf, "lib", ".sl", patterns,
+        					offset);
+        		} else {
+        			offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns,
+        					offset);
+        		}
+        	}
+        }
+        return patterns;
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    public String getOutputFileName(String baseName) {
+        return outputPrefix + super.getOutputFileName(baseName);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return GccProcessor.getOutputFileSwitch("-o", outputFile);
+    }
+    public boolean isCaseSensitive() {
+        return true;
+    }
+    protected boolean isHPUX() {
+        String osname = System.getProperty("os.name").toLowerCase();
+        if (osname.indexOf("hp") >= 0 && osname.indexOf("ux") >= 0) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Prepares argument list for exec command. Will return null if command
+     * line would exceed allowable command line buffer.
+     * 
+     * @param outputFile
+     *            linker output file
+     * @param sourceFiles
+     *            linker input files (.obj, .o, .res)
+     * @param args
+     *            linker arguments
+     * @return arguments for runTask
+     */
+    public String[] prepareArguments(CCTask task, String outputDir,
+            String outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) {
+        //
+        //   need to suppress sources that correspond to
+        //        library set entries since they are already
+        //        in the argument list
+        String[] libnames = config.getLibraryNames();
+        if (libnames == null || libnames.length == 0) {
+            return super.prepareArguments(task, outputDir, outputFile,
+                    sourceFiles, config);
+        }
+        //
+        //
+        //   null out any sources that correspond to library names
+        //
+        String[] localSources = (String[]) sourceFiles.clone();
+        int extra = 0;
+        for (int i = 0; i < libnames.length; i++) {
+            String libname = libnames[i];
+            for (int j = 0; j < localSources.length; j++) {
+                if (localSources[j] != null
+                        && localSources[j].indexOf(libname) > 0
+                        && localSources[j].indexOf("lib") > 0) {
+                    String filename = new File(localSources[j]).getName();
+                    if (filename.startsWith("lib")
+                            && filename.substring(3).startsWith(libname)) {
+                        String extension = filename
+                                .substring(libname.length() + 3);
+                        if (extension.equals(".a") || extension.equals(".so")
+                                || extension.equals(".sl")) {
+                            localSources[j] = null;
+                            extra++;
+                        }
+                    }
+                }
+            }
+        }
+        if (extra == 0) {
+            return super.prepareArguments(task, outputDir, outputFile,
+                    sourceFiles, config);
+        }
+        String[] finalSources = new String[localSources.length - extra];
+        int index = 0;
+        for (int i = 0; i < localSources.length; i++) {
+            if (localSources[i] != null) {
+                finalSources[index++] = localSources[i];
+            }
+        }
+        return super.prepareArguments(task, outputDir, outputFile,
+                finalSources, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java
new file mode 100644
index 0000000000..412bffa847
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccAssembler.java
@@ -0,0 +1,76 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineAssembler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+/**
+ * Adapter for gcc assemble
+ * 
+ */
+public final class GccAssembler extends CommandLineAssembler {
+    private final static String[] sourceExtensions = new String[] { ".asm" };
+
+    private final static String[] headerExtensions = new String[] { ".h",
+                    ".inc" };
+
+    private static final GccAssembler instance = new GccAssembler("gas",
+                    sourceExtensions, headerExtensions, false);
+
+    /**
+     * Gets gcc adapter
+     */
+    public static GccAssembler getInstance() {
+        return instance;
+    }
+
+    /**
+     * Private constructor. Use GccAssembler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private GccAssembler (String command, String[] sourceExtensions,
+                    String[] headerExtensions, boolean isLibtool) {
+        super(command, null, sourceExtensions, headerExtensions,
+                        isLibtool ? ".fo" : ".o");
+    }
+
+    public void addImpliedArgs(Vector args, boolean debug, Boolean defaultflag) {
+
+    }
+
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+
+    public Linker getLinker(LinkType linkType) {
+        return GccLinker.getInstance().getLinker(linkType);
+    }
+
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+
+    protected String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
new file mode 100644
index 0000000000..af3b26b134
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
@@ -0,0 +1,243 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.FortranParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * Adapter for the GCC C/C++ compiler
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccCCompiler extends GccCompatibleCCompiler {
+    private final static String[] sourceExtensions = new String[]{".c", /* C */
+            ".cc", /* C++ */
+            ".cpp", /* C++ */
+            ".cxx", /* C++ */
+            ".c++", /* C++ */
+            ".i", /* preprocessed C */
+            ".ii", /* preprocessed C++ */
+            ".f", /* FORTRAN */
+            ".for", /* FORTRAN */
+            ".m", /* Objective-C */
+            ".mm", /* Objected-C++ */
+            ".s" /* Assembly */
+            };
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+    ".inl"};
+    private static final GccCCompiler cppInstance = new GccCCompiler("c++",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("c++", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler g77Instance = new GccCCompiler("g77",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("g77", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler gppInstance = new GccCCompiler("g++",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("g++", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler instance = new GccCCompiler("gcc",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("gcc", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    /**
+     * Gets c++ adapter
+     */
+    public static GccCCompiler getCppInstance() {
+        return cppInstance;
+    }
+    /**
+     * Gets g77 adapter
+     */
+    public static GccCCompiler getG77Instance() {
+        return g77Instance;
+    }
+    /**
+     * Gets gpp adapter
+     */
+    public static GccCCompiler getGppInstance() {
+        return gppInstance;
+    }
+    /**
+     * Gets gcc adapter
+     */
+    public static GccCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    private boolean isPICMeaningful = true;
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private GccCCompiler(String command, String[] sourceExtensions,
+            String[] headerExtensions, boolean isLibtool,
+            GccCCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(command, null, sourceExtensions, headerExtensions, isLibtool,
+                libtoolCompiler, newEnvironment, env);
+        isPICMeaningful = System.getProperty("os.name").indexOf("Windows") < 0;
+    }
+    public void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        super.addImpliedArgs(args, debug, multithreaded, 
+        		exceptions, linkType, rtti, optimization, defaultflag);
+        if (isPICMeaningful && linkType.isSharedLibrary()) {
+            args.addElement("-fPIC");
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new GccCCompiler(getCommand(), this.getSourceExtensions(),
+                    this.getHeaderExtensions(), this.getLibtool(),
+                    (GccCCompiler) this.getLibtoolCompiler(), newEnvironment,
+                    env);
+        }
+        return this;
+    }
+    /**
+     * Create parser to determine dependencies.
+     * 
+     * Will create appropriate parser (C++, FORTRAN) based on file extension.
+     *  
+     */
+    protected Parser createParser(File source) {
+        if (source != null) {
+            String sourceName = source.getName();
+            int lastDot = sourceName.lastIndexOf('.');
+            if (lastDot >= 0 && lastDot + 1 < sourceName.length()) {
+                char afterDot = sourceName.charAt(lastDot + 1);
+                if (afterDot == 'f' || afterDot == 'F') {
+                    return new FortranParser();
+                }
+            }
+        }
+        return new CParser();
+    }
+    public File[] getEnvironmentIncludePath() {
+        if (includePath == null) {
+            //
+            //   construct default include path from machine id and version id
+            //
+            String[] defaultInclude = new String[1];
+            StringBuffer buf = new StringBuffer("/lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            buf.append("/include");
+            defaultInclude[0] = buf.toString();
+            //
+            //   read specs file and look for -istart and -idirafter
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] optionValues = GccProcessor.parseSpecs(specs, "*cpp:",
+                    new String[]{"-isystem ", "-idirafter "});
+            //
+            //   if no entries were found, then use a default path
+            //
+            if (optionValues[0].length == 0 && optionValues[1].length == 0) {
+                optionValues[0] = new String[]{"/usr/local/include",
+                        "/usr/include", "/usr/include/win32api"};
+            }
+            //
+            //  remove mingw entries.
+            //    For MinGW compiles this will mean the
+            //      location of the sys includes will be
+            //      wrong in dependencies.xml
+            //      but that should have no significant effect
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j].indexOf("mingw") > 0) {
+                        optionValues[i][j] = null;
+                    }
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(optionValues[0]);
+                GccProcessor.convertCygwinFilenames(optionValues[1]);
+                GccProcessor.convertCygwinFilenames(defaultInclude);
+            }
+            int count = CUtil.checkDirectoryArray(optionValues[0]);
+            count += CUtil.checkDirectoryArray(optionValues[1]);
+            count += CUtil.checkDirectoryArray(defaultInclude);
+            includePath = new File[count];
+            int index = 0;
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j] != null) {
+                        includePath[index++] = new File(optionValues[i][j]);
+                    }
+                }
+            }
+            for (int i = 0; i < defaultInclude.length; i++) {
+                if (defaultInclude[i] != null) {
+                    includePath[index++] = new File(defaultInclude[i]);
+                }
+            }
+        }
+        return (File[]) includePath.clone();
+    }
+    public String getIdentifier() throws BuildException {
+        if (identifier == null) {
+            StringBuffer buf;
+            if (getLibtool()) {
+                buf = new StringBuffer("libtool ");
+            } else {
+                buf = new StringBuffer(' ');
+            }
+            buf.append(getCommand());
+            buf.append(' ');
+            buf.append(GccProcessor.getVersion());
+            buf.append(' ');
+            buf.append(GccProcessor.getMachine());
+            identifier = buf.toString();
+        }
+        return identifier;
+    }
+    public Linker getLinker(LinkType linkType) {
+        return GccLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
new file mode 100644
index 0000000000..98f086ed61
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java
@@ -0,0 +1,152 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * Abstract base class for compilers that attempt to be command line compatible
+ * with GCC
+ *
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public abstract class GccCompatibleCCompiler extends CommandLineCCompiler {
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cpp", ".cxx", ".c++", ".i", ".f", ".for"};
+    private final static String[] defaultflags = new String[]{"-c"};
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    protected GccCompatibleCCompiler(String command, String identifierArg,
+            boolean libtool, GccCompatibleCCompiler libtoolCompiler,
+            boolean newEnvironment, Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                libtool ? ".fo" : ".o", libtool, libtoolCompiler,
+                newEnvironment, env);
+    }
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    protected GccCompatibleCCompiler(String command, String identifierArg,
+            String[] sourceExtensions, String[] headerExtensions,
+            boolean libtool, GccCompatibleCCompiler libtoolCompiler,
+            boolean newEnvironment, Environment env) {
+        super(command, identifierArg, sourceExtensions, headerExtensions,
+                libtool ? ".fo" : ".o", libtool, libtoolCompiler,
+                newEnvironment, env);
+    }
+    public void addImpliedArgs(final Vector args,
+                    final boolean debug,
+            final boolean multithreaded,
+                        final boolean exceptions,
+                        final LinkType linkType,
+                        final Boolean rtti,
+                        final OptimizationEnum optimization,
+                        final Boolean defaultflag) {
+        //
+        //  -fPIC is too much trouble
+        //      users have to manually add it for
+        //      operating systems that make sense
+        //
+        if (defaultflag != null && defaultflag.booleanValue()) {
+            for (int i = 0; i < defaultflags.length; i++) {
+                args.addElement(defaultflags[i]);
+            }
+        }
+        if (debug) {
+            args.addElement("-g");
+        } else {
+          if (optimization != null) {
+            if (optimization.isSize()) {
+              args.addElement("-Os");
+            } else if (optimization.isSpeed()) {
+              if ("full".equals(optimization.getValue())) {
+                args.addElement("-O2");
+              } else {
+                if ("speed".equals(optimization.getValue())) {
+                  args.addElement("-O1");
+                } else {
+                  args.addElement("-O3");
+                }
+              }
+            }
+          }
+        }
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+        if (rtti != null && !rtti.booleanValue()) {
+          args.addElement("-fno-rtti");
+        }
+
+    }
+    /**
+     * Adds an include path to the command.
+     */
+    public void addIncludePath(String path, Vector cmd) {
+        cmd.addElement("-I" + path);
+    }
+    public void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("-w");
+                break;
+            case 5 :
+                args.addElement("-Werror");
+            /* nobreak */
+            case 4 :
+                args.addElement("-W");
+            /* nobreak */
+            case 3 :
+                args.addElement("-Wall");
+                break;
+        }
+    }
+    public void getDefineSwitch(StringBuffer buffer, String define, String value) {
+        buffer.append("-D");
+        buffer.append(define);
+        if (value != null && value.length() > 0) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+    public String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+    public void getUndefineSwitch(StringBuffer buffer, String define) {
+        buffer.append("-U");
+        buffer.append(define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
new file mode 100644
index 0000000000..62500021cf
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java
@@ -0,0 +1,41 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+/**
+ * Adapter for the 'ar' archiver
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccLibrarian extends AbstractArLibrarian {
+    private static String[] objFileExtensions = new String[]{".o"};
+    private static GccLibrarian instance = new GccLibrarian("ar",
+            objFileExtensions, false, new GccLibrarian("ar", objFileExtensions,
+                    true, null));
+    public static GccLibrarian getInstance() {
+        return instance;
+    }
+    private GccLibrarian(String command, String[] inputExtensions,
+            boolean isLibtool, GccLibrarian libtoolLibrarian) {
+        super(command, "V", inputExtensions, new String[0], "lib", ".a",
+                isLibtool, libtoolLibrarian);
+    }
+    public Linker getLinker(LinkType type) {
+        return GccLinker.getInstance().getLinker(type);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
new file mode 100644
index 0000000000..f37f55092a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccLinker.java
@@ -0,0 +1,210 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+/**
+ * Adapter for the GCC linker
+ * 
+ * @author Adam Murdoch
+ */
+public class GccLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle",
+            "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
+            "-static", "-shared", "-symbolic", "-Xlinker",
+            "--export-all-symbols", "-static-libgcc",};
+    private static final GccLinker dllLinker = new GccLinker("gcc", objFiles,
+            discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private static final GccLinker instance = new GccLinker("gcc", objFiles,
+            discardFiles, "", "", false, null);
+    private static final GccLinker machBundleLinker = new GccLinker("gcc",
+            objFiles, discardFiles, "lib", ".bundle", false, null);
+    private static final GccLinker machDllLinker = new GccLinker("gcc",
+            objFiles, discardFiles, "lib", ".dylib", false, null);
+    public static GccLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    protected GccLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GccLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GccLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                case 'v' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            //
+            //   construct gcc lib path from machine and version
+            //
+            StringBuffer buf = new StringBuffer("/lib/gcc-lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            //
+            //   build default path from gcc and system /lib and /lib/w32api
+            //
+            String[] impliedLibPath = new String[]{buf.toString(),
+                    "/lib/w32api", "/lib"};
+            //
+            //     read gcc specs file for other library paths
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] libpaths = GccProcessor.parseSpecs(specs, "*link:",
+                    new String[]{"%q"});
+            String[] libpath;
+            if (libpaths[0].length > 0) {
+                libpath = new String[libpaths[0].length + 3];
+                int i = 0;
+                for (; i < libpaths[0].length; i++) {
+                    libpath[i] = libpaths[0][i];
+                }
+                libpath[i++] = buf.toString();
+                libpath[i++] = "/lib/w32api";
+                libpath[i++] = "/lib";
+            } else {
+                //
+                //   if a failure to find any matches then
+                //      use some default values for lib path entries
+                libpath = new String[]{"/usr/local/lib/mingw",
+                        "/usr/local/lib", "/usr/lib/w32api", "/usr/lib/mingw",
+                        "/usr/lib", buf.toString(), "/lib/w32api", "/lib"};
+            }
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i].indexOf("mingw") >= 0) {
+                    libpath[i] = null;
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(libpath);
+            }
+            //
+            //  check that remaining entries are actual directories
+            //
+            int count = CUtil.checkDirectoryArray(libpath);
+            //
+            //   populate return array with remaining entries
+            //
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (isDarwin()) {
+                return machBundleLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (isDarwin()) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
new file mode 100644
index 0000000000..236969f5e7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GccProcessor.java
@@ -0,0 +1,299 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+/**
+ * A add-in class for Gcc processors
+ * 
+ *  
+ */
+public class GccProcessor {
+    //   the results from gcc -dumpmachine
+    private static String machine;
+    private static String[] specs;
+    //   the results from gcc -dumpversion
+    private static String version;
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    /**
+     * Converts absolute Cygwin file or directory names to the corresponding
+     * Win32 name.
+     * 
+     * @param names
+     *            array of names, some elements may be null, will be changed in
+     *            place.
+     */
+    public static void convertCygwinFilenames(String[] names) {
+        if (names == null) {
+            throw new NullPointerException("names");
+        }
+        File gccDir = CUtil.getExecutableLocation("gcc.exe");
+        if (gccDir != null) {
+            String prefix = gccDir.getAbsolutePath() + "/..";
+            StringBuffer buf = new StringBuffer();
+            for (int i = 0; i < names.length; i++) {
+                String name = names[i];
+                if (name != null && name.length() > 1 && name.charAt(0) == '/') {
+                    buf.setLength(0);
+                    buf.append(prefix);
+                    buf.append(name);
+                    names[i] = buf.toString();
+                }
+            }
+        }
+    }
+    public static String[] getLibraryPatterns(String[] libnames) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length * 2];
+        int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        if (isHPUX()) {
+            offset = addLibraryPatterns(libnames, buf, "lib", ".sl", patterns,
+                    offset);
+        } else {
+            offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns,
+                    offset);
+        }
+        return patterns;
+    }
+    public static String getMachine() {
+        if (machine == null) {
+            String[] args = new String[]{"gcc", "-dumpmachine"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                machine = "nomachine";
+            } else {
+                machine = cmdout[0];
+            }
+        }
+        return machine;
+    }
+    public static String[] getOutputFileSwitch(String letter, String outputFile) {
+        StringBuffer buf = new StringBuffer();
+        if (outputFile.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(outputFile.replace('\\', '/'));
+            buf.append('"');
+        } else {
+            buf.append(outputFile.replace('\\', '/'));
+        }
+        String[] retval = new String[]{letter, buf.toString()};
+        return retval;
+    }
+    /**
+     * Returns the contents of the gcc specs file.
+     * 
+     * The implementation locates gcc.exe in the executable path and then
+     * builds a relative path name from the results of -dumpmachine and
+     * -dumpversion. Attempts to use gcc -dumpspecs to provide this information
+     * resulted in stalling on the Execute.run
+     * 
+     * @returns contents of the specs file
+     */
+    public static String[] getSpecs() {
+        if (specs == null) {
+            File gccParent = CUtil.getExecutableLocation("gcc.exe");
+            if (gccParent != null) {
+                //
+                //  build a relative path like
+                //    ../lib/gcc-lib/i686-pc-cygwin/2.95.3-5/specs
+                //
+                StringBuffer buf = new StringBuffer("../lib/gcc-lib/");
+                buf.append(getMachine());
+                buf.append('/');
+                buf.append(getVersion());
+                buf.append("/specs");
+                //
+                //  resolve it relative to the location of gcc.exe
+                //
+                String relativePath = buf.toString();
+                File specsFile = new File(gccParent, relativePath);
+                //
+                //  found the specs file
+                //
+                try {
+                    //
+                    //  read the lines in the file
+                    //
+                    BufferedReader reader = new BufferedReader(new FileReader(
+                            specsFile));
+                    Vector lines = new Vector(100);
+                    String line = reader.readLine();
+                    while (line != null) {
+                        lines.addElement(line);
+                        line = reader.readLine();
+                    }
+                    specs = new String[lines.size()];
+                    lines.copyInto(specs);
+                } catch (IOException ex) {
+                }
+            }
+        }
+        if (specs == null) {
+            specs = new String[0];
+        }
+        return specs;
+    }
+    public static String getVersion() {
+        if (version == null) {
+            String[] args = new String[]{"gcc", "-dumpversion"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                version = "noversion";
+            } else {
+                version = cmdout[0];
+            }
+        }
+        return version;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    /**
+     * Determines if task is running with cygwin
+     * 
+     * @return true if cygwin was detected
+     */
+    public static boolean isCygwin() {
+        return getMachine().indexOf("cygwin") > 0;
+    }
+    private static boolean isHPUX() {
+        String osname = System.getProperty("os.name").toLowerCase();
+        if (osname.indexOf("hp") >= 0 && osname.indexOf("ux") >= 0) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 
+     * Parses the results of the specs file for a specific processor and
+     * options
+     * 
+     * @param specsContent
+     *            Contents of specs file as returned from getSpecs
+     * @param specSectionStart
+     *            start of spec section, for example "*cpp:"
+     * @param options
+     *            command line switches such as "-istart"
+     */
+    public static String[][] parseSpecs(String[] specsContent,
+            String specSectionStart, String[] options) {
+        if (specsContent == null) {
+            throw new NullPointerException("specsContent");
+        }
+        if (specSectionStart == null) {
+            throw new NullPointerException("specSectionStart");
+        }
+        if (options == null) {
+            throw new NullPointerException("option");
+        }
+        String[][] optionValues = new String[options.length][];
+        StringBuffer optionValue = new StringBuffer(40);
+        for (int i = 0; i < specsContent.length; i++) {
+            String specLine = specsContent[i];
+            //
+            //   if start of section then start paying attention
+            //
+            if (specLine.startsWith(specSectionStart)) {
+                Vector[] optionVectors = new Vector[options.length];
+                for (int j = 0; j < options.length; j++) {
+                    optionVectors[j] = new Vector(10);
+                }
+                //
+                //  go to next line and examine contents
+                //     and repeat until end of file
+                //
+                for (i++; i < specsContent.length; i++) {
+                    specLine = specsContent[i];
+                    for (int j = 0; j < options.length; j++) {
+                        int optionStart = specLine.indexOf(options[j]);
+                        while (optionStart >= 0) {
+                            optionValue.setLength(0);
+                            //
+                            //   walk rest of line looking for first non
+                            // whitespace
+                            //       and then next space
+                            boolean hasNonBlank = false;
+                            int k = optionStart + options[j].length();
+                            for (; k < specLine.length(); k++) {
+                                //
+                                //  either a blank or a "}" (close of
+                                // conditional)
+                                //    section will end the path
+                                //
+                                if (specLine.charAt(k) == ' '
+                                        || specLine.charAt(k) == '}') {
+                                    if (hasNonBlank) {
+                                        break;
+                                    }
+                                } else {
+                                    hasNonBlank = true;
+                                    optionValue.append(specLine.charAt(k));
+                                }
+                            }
+                            //
+                            //  transition back to whitespace
+                            //     value is over, add it to vector
+                            if (hasNonBlank) {
+                                optionVectors[j].addElement(optionValue
+                                        .toString());
+                            }
+                            //
+                            //  find next occurance on line
+                            //
+                            optionStart = specLine.indexOf(options[j], k);
+                        }
+                    }
+                }
+                //
+                //   copy vectors over to option arrays
+                //
+                for (int j = 0; j < options.length; j++) {
+                    optionValues[j] = new String[optionVectors[j].size()];
+                    optionVectors[j].copyInto(optionValues[j]);
+                }
+            }
+        }
+        //
+        //   fill in any missing option values with
+        //      a zero-length string array
+        for (int i = 0; i < optionValues.length; i++) {
+            String[] zeroLenArray = new String[0];
+            if (optionValues[i] == null) {
+                optionValues[i] = zeroLenArray;
+            }
+        }
+        return optionValues;
+    }
+    private GccProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
new file mode 100644
index 0000000000..e7036abe16
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/GppLinker.java
@@ -0,0 +1,203 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+/**
+ * Adapter for the g++ variant of the GCC linker
+ * 
+ * @author Stephen M. Webb <stephen.webb@bregmasoft.com>
+ */
+public class GppLinker extends AbstractLdLinker {
+    protected static final String[] discardFiles = new String[0];
+    protected static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final GppLinker dllLinker = new GppLinker("gcc", objFiles,
+            discardFiles, "lib", ".so", false, new GppLinker("gcc", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private final static String libPrefix = "libraries: =";
+    protected static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
+            "-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
+            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
+    private static final GppLinker instance = new GppLinker("gcc", objFiles,
+            discardFiles, "", "", false, null);
+    private static final GppLinker machDllLinker = new GppLinker("gcc",
+            objFiles, discardFiles, "lib", ".dylib", false, null);
+    private static final GppLinker machPluginLinker = new GppLinker("gcc",
+            objFiles, discardFiles, "lib", ".bundle", false, null);
+    public static GppLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private String runtimeLibrary;
+    protected GppLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GppLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+        if (linkType.isStaticRuntime()) {
+            String[] cmdin = new String[]{"g++", "-print-file-name=libstdc++.a"};
+            String[] cmdout = CaptureStreamHandler.run(cmdin);
+            if (cmdout.length > 0) {
+                runtimeLibrary = cmdout[0];
+            } else {
+                runtimeLibrary = null;
+            }
+        } else {
+            runtimeLibrary = "-lstdc++";
+        }
+    }
+    public String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        String[] rs = super.addLibrarySets(task, libsets, preargs, midargs,
+                endargs);
+        if (runtimeLibrary != null) {
+            endargs.addElement(runtimeLibrary);
+        }
+        return rs;
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GppLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            Vector dirs = new Vector();
+            // Ask GCC where it will look for its libraries.
+            String[] args = new String[]{"g++", "-print-search-dirs"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            for (int i = 0; i < cmdout.length; ++i) {
+                int prefixIndex = cmdout[i].indexOf(libPrefix);
+                if (prefixIndex >= 0) {
+                    // Special case DOS-type GCCs like MinGW or Cygwin
+                    int s = prefixIndex + libPrefix.length();
+                    int t = cmdout[i].indexOf(';', s);
+                    while (t > 0) {
+                        dirs.addElement(cmdout[i].substring(s, t));
+                        s = t + 1;
+                        t = cmdout[i].indexOf(';', s);
+                    }
+                    dirs.addElement(cmdout[i].substring(s));
+                    ++i;
+                    for (; i < cmdout.length; ++i) {
+                        dirs.addElement(cmdout[i]);
+                    }
+                }
+            }
+            // Eliminate all but actual directories.
+            String[] libpath = new String[dirs.size()];
+            dirs.copyInto(libpath);
+            int count = CUtil.checkDirectoryArray(libpath);
+            // Build return array.
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; ++i) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machPluginLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
new file mode 100644
index 0000000000..e05fa5b2db
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/LdLinker.java
@@ -0,0 +1,57 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+/**
+ * Adapter for the 'ld' linker
+ * 
+ * @author Curt Arnold
+ */
+public final class LdLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final LdLinker dllLinker = new LdLinker("ld", objFiles,
+            discardFiles, "lib", ".so", false, new LdLinker("ld", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private static final LdLinker instance = new LdLinker("ld", objFiles,
+            discardFiles, "", "", false, null);
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    public static LdLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private LdLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, LdLinker libtoolLinker) {
+        super(command, "-version", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, isLibtool, libtoolLinker);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
new file mode 100644
index 0000000000..6a5697eb80
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java
@@ -0,0 +1,273 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.CompilerParam;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCompilerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.compiler.ProgressMonitor;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.FortranParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * Adapter for the GCC C/C++ compiler
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccCCompiler extends GccCompatibleCCompiler {
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+    ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", /* C */
+            ".cc", /* C++ */
+            ".cpp", /* C++ */
+            ".cxx", /* C++ */
+            ".c++", /* C++ */
+            ".i", /* preprocessed C */
+            ".ii", /* preprocessed C++ */
+            ".f", /* FORTRAN */
+            ".for", /* FORTRAN */
+            ".m", /* Objective-C */
+            ".mm", /* Objected-C++ */
+            ".s" /* Assembly */
+    };
+    private static final GccCCompiler cppInstance = new GccCCompiler("c++",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("c++", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler g77Instance = new GccCCompiler("g77",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("g77", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler gppInstance = new GccCCompiler("g++",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("g++", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    private static final GccCCompiler instance = new GccCCompiler("gcc",
+            sourceExtensions, headerExtensions, false,
+            new GccCCompiler("gcc", sourceExtensions, headerExtensions, true,
+                    null, false, null), false, null);
+    /**
+     * Gets c++ adapter
+     */
+    public static GccCCompiler getCppInstance() {
+        return cppInstance;
+    }
+    /**
+     * Gets g77 adapter
+     */
+    public static GccCCompiler getG77Instance() {
+        return g77Instance;
+    }
+    /**
+     * Gets gpp adapter
+     */
+    public static GccCCompiler getGppInstance() {
+        return gppInstance;
+    }
+    /**
+     * Gets gcc adapter
+     */
+    public static GccCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    private boolean isPICMeaningful = true;
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private GccCCompiler(String command, String[] sourceExtensions,
+            String[] headerExtensions, boolean isLibtool,
+            GccCCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(command, null, sourceExtensions, headerExtensions, isLibtool,
+                libtoolCompiler, newEnvironment, env);
+        isPICMeaningful = System.getProperty("os.name").indexOf("Windows") < 0;
+    }
+    public void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        super.addImpliedArgs(args, debug, multithreaded, 
+        		exceptions, linkType, rtti, optimization, defaultflag);
+        if (isPICMeaningful && linkType.isSharedLibrary()) {
+            args.addElement("-fPIC");
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new GccCCompiler(getCommand(), this.getSourceExtensions(),
+                    this.getHeaderExtensions(), this.getLibtool(),
+                    (GccCCompiler) this.getLibtoolCompiler(), newEnvironment,
+                    env);
+        }
+        return this;
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        GccCCompiler clone = (GccCCompiler) super.clone();
+        return clone;
+    }
+    public void compile(CCTask task, File outputDir, String[] sourceFiles,
+            String[] args, String[] endArgs, boolean relentless,
+            CommandLineCompilerConfiguration config, ProgressMonitor monitor)
+            throws BuildException {
+        try {
+            GccCCompiler clone = (GccCCompiler) this.clone();
+            CompilerParam param = config.getParam("target");
+            if (param != null)
+                clone.setCommand(param.getValue() + "-" + this.getCommand());
+            clone.supercompile(task, outputDir, sourceFiles, args, endArgs,
+                    relentless, config, monitor);
+        } catch (CloneNotSupportedException e) {
+            supercompile(task, outputDir, sourceFiles, args, endArgs,
+                    relentless, config, monitor);
+        }
+    }
+    /**
+     * Create parser to determine dependencies.
+     * 
+     * Will create appropriate parser (C++, FORTRAN) based on file extension.
+     *  
+     */
+    protected Parser createParser(File source) {
+        if (source != null) {
+            String sourceName = source.getName();
+            int lastDot = sourceName.lastIndexOf('.');
+            if (lastDot >= 0 && lastDot + 1 < sourceName.length()) {
+                char afterDot = sourceName.charAt(lastDot + 1);
+                if (afterDot == 'f' || afterDot == 'F') {
+                    return new FortranParser();
+                }
+            }
+        }
+        return new CParser();
+    }
+    public File[] getEnvironmentIncludePath() {
+        if (includePath == null) {
+            //
+            //   construct default include path from machine id and version id
+            //
+            String[] defaultInclude = new String[1];
+            StringBuffer buf = new StringBuffer("/lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            buf.append("/include");
+            defaultInclude[0] = buf.toString();
+            //
+            //   read specs file and look for -istart and -idirafter
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] optionValues = GccProcessor.parseSpecs(specs, "*cpp:",
+                    new String[]{"-isystem ", "-idirafter "});
+            //
+            //   if no entries were found, then use a default path
+            //
+            if (optionValues[0].length == 0 && optionValues[1].length == 0) {
+                optionValues[0] = new String[]{"/usr/local/include",
+                        "/usr/include", "/usr/include/win32api"};
+            }
+            //
+            //  remove mingw entries.
+            //    For MinGW compiles this will mean the
+            //      location of the sys includes will be
+            //      wrong in dependencies.xml
+            //      but that should have no significant effect
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j].indexOf("mingw") > 0) {
+                        optionValues[i][j] = null;
+                    }
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(optionValues[0]);
+                GccProcessor.convertCygwinFilenames(optionValues[1]);
+                GccProcessor.convertCygwinFilenames(defaultInclude);
+            }
+            int count = CUtil.checkDirectoryArray(optionValues[0]);
+            count += CUtil.checkDirectoryArray(optionValues[1]);
+            count += CUtil.checkDirectoryArray(defaultInclude);
+            includePath = new File[count];
+            int index = 0;
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j] != null) {
+                        includePath[index++] = new File(optionValues[i][j]);
+                    }
+                }
+            }
+            for (int i = 0; i < defaultInclude.length; i++) {
+                if (defaultInclude[i] != null) {
+                    includePath[index++] = new File(defaultInclude[i]);
+                }
+            }
+        }
+        return (File[]) includePath.clone();
+    }
+    public String getIdentifier() throws BuildException {
+        if (identifier == null) {
+            StringBuffer buf;
+            if (getLibtool()) {
+                buf = new StringBuffer("libtool ");
+            } else {
+                buf = new StringBuffer(' ');
+            }
+            buf.append(getCommand());
+            buf.append(' ');
+            buf.append(GccProcessor.getVersion());
+            buf.append(' ');
+            buf.append(GccProcessor.getMachine());
+            identifier = buf.toString();
+        }
+        return identifier;
+    }
+    public Linker getLinker(LinkType linkType) {
+        return GccLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    private void supercompile(CCTask task, File outputDir,
+            String[] sourceFiles, String[] args, String[] endArgs,
+            boolean relentless, CommandLineCompilerConfiguration config,
+            ProgressMonitor monitor) throws BuildException {
+        super.compile(task, outputDir, sourceFiles, args, endArgs, relentless,
+                config, monitor);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
new file mode 100644
index 0000000000..ea2278a6e7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java
@@ -0,0 +1,69 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractArLibrarian;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the 'ar' archiver
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccLibrarian extends AbstractArLibrarian {
+    private static String[] objFileExtensions = new String[]{".o"};
+    private static GccLibrarian instance = new GccLibrarian("ar",
+            objFileExtensions, false, new GccLibrarian("ar", objFileExtensions,
+                    true, null));
+    public static GccLibrarian getInstance() {
+        return instance;
+    }
+    private GccLibrarian(String command, String[] inputExtensions,
+            boolean isLibtool, GccLibrarian libtoolLibrarian) {
+        super(command, "V", inputExtensions, new String[0], "lib", ".a",
+                isLibtool, libtoolLibrarian);
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        GccLibrarian clone = (GccLibrarian) super.clone();
+        return clone;
+    }
+    public Linker getLinker(LinkType type) {
+        return GccLinker.getInstance().getLinker(type);
+    }
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        try {
+            GccLibrarian clone = (GccLibrarian) this.clone();
+            LinkerParam param = config.getParam("target");
+            if (param != null)
+                clone.setCommand(param.getValue() + "-" + this.getCommand());
+            clone.superlink(task, outputFile, sourceFiles, config);
+        } catch (CloneNotSupportedException e) {
+            superlink(task, outputFile, sourceFiles, config);
+        }
+    }
+    private void superlink(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        super.link(task, outputFile, sourceFiles, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
new file mode 100644
index 0000000000..3293829d13
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java
@@ -0,0 +1,234 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.File;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the GCC linker
+ * 
+ * @author Adam Murdoch
+ */
+public class GccLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final GccLinker dllLinker = new GccLinker("gcc", objFiles,
+            discardFiles, "lib", ".so", false, new GccLinker("gcc", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private static final GccLinker instance = new GccLinker("gcc", objFiles,
+            discardFiles, "", "", false, null);
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle",
+            "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
+            "-static", "-shared", "-symbolic", "-Xlinker",
+            "--export-all-symbols", "-static-libgcc",};
+    private static final GccLinker machBundleLinker = new GccLinker("gcc",
+            objFiles, discardFiles, "lib", ".bundle", false, null);
+    private static final GccLinker machDllLinker = new GccLinker("gcc",
+            objFiles, discardFiles, "lib", ".dylib", false, null);
+    public static GccLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    protected GccLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GccLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        GccLinker clone = (GccLinker) super.clone();
+        return clone;
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GccLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                case 'v' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            //
+            //   construct gcc lib path from machine and version
+            //
+            StringBuffer buf = new StringBuffer("/lib/gcc-lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            //
+            //   build default path from gcc and system /lib and /lib/w32api
+            //
+            String[] impliedLibPath = new String[]{buf.toString(),
+                    "/lib/w32api", "/lib"};
+            //
+            //     read gcc specs file for other library paths
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] libpaths = GccProcessor.parseSpecs(specs, "*link:",
+                    new String[]{"%q"});
+            String[] libpath;
+            if (libpaths[0].length > 0) {
+                libpath = new String[libpaths[0].length + 3];
+                int i = 0;
+                for (; i < libpaths[0].length; i++) {
+                    libpath[i] = libpaths[0][i];
+                }
+                libpath[i++] = buf.toString();
+                libpath[i++] = "/lib/w32api";
+                libpath[i++] = "/lib";
+            } else {
+                //
+                //   if a failure to find any matches then
+                //      use some default values for lib path entries
+                libpath = new String[]{"/usr/local/lib/mingw",
+                        "/usr/local/lib", "/usr/lib/w32api", "/usr/lib/mingw",
+                        "/usr/lib", buf.toString(), "/lib/w32api", "/lib"};
+            }
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i].indexOf("mingw") >= 0) {
+                    libpath[i] = null;
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(libpath);
+            }
+            //
+            //  check that remaining entries are actual directories
+            //
+            int count = CUtil.checkDirectoryArray(libpath);
+            //
+            //   populate return array with remaining entries
+            //
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (isDarwin()) {
+                return machBundleLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (isDarwin()) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        try {
+            GccLinker clone = (GccLinker) this.clone();
+            LinkerParam param = config.getParam("target");
+            if (param != null)
+                clone.setCommand(param.getValue() + "-" + this.getCommand());
+            clone.superlink(task, outputFile, sourceFiles, config);
+        } catch (CloneNotSupportedException e) {
+            superlink(task, outputFile, sourceFiles, config);
+        }
+    }
+    private void superlink(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        super.link(task, outputFile, sourceFiles, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
new file mode 100644
index 0000000000..283df63314
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java
@@ -0,0 +1,288 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+
+/**
+ * A add-in class for Gcc processors
+ * 
+ *  
+ */
+public class GccProcessor {
+    //   the results from gcc -dumpmachine
+    private static String machine;
+    private static String[] specs;
+    //   the results from gcc -dumpversion
+    private static String version;
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    /**
+     * Converts absolute Cygwin file or directory names to the corresponding
+     * Win32 name.
+     * 
+     * @param names
+     *            array of names, some elements may be null, will be changed in
+     *            place.
+     */
+    public static void convertCygwinFilenames(String[] names) {
+        if (names == null) {
+            throw new NullPointerException("names");
+        }
+        File gccDir = CUtil.getExecutableLocation("gcc.exe");
+        if (gccDir != null) {
+            String prefix = gccDir.getAbsolutePath() + "/..";
+            StringBuffer buf = new StringBuffer();
+            for (int i = 0; i < names.length; i++) {
+                String name = names[i];
+                if (name != null && name.length() > 1 && name.charAt(0) == '/') {
+                    buf.setLength(0);
+                    buf.append(prefix);
+                    buf.append(name);
+                    names[i] = buf.toString();
+                }
+            }
+        }
+    }
+    
+    public static String getMachine() {
+        if (machine == null) {
+            String[] args = new String[]{"gcc", "-dumpmachine"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                machine = "nomachine";
+            } else {
+                machine = cmdout[0];
+            }
+        }
+        return machine;
+    }
+    public static String[] getOutputFileSwitch(String letter, String outputFile) {
+        StringBuffer buf = new StringBuffer();
+        if (outputFile.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(outputFile.replace('\\', '/'));
+            buf.append('"');
+        } else {
+            buf.append(outputFile.replace('\\', '/'));
+        }
+        String[] retval = new String[]{letter, buf.toString()};
+        return retval;
+    }
+    /**
+     * Returns the contents of the gcc specs file.
+     * 
+     * The implementation locates gcc.exe in the executable path and then
+     * builds a relative path name from the results of -dumpmachine and
+     * -dumpversion. Attempts to use gcc -dumpspecs to provide this information
+     * resulted in stalling on the Execute.run
+     * 
+     * @returns contents of the specs file
+     */
+    public static String[] getSpecs() {
+        if (specs == null) {
+            File gccParent = CUtil.getExecutableLocation("gcc.exe");
+            if (gccParent != null) {
+                //
+                //  build a relative path like
+                //    ../lib/gcc-lib/i686-pc-cygwin/2.95.3-5/specs
+                //
+                StringBuffer buf = new StringBuffer("../lib/gcc-lib/");
+                buf.append(getMachine());
+                buf.append('/');
+                buf.append(getVersion());
+                buf.append("/specs");
+                //
+                //  resolve it relative to the location of gcc.exe
+                //
+                String relativePath = buf.toString();
+                File specsFile = new File(gccParent, relativePath);
+                //
+                //  found the specs file
+                //
+                try {
+                    //
+                    //  read the lines in the file
+                    //
+                    BufferedReader reader = new BufferedReader(new FileReader(
+                            specsFile));
+                    Vector lines = new Vector(100);
+                    String line = reader.readLine();
+                    while (line != null) {
+                        lines.addElement(line);
+                        line = reader.readLine();
+                    }
+                    specs = new String[lines.size()];
+                    lines.copyInto(specs);
+                } catch (IOException ex) {
+                }
+            }
+        }
+        if (specs == null) {
+            specs = new String[0];
+        }
+        return specs;
+    }
+    public static String getVersion() {
+        if (version == null) {
+            String[] args = new String[]{"gcc", "-dumpversion"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                version = "noversion";
+            } else {
+                version = cmdout[0];
+            }
+        }
+        return version;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    /**
+     * Determines if task is running with cygwin
+     * 
+     * @return true if cygwin was detected
+     */
+    public static boolean isCygwin() {
+        return getMachine().indexOf("cygwin") > 0;
+    }
+    private static boolean isHPUX() {
+        String osname = System.getProperty("os.name").toLowerCase();
+        if (osname.indexOf("hp") >= 0 && osname.indexOf("ux") >= 0) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 
+     * Parses the results of the specs file for a specific processor and
+     * options
+     * 
+     * @param specsContent
+     *            Contents of specs file as returned from getSpecs
+     * @param specSectionStart
+     *            start of spec section, for example "*cpp:"
+     * @param options
+     *            command line switches such as "-istart"
+     */
+    public static String[][] parseSpecs(String[] specsContent,
+            String specSectionStart, String[] options) {
+        if (specsContent == null) {
+            throw new NullPointerException("specsContent");
+        }
+        if (specSectionStart == null) {
+            throw new NullPointerException("specSectionStart");
+        }
+        if (options == null) {
+            throw new NullPointerException("option");
+        }
+        String[][] optionValues = new String[options.length][];
+        StringBuffer optionValue = new StringBuffer(40);
+        for (int i = 0; i < specsContent.length; i++) {
+            String specLine = specsContent[i];
+            //
+            //   if start of section then start paying attention
+            //
+            if (specLine.startsWith(specSectionStart)) {
+                Vector[] optionVectors = new Vector[options.length];
+                for (int j = 0; j < options.length; j++) {
+                    optionVectors[j] = new Vector(10);
+                }
+                //
+                //  go to next line and examine contents
+                //     and repeat until end of file
+                //
+                for (i++; i < specsContent.length; i++) {
+                    specLine = specsContent[i];
+                    for (int j = 0; j < options.length; j++) {
+                        int optionStart = specLine.indexOf(options[j]);
+                        while (optionStart >= 0) {
+                            optionValue.setLength(0);
+                            //
+                            //   walk rest of line looking for first non
+                            // whitespace
+                            //       and then next space
+                            boolean hasNonBlank = false;
+                            int k = optionStart + options[j].length();
+                            for (; k < specLine.length(); k++) {
+                                //
+                                //  either a blank or a "}" (close of
+                                // conditional)
+                                //    section will end the path
+                                //
+                                if (specLine.charAt(k) == ' '
+                                        || specLine.charAt(k) == '}') {
+                                    if (hasNonBlank) {
+                                        break;
+                                    }
+                                } else {
+                                    hasNonBlank = true;
+                                    optionValue.append(specLine.charAt(k));
+                                }
+                            }
+                            //
+                            //  transition back to whitespace
+                            //     value is over, add it to vector
+                            if (hasNonBlank) {
+                                optionVectors[j].addElement(optionValue
+                                        .toString());
+                            }
+                            //
+                            //  find next occurance on line
+                            //
+                            optionStart = specLine.indexOf(options[j], k);
+                        }
+                    }
+                }
+                //
+                //   copy vectors over to option arrays
+                //
+                for (int j = 0; j < options.length; j++) {
+                    optionValues[j] = new String[optionVectors[j].size()];
+                    optionVectors[j].copyInto(optionValues[j]);
+                }
+            }
+        }
+        //
+        //   fill in any missing option values with
+        //      a zero-length string array
+        for (int i = 0; i < optionValues.length; i++) {
+            String[] zeroLenArray = new String[0];
+            if (optionValues[i] == null) {
+                optionValues[i] = zeroLenArray;
+            }
+        }
+        return optionValues;
+    }
+    private GccProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
new file mode 100644
index 0000000000..3ba8f06bf8
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java
@@ -0,0 +1,228 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the g++ variant of the GCC linker
+ * 
+ * @author Stephen M. Webb <stephen.webb@bregmasoft.com>
+ */
+public class GppLinker extends AbstractLdLinker {
+    protected static final String[] discardFiles = new String[0];
+    protected static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final GppLinker dllLinker = new GppLinker("gcc", objFiles,
+            discardFiles, "lib", ".so", false, new GppLinker("gcc", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private final static String libPrefix = "libraries: =";
+    protected static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
+            "-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
+            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
+    private static final GppLinker instance = new GppLinker("gcc", objFiles,
+            discardFiles, "", "", false, null);
+    private static final GppLinker machDllLinker = new GppLinker("gcc",
+            objFiles, discardFiles, "lib", ".dylib", false, null);
+    private static final GppLinker machPluginLinker = new GppLinker("gcc",
+            objFiles, discardFiles, "lib", ".bundle", false, null);
+    public static GppLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private String runtimeLibrary;
+    protected GppLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GppLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+        if (linkType.isStaticRuntime()) {
+            String[] cmdin = new String[]{"g++", "-print-file-name=libstdc++.a"};
+            String[] cmdout = CaptureStreamHandler.run(cmdin);
+            if (cmdout.length > 0) {
+                runtimeLibrary = cmdout[0];
+            } else {
+                runtimeLibrary = null;
+            }
+        } else {
+            runtimeLibrary = "-lstdc++";
+        }
+    }
+    public String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        String[] rs = super.addLibrarySets(task, libsets, preargs, midargs,
+                endargs);
+        if (runtimeLibrary != null) {
+            endargs.addElement(runtimeLibrary);
+        }
+        return rs;
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        GppLinker clone = (GppLinker) super.clone();
+        return clone;
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GppLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            Vector dirs = new Vector();
+            // Ask GCC where it will look for its libraries.
+            String[] args = new String[]{"g++", "-print-search-dirs"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            for (int i = 0; i < cmdout.length; ++i) {
+                int prefixIndex = cmdout[i].indexOf(libPrefix);
+                if (prefixIndex >= 0) {
+                    // Special case DOS-type GCCs like MinGW or Cygwin
+                    int s = prefixIndex + libPrefix.length();
+                    int t = cmdout[i].indexOf(';', s);
+                    while (t > 0) {
+                        dirs.addElement(cmdout[i].substring(s, t));
+                        s = t + 1;
+                        t = cmdout[i].indexOf(';', s);
+                    }
+                    dirs.addElement(cmdout[i].substring(s));
+                    ++i;
+                    for (; i < cmdout.length; ++i) {
+                        dirs.addElement(cmdout[i]);
+                    }
+                }
+            }
+            // Eliminate all but actual directories.
+            String[] libpath = new String[dirs.size()];
+            dirs.copyInto(libpath);
+            int count = CUtil.checkDirectoryArray(libpath);
+            // Build return array.
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; ++i) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machPluginLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        try {
+            GppLinker clone = (GppLinker) this.clone();
+            LinkerParam param = config.getParam("target");
+            if (param != null)
+                clone.setCommand(param.getValue() + "-" + this.getCommand());
+            clone.superlink(task, outputFile, sourceFiles, config);
+        } catch (CloneNotSupportedException e) {
+            superlink(task, outputFile, sourceFiles, config);
+        }
+    }
+    private void superlink(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        super.link(task, outputFile, sourceFiles, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
new file mode 100644
index 0000000000..8ac0cf82a7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java
@@ -0,0 +1,83 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.LinkerParam;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the 'ld' linker
+ * 
+ * @author Curt Arnold
+ */
+public final class LdLinker extends AbstractLdLinker {
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final String[] discardFiles = new String[0];
+    private static final LdLinker dllLinker = new LdLinker("ld", objFiles,
+            discardFiles, "lib", ".so", false, new LdLinker("ld", objFiles,
+                    discardFiles, "lib", ".so", true, null));
+    private static final LdLinker instance = new LdLinker("ld", objFiles,
+            discardFiles, "", "", false, null);
+    public static LdLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private LdLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, LdLinker libtoolLinker) {
+        super(command, "-version", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected Object clone() throws CloneNotSupportedException {
+        LdLinker clone = (LdLinker) super.clone();
+        return clone;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        try {
+            LdLinker clone = (LdLinker) this.clone();
+            LinkerParam param = config.getParam("target");
+            if (param != null)
+                clone.setCommand(param.getValue() + "-" + this.getCommand());
+            clone.superlink(task, outputFile, sourceFiles, config);
+        } catch (CloneNotSupportedException e) {
+            superlink(task, outputFile, sourceFiles, config);
+        }
+    }
+    private void superlink(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        super.link(task, outputFile, sourceFiles, config);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
new file mode 100644
index 0000000000..62d65b910c
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java
@@ -0,0 +1,245 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+import net.sf.antcontrib.cpptasks.parser.CParser;
+import net.sf.antcontrib.cpptasks.parser.FortranParser;
+import net.sf.antcontrib.cpptasks.parser.Parser;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.Environment;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+/**
+ * Adapter for the GCC C/C++ compiler
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccCCompiler extends GccCompatibleCCompiler {
+    private final static String[] sourceExtensions = new String[]{".c", /* C */
+            ".cc", /* C++ */
+            ".cpp", /* C++ */
+            ".cxx", /* C++ */
+            ".c++", /* C++ */
+            ".i", /* preprocessed C */
+            ".ii", /* preprocessed C++ */
+            ".f", /* FORTRAN */
+            ".for", /* FORTRAN */
+            ".m", /* Objective-C */
+            ".mm", /* Objected-C++ */
+            ".s" /* Assembly */
+            };
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+    ".inl"};
+    public static final String CMD_PREFIX = "sparc-sun-solaris2-";
+    private static final GccCCompiler cppInstance = new GccCCompiler(CMD_PREFIX
+            + "c++", sourceExtensions, headerExtensions, false,
+            new GccCCompiler(CMD_PREFIX + "c++", sourceExtensions,
+                    headerExtensions, true, null, false, null), false, null);
+    private static final GccCCompiler g77Instance = new GccCCompiler(CMD_PREFIX
+            + "g77", sourceExtensions, headerExtensions, false,
+            new GccCCompiler(CMD_PREFIX + "g77", sourceExtensions,
+                    headerExtensions, true, null, false, null), false, null);
+    private static final GccCCompiler gppInstance = new GccCCompiler(CMD_PREFIX
+            + "g++", sourceExtensions, headerExtensions, false,
+            new GccCCompiler(CMD_PREFIX + "g++", sourceExtensions,
+                    headerExtensions, true, null, false, null), false, null);
+    private static final GccCCompiler instance = new GccCCompiler(CMD_PREFIX
+            + "gcc", sourceExtensions, headerExtensions, false,
+            new GccCCompiler(CMD_PREFIX + "gcc", sourceExtensions,
+                    headerExtensions, true, null, false, null), false, null);
+    /**
+     * Gets c++ adapter
+     */
+    public static GccCCompiler getCppInstance() {
+        return cppInstance;
+    }
+    /**
+     * Gets g77 adapter
+     */
+    public static GccCCompiler getG77Instance() {
+        return g77Instance;
+    }
+    /**
+     * Gets gpp adapter
+     */
+    public static GccCCompiler getGppInstance() {
+        return gppInstance;
+    }
+    /**
+     * Gets gcc adapter
+     */
+    public static GccCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    private boolean isPICMeaningful = true;
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private GccCCompiler(String command, String[] sourceExtensions,
+            String[] headerExtensions, boolean isLibtool,
+            GccCCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super(command, null, sourceExtensions, headerExtensions, isLibtool,
+                libtoolCompiler, newEnvironment, env);
+        isPICMeaningful = System.getProperty("os.name").indexOf("Windows") < 0;
+    }
+    public void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        super.addImpliedArgs(args, debug, multithreaded, 
+        		exceptions, linkType, rtti, optimization, defaultflag);
+        if (isPICMeaningful && linkType.isSharedLibrary()) {
+            args.addElement("-fPIC");
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new GccCCompiler(getCommand(), this.getSourceExtensions(),
+                    this.getHeaderExtensions(), this.getLibtool(),
+                    (GccCCompiler) this.getLibtoolCompiler(), newEnvironment,
+                    env);
+        }
+        return this;
+    }
+    /**
+     * Create parser to determine dependencies.
+     * 
+     * Will create appropriate parser (C++, FORTRAN) based on file extension.
+     *  
+     */
+    protected Parser createParser(File source) {
+        if (source != null) {
+            String sourceName = source.getName();
+            int lastDot = sourceName.lastIndexOf('.');
+            if (lastDot >= 0 && lastDot + 1 < sourceName.length()) {
+                char afterDot = sourceName.charAt(lastDot + 1);
+                if (afterDot == 'f' || afterDot == 'F') {
+                    return new FortranParser();
+                }
+            }
+        }
+        return new CParser();
+    }
+    public File[] getEnvironmentIncludePath() {
+        if (includePath == null) {
+            //
+            //   construct default include path from machine id and version id
+            //
+            String[] defaultInclude = new String[1];
+            StringBuffer buf = new StringBuffer("/lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            buf.append("/include");
+            defaultInclude[0] = buf.toString();
+            //
+            //   read specs file and look for -istart and -idirafter
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] optionValues = GccProcessor.parseSpecs(specs, "*cpp:",
+                    new String[]{"-isystem ", "-idirafter "});
+            //
+            //   if no entries were found, then use a default path
+            //
+            if (optionValues[0].length == 0 && optionValues[1].length == 0) {
+                optionValues[0] = new String[]{"/usr/local/include",
+                        "/usr/include", "/usr/include/win32api"};
+            }
+            //
+            //  remove mingw entries.
+            //    For MinGW compiles this will mean the
+            //      location of the sys includes will be
+            //      wrong in dependencies.xml
+            //      but that should have no significant effect
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j].indexOf("mingw") > 0) {
+                        optionValues[i][j] = null;
+                    }
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(optionValues[0]);
+                GccProcessor.convertCygwinFilenames(optionValues[1]);
+                GccProcessor.convertCygwinFilenames(defaultInclude);
+            }
+            int count = CUtil.checkDirectoryArray(optionValues[0]);
+            count += CUtil.checkDirectoryArray(optionValues[1]);
+            count += CUtil.checkDirectoryArray(defaultInclude);
+            includePath = new File[count];
+            int index = 0;
+            for (int i = 0; i < optionValues.length; i++) {
+                for (int j = 0; j < optionValues[i].length; j++) {
+                    if (optionValues[i][j] != null) {
+                        includePath[index++] = new File(optionValues[i][j]);
+                    }
+                }
+            }
+            for (int i = 0; i < defaultInclude.length; i++) {
+                if (defaultInclude[i] != null) {
+                    includePath[index++] = new File(defaultInclude[i]);
+                }
+            }
+        }
+        return (File[]) includePath.clone();
+    }
+    public String getIdentifier() throws BuildException {
+        if (identifier == null) {
+            StringBuffer buf;
+            if (getLibtool()) {
+                buf = new StringBuffer("libtool ");
+            } else {
+                buf = new StringBuffer(' ');
+            }
+            buf.append(getCommand());
+            buf.append(' ');
+            buf.append(GccProcessor.getVersion());
+            buf.append(' ');
+            buf.append(GccProcessor.getMachine());
+            identifier = buf.toString();
+        }
+        return identifier;
+    }
+    public Linker getLinker(LinkType linkType) {
+        return GccLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
new file mode 100644
index 0000000000..bb243879af
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java
@@ -0,0 +1,43 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractArLibrarian;
+/**
+ * Adapter for the 'ar' archiver
+ * 
+ * @author Adam Murdoch
+ */
+public final class GccLibrarian extends AbstractArLibrarian {
+    private static String[] objFileExtensions = new String[]{".o"};
+    private static GccLibrarian instance = new GccLibrarian(
+            GccCCompiler.CMD_PREFIX + "ar", objFileExtensions, false,
+            new GccLibrarian(GccCCompiler.CMD_PREFIX + "ar", objFileExtensions,
+                    true, null));
+    public static GccLibrarian getInstance() {
+        return instance;
+    }
+    private GccLibrarian(String command, String[] inputExtensions,
+            boolean isLibtool, GccLibrarian libtoolLibrarian) {
+        super(command, "V", inputExtensions, new String[0], "lib", ".a",
+                isLibtool, libtoolLibrarian);
+    }
+    public Linker getLinker(LinkType type) {
+        return GccLinker.getInstance().getLinker(type);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
new file mode 100644
index 0000000000..914da34439
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java
@@ -0,0 +1,215 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+/**
+ * Adapter for the GCC linker
+ * 
+ * @author Adam Murdoch
+ */
+public class GccLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle",
+            "-dynamiclib", "-nostartfiles", "-nostdlib", "-prebind", "-s",
+            "-static", "-shared", "-symbolic", "-Xlinker",
+            "--export-all-symbols", "-static-libgcc",};
+    private static final GccLinker dllLinker = new GccLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".so", false, new GccLinker(GccCCompiler.CMD_PREFIX + "gcc",
+                    objFiles, discardFiles, "lib", ".so", true, null));
+    private static final GccLinker instance = new GccLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "", "",
+            false, null);
+    private static final GccLinker machBundleLinker = new GccLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".bundle", false, null);
+    private static final GccLinker machDllLinker = new GccLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".dylib", false, null);
+    public static GccLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    protected GccLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GccLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GccLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                case 'v' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            //
+            //   construct gcc lib path from machine and version
+            //
+            StringBuffer buf = new StringBuffer("/lib/gcc-lib/");
+            buf.append(GccProcessor.getMachine());
+            buf.append('/');
+            buf.append(GccProcessor.getVersion());
+            //
+            //   build default path from gcc and system /lib and /lib/w32api
+            //
+            String[] impliedLibPath = new String[]{buf.toString(),
+                    "/lib/w32api", "/lib"};
+            //
+            //     read gcc specs file for other library paths
+            //
+            String[] specs = GccProcessor.getSpecs();
+            String[][] libpaths = GccProcessor.parseSpecs(specs, "*link:",
+                    new String[]{"%q"});
+            String[] libpath;
+            if (libpaths[0].length > 0) {
+                libpath = new String[libpaths[0].length + 3];
+                int i = 0;
+                for (; i < libpaths[0].length; i++) {
+                    libpath[i] = libpaths[0][i];
+                }
+                libpath[i++] = buf.toString();
+                libpath[i++] = "/lib/w32api";
+                libpath[i++] = "/lib";
+            } else {
+                //
+                //   if a failure to find any matches then
+                //      use some default values for lib path entries
+                libpath = new String[]{"/usr/local/lib/mingw",
+                        "/usr/local/lib", "/usr/lib/w32api", "/usr/lib/mingw",
+                        "/usr/lib", buf.toString(), "/lib/w32api", "/lib"};
+            }
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i].indexOf("mingw") >= 0) {
+                    libpath[i] = null;
+                }
+            }
+            //
+            //   if cygwin then
+            //     we have to prepend location of gcc32
+            //       and .. to start of absolute filenames to
+            //       have something that will exist in the
+            //       windows filesystem
+            if (GccProcessor.isCygwin()) {
+                GccProcessor.convertCygwinFilenames(libpath);
+            }
+            //
+            //  check that remaining entries are actual directories
+            //
+            int count = CUtil.checkDirectoryArray(libpath);
+            //
+            //   populate return array with remaining entries
+            //
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; i++) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (isDarwin()) {
+                return machBundleLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (isDarwin()) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
new file mode 100644
index 0000000000..599d6a8013
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java
@@ -0,0 +1,305 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * A add-in class for Gcc processors
+ * 
+ *  
+ */
+public class GccProcessor {
+    //   the results from gcc -dumpmachine
+    private static String machine;
+    private static String[] specs;
+    //   the results from gcc -dumpversion
+    private static String version;
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    /**
+     * Converts absolute Cygwin file or directory names to the corresponding
+     * Win32 name.
+     * 
+     * @param names
+     *            array of names, some elements may be null, will be changed in
+     *            place.
+     */
+    public static void convertCygwinFilenames(String[] names) {
+        if (names == null) {
+            throw new NullPointerException("names");
+        }
+        File gccDir = CUtil.getExecutableLocation(GccCCompiler.CMD_PREFIX
+                + "gcc.exe");
+        if (gccDir != null) {
+            String prefix = gccDir.getAbsolutePath() + "/..";
+            StringBuffer buf = new StringBuffer();
+            for (int i = 0; i < names.length; i++) {
+                String name = names[i];
+                if (name != null && name.length() > 1 && name.charAt(0) == '/') {
+                    buf.setLength(0);
+                    buf.append(prefix);
+                    buf.append(name);
+                    names[i] = buf.toString();
+                }
+            }
+        }
+    }
+    public static String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length * 2];
+        int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        if (isHPUX()) {
+            offset = addLibraryPatterns(libnames, buf, "lib", ".sl", patterns,
+                    offset);
+        } else {
+            offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns,
+                    offset);
+        }
+        return patterns;
+    }
+    public static String getMachine() {
+        if (machine == null) {
+            String[] args = new String[]{GccCCompiler.CMD_PREFIX + "gcc",
+                    "-dumpmachine"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                machine = "nomachine";
+            } else {
+                machine = cmdout[0];
+            }
+        }
+        return machine;
+    }
+    public static String[] getOutputFileSwitch(String letter, String outputFile) {
+        StringBuffer buf = new StringBuffer();
+        if (outputFile.indexOf(' ') >= 0) {
+            buf.append('"');
+            buf.append(outputFile.replace('\\', '/'));
+            buf.append('"');
+        } else {
+            buf.append(outputFile.replace('\\', '/'));
+        }
+        String[] retval = new String[]{letter, buf.toString()};
+        return retval;
+    }
+    /**
+     * Returns the contents of the gcc specs file.
+     * 
+     * The implementation locates gcc.exe in the executable path and then
+     * builds a relative path name from the results of -dumpmachine and
+     * -dumpversion. Attempts to use gcc -dumpspecs to provide this information
+     * resulted in stalling on the Execute.run
+     * 
+     * @returns contents of the specs file
+     */
+    public static String[] getSpecs() {
+        if (specs == null) {
+            File gccParent = CUtil
+                    .getExecutableLocation(GccCCompiler.CMD_PREFIX + "gcc.exe");
+            if (gccParent != null) {
+                //
+                //  build a relative path like
+                //    ../lib/gcc-lib/i686-pc-cygwin/2.95.3-5/specs
+                //
+                StringBuffer buf = new StringBuffer("../lib/gcc-lib/");
+                buf.append(getMachine());
+                buf.append('/');
+                buf.append(getVersion());
+                buf.append("/specs");
+                //
+                //  resolve it relative to the location of gcc.exe
+                //
+                String relativePath = buf.toString();
+                File specsFile = new File(gccParent, relativePath);
+                //
+                //  found the specs file
+                //
+                try {
+                    //
+                    //  read the lines in the file
+                    //
+                    BufferedReader reader = new BufferedReader(new FileReader(
+                            specsFile));
+                    Vector lines = new Vector(100);
+                    String line = reader.readLine();
+                    while (line != null) {
+                        lines.addElement(line);
+                        line = reader.readLine();
+                    }
+                    specs = new String[lines.size()];
+                    lines.copyInto(specs);
+                } catch (IOException ex) {
+                }
+            }
+        }
+        if (specs == null) {
+            specs = new String[0];
+        }
+        return specs;
+    }
+    public static String getVersion() {
+        if (version == null) {
+            String[] args = new String[]{GccCCompiler.CMD_PREFIX + "gcc",
+                    "-dumpversion"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            if (cmdout.length == 0) {
+                version = "noversion";
+            } else {
+                version = cmdout[0];
+            }
+        }
+        return version;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    /**
+     * Determines if task is running with cygwin
+     * 
+     * @return true if cygwin was detected
+     */
+    public static boolean isCygwin() {
+        return getMachine().indexOf("cygwin") > 0;
+    }
+    private static boolean isHPUX() {
+        String osname = System.getProperty("os.name").toLowerCase();
+        if (osname.indexOf("hp") >= 0 && osname.indexOf("ux") >= 0) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * 
+     * Parses the results of the specs file for a specific processor and
+     * options
+     * 
+     * @param specsContent
+     *            Contents of specs file as returned from getSpecs
+     * @param specSectionStart
+     *            start of spec section, for example "*cpp:"
+     * @param options
+     *            command line switches such as "-istart"
+     */
+    public static String[][] parseSpecs(String[] specsContent,
+            String specSectionStart, String[] options) {
+        if (specsContent == null) {
+            throw new NullPointerException("specsContent");
+        }
+        if (specSectionStart == null) {
+            throw new NullPointerException("specSectionStart");
+        }
+        if (options == null) {
+            throw new NullPointerException("option");
+        }
+        String[][] optionValues = new String[options.length][];
+        StringBuffer optionValue = new StringBuffer(40);
+        for (int i = 0; i < specsContent.length; i++) {
+            String specLine = specsContent[i];
+            //
+            //   if start of section then start paying attention
+            //
+            if (specLine.startsWith(specSectionStart)) {
+                Vector[] optionVectors = new Vector[options.length];
+                for (int j = 0; j < options.length; j++) {
+                    optionVectors[j] = new Vector(10);
+                }
+                //
+                //  go to next line and examine contents
+                //     and repeat until end of file
+                //
+                for (i++; i < specsContent.length; i++) {
+                    specLine = specsContent[i];
+                    for (int j = 0; j < options.length; j++) {
+                        int optionStart = specLine.indexOf(options[j]);
+                        while (optionStart >= 0) {
+                            optionValue.setLength(0);
+                            //
+                            //   walk rest of line looking for first non
+                            // whitespace
+                            //       and then next space
+                            boolean hasNonBlank = false;
+                            int k = optionStart + options[j].length();
+                            for (; k < specLine.length(); k++) {
+                                //
+                                //  either a blank or a "}" (close of
+                                // conditional)
+                                //    section will end the path
+                                //
+                                if (specLine.charAt(k) == ' '
+                                        || specLine.charAt(k) == '}') {
+                                    if (hasNonBlank) {
+                                        break;
+                                    }
+                                } else {
+                                    hasNonBlank = true;
+                                    optionValue.append(specLine.charAt(k));
+                                }
+                            }
+                            //
+                            //  transition back to whitespace
+                            //     value is over, add it to vector
+                            if (hasNonBlank) {
+                                optionVectors[j].addElement(optionValue
+                                        .toString());
+                            }
+                            //
+                            //  find next occurance on line
+                            //
+                            optionStart = specLine.indexOf(options[j], k);
+                        }
+                    }
+                }
+                //
+                //   copy vectors over to option arrays
+                //
+                for (int j = 0; j < options.length; j++) {
+                    optionValues[j] = new String[optionVectors[j].size()];
+                    optionVectors[j].copyInto(optionValues[j]);
+                }
+            }
+        }
+        //
+        //   fill in any missing option values with
+        //      a zero-length string array
+        for (int i = 0; i < optionValues.length; i++) {
+            String[] zeroLenArray = new String[0];
+            if (optionValues[i] == null) {
+                optionValues[i] = zeroLenArray;
+            }
+        }
+        return optionValues;
+    }
+    private GccProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
new file mode 100644
index 0000000000..6a4c0ab14b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java
@@ -0,0 +1,210 @@
+/*
+ * 
+ * Copyright 2003-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CaptureStreamHandler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+/**
+ * Adapter for the g++ variant of the GCC linker
+ * 
+ * @author Stephen M. Webb <stephen.webb@bregmasoft.com>
+ */
+public class GppLinker extends AbstractLdLinker {
+    protected static final String[] discardFiles = new String[0];
+    protected static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private final static String libPrefix = "libraries: =";
+    protected static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static String[] linkerOptions = new String[]{"-bundle", "-dylib",
+            "-dynamic", "-dynamiclib", "-nostartfiles", "-nostdlib",
+            "-prebind", "-s", "-static", "-shared", "-symbolic", "-Xlinker"};
+    private static final GppLinker dllLinker = new GppLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".so", false, new GppLinker(GccCCompiler.CMD_PREFIX + "gcc",
+                    objFiles, discardFiles, "lib", ".so", true, null));
+    private static final GppLinker instance = new GppLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "", "",
+            false, null);
+    private static final GppLinker machDllLinker = new GppLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".dylib", false, null);
+    private static final GppLinker machPluginLinker = new GppLinker(
+            GccCCompiler.CMD_PREFIX + "gcc", objFiles, discardFiles, "lib",
+            ".bundle", false, null);
+    public static GppLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private String runtimeLibrary;
+    protected GppLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, GppLinker libtoolLinker) {
+        super(command, "-dumpversion", extensions, ignoredExtensions,
+                outputPrefix, outputSuffix, isLibtool, libtoolLinker);
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        super.addImpliedArgs(debug, linkType, args, defaultflag);
+        if (getIdentifier().indexOf("mingw") >= 0) {
+            if (linkType.isSubsystemConsole()) {
+                args.addElement("-mconsole");
+            }
+            if (linkType.isSubsystemGUI()) {
+                args.addElement("-mwindows");
+            }
+        }
+        if (linkType.isStaticRuntime()) {
+            String[] cmdin = new String[]{GccCCompiler.CMD_PREFIX + "g++",
+                    "-print-file-name=libstdc++.a"};
+            String[] cmdout = CaptureStreamHandler.run(cmdin);
+            if (cmdout.length > 0) {
+                runtimeLibrary = cmdout[0];
+            } else {
+                runtimeLibrary = null;
+            }
+        } else {
+            runtimeLibrary = "-lstdc++";
+        }
+    }
+    public String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        String[] rs = super.addLibrarySets(task, libsets, preargs, midargs,
+                endargs);
+        if (runtimeLibrary != null) {
+            endargs.addElement(runtimeLibrary);
+        }
+        return rs;
+    }
+    /**
+     * Allows drived linker to decorate linker option. Override by GppLinker to
+     * prepend a "-Wl," to pass option to through gcc to linker.
+     * 
+     * @param buf
+     *            buffer that may be used and abused in the decoration process,
+     *            must not be null.
+     * @param arg
+     *            linker argument
+     */
+    public String decorateLinkerOption(StringBuffer buf, String arg) {
+        String decoratedArg = arg;
+        if (arg.length() > 1 && arg.charAt(0) == '-') {
+            switch (arg.charAt(1)) {
+                //
+                //   passed automatically by GCC
+                //
+                case 'g' :
+                case 'f' :
+                case 'F' :
+                /* Darwin */
+                case 'm' :
+                case 'O' :
+                case 'W' :
+                case 'l' :
+                case 'L' :
+                case 'u' :
+                    break;
+                default :
+                    boolean known = false;
+                    for (int i = 0; i < linkerOptions.length; i++) {
+                        if (linkerOptions[i].equals(arg)) {
+                            known = true;
+                            break;
+                        }
+                    }
+                    if (!known) {
+                        buf.setLength(0);
+                        buf.append("-Wl,");
+                        buf.append(arg);
+                        decoratedArg = buf.toString();
+                    }
+                    break;
+            }
+        }
+        return decoratedArg;
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            Vector dirs = new Vector();
+            // Ask GCC where it will look for its libraries.
+            String[] args = new String[]{GccCCompiler.CMD_PREFIX + "g++",
+                    "-print-search-dirs"};
+            String[] cmdout = CaptureStreamHandler.run(args);
+            for (int i = 0; i < cmdout.length; ++i) {
+                int prefixIndex = cmdout[i].indexOf(libPrefix);
+                if (prefixIndex >= 0) {
+                    // Special case DOS-type GCCs like MinGW or Cygwin
+                    int s = prefixIndex + libPrefix.length();
+                    int t = cmdout[i].indexOf(';', s);
+                    while (t > 0) {
+                        dirs.addElement(cmdout[i].substring(s, t));
+                        s = t + 1;
+                        t = cmdout[i].indexOf(';', s);
+                    }
+                    dirs.addElement(cmdout[i].substring(s));
+                    ++i;
+                    for (; i < cmdout.length; ++i) {
+                        dirs.addElement(cmdout[i]);
+                    }
+                }
+            }
+            // Eliminate all but actual directories.
+            String[] libpath = new String[dirs.size()];
+            dirs.copyInto(libpath);
+            int count = CUtil.checkDirectoryArray(libpath);
+            // Build return array.
+            libDirs = new File[count];
+            int index = 0;
+            for (int i = 0; i < libpath.length; ++i) {
+                if (libpath[i] != null) {
+                    libDirs[index++] = new File(libpath[i]);
+                }
+            }
+        }
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isPluginModule()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machPluginLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        if (type.isSharedLibrary()) {
+            if (GccProcessor.getMachine().indexOf("darwin") >= 0) {
+                return machDllLinker;
+            } else {
+                return dllLinker;
+            }
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
new file mode 100644
index 0000000000..fc7761e87c
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java
@@ -0,0 +1,60 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.gcc.cross.sparc_sun_solaris2;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+/**
+ * Adapter for the 'ld' linker
+ * 
+ * @author Curt Arnold
+ */
+public final class LdLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final LdLinker dllLinker = new LdLinker(
+            GccCCompiler.CMD_PREFIX + "ld", objFiles, discardFiles, "lib",
+            ".so", false, new LdLinker(GccCCompiler.CMD_PREFIX + "ld",
+                    objFiles, discardFiles, "lib", ".so", true, null));
+    private static final LdLinker instance = new LdLinker(
+            GccCCompiler.CMD_PREFIX + "ld", objFiles, discardFiles, "", "",
+            false, null);
+    public static LdLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private LdLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix,
+            String outputSuffix, boolean isLibtool, LdLinker libtoolLinker) {
+        super(command, "-version", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, isLibtool, libtoolLinker);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
new file mode 100644
index 0000000000..951bfc1a75
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
@@ -0,0 +1,104 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.hp;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the HP aC++ C++ compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class aCCCompiler extends GccCompatibleCCompiler {
+    private static final aCCCompiler instance = new aCCCompiler("aCC", false,
+            null);
+    /**
+     * Gets singleton instance of this class
+     */
+    public static aCCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    /**
+     * Private constructor. Use GccCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private aCCCompiler(String command, boolean newEnvironment, Environment env) {
+        super(command, "-help", false, null, newEnvironment, env);
+    }
+    public void addImpliedArgs(Vector args, boolean debug,
+            boolean multithreaded, boolean exceptions, LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization) {
+        args.addElement("-c");
+        if (debug) {
+            args.addElement("-g");
+        }
+        /*
+         * if (multithreaded) { args.addElement("-mt"); }
+         */
+        if (linkType.isSharedLibrary()) {
+            args.addElement("+z");
+        }
+    }
+    public void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("-w");
+                break;
+            case 1 :
+            case 2 :
+                args.addElement("+w");
+                break;
+        /*
+         * case 3: case 4: case 5: args.addElement("+w2"); break;
+         */
+        }
+    }
+    public File[] getEnvironmentIncludePath() {
+        if (includePath == null) {
+            File ccLoc = CUtil.getExecutableLocation("aCC");
+            if (ccLoc != null) {
+                File compilerIncludeDir = new File(
+                        new File(ccLoc, "../include").getAbsolutePath());
+                if (compilerIncludeDir.exists()) {
+                    includePath = new File[2];
+                    includePath[0] = compilerIncludeDir;
+                }
+            }
+            if (includePath == null) {
+                includePath = new File[1];
+            }
+            includePath[includePath.length - 1] = new File("/usr/include");
+        }
+        return includePath;
+    }
+    public Linker getLinker(LinkType linkType) {
+        return aCCLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
new file mode 100644
index 0000000000..86b22e0522
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/hp/aCCLinker.java
@@ -0,0 +1,100 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.hp;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+/**
+ * Adapter for Sun (r) Forte(tm) C++ Linker
+ * 
+ * @author Curt Arnold
+ */
+public final class aCCLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final aCCLinker arLinker = new aCCLinker("aCC", objFiles,
+            discardFiles, "", ".a");
+    private static final aCCLinker dllLinker = new aCCLinker("aCC", objFiles,
+            discardFiles, "lib", ".sl");
+    private static final aCCLinker instance = new aCCLinker("aCC", objFiles,
+            discardFiles, "", "");
+    public static aCCLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private aCCLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix, String outputSuffix) {
+        super(command, "-help", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, false, null);
+    }
+    public void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
+        if (debug) {
+            args.addElement("-g");
+        }
+        /*
+         * if(linkType.isStaticRuntime()) { args.addElement("-static"); }
+         */
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-b");
+        }
+        /*
+         * if (linkType.isStaticLibrary()) { args.addElement("-Wl,-noshared"); }
+         */
+    }
+    public void addIncremental(boolean incremental, Vector args) {
+        /*
+         * if (incremental) { args.addElement("-xidlon"); } else {
+         * args.addElement("-xidloff"); }
+         */
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            File CCloc = CUtil.getExecutableLocation("aCC");
+            if (CCloc != null) {
+                File compilerLib = new File(new File(CCloc, "../lib")
+                        .getAbsolutePath());
+                if (compilerLib.exists()) {
+                    libDirs = new File[2];
+                    libDirs[0] = compilerLib;
+                }
+            }
+            if (libDirs == null) {
+                libDirs = new File[1];
+            }
+        }
+        libDirs[libDirs.length - 1] = new File("/usr/lib");
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return arLinker;
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
new file mode 100644
index 0000000000..f181c0e3af
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
@@ -0,0 +1,111 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.ibm;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the IBM(r) Visual Age(tm) C++ compiler for AIX(tm)
+ * 
+ * @author Curt Arnold
+ */
+public final class VisualAgeCCompiler extends GccCompatibleCCompiler {
+    private static final VisualAgeCCompiler instance = new VisualAgeCCompiler(
+            "xlC", false, null);
+    /**
+     * Gets singleton instance of this class
+     */
+    public static VisualAgeCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    /**
+     * Private constructor. Use getInstance() to get singleton instance of this
+     * class.
+     */
+    private VisualAgeCCompiler(String command, boolean newEnvironment,
+            Environment env) {
+        super(command, "-help", false, null, newEnvironment, env);
+    }
+    public void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization) {
+        args.addElement("-c");
+        if (debug) {
+            args.addElement("-g");
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-fpic");
+        }
+        if (rtti != null) {
+        	if (rtti.booleanValue()) {
+        		args.addElement("-qrtti=all");
+        	} else {
+        		args.addElement("-qnortti");
+        	}
+        }
+    }
+    public void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("-w");
+                break;
+            case 1 :
+                args.addElement("-qflag=s:s");
+                break;
+            case 2 :
+                args.addElement("-qflag=e:e");
+                break;
+            case 3 :
+                args.addElement("-qflag=w:w");
+                break;
+            case 4 :
+                args.addElement("-qflag=i:i");
+                break;
+            case 5 :
+                args.addElement("-qhalt=w:w");
+                break;
+        }
+    }
+    public Linker getLinker(LinkType linkType) {
+        return VisualAgeLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    /**
+     * Gets identifier for the compiler.
+     * 
+     * Initial attempt at extracting version information
+     * would lock up.  Using a stock response.
+     */
+    public String getIdentifier() {
+    	return "VisualAge compiler - unidentified version";
+    }
+    
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
new file mode 100644
index 0000000000..f0a811b4ea
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java
@@ -0,0 +1,75 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.ibm;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import net.sf.antcontrib.cpptasks.gcc.GccLibrarian;
+/**
+ * Adapter for IBM(r) Visual Age(tm) Linker for AIX(tm)
+ * 
+ * @author Curt Arnold
+ */
+public final class VisualAgeLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[]{};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final VisualAgeLinker dllLinker = new VisualAgeLinker(
+            "makeC++SharedLib", objFiles, discardFiles, "lib", ".so");
+    private static final VisualAgeLinker instance = new VisualAgeLinker("xlC",
+            objFiles, discardFiles, "", "");
+    public static VisualAgeLinker getInstance() {
+        return instance;
+    }
+    private VisualAgeLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix, String outputSuffix) {
+        //
+        //  just guessing that -? might display something useful
+        //
+        super(command, "-?", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, false, null);
+    }
+    public void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
+        if (debug) {
+            //args.addElement("-g");
+        }
+        if (linkType.isSharedLibrary()) {
+            //args.addElement("-G");
+        }
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+    /**
+     * Gets identifier for the compiler.
+     * 
+     * Initial attempt at extracting version information
+     * would lock up.  Using a stock response.
+     */
+    public String getIdentifier() {
+    	return "VisualAge linker - unidentified version";
+    }
+    
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
new file mode 100644
index 0000000000..65402f41fb
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java
@@ -0,0 +1,58 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Intel (r) C/C++ compiler for IA-32 Linux (r)
+ * 
+ * The Intel (r) C/C++ compiler for IA32 Linux mimics the command options for
+ * gcc compiler.
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelLinux32CCompiler extends GccCompatibleCCompiler {
+    private static final IntelLinux32CCompiler instance = new IntelLinux32CCompiler(
+            false, new IntelLinux32CCompiler(true, null, false, null), false,
+            null);
+    public static IntelLinux32CCompiler getInstance() {
+        return instance;
+    }
+    private IntelLinux32CCompiler(boolean isLibtool,
+            IntelLinux32CCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super("icc", "-V", isLibtool, libtoolCompiler, newEnvironment, env);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new IntelLinux32CCompiler(getLibtool(),
+                    (IntelLinux32CCompiler) getLibtoolCompiler(),
+                    newEnvironment, env);
+        }
+        return this;
+    }
+    public Linker getLinker(LinkType type) {
+        return IntelLinux32Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
new file mode 100644
index 0000000000..268f490ff3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java
@@ -0,0 +1,55 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import net.sf.antcontrib.cpptasks.gcc.GccLibrarian;
+/**
+ * Adapter for the Intel (r) Linker for Linux (r) for IA-32
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelLinux32Linker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final IntelLinux32Linker dllLinker = new IntelLinux32Linker(
+            "lib", ".so", false, new IntelLinux32Linker("lib", ".so", true,
+                    null));
+    private static final IntelLinux32Linker instance = new IntelLinux32Linker(
+            "", "", false, null);
+    public static IntelLinux32Linker getInstance() {
+        return instance;
+    }
+    private IntelLinux32Linker(String outputPrefix, String outputSuffix,
+            boolean isLibtool, IntelLinux32Linker libtoolLinker) {
+        super("icc", "-V", objFiles, discardFiles, outputPrefix, outputSuffix,
+                isLibtool, libtoolLinker);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
new file mode 100644
index 0000000000..5a506e0d85
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java
@@ -0,0 +1,58 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Intel (r) C/C++ compiler for IA-64 Linux (r)
+ * 
+ * The Intel C/C++ compiler for IA-64 Linux mimics the command options for gcc
+ * compiler.
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelLinux64CCompiler extends GccCompatibleCCompiler {
+    private static final IntelLinux64CCompiler instance = new IntelLinux64CCompiler(
+            false, new IntelLinux64CCompiler(true, null, false, null), false,
+            null);
+    public static IntelLinux64CCompiler getInstance() {
+        return instance;
+    }
+    private IntelLinux64CCompiler(boolean isLibtool,
+            IntelLinux64CCompiler libtoolCompiler, boolean newEnvironment,
+            Environment env) {
+        super("ecc", "-V", isLibtool, libtoolCompiler, newEnvironment, env);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new IntelLinux64CCompiler(getLibtool(),
+                    (IntelLinux64CCompiler) this.getLibtoolCompiler(),
+                    newEnvironment, env);
+        }
+        return this;
+    }
+    public Linker getLinker(LinkType type) {
+        return IntelLinux64Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
new file mode 100644
index 0000000000..f381403510
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java
@@ -0,0 +1,55 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+import net.sf.antcontrib.cpptasks.gcc.GccLibrarian;
+/**
+ * Adapter for the Intel (r) linker for Linux for IA-64
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelLinux64Linker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[0];
+    private static final String[] libtoolObjFiles = new String[]{".fo", ".a",
+            ".lib", ".dll", ".so", ".sl"};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib",
+            ".dll", ".so", ".sl"};
+    private static final IntelLinux64Linker dllLinker = new IntelLinux64Linker(
+            "lib", ".so", false, new IntelLinux64Linker("lib", ".so", true,
+                    null));
+    private static final IntelLinux64Linker instance = new IntelLinux64Linker(
+            "", "", false, null);
+    public static IntelLinux64Linker getInstance() {
+        return instance;
+    }
+    private IntelLinux64Linker(String outputPrefix, String outputSuffix,
+            boolean isLibtool, IntelLinux64Linker libtoolLinker) {
+        super("ecc", "-V", objFiles, discardFiles, outputPrefix, outputSuffix,
+                isLibtool, libtoolLinker);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return GccLibrarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
new file mode 100644
index 0000000000..d1b4eafec5
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelProcessor.java
@@ -0,0 +1,51 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioProcessor;
+/**
+ * A add-in class for Intel (r) compilers and linkers
+ * 
+ *  
+ */
+public class IntelProcessor {
+    public static void addWarningSwitch(Vector args, int level) {
+        DevStudioProcessor.addWarningSwitch(args, level);
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        return DevStudioProcessor.getCommandFileSwitch(cmdFile);
+    }
+    public static void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        DevStudioProcessor.getDefineSwitch(buffer, define, value);
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return DevStudioProcessor.getIncludeDirSwitch(includeDir);
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        return DevStudioProcessor.getOutputFileSwitch(outPath);
+    }
+    public static void getUndefineSwitch(StringBuffer buffer, String define) {
+        DevStudioProcessor.getUndefineSwitch(buffer, define);
+    }
+    public static boolean isCaseSensitive() {
+        return false;
+    }
+    private IntelProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java
new file mode 100644
index 0000000000..5255cb90ce
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java
@@ -0,0 +1,66 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineAslcompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioLinker;
+/**
+ * Adapter for Intel ASL compiler
+ *
+ */
+public final class IntelWin32Aslcompiler extends CommandLineAslcompiler{
+   private final static String[] sourceExtensions = new String[]{".asl"};
+   private final static String[] headerExtensions = new String[]{};
+   private final static String[] defaultflags = new String[]{};
+   private static final IntelWin32Aslcompiler instance = new IntelWin32Aslcompiler("iasl", 
+       sourceExtensions, headerExtensions, false);
+   
+   /**
+    * Gets gcc adapter
+    */
+   public static IntelWin32Aslcompiler getInstance() {
+       return instance;
+   }
+   
+   /**
+    * Private constructor. Use GccAssembler.getInstance() to get singleton
+    * instance of this class. 
+    */
+   private IntelWin32Aslcompiler(String command, String[] sourceExtensions,
+       String[] headerExtensions, boolean isLibtool){
+       super(command, null, sourceExtensions, headerExtensions, 
+               ".aml");
+   }
+   public void addImpliedArgs(Vector args, boolean debug,
+       Boolean defaultflag){
+       if (defaultflag != null && defaultflag.booleanValue()) {
+           for (int i = 0; i < defaultflags.length; i++) {
+               args.addElement(defaultflags[i]);
+           }
+       }
+   }
+   public int getMaximumCommandLength() {
+       return Integer.MAX_VALUE;
+   }
+   public Linker getLinker(LinkType linkType) {
+     return DevStudioLinker.getInstance().getLinker(linkType);
+   }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
new file mode 100644
index 0000000000..7aef79999f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java
@@ -0,0 +1,53 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleCCompiler;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Intel (r) C++ compiler for 32-bit applications
+ * 
+ * The Intel (r) C++ compiler for IA32 Windows mimics the command options for
+ * the Microsoft (r) C++ compiler.
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelWin32CCompiler extends DevStudioCompatibleCCompiler {
+    private static final IntelWin32CCompiler instance = new IntelWin32CCompiler(
+            false, null);
+    public static IntelWin32CCompiler getInstance() {
+        return instance;
+    }
+    private IntelWin32CCompiler(boolean newEnvironment, Environment env) {
+        super("icl", null, newEnvironment, env);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new IntelWin32CCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    public Linker getLinker(LinkType type) {
+        return IntelWin32Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
new file mode 100644
index 0000000000..e83da1ce0b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java
@@ -0,0 +1,38 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleLibrarian;
+/**
+ * Adapter for the xilib from the Intel(r) C++ Compiler for IA-32 or IA-64
+ * systems running Microsoft (r) operating systems
+ * 
+ * @author Curt Arnold
+ */
+public class IntelWin32Librarian extends DevStudioCompatibleLibrarian {
+    private static final IntelWin32Librarian instance = new IntelWin32Librarian();
+    public static IntelWin32Librarian getInstance() {
+        return instance;
+    }
+    protected IntelWin32Librarian() {
+        super("xilib", "/bogus");
+    }
+    public Linker getLinker(LinkType type) {
+        return IntelWin32Linker.getInstance().getLinker(type);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
new file mode 100644
index 0000000000..51258e23ca
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java
@@ -0,0 +1,46 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleLinker;
+/**
+ * Adapter for the Intel (r) linker for 32-bit applications
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelWin32Linker extends DevStudioCompatibleLinker {
+    private static final IntelWin32Linker dllLinker = new IntelWin32Linker(
+            ".dll");
+    private static final IntelWin32Linker instance = new IntelWin32Linker(
+            ".exe");
+    public static IntelWin32Linker getInstance() {
+        return instance;
+    }
+    private IntelWin32Linker(String outputSuffix) {
+        super("xilink", "/bogus", outputSuffix);
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return IntelWin32Librarian.getInstance();
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
new file mode 100644
index 0000000000..9b8d2c9db4
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java
@@ -0,0 +1,53 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.intel;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.devstudio.DevStudioCompatibleCCompiler;
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Intel C++ compiler for Itanium(TM) Applications
+ * 
+ * @author Curt Arnold
+ */
+public final class IntelWin64CCompiler extends DevStudioCompatibleCCompiler {
+    private static final IntelWin64CCompiler instance = new IntelWin64CCompiler(
+            false, null);
+    public static IntelWin64CCompiler getInstance() {
+        return instance;
+    }
+    private IntelWin64CCompiler(boolean newEnvironment, Environment env) {
+        super("ecl", null, newEnvironment, env);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new IntelWin64CCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    public Linker getLinker(LinkType type) {
+        //
+        //   currently the Intel Win32 and Win64 linkers
+        //      are command line equivalent
+        return IntelWin32Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
new file mode 100644
index 0000000000..633b55ec0c
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java
@@ -0,0 +1,157 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os390;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.CompilerDef;
+import net.sf.antcontrib.cpptasks.compiler.AbstractCompiler;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.types.DefineArgument;
+import net.sf.antcontrib.cpptasks.types.UndefineArgument;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) C++ Compiler
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class OS390CCompiler extends CommandLineCCompiler {
+    private static final AbstractCompiler instance = new OS390CCompiler(false,
+            null);
+    public static AbstractCompiler getInstance() {
+        return instance;
+    }
+    private OS390CCompiler(boolean newEnvironment, Environment env) {
+        super("cxx", null, new String[]{".c", ".cc", ".cpp", ".cxx", ".c++",
+                ".s"}, new String[]{".h", ".hpp"}, ".o", false, null,
+                newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        // Specifies that only compilations and assemblies be done.
+        //  Link-edit is not done
+        args.addElement("-c");
+        args.addElement("-W");
+        args.addElement("c,NOEXPMAC,NOSHOWINC");
+        /*
+         * if (exceptions) { args.addElement("/GX"); }
+         */
+        if (debug) {
+            args.addElement("-g");
+            args.addElement("-D");
+            args.addElement("_DEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MTd"); } else { args.addElement("/MDd");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/MLd"); }
+             */
+        } else {
+            args.addElement("-D");
+            args.addElement("NEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MT"); } else { args.addElement("/MD");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/ML"); }
+             */
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        OS390Processor.addWarningSwitch(args, level);
+    }
+    /**
+     * The buildDefineArguments implementation CommandLineCCompiler is not good
+     * for us because os390 defines are give by -D definex instead of
+     * /Ddefinex, 2 args not 1! since we implement this ourslefs, we do not
+     * have to implement the getDefineSwitch() and the getUndefineSwitch().
+     */
+    protected void buildDefineArguments(CompilerDef[] defs, Vector args) {
+        //
+        //   assume that we aren't inheriting defines from containing <cc>
+        //
+        UndefineArgument[] merged = defs[0].getActiveDefines();
+        for (int i = 1; i < defs.length; i++) {
+            //
+            //  if we are inheriting, merge the specific defines with the
+            //      containing defines
+            merged = DefineArgument.merge(defs[i].getActiveDefines(), merged);
+        }
+        StringBuffer buf = new StringBuffer(30);
+        for (int i = 0; i < merged.length; i++) {
+            buf.setLength(0);
+            UndefineArgument current = merged[i];
+            if (current.isDefine()) {
+                args.addElement("-D");
+                buf.append(current.getName());
+                if (current.getValue() != null
+                        && current.getValue().length() > 0) {
+                    buf.append('=');
+                    buf.append(current.getValue());
+                }
+                args.addElement(buf.toString());
+            } else {
+                args.addElement("-U");
+                args.addElement(current.getName());
+            }
+        }
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new OS390CCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    /*
+     * @see CommandLineCompiler#getDefineSwitch(StringBuffer, String, String)
+     */
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return OS390Processor.getIncludeDirSwitch(includeDir);
+    }
+    public Linker getLinker(LinkType type) {
+        return OS390Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    /* Only compile one file at time for now */
+    protected int getMaximumInputFilesPerCommand() {
+        return Integer.MAX_VALUE;
+    }
+    /*
+     * @see CommandLineCompiler#getUndefineSwitch(StringBuffer, String)
+     */
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
new file mode 100644
index 0000000000..f6653b7be4
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Linker.java
@@ -0,0 +1,201 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os390;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) Linker
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public final class OS390Linker extends CommandLineLinker {
+    private static final OS390Linker datasetLinker = new OS390Linker();
+    private static final OS390Linker dllLinker = new OS390Linker("", ".dll");
+    private static final OS390Linker instance = new OS390Linker("", "");
+    public static OS390Linker getDataSetInstance() {
+        return datasetLinker;
+    }
+    public static OS390Linker getInstance() {
+        return instance;
+    }
+    private boolean isADatasetLinker;
+    File outputFile;
+    private String outputPrefix;
+    CCTask task;
+    private OS390Linker() {
+        super("cxx", "/bogus", new String[]{".o", ".a", ".lib", ".xds"},
+                new String[]{".dll", ".x"}, ".xds", false, null);
+        this.outputPrefix = "";
+        this.isADatasetLinker = true;
+    }
+    private OS390Linker(String outputPrefix, String outputSuffix) {
+        super("cxx", "/bogus", new String[]{".o", ".a", ".lib", ".x"},
+                new String[]{".dll"}, outputSuffix, false, null);
+        this.outputPrefix = outputPrefix;
+        this.isADatasetLinker = false;
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-W");
+            args.addElement("l,DLL");
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    /*
+     * @see CommandLineLinker#addLibrarySets(LibrarySet[], Vector, Vector,
+     *      Vector)
+     */
+    protected String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        // If yo want to link against a library sitting in a dataset and
+        // not in the HFS, you can just use the //'dataset' notation
+        // to specify it. e.g:
+        // <libset dir="." libs="//'MQM.V5R2M0.SCSQLOAD'"/>
+        //
+        // We have to have special handling here because the file is not
+        // on the normal filesystem so the task will not noramly include it
+        // as part of the link command.
+        if (libsets != null) {
+            for (int i = 0; i < libsets.length; i++) {
+                String libs[] = libsets[i].getLibs();
+                for (int j = 0; j < libs.length; j++) {
+                    if (libs[j].startsWith("//")) {
+                        endargs.addElement("-l");
+                        endargs.addElement(libs[j]);
+                    } else if (libsets[i].getDataset() != null) {
+                        String ds = libsets[i].getDataset();
+                        endargs.addElement("//'" + ds + "(" + libs[j] + ")'");
+                    }
+                }
+            }
+        }
+        return super.addLibrarySets(task, libsets, preargs, midargs, endargs);
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("LIB", ";");
+    }
+    
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length * 3];
+        int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        offset = addLibraryPatterns(libnames, buf, "", ".x", patterns, offset);
+        offset = addLibraryPatterns(libnames, buf, "", ".o", patterns, offset);
+        return patterns;
+    }
+    
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    
+    public Linker getLinker(LinkType linkType) {
+        if (this == datasetLinker)
+            return datasetLinker;
+        if (linkType.isSharedLibrary())
+            return dllLinker;
+        return instance;
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    public String getOutputFileName(String baseName) {
+        return outputPrefix + super.getOutputFileName(baseName);
+    }
+    protected String[] getOutputFileSwitch(CCTask task, String outputFile) {
+        if (isADatasetLinker && task.getDataset() != null) {
+            String ds = task.getDataset();
+            outputFile = "//'" + ds + "(" + outputFile + ")'";
+        }
+        return getOutputFileSwitch(outputFile);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    public boolean isCaseSensitive() {
+        return OS390Processor.isCaseSensitive();
+    }
+    /*
+     * @see CommandLineLinker#link(Task, File, String[],
+     *      CommandLineLinkerConfiguration)
+     */
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        this.task = task;
+        this.outputFile = outputFile;
+        if (isADatasetLinker) {
+            int p = outputFile.getName().indexOf(".");
+            if (p >= 0) {
+                String newname = outputFile.getName().substring(0, p);
+                outputFile = new File(outputFile.getParent(), newname);
+            }
+        }
+        super.link(task, outputFile, sourceFiles, config);
+    }
+    /*
+     * @see CommandLineLinker#runCommand(Task, File, String[])
+     */
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+            throws BuildException {
+        int rc = super.runCommand(task, workingDir, cmdline);
+        // create the .xds file if everything was ok.
+        if (rc == 0) {
+            try {
+                outputFile.delete();
+                new FileOutputStream(outputFile).close();
+            } catch (IOException e) {
+                throw new BuildException(e.getMessage());
+            }
+        }
+        return rc;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
new file mode 100644
index 0000000000..2c209dd6bb
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os390/OS390Processor.java
@@ -0,0 +1,71 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os390;
+import java.util.Vector;
+/**
+ * A add-in class for IBM (r) OS/390 compilers and linkers
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class OS390Processor {
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+        /*
+         * case 0: args.addElement("/W0"); break;
+         * 
+         * case 1: args.addElement("/W1"); break;
+         * 
+         * case 2: break;
+         * 
+         * case 3: args.addElement("/W3"); break;
+         * 
+         * case 4: args.addElement("/W4"); break;
+         */
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        if (cmdFile.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(cmdFile);
+            buf.append('\"');
+        } else {
+            buf.append(cmdFile);
+        }
+        return buf.toString();
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        StringBuffer buf = new StringBuffer("-o ");
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+        String[] retval = new String[]{buf.toString()};
+        return retval;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    private OS390Processor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
new file mode 100644
index 0000000000..f40858f71b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccCompiler.java
@@ -0,0 +1,124 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os400;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.AbstractCompiler;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) C++ Compiler
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class IccCompiler extends CommandLineCCompiler {
+    private static final AbstractCompiler instance = new IccCompiler(false,
+            null);
+    public static AbstractCompiler getInstance() {
+        return instance;
+    }
+    private IccCompiler(boolean newEnvironment, Environment env) {
+        super("icc", null, new String[]{".c", ".cc", ".cpp", ".cxx", ".c++",
+                ".s"}, new String[]{".h", ".hpp"}, ".o", false, null,
+                newEnvironment, env);
+    }
+    protected void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        // Specifies that only compilations and assemblies be done.
+        //  Link-edit is not done
+        args.addElement("-c");
+        /*
+         * if (exceptions) { args.addElement("/GX"); }
+         */
+        if (debug) {
+            args.addElement("-g");
+            /*
+             * args.addElement("-D"); args.addElement("_DEBUG"); if
+             * (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MTd"); } else { args.addElement("/MDd");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/MLd"); }
+             */
+        } else {
+            /*
+             * args.addElement("-D"); args.addElement("NEBUG"); if
+             * (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MT"); } else { args.addElement("/MD");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/ML"); }
+             */
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        IccProcessor.addWarningSwitch(args, level);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new IccCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    /*
+     * @see CommandLineCompiler#getDefineSwitch(StringBuffer, String, String)
+     */
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("-q");
+        buffer.append(define);
+        if (value != null && value.length() > 0) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return IccProcessor.getIncludeDirSwitch(includeDir);
+    }
+    public Linker getLinker(LinkType type) {
+        return IccLinker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    /* Only compile one file at time for now */
+    protected int getMaximumInputFilesPerCommand() {
+        return 1;
+        //return Integer.MAX_VALUE;
+    }
+    /*
+     * @see CommandLineCompiler#getUndefineSwitch(StringBuffer, String)
+     */
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        /*
+         * buffer.addElement("-q"); buf.append(define);
+         */
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java
new file mode 100644
index 0000000000..5e4e2f229a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccLinker.java
@@ -0,0 +1,202 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os400;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinkerConfiguration;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+import org.apache.tools.ant.BuildException;
+/**
+ * Adapter for the IBM (R) OS/390 (tm) Linker
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public final class IccLinker extends CommandLineLinker {
+    private static final IccLinker datasetLinker = new IccLinker();
+    private static final IccLinker dllLinker = new IccLinker("", ".dll");
+    private static final IccLinker instance = new IccLinker("", "");
+    public static IccLinker getDataSetInstance() {
+        return datasetLinker;
+    }
+    public static IccLinker getInstance() {
+        return instance;
+    }
+    private boolean isADatasetLinker;
+    File outputFile;
+    private String outputPrefix;
+    CCTask task;
+    private IccLinker() {
+        super("icc", "/bogus", new String[]{".o", ".a", ".lib", ".xds"},
+                new String[]{".dll", ".x"}, ".xds", false, null);
+        this.outputPrefix = "";
+        this.isADatasetLinker = true;
+    }
+    private IccLinker(String outputPrefix, String outputSuffix) {
+        super("icc", "/bogus", new String[]{".o", ".a", ".lib", ".x"},
+                new String[]{".dll"}, outputSuffix, false, null);
+        this.outputPrefix = outputPrefix;
+        this.isADatasetLinker = false;
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-W");
+            args.addElement("l,DLL");
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    /*
+     * @see CommandLineLinker#addLibrarySets(LibrarySet[], Vector, Vector,
+     *      Vector)
+     */
+    protected String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        // If yo want to link against a library sitting in a dataset and
+        // not in the HFS, you can just use the //'dataset' notation
+        // to specify it. e.g:
+        // <libset dir="." libs="//'MQM.V5R2M0.SCSQLOAD'"/>
+        //
+        // We have to have special handling here because the file is not
+        // on the normal filesystem so the task will not noramly include it
+        // as part of the link command.
+        if (libsets != null) {
+            for (int i = 0; i < libsets.length; i++) {
+                String libs[] = libsets[i].getLibs();
+                for (int j = 0; j < libs.length; j++) {
+                    if (libs[j].startsWith("//")) {
+                        endargs.addElement("-l");
+                        endargs.addElement(libs[j]);
+                    } else if (libsets[i].getDataset() != null) {
+                        String ds = libsets[i].getDataset();
+                        endargs.addElement("//'" + ds + "(" + libs[j] + ")'");
+                    }
+                }
+            }
+        }
+        return super.addLibrarySets(task, libsets, preargs, midargs, endargs);
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("LIB", ";");
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        String[] patterns = new String[libnames.length * 3];
+        int offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        offset = addLibraryPatterns(libnames, buf, "", ".x", patterns, offset);
+        offset = addLibraryPatterns(libnames, buf, "", ".o", patterns, offset);
+        return patterns;
+    }
+    
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    
+    
+    public Linker getLinker(LinkType linkType) {
+        if (this == datasetLinker)
+            return datasetLinker;
+        if (linkType.isSharedLibrary())
+            return dllLinker;
+        return instance;
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    protected String[] getOutputFileSwitch(CCTask task, String outputFile) {
+        if (isADatasetLinker && task.getDataset() != null) {
+            String ds = task.getDataset();
+            outputFile = "//'" + ds + "(" + outputFile + ")'";
+        }
+        return getOutputFileSwitch(outputFile);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    public boolean isCaseSensitive() {
+        return IccProcessor.isCaseSensitive();
+    }
+    /*
+     * @see CommandLineLinker#link(Task, File, String[],
+     *      CommandLineLinkerConfiguration)
+     */
+    public void link(CCTask task, File outputFile, String[] sourceFiles,
+            CommandLineLinkerConfiguration config) throws BuildException {
+        this.task = task;
+        this.outputFile = outputFile;
+        if (isADatasetLinker) {
+            int p = outputFile.getName().indexOf(".");
+            if (p >= 0) {
+                String newname = outputFile.getName().substring(0, p);
+                outputFile = new File(outputFile.getParent(), newname);
+            }
+        }
+        super.link(task, outputFile, sourceFiles, config);
+    }
+    /*
+     * @see CommandLineLinker#runCommand(Task, File, String[])
+     */
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+            throws BuildException {
+        int rc = super.runCommand(task, workingDir, cmdline);
+        // create the .xds file if everything was ok.
+        if (rc == 0) {
+            try {
+                outputFile.delete();
+                new FileOutputStream(outputFile).close();
+            } catch (IOException e) {
+                throw new BuildException(e.getMessage());
+            }
+        }
+        return rc;
+    }
+    public String xgetOutputFileName(String baseName) {
+        return outputPrefix + super.getOutputFileName(baseName);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
new file mode 100644
index 0000000000..4cc7b36ab3
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/os400/IccProcessor.java
@@ -0,0 +1,71 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.os400;
+import java.util.Vector;
+/**
+ * A add-in class for IBM (r) OS/390 compilers and linkers
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class IccProcessor {
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+        /*
+         * case 0: args.addElement("/W0"); break;
+         * 
+         * case 1: args.addElement("/W1"); break;
+         * 
+         * case 2: break;
+         * 
+         * case 3: args.addElement("/W3"); break;
+         * 
+         * case 4: args.addElement("/W4"); break;
+         */
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        if (cmdFile.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(cmdFile);
+            buf.append('\"');
+        } else {
+            buf.append(cmdFile);
+        }
+        return buf.toString();
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        StringBuffer buf = new StringBuffer("-o ");
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+        String[] retval = new String[]{buf.toString()};
+        return retval;
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    private IccProcessor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
new file mode 100644
index 0000000000..6f0b79c072
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParser.java
@@ -0,0 +1,67 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+import java.io.IOException;
+import java.io.Reader;
+/**
+ * An abstract base class for simple parsers
+ * 
+ * @author Curt Arnold
+ */
+public abstract class AbstractParser {
+    /**
+     * 
+     *  
+     */
+    protected AbstractParser() {
+    }
+    protected abstract void addFilename(String filename);
+    public abstract AbstractParserState getNewLineState();
+    protected void parse(Reader reader) throws IOException {
+        char[] buf = new char[4096];
+        AbstractParserState newLineState = getNewLineState();
+        AbstractParserState state = newLineState;
+        int charsRead = -1;
+        do {
+            charsRead = reader.read(buf, 0, buf.length);
+            if (state == null) {
+                for (int i = 0; i < charsRead; i++) {
+                    if (buf[i] == '\n') {
+                        state = newLineState;
+                        break;
+                    }
+                }
+            }
+            if (state != null) {
+                for (int i = 0; i < charsRead; i++) {
+                    state = state.consume(buf[i]);
+                    //
+                    //  didn't match a production, skip to a new line
+                    //
+                    if (state == null) {
+                        for (; i < charsRead; i++) {
+                            if (buf[i] == '\n') {
+                                state = newLineState;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        } while (charsRead >= 0);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
new file mode 100644
index 0000000000..fe66dbbef0
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/AbstractParserState.java
@@ -0,0 +1,41 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+/**
+ * An base class for objects that represent the state of an AbstractParser.
+ * 
+ * @author CurtArnold
+ * @see AbstractParser
+ */
+public abstract class AbstractParserState {
+    private AbstractParser parser;
+    protected AbstractParserState(AbstractParser parser) {
+        if (parser == null) {
+            throw new NullPointerException("parser");
+        }
+        this.parser = parser;
+    }
+    /**
+     * Consume a character
+     * 
+     * @return new state, may be null to ignore the rest of the line
+     */
+    public abstract AbstractParserState consume(char ch);
+    protected AbstractParser getParser() {
+        return parser;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java
new file mode 100644
index 0000000000..370c7d5836
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/BranchState.java
@@ -0,0 +1,46 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+public class BranchState extends AbstractParserState {
+    private char[] branchChars;
+    private AbstractParserState[] branchStates;
+    private AbstractParserState noMatchState;
+    public BranchState(AbstractParser parser, char[] branchChars,
+            AbstractParserState[] branchStates, AbstractParserState noMatchState) {
+        super(parser);
+        this.branchChars = (char[]) branchChars.clone();
+        this.branchStates = (AbstractParserState[]) branchStates.clone();
+        this.noMatchState = noMatchState;
+    }
+    public AbstractParserState consume(char ch) {
+        AbstractParserState state;
+        for (int i = 0; i < branchChars.length; i++) {
+            if (ch == branchChars[i]) {
+                state = branchStates[i];
+                return state.consume(ch);
+            }
+        }
+        state = getNoMatchState();
+        if (state != null) {
+            return state.consume(ch);
+        }
+        return state;
+    }
+    protected AbstractParserState getNoMatchState() {
+        return noMatchState;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java
new file mode 100644
index 0000000000..07f8eba4e2
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CParser.java
@@ -0,0 +1,78 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Vector;
+/**
+ * A parser that extracts #include statements from a Reader.
+ * 
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public final class CParser extends AbstractParser implements Parser {
+    private final Vector includes = new Vector();
+    private AbstractParserState newLineState;
+    /**
+     * 
+     *  
+     */
+    public CParser() {
+        AbstractParserState quote = new FilenameState(this, new char[]{'"'});
+        AbstractParserState bracket = new FilenameState(this, new char[]{'>'});
+        AbstractParserState postE = new PostE(this, bracket, quote);
+        //
+        //    nclude
+        //
+        AbstractParserState e = new LetterState(this, 'e', postE, null);
+        AbstractParserState d = new LetterState(this, 'd', e, null);
+        AbstractParserState u = new LetterState(this, 'u', d, null);
+        AbstractParserState l = new LetterState(this, 'l', u, null);
+        AbstractParserState c = new LetterState(this, 'c', l, null);
+        AbstractParserState n = new LetterState(this, 'n', c, null);
+        //
+        //   mport is equivalent to nclude
+        //
+        AbstractParserState t = new LetterState(this, 't', postE, null);
+        AbstractParserState r = new LetterState(this, 'r', t, null);
+        AbstractParserState o = new LetterState(this, 'o', r, null);
+        AbstractParserState p = new LetterState(this, 'p', o, null);
+        AbstractParserState m = new LetterState(this, 'm', p, null);
+        //
+        //   switch between
+        //
+        AbstractParserState n_m = new BranchState(this, new char[]{'n', 'm'},
+                new AbstractParserState[]{n, m}, null);
+        AbstractParserState i = new WhitespaceOrLetterState(this, 'i', n_m);
+        newLineState = new LetterState(this, '#', i, null);
+    }
+    public void addFilename(String include) {
+        includes.addElement(include);
+    }
+    public String[] getIncludes() {
+        String[] retval = new String[includes.size()];
+        includes.copyInto(retval);
+        return retval;
+    }
+    public AbstractParserState getNewLineState() {
+        return newLineState;
+    }
+    public void parse(Reader reader) throws IOException {
+        includes.setSize(0);
+        super.parse(reader);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
new file mode 100644
index 0000000000..a86700f166
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+
+/**
+ * This parser state checks consumed characters against a specific character
+ * (case insensitive).
+ *
+ * @author Curt Arnold
+ */
+public final class CaseInsensitiveLetterState
+    extends AbstractParserState {
+  /**
+   * Next state if a match is found.
+   */
+  private final AbstractParserState nextState;
+
+  /**
+   * Next state if not match is found.
+   */
+  private final AbstractParserState noMatchState;
+
+  /**
+   * Lower case version of character to match.
+   */
+  private final char lowerLetter;
+
+  /**
+   * Lower case version of character to match.
+   */
+  private final char upperLetter;
+
+  /**
+   * Constructor.
+   *
+   * @param parser
+   *            parser
+   * @param matchLetter
+   *            letter to match
+   * @param nextStateArg
+   *            next state if a match on the letter
+   * @param noMatchStateArg
+   *            state if no match on letter
+   */
+  public CaseInsensitiveLetterState(final AbstractParser parser,
+                                    final char matchLetter,
+                                    final AbstractParserState nextStateArg,
+                                    final AbstractParserState noMatchStateArg) {
+    super(parser);
+    this.lowerLetter = Character.toLowerCase(matchLetter);
+    this.upperLetter = Character.toUpperCase(matchLetter);
+    this.nextState = nextStateArg;
+    this.noMatchState = noMatchStateArg;
+  }
+
+  /**
+   * Consumes a character and returns the next state for the parser.
+   *
+   * @param ch
+   *            next character
+   * @return the configured nextState if ch is the expected character or the
+   *         configure noMatchState otherwise.
+   */
+  public AbstractParserState consume(final char ch) {
+    if (ch == lowerLetter || ch == upperLetter) {
+      return nextState;
+    }
+    if (ch == '\n') {
+      getParser().getNewLineState();
+    }
+    return noMatchState;
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java
new file mode 100644
index 0000000000..f33940b0a7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FilenameState.java
@@ -0,0 +1,41 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+public class FilenameState extends AbstractParserState {
+    private final StringBuffer buf = new StringBuffer();
+    private final char[] terminators;
+    public FilenameState(AbstractParser parser, char[] terminators) {
+        super(parser);
+        this.terminators = (char[]) terminators.clone();
+    }
+    public AbstractParserState consume(char ch) {
+        for (int i = 0; i < terminators.length; i++) {
+            if (ch == terminators[i]) {
+                getParser().addFilename(buf.toString());
+                buf.setLength(0);
+                return null;
+            }
+        }
+        if (ch == '\n') {
+            buf.setLength(0);
+            return getParser().getNewLineState();
+        } else {
+            buf.append(ch);
+        }
+        return this;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java
new file mode 100644
index 0000000000..261e95ad81
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/FortranParser.java
@@ -0,0 +1,106 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Vector;
+
+/**
+ * A parser that extracts INCLUDE statements from a Reader.
+ *
+ * @author Curt Arnold
+ */
+public final class FortranParser
+    extends AbstractParser
+    implements Parser {
+  /**
+   * List of included filenames.
+   */
+  private final Vector includes = new Vector();
+
+  /**
+   * State that starts consuming content at the beginning of a line.
+   */
+  private final AbstractParserState newLineState;
+
+  /**
+   * Default constructor.
+   *
+   */
+  public FortranParser() {
+    AbstractParserState filename = new FilenameState(this, new char[] {'\'',
+        '/'});
+    AbstractParserState apos = new WhitespaceOrLetterState(this, '\'',
+        filename);
+    AbstractParserState blank = new LetterState(this, ' ', apos, null);
+    AbstractParserState e = new CaseInsensitiveLetterState(this, 'E',
+        blank, null);
+    AbstractParserState d = new CaseInsensitiveLetterState(this, 'D', e,
+        null);
+    AbstractParserState u = new CaseInsensitiveLetterState(this, 'U', d,
+        null);
+    AbstractParserState l = new CaseInsensitiveLetterState(this, 'L', u,
+        null);
+    AbstractParserState c = new CaseInsensitiveLetterState(this, 'C', l,
+        null);
+    AbstractParserState n = new CaseInsensitiveLetterState(this, 'N', c,
+        null);
+    newLineState = new WhitespaceOrCaseInsensitiveLetterState(this, 'I', n);
+  }
+
+  /**
+   * Called by FilenameState at completion of file name production.
+   *
+   * @param include
+   *            include file name
+   */
+  public void addFilename(final String include) {
+    includes.addElement(include);
+  }
+
+  /**
+   * Gets collection of include file names encountered in parse.
+   * @return include file names
+   */
+  public String[] getIncludes() {
+    String[] retval = new String[includes.size()];
+    includes.copyInto(retval);
+    return retval;
+  }
+
+  /**
+   * Get the state for the beginning of a new line.
+   * @return start of line state
+   */
+  public AbstractParserState getNewLineState() {
+    return newLineState;
+  }
+
+  /**
+   * Collects all included files from the content of the reader.
+   *
+   * @param reader
+   *            character reader containing a FORTRAN source module
+   * @throws IOException
+   *             throw if I/O error during parse
+   */
+  public void parse(final Reader reader) throws IOException {
+    includes.setSize(0);
+    super.parse(reader);
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java
new file mode 100644
index 0000000000..945ae91233
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/LetterState.java
@@ -0,0 +1,80 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+
+/**
+ * This parser state checks consumed characters against a specific character.
+ *
+ * @author Curt Arnold
+ */
+public final class LetterState
+    extends AbstractParserState {
+  /**
+   * Next state if a match is found.
+   */
+  private final AbstractParserState nextState;
+
+  /**
+   * Next state if not match is found.
+   */
+  private final AbstractParserState noMatchState;
+
+  /**
+   * Character to match.
+   */
+  private final char thisLetter;
+
+  /**
+   * Constructor.
+   *
+   * @param parser
+   *            parser
+   * @param matchLetter
+   *            letter to match
+   * @param nextStateArg
+   *            next state if a match on the letter
+   * @param noMatchStateArg
+   *            state if no match on letter
+   */
+  public LetterState(final AbstractParser parser,
+                     final char matchLetter,
+                     final AbstractParserState nextStateArg,
+                     final AbstractParserState noMatchStateArg) {
+    super(parser);
+    this.thisLetter = matchLetter;
+    this.nextState = nextStateArg;
+    this.noMatchState = noMatchStateArg;
+  }
+
+  /**
+   * Consumes a character and returns the next state for the parser.
+   *
+   * @param ch
+   *            next character
+   * @return the configured nextState if ch is the expected character or the
+   *         configure noMatchState otherwise.
+   */
+  public AbstractParserState consume(final char ch) {
+    if (ch == thisLetter) {
+      return nextState;
+    }
+    if (ch == '\n') {
+      getParser().getNewLineState();
+    }
+    return noMatchState;
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java
new file mode 100644
index 0000000000..cf759fc7d5
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/Parser.java
@@ -0,0 +1,28 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+import java.io.IOException;
+import java.io.Reader;
+/**
+ * A parser that extracts #include statements from a Reader.
+ * 
+ * @author Curt Arnold
+ */
+public interface Parser {
+    String[] getIncludes();
+    void parse(Reader reader) throws IOException;
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java
new file mode 100644
index 0000000000..fe225fb35a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/PostE.java
@@ -0,0 +1,41 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+public class PostE extends AbstractParserState {
+    private AbstractParserState bracket;
+    private AbstractParserState quote;
+    public PostE(CParser parser, AbstractParserState bracket,
+            AbstractParserState quote) {
+        super(parser);
+        this.bracket = bracket;
+        this.quote = quote;
+    }
+    public AbstractParserState consume(char ch) {
+        switch (ch) {
+            case ' ' :
+            case '\t' :
+                return this;
+            case '<' :
+                return bracket;
+            case '"' :
+                return quote;
+            case '\n' :
+                return getParser().getNewLineState();
+        }
+        return null;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
new file mode 100644
index 0000000000..9d42feeaad
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java
@@ -0,0 +1,83 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+
+/**
+ * This parser state checks consumed characters against a specific character
+ * (case insensitive) or whitespace.
+ *
+ * @author Curt Arnold
+ */
+public final class WhitespaceOrCaseInsensitiveLetterState
+    extends
+    AbstractParserState {
+  /**
+   * Next state if the character is found.
+   */
+  private final AbstractParserState nextState;
+
+  /**
+   * Character to match (lower case).
+   */
+  private final char lowerLetter;
+
+  /**
+   * Character to match (upper case).
+   */
+  private final char upperLetter;
+
+  /**
+   * Constructor.
+   *
+   * @param parser
+   *            parser
+   * @param matchLetter
+   *            letter to match
+   * @param nextStateArg
+   *            next state if a match on the letter
+   */
+  public WhitespaceOrCaseInsensitiveLetterState(final AbstractParser parser,
+                                                final char matchLetter,
+                                                final AbstractParserState
+                                                nextStateArg) {
+    super(parser);
+    this.lowerLetter = Character.toLowerCase(matchLetter);
+    this.upperLetter = Character.toUpperCase(matchLetter);
+    this.nextState = nextStateArg;
+  }
+
+  /**
+   * Consumes a character and returns the next state for the parser.
+   *
+   * @param ch
+   *            next character
+   * @return the configured nextState if ch is the expected character or the
+   *         configure noMatchState otherwise.
+   */
+  public AbstractParserState consume(final char ch) {
+    if (ch == lowerLetter || ch == upperLetter) {
+      return nextState;
+    }
+    if (ch == ' ' || ch == '\t') {
+      return this;
+    }
+    if (ch == '\n') {
+      getParser().getNewLineState();
+    }
+    return null;
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
new file mode 100644
index 0000000000..824abe6b68
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java
@@ -0,0 +1,75 @@
+/*
+ *
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.parser;
+
+/**
+ * This parser state checks consumed characters against a specific character or
+ * whitespace.
+ *
+ * @author Curt Arnold
+ */
+public final class WhitespaceOrLetterState
+    extends AbstractParserState {
+  /**
+   * Next state if the character is found.
+   */
+  private final AbstractParserState nextState;
+
+  /**
+   * Character to match.
+   */
+  private final char thisLetter;
+
+  /**
+   * Constructor.
+   *
+   * @param parser
+   *            parser
+   * @param matchLetter
+   *            letter to match
+   * @param nextStateArg
+   *            next state if a match on the letter
+   */
+  public WhitespaceOrLetterState(final AbstractParser parser,
+                                 final char matchLetter,
+                                 final AbstractParserState nextStateArg) {
+    super(parser);
+    this.thisLetter = matchLetter;
+    this.nextState = nextStateArg;
+  }
+
+  /**
+   * Consumes a character and returns the next state for the parser.
+   *
+   * @param ch
+   *            next character @returns the configured nextState if ch is the
+   *            expected character or the configure noMatchState otherwise.
+   * @return next state
+   */
+  public AbstractParserState consume(final char ch) {
+    if (ch == thisLetter) {
+      return nextState;
+    }
+    if (ch == ' ' || ch == '\t') {
+      return this;
+    }
+    if (ch == '\n') {
+      getParser().getNewLineState();
+    }
+    return null;
+  }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
new file mode 100644
index 0000000000..6679c239dd
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89CCompiler.java
@@ -0,0 +1,109 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.sun;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.AbstractCompiler;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.compiler.Processor;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for the Sun C89 C++ Compiler
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class C89CCompiler extends CommandLineCCompiler {
+    private static final AbstractCompiler instance = new C89CCompiler(false,
+            null);
+    public static AbstractCompiler getInstance() {
+        return instance;
+    }
+    private C89CCompiler(boolean newEnvironment, Environment env) {
+        super("c89", null, new String[]{".c", ".cc", ".cpp", ".cxx", ".c++"},
+                new String[]{".h", ".hpp"}, ".o", false, null, newEnvironment,
+                env);
+    }
+    protected void addImpliedArgs(
+    		final Vector args, 
+			final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        // Specifies that only compilations and assemblies be done.
+        args.addElement("-c");
+        /*
+         * if (exceptions) { args.addElement("/GX"); }
+         */
+        if (debug) {
+            args.addElement("-g");
+            args.addElement("-D_DEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MTd"); } else { args.addElement("/MDd");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/MLd"); }
+             */
+        } else {
+            args.addElement("-DNDEBUG");
+            /*
+             * if (multithreaded) { args.addElement("/D_MT"); if (staticLink) {
+             * args.addElement("/MT"); } else { args.addElement("/MD");
+             * args.addElement("/D_DLL"); } } else { args.addElement("/ML"); }
+             */
+        }
+    }
+    protected void addWarningSwitch(Vector args, int level) {
+        C89Processor.addWarningSwitch(args, level);
+    }
+    public Processor changeEnvironment(boolean newEnvironment, Environment env) {
+        if (newEnvironment || env != null) {
+            return new C89CCompiler(newEnvironment, env);
+        }
+        return this;
+    }
+    protected void getDefineSwitch(StringBuffer buf, String define, String value) {
+        C89Processor.getDefineSwitch(buf, define, value);
+    }
+    protected File[] getEnvironmentIncludePath() {
+        return CUtil.getPathFromEnvironment("INCLUDE", ":");
+    }
+    protected String getIncludeDirSwitch(String includeDir) {
+        return C89Processor.getIncludeDirSwitch(includeDir);
+    }
+    public Linker getLinker(LinkType type) {
+        return C89Linker.getInstance().getLinker(type);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    /* Only compile one file at time for now */
+    protected int getMaximumInputFilesPerCommand() {
+        return 1;
+    }
+    protected void getUndefineSwitch(StringBuffer buf, String define) {
+        C89Processor.getUndefineSwitch(buf, define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java
new file mode 100644
index 0000000000..37b3950bbe
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Linker.java
@@ -0,0 +1,125 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.sun;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for the Sun C89 Linker
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public final class C89Linker extends CommandLineLinker {
+    private static final C89Linker dllLinker = new C89Linker("lib", ".so");
+    private static final C89Linker instance = new C89Linker("", "");
+    public static C89Linker getInstance() {
+        return instance;
+    }
+    private String outputPrefix;
+    private C89Linker(String outputPrefix, String outputSuffix) {
+        super("ld", "/bogus", new String[]{".o", ".a", ".lib", ".x"},
+                new String[]{}, outputSuffix, false, null);
+        this.outputPrefix = outputPrefix;
+    }
+    protected void addBase(long base, Vector args) {
+    }
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-G");
+        }
+    }
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    public String[] addLibrarySets(CCTask task, LibrarySet[] libsets,
+            Vector preargs, Vector midargs, Vector endargs) {
+        super.addLibrarySets(task, libsets, preargs, midargs, endargs);
+        StringBuffer buf = new StringBuffer("-l");
+        for (int i = 0; i < libsets.length; i++) {
+            LibrarySet set = libsets[i];
+            File libdir = set.getDir(null);
+            String[] libs = set.getLibs();
+            if (libdir != null) {
+                endargs.addElement("-L");
+                endargs.addElement(libdir.getAbsolutePath());
+            }
+            for (int j = 0; j < libs.length; j++) {
+                //
+                //  reset the buffer to just "-l"
+                //
+                buf.setLength(2);
+                //
+                //  add the library name
+                buf.append(libs[j]);
+                //
+                //  add the argument to the list
+                endargs.addElement(buf.toString());
+            }
+        }
+        return null;
+    }
+    protected void addMap(boolean map, Vector args) {
+    }
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    public String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    public File[] getLibraryPath() {
+        return CUtil.getPathFromEnvironment("LIB", ";");
+    }
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return C89Processor.getLibraryPatterns(libnames, libType);
+    }
+    public Linker getLinker(LinkType linkType) {
+        if (linkType.isSharedLibrary()) {
+            return dllLinker;
+        }
+        /*
+         * if(linkType.isStaticLibrary()) { return
+         * OS390Librarian.getInstance(); }
+         */
+        return instance;
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+    public String getOutputFileName(String baseName) {
+        return outputPrefix + super.getOutputFileName(baseName);
+    }
+    public String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    public boolean isCaseSensitive() {
+        return C89Processor.isCaseSensitive();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java
new file mode 100644
index 0000000000..c54c866966
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/C89Processor.java
@@ -0,0 +1,116 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.sun;
+import java.util.Vector;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * A add-in class for Sun C89 compilers and linkers
+ * 
+ * @author Hiram Chirino (cojonudo14@hotmail.com)
+ */
+public class C89Processor {
+    private static int addLibraryPatterns(String[] libnames, StringBuffer buf,
+            String prefix, String extension, String[] patterns, int offset) {
+        for (int i = 0; i < libnames.length; i++) {
+            buf.setLength(0);
+            buf.append(prefix);
+            buf.append(libnames[i]);
+            buf.append(extension);
+            patterns[offset + i] = buf.toString();
+        }
+        return offset + libnames.length;
+    }
+    public static void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+        /*
+         * case 0: args.addElement("/W0"); break;
+         * 
+         * case 1: args.addElement("/W1"); break;
+         * 
+         * case 2: break;
+         * 
+         * case 3: args.addElement("/W3"); break;
+         * 
+         * case 4: args.addElement("/W4"); break;
+         */
+        }
+    }
+    public static String getCommandFileSwitch(String cmdFile) {
+        StringBuffer buf = new StringBuffer("@");
+        if (cmdFile.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(cmdFile);
+            buf.append('\"');
+        } else {
+            buf.append(cmdFile);
+        }
+        return buf.toString();
+    }
+    public static void getDefineSwitch(StringBuffer buf, String define,
+            String value) {
+        buf.setLength(0);
+        buf.append("-D");
+        buf.append(define);
+        if (value != null && value.length() > 0) {
+            buf.append('=');
+            buf.append(value);
+        }
+    }
+    public static String getIncludeDirSwitch(String includeDir) {
+        return "-I" + includeDir;
+    }
+    public static String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        StringBuffer buf = new StringBuffer();
+        int patternCount = libnames.length*2;
+        if (libType != null) {
+        	patternCount = libnames.length;
+        }
+        String[] patterns = new String[patternCount];
+        int offset = 0;
+        if (libType == null || "static".equals(libType.getValue())) {
+        	offset = addLibraryPatterns(libnames, buf, "lib", ".a", patterns, 0);
+        }
+        if (libType == null || !"static".equals(libType.getValue())) {
+        	offset = addLibraryPatterns(libnames, buf, "lib", ".so", patterns,
+                offset);
+        }
+        return patterns;
+    }
+    public static String[] getOutputFileSwitch(String outPath) {
+        StringBuffer buf = new StringBuffer("-o ");
+        if (outPath.indexOf(' ') >= 0) {
+            buf.append('\"');
+            buf.append(outPath);
+            buf.append('\"');
+        } else {
+            buf.append(outPath);
+        }
+        String[] retval = new String[]{buf.toString()};
+        return retval;
+    }
+    public static void getUndefineSwitch(StringBuffer buf, String define) {
+        buf.setLength(0);
+        buf.append("-U");
+        buf.append(define);
+    }
+    public static boolean isCaseSensitive() {
+        return true;
+    }
+    private C89Processor() {
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
new file mode 100644
index 0000000000..a35d01af49
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
@@ -0,0 +1,119 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.sun;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.GccCompatibleCCompiler;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+/**
+ * Adapter for the Sun (r) Forte (tm) C++ compiler
+ * 
+ * @author Curt Arnold
+ */
+public final class ForteCCCompiler extends GccCompatibleCCompiler {
+    private static final ForteCCCompiler instance = new ForteCCCompiler("CC");
+    /**
+     * Gets singleton instance of this class
+     */
+    public static ForteCCCompiler getInstance() {
+        return instance;
+    }
+    private String identifier;
+    private File[] includePath;
+    /**
+     * Private constructor. Use ForteCCCompiler.getInstance() to get singleton
+     * instance of this class.
+     */
+    private ForteCCCompiler(String command) {
+        super(command, "-V", false, null, false, null);
+    }
+    public void addImpliedArgs(final Vector args, 
+    		final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization) {
+        args.addElement("-c");
+        if (debug) {
+            args.addElement("-g");
+        }
+    	if (optimization != null) {
+    		if (optimization.isSpeed()) {
+    			args.addElement("-xO2");
+    		}
+    	}
+    	if (rtti != null) {
+    		if (rtti.booleanValue()) {
+    			args.addElement("-features=rtti");
+    		} else {
+    			args.addElement("-features=no%rtti");
+    		}
+    	}
+        if (multithreaded) {
+            args.addElement("-mt");
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-KPIC");
+        }
+        
+    }
+    public void addWarningSwitch(Vector args, int level) {
+        switch (level) {
+            case 0 :
+                args.addElement("-w");
+                break;
+            case 1 :
+            case 2 :
+                args.addElement("+w");
+                break;
+            case 3 :
+            case 4 :
+            case 5 :
+                args.addElement("+w2");
+                break;
+        }
+    }
+    public File[] getEnvironmentIncludePath() {
+        if (includePath == null) {
+            File ccLoc = CUtil.getExecutableLocation("CC");
+            if (ccLoc != null) {
+                File compilerIncludeDir = new File(
+                        new File(ccLoc, "../include").getAbsolutePath());
+                if (compilerIncludeDir.exists()) {
+                    includePath = new File[2];
+                    includePath[0] = compilerIncludeDir;
+                }
+            }
+            if (includePath == null) {
+                includePath = new File[1];
+            }
+            includePath[includePath.length - 1] = new File("/usr/include");
+        }
+        return includePath;
+    }
+    public Linker getLinker(LinkType linkType) {
+        return ForteCCLinker.getInstance().getLinker(linkType);
+    }
+    public int getMaximumCommandLength() {
+        return Integer.MAX_VALUE;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
new file mode 100644
index 0000000000..c39071af9f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java
@@ -0,0 +1,100 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.sun;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.gcc.AbstractLdLinker;
+/**
+ * Adapter for Sun (r) Forte(tm) C++ Linker
+ * 
+ * @author Curt Arnold
+ */
+public final class ForteCCLinker extends AbstractLdLinker {
+    private static final String[] discardFiles = new String[]{".dll", ".so",
+    ".sl"};
+    private static final String[] objFiles = new String[]{".o", ".a", ".lib"};
+    private static final ForteCCLinker arLinker = new ForteCCLinker("CC",
+            objFiles, discardFiles, "lib", ".a");
+    private static final ForteCCLinker dllLinker = new ForteCCLinker("CC",
+            objFiles, discardFiles, "lib", ".so");
+    private static final ForteCCLinker instance = new ForteCCLinker("CC",
+            objFiles, discardFiles, "", "");
+    public static ForteCCLinker getInstance() {
+        return instance;
+    }
+    private File[] libDirs;
+    private ForteCCLinker(String command, String[] extensions,
+            String[] ignoredExtensions, String outputPrefix, String outputSuffix) {
+        super(command, "-V", extensions, ignoredExtensions, outputPrefix,
+                outputSuffix, false, null);
+    }
+    public void addImpliedArgs(boolean debug, LinkType linkType, Vector args) {
+        if (debug) {
+            args.addElement("-g");
+        }
+        if (linkType.isStaticRuntime()) {
+            args.addElement("-static");
+        }
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-G");
+        }
+        if (linkType.isStaticLibrary()) {
+            args.addElement("-xar");
+        }
+    }
+    public void addIncremental(boolean incremental, Vector args) {
+        /*
+         * if (incremental) { args.addElement("-xidlon"); } else {
+         * args.addElement("-xidloff"); }
+         */
+    }
+    /**
+     * Returns library path.
+     *  
+     */
+    public File[] getLibraryPath() {
+        if (libDirs == null) {
+            File CCloc = CUtil.getExecutableLocation("CC");
+            if (CCloc != null) {
+                File compilerLib = new File(new File(CCloc, "../lib")
+                        .getAbsolutePath());
+                if (compilerLib.exists()) {
+                    libDirs = new File[2];
+                    libDirs[0] = compilerLib;
+                }
+            }
+            if (libDirs == null) {
+                libDirs = new File[1];
+            }
+        }
+        libDirs[libDirs.length - 1] = new File("/usr/lib");
+        return libDirs;
+    }
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            return arLinker;
+        }
+        if (type.isSharedLibrary()) {
+            return dllLinker;
+        }
+        return instance;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
new file mode 100644
index 0000000000..d08b9fbbf6
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java
@@ -0,0 +1,192 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.ti;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.compiler.CommandLineCCompiler;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.OptimizationEnum;
+
+
+import org.apache.tools.ant.types.Environment;
+/**
+ * Adapter for TI DSP compilers with cl** commands
+ * 
+ * @author CurtA
+ */
+public class ClxxCCompiler extends CommandLineCCompiler {
+    /**
+     * Header file extensions
+     */
+    private static final String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    /**
+     * Source file extensions
+     */
+    private static final String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cpp", ".cxx", ".c++"};
+    /**
+     * Singleton for TMS320C55x
+     */
+    private static final ClxxCCompiler cl55 = new ClxxCCompiler("cl55", false,
+            null);
+    /**
+     * Singleton for TMS320C6000
+     */
+    private static final ClxxCCompiler cl6x = new ClxxCCompiler("cl6x", false,
+            null);
+    public static ClxxCCompiler getCl55Instance() {
+        return cl55;
+    }
+    public static ClxxCCompiler getCl6xInstance() {
+        return cl6x;
+    }
+    /**
+     * Private constructor
+     * 
+     * @param command
+     *            executable name
+     * @param newEnvironment
+     *            Change environment
+     * @param env
+     *            New environment
+     */
+    private ClxxCCompiler(String command, boolean newEnvironment,
+            Environment env) {
+        super(command, "-h", sourceExtensions, headerExtensions, ".o", false,
+                null, newEnvironment, env);
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addImpliedArgs(java.util.Vector,
+     *      boolean, boolean, boolean,
+     *      net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    protected void addImpliedArgs(
+    		final Vector args, 
+			final boolean debug,
+            final boolean multithreaded, 
+			final boolean exceptions, 
+			final LinkType linkType,
+			final Boolean rtti,
+			final OptimizationEnum optimization,
+   final Boolean defaultflag) {
+        if (debug) {
+            args.addElement("-gw");
+        }
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#addWarningSwitch(java.util.Vector,
+     *      int)
+     */
+    protected void addWarningSwitch(Vector args, int warnings) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getDefineSwitch(java.lang.StringBuffer,
+     *      java.lang.String, java.lang.String)
+     */
+    protected void getDefineSwitch(StringBuffer buffer, String define,
+            String value) {
+        buffer.append("-d");
+        buffer.append(define);
+        if (value != null) {
+            buffer.append('=');
+            buffer.append(value);
+        }
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getEnvironmentIncludePath()
+     */
+    protected File[] getEnvironmentIncludePath() {
+        File[] c_dir = CUtil.getPathFromEnvironment("C_DIR", ";");
+        File[] cx_dir = CUtil.getPathFromEnvironment("C6X_C_DIR", ";");
+        if (c_dir.length == 0) {
+            return cx_dir;
+        }
+        if (cx_dir.length == 0) {
+            return c_dir;
+        }
+        File[] combo = new File[c_dir.length + cx_dir.length];
+        for (int i = 0; i < cx_dir.length; i++) {
+            combo[i] = cx_dir[i];
+        }
+        for (int i = 0; i < c_dir.length; i++) {
+            combo[i + cx_dir.length] = c_dir[i];
+        }
+        return combo;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getIncludeDirSwitch(java.lang.String)
+     */
+    protected String getIncludeDirSwitch(String source) {
+        return "-I" + source;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType type) {
+        if (type.isStaticLibrary()) {
+            if (this == cl6x) {
+                return ClxxLibrarian.getCl6xInstance();
+            }
+            return ClxxLibrarian.getCl55Instance();
+        }
+        if (type.isSharedLibrary()) {
+            if (this == cl6x) {
+                return ClxxLinker.getCl6xDllInstance();
+            }
+            return ClxxLinker.getCl55DllInstance();
+        }
+        if (this == cl6x) {
+            return ClxxLinker.getCl6xInstance();
+        }
+        return ClxxLinker.getCl55Instance();
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getMaximumCommandLength()
+     */
+    public int getMaximumCommandLength() {
+        return 1024;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineCompiler#getUndefineSwitch(java.lang.StringBuffer,
+     *      java.lang.String)
+     */
+    protected void getUndefineSwitch(StringBuffer buffer, String define) {
+        buffer.append("-u");
+        buffer.append(define);
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
new file mode 100644
index 0000000000..082d1a477f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java
@@ -0,0 +1,162 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.ti;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * 
+ * Adapter for TI DSP librarian
+ *  *
+ * @author CurtA
+ */
+public class ClxxLibrarian extends CommandLineLinker {
+    private static final ClxxLibrarian cl55Instance = new ClxxLibrarian("ar55");
+    private static final ClxxLibrarian cl6xInstance = new ClxxLibrarian("ar6x");
+    public static final ClxxLibrarian getCl55Instance() {
+        return cl55Instance;
+    }
+    public static final ClxxLibrarian getCl6xInstance() {
+        return cl6xInstance;
+    }
+    private ClxxLibrarian(String command) {
+        super(command, null, new String[]{".o"}, new String[0], ".lib", false,
+                null);
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long,
+     *      java.util.Vector)
+     */
+    protected void addBase(long base, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean,
+     *      java.util.Vector)
+     */
+    protected void addFixed(Boolean fixed, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean,
+     *      net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
+     */
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean,
+     *      java.util.Vector)
+     */
+    protected void addIncremental(boolean incremental, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean,
+     *      java.util.Vector)
+     */
+    protected void addMap(boolean map, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int,
+     *      java.util.Vector)
+     */
+    protected void addStack(int stack, Vector args) {
+        // TODO Auto-generated method stub
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
+     */
+    protected String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
+     */
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
+     */
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+        return new String[0];
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType linkType) {
+        return null;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
+     */
+    protected int getMaximumCommandLength() {
+        return 1024;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
+     */
+    protected String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
+     */
+    public boolean isCaseSensitive() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
new file mode 100644
index 0000000000..43ee7c0662
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/ti/ClxxLinker.java
@@ -0,0 +1,181 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.ti;
+import java.io.File;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.compiler.CommandLineLinker;
+import net.sf.antcontrib.cpptasks.compiler.LinkType;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+import net.sf.antcontrib.cpptasks.types.LibraryTypeEnum;
+
+/**
+ * Adapter for TI DSP linkers
+ *  *
+ * @author CurtA
+ *  
+ */
+public class ClxxLinker extends CommandLineLinker {
+    private static final ClxxLinker cl55DllInstance = new ClxxLinker("lnk55",
+            ".dll");
+    private static final ClxxLinker cl55Instance = new ClxxLinker("lnk55",
+            ".exe");
+    private static final ClxxLinker cl6xDllInstance = new ClxxLinker("lnk6x",
+            ".dll");
+    private static final ClxxLinker cl6xInstance = new ClxxLinker("lnk6x",
+            ".exe");
+    public static ClxxLinker getCl55DllInstance() {
+        return cl55DllInstance;
+    }
+    public static ClxxLinker getCl55Instance() {
+        return cl55Instance;
+    }
+    public static ClxxLinker getCl6xDllInstance() {
+        return cl6xDllInstance;
+    }
+    public static ClxxLinker getCl6xInstance() {
+        return cl6xInstance;
+    }
+    private ClxxLinker(String command, String outputSuffix) {
+        super(command, "-h", new String[]{".o", ".lib", ".res"}, new String[]{
+                ".map", ".pdb", ".lnk"}, outputSuffix, false, null);
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addBase(long,
+     *      java.util.Vector)
+     */
+    protected void addBase(long base, Vector args) {
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addFixed(java.lang.Boolean,
+     *      java.util.Vector)
+     */
+    protected void addFixed(Boolean fixed, Vector args) {
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addImpliedArgs(boolean,
+     *      net.sf.antcontrib.cpptasks.compiler.LinkType, java.util.Vector)
+     */
+    protected void addImpliedArgs(boolean debug, LinkType linkType, Vector args, Boolean defaultflag) {
+        if (linkType.isSharedLibrary()) {
+            args.addElement("-abs");
+        }
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addIncremental(boolean,
+     *      java.util.Vector)
+     */
+    protected void addIncremental(boolean incremental, Vector args) {
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addMap(boolean,
+     *      java.util.Vector)
+     */
+    protected void addMap(boolean map, Vector args) {
+        if (map) {
+            args.addElement("-m");
+        }
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addStack(int,
+     *      java.util.Vector)
+     */
+    protected void addStack(int stack, Vector args) {
+    }
+    /* (non-Javadoc)
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#addEntry(int, java.util.Vector)
+     */
+    protected void addEntry(String entry, Vector args) {
+    }
+    
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getCommandFileSwitch(java.lang.String)
+     */
+    protected String getCommandFileSwitch(String commandFile) {
+        return "@" + commandFile;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPath()
+     */
+    public File[] getLibraryPath() {
+        return new File[0];
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#getLibraryPatterns(java.lang.String[])
+     */
+    public String[] getLibraryPatterns(String[] libnames, LibraryTypeEnum libType) {
+    	//
+    	//  TODO: Looks bogus, should be .a or .so's not .o's
+    	//
+    	String[] libpats = new String[libnames.length];
+        for (int i = 0; i < libnames.length; i++) {
+            libpats[i] = libnames[i] + ".o";
+        }
+        return libpats;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Processor#getLinker(net.sf.antcontrib.cpptasks.compiler.LinkType)
+     */
+    public Linker getLinker(LinkType linkType) {
+        return this;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getMaximumCommandLength()
+     */
+    protected int getMaximumCommandLength() {
+        return 1024;
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.CommandLineLinker#getOutputFileSwitch(java.lang.String)
+     */
+    protected String[] getOutputFileSwitch(String outputFile) {
+        return new String[]{"-o", outputFile};
+    }
+    /*
+     * (non-Javadoc)
+     * 
+     * @see net.sf.antcontrib.cpptasks.compiler.Linker#isCaseSensitive()
+     */
+    public boolean isCaseSensitive() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java
new file mode 100644
index 0000000000..87babcf740
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java
@@ -0,0 +1,30 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+
+/**
+ * A aslcompiler command line argument.
+ */
+public class AslcompilerArgument extends CommandLineArgument {
+    public AslcompilerArgument () {
+    }
+
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                        "Not an actual task, but looks like one for documentation purposes");
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java
new file mode 100644
index 0000000000..1b5f54d9a7
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/AssemblerArgument.java
@@ -0,0 +1,30 @@
+/*
+ * 
+ * Copyright 2001-2005 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+
+/**
+ * A assembler command line argument.
+ */
+public class AssemblerArgument extends CommandLineArgument {
+    public AssemblerArgument () {
+    }
+
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                        "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
new file mode 100644
index 0000000000..91ab2f6327
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CommandLineArgument.java
@@ -0,0 +1,122 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import java.io.File;
+/**
+ * An compiler/linker command line flag.
+ */
+public class CommandLineArgument {
+    /**
+     * Enumerated attribute with the values "start", "mid" and "end",
+     */
+    public static class LocationEnum extends EnumeratedAttribute {
+        public String[] getValues() {
+            return new String[]{"start", "mid", "end"};
+        }
+    }
+    private String ifCond;
+    private int location;
+    private String unlessCond;
+    private String value;
+    private File file;
+    public CommandLineArgument() {
+    }
+    public int getLocation() {
+        return location;
+    }
+    public String getValue() {
+        return value;
+    }
+    public File getFile() {
+      return file;
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     */
+    public boolean isActive(org.apache.tools.ant.Project p) {
+        if (value == null) {
+            return false;
+        }
+        if (ifCond != null && p.getProperty(ifCond) == null) {
+            return false;
+        } else if (unlessCond != null && p.getProperty(unlessCond) != null) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The argument will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Specifies relative location of argument on command line. "start" will
+     * place argument at start of command line, "mid" will place argument after
+     * all "start" arguments but before filenames, "end" will place argument
+     * after filenames.
+     *  
+     */
+    public void setLocation(LocationEnum location) {
+        this.location = location.getIndex();
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the argument will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+    /**
+     * Specifies the string that should appear on the command line. The
+     * argument will be quoted if it contains embedded blanks. Use multiple
+     * arguments to avoid quoting.
+     *  
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+    /**
+     * Specifies the file which lists many strings that should appear on 
+     * the command line. Each line is one argument. The argument will be 
+     * quated if it contains embedded blanks. Use multiple arguments in 
+     * file to avoid quating. 
+     * 
+     * @param file
+     *          name of the file
+     */
+    public void setFile(File file) {
+        this.file = file;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
new file mode 100644
index 0000000000..ca9e90e732
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/CompilerArgument.java
@@ -0,0 +1,28 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+/**
+ * A compiler command line argument.
+ */
+public class CompilerArgument extends CommandLineArgument {
+    public CompilerArgument() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
new file mode 100644
index 0000000000..af2d141e99
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java
@@ -0,0 +1,84 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import net.sf.antcontrib.cpptasks.CUtil;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.AbstractFileSet;
+import org.apache.tools.ant.types.FileSet;
+/**
+ * An Ant FileSet object augmented with if and unless conditions.
+ * 
+ * @author Curt Arnold
+ */
+public class ConditionalFileSet extends FileSet {
+    private String ifCond;
+    private String unlessCond;
+    public ConditionalFileSet() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /**
+     * overrides FileSet's implementation which would throw an exception since
+     * the referenced object isn't this type.
+     */
+    protected AbstractFileSet getRef(Project p) {
+        return (AbstractFileSet) getRefid().getReferencedObject(p);
+    }
+    /**
+     * Returns true if the Path's if and unless conditions (if any) are
+     * satisfied.
+     */
+    public boolean isActive() throws BuildException {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException(
+                    "setProject() should have been called");
+        }
+        return CUtil.isActive(p, ifCond, unlessCond);
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The fileset will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the fileset will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
new file mode 100644
index 0000000000..dc21189c15
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/ConditionalPath.java
@@ -0,0 +1,92 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Path;
+/**
+ * An Ant Path object augmented with if and unless conditionals
+ * 
+ * @author Curt Arnold
+ */
+public class ConditionalPath extends Path {
+    private String ifCond;
+    private String unlessCond;
+    private File file;
+    public ConditionalPath(Project project) {
+        super(project);
+    }
+    public ConditionalPath(Project p, String path) {
+        super(p, path);
+    }
+    public File getFile() {
+      return file;
+    }
+    /**
+     * Returns true if the Path's if and unless conditions (if any) are
+     * satisfied.
+     */
+    public boolean isActive(org.apache.tools.ant.Project p)
+            throws BuildException {
+        return CUtil.isActive(p, ifCond, unlessCond);
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The path will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            property name
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the path will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+    /**
+     * Specifies the file which lists many include paths that should appear on 
+     * the command line. Each line is an include path. The includepath will be 
+     * quated if it contains embedded blanks. 
+     * 
+     * @param file
+     *          name of the file
+     */
+    public void setFile(File file) {
+        this.file = file;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java
new file mode 100644
index 0000000000..824e939481
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineArgument.java
@@ -0,0 +1,38 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+/**
+ * Preprocessor macro definition.
+ * 
+ * @author Mark A Russell <a
+ *         href="mailto:mark_russell@csgsystems.com">mark_russell@csg_systems.com
+ *         </a>
+ */
+public class DefineArgument extends UndefineArgument {
+    private String value;
+    public DefineArgument() {
+        super(true);
+    }
+    /** Returns the value of the define */
+    public final String getValue() {
+        return value;
+    }
+    /** Set the value attribute */
+    public final void setValue(String value) {
+        this.value = value;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java
new file mode 100644
index 0000000000..9d229fb0ff
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/DefineSet.java
@@ -0,0 +1,199 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Reference;
+/**
+ * Set of preprocessor macro defines and undefines.
+ * 
+ * @author Mark A Russell <a
+ *         href="mailto:mark_russell@csgsystems.com">mark_russell@csg_systems.com
+ *         </a>
+ * @author Adam Murdoch
+ */
+public class DefineSet extends DataType {
+    private Vector defineList = new Vector();
+    private String ifCond = null;
+    private String unlessCond = null;
+    /**
+     * 
+     * Adds a define element.
+     * 
+     * @throws BuildException
+     *             if reference
+     */
+    public void addDefine(DefineArgument arg) throws BuildException {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        defineList.addElement(arg);
+    }
+    /** Adds defines/undefines. */
+    private void addDefines(String[] defs, boolean isDefine) {
+        for (int i = 0; i < defs.length; i++) {
+            UndefineArgument def;
+            if (isDefine) {
+                def = new DefineArgument();
+            } else {
+                def = new UndefineArgument();
+            }
+            def.setName(defs[i]);
+            defineList.addElement(def);
+        }
+    }
+    /**
+     * 
+     * Adds an undefine element.
+     * 
+     * @throws BuildException
+     *             if reference
+     */
+    public void addUndefine(UndefineArgument arg) throws BuildException {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        defineList.addElement(arg);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /** Returns the defines and undefines in this set. */
+    public UndefineArgument[] getDefines() throws BuildException {
+        if (isReference()) {
+            DefineSet defset = (DefineSet) getCheckedRef(DefineSet.class,
+                    "DefineSet");
+            return defset.getDefines();
+        } else {
+            if (isActive()) {
+                UndefineArgument[] defs = new UndefineArgument[defineList
+                        .size()];
+                defineList.copyInto(defs);
+                return defs;
+            } else {
+                return new UndefineArgument[0];
+            }
+        }
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     * 
+     * @exception BuildException
+     *                throws build exception if name is not set
+     */
+    public final boolean isActive() throws BuildException {
+        return CUtil.isActive(getProject(), ifCond, unlessCond);
+    }
+    /**
+     * A comma-separated list of preprocessor macros to define. Use nested
+     * define elements to define macro values.
+     * 
+     * @param defList
+     *            comma-separated list of preprocessor macros
+     * @throws BuildException
+     *             throw if defineset is a reference
+     */
+    public void setDefine(CUtil.StringArrayBuilder defList)
+            throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        addDefines(defList.getValue(), true);
+    }
+    /**
+     * Sets a description of the current data type.
+     */
+    public void setDescription(String desc) {
+        super.setDescription(desc);
+    }
+    /**
+     * Sets an id that can be used to reference this element.
+     * 
+     * @param id
+     *            id
+     */
+    public void setId(String id) {
+        //
+        //  this is actually accomplished by a different
+        //     mechanism, but we can document it
+        //
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The define will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            property name
+     */
+    public final void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Specifies that this element should behave as if the content of the
+     * element with the matching id attribute was inserted at this location. If
+     * specified, no other attributes or child content should be specified,
+     * other than "description".
+     *  
+     */
+    public void setRefid(Reference r) throws BuildException {
+        if (!defineList.isEmpty()) {
+            throw tooManyAttributes();
+        }
+        super.setRefid(r);
+    }
+    /**
+     * A comma-separated list of preprocessor macros to undefine.
+     * 
+     * @param undefList
+     *            comma-separated list of preprocessor macros
+     * @throws BuildException
+     *             throw if defineset is a reference
+     */
+    public void setUndefine(CUtil.StringArrayBuilder undefList)
+            throws BuildException {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        addDefines(undefList.getValue(), false);
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the define will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public final void setUnless(String propName) {
+        unlessCond = propName;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java
new file mode 100644
index 0000000000..d95959f631
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/FlexLong.java
@@ -0,0 +1,59 @@
+/*
+ * 
+ * Copyright 2002-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import java.lang.reflect.Method;
+
+/**
+ * Helper class which can be used for Ant task attribute setter methods to
+ * allow the build file to specify a long in either decimal, octal, or
+ * hexadecimal format.
+ *  // FlexInteger author
+ * @author Erik Hatcher
+ * @see org.apache.tools.ant.types.FlexInteger
+ */
+public class FlexLong {
+    private Long value;
+    /**
+     * Constructor used by Ant's introspection mechanism for attribute
+     * population
+     */
+    public FlexLong(String value) {
+        // Java 1.1 did not support Long.decode().. so we call it by
+        // reflection.
+        try {
+            Method m = Long.class
+                    .getMethod("decode", new Class[]{String.class});
+            Object rc = m.invoke(null, new Object[]{value});
+            this.value = (Long) rc;
+        } catch (Exception e) {
+            // Try it the old fashioned way, we must be on a 1.1 jre
+            this.value = new Long(value);
+        }
+    }
+    /**
+     * Returns the decimal integer value
+     */
+    public long longValue() {
+        return value.longValue();
+    }
+    /**
+     * Overridden method to return the decimal value for display
+     */
+    public String toString() {
+        return value.toString();
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java
new file mode 100644
index 0000000000..edcc42103c
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/IncludePath.java
@@ -0,0 +1,38 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import org.apache.tools.ant.Project;
+/**
+ * An include path.
+ * 
+ * Works like other paths in Ant with with the addition of "if" and "unless"
+ * conditions.
+ * 
+ * @author Curt Arnold
+ */
+public class IncludePath extends ConditionalPath {
+    public IncludePath(Project project) {
+        super(project);
+    }
+    public IncludePath(Project p, String path) {
+        super(p, path);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java
new file mode 100644
index 0000000000..d522ccc36f
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibrarySet.java
@@ -0,0 +1,290 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import java.io.File;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.FileVisitor;
+import net.sf.antcontrib.cpptasks.compiler.Linker;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.PatternSet;
+/**
+ * A set of library names. Libraries can also be added to a link by specifying
+ * them in a fileset.
+ * 
+ * For most Unix-like compilers, libset will result in a series of -l and -L
+ * linker arguments. For Windows compilers, the library names will be used to
+ * locate the appropriate library files which will be added to the linkers
+ * input file list as if they had been specified in a fileset.
+ * 
+ * @author Mark A Russell <a
+ *         href="mailto:mark_russell@csgsystems.com">mark_russell@csg_systems.com
+ *         </a>
+ * @author Adam Murdoch
+ * @author Curt Arnold
+ */
+public class LibrarySet extends ProjectComponent {
+    private String dataset;
+    private boolean explicitCaseSensitive;
+    private String ifCond;
+    private String[] libnames;
+    private final FileSet set = new FileSet();
+    private String unlessCond;
+    private LibraryTypeEnum libraryType;
+    public LibrarySet() {
+        libnames = new String[0];
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /**
+     * Gets the dataset. Used on OS390 if the libs are in a dataset.
+     * 
+     * @return Returns a String
+     */
+    public String getDataset() {
+        return dataset;
+    }
+    public File getDir(Project project) {
+        return set.getDir(project);
+    }
+    protected FileSet getFileSet() {
+        return set;
+    }
+    public String[] getLibs() {
+        String[] retval = (String[]) libnames.clone();
+        return retval;
+    }
+    
+    /**
+     * Gets preferred library type
+     * 
+     * @return library type, may be null.
+     */
+    public LibraryTypeEnum getType() {
+    	return libraryType;
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     */
+    public boolean isActive(org.apache.tools.ant.Project p) {
+        if (p == null) {
+            throw new NullPointerException("p");
+        }
+        if (ifCond != null) {
+            String ifValue = p.getProperty(ifCond);
+            if (ifValue != null) {
+                if (ifValue.equals("no") || ifValue.equals("false")) {
+                    throw new BuildException(
+                            "property "
+                                    + ifCond
+                                    + " used as if condition has value "
+                                    + ifValue
+                                    + " which suggests a misunderstanding of if attributes");
+                }
+            } else {
+                return false;
+            }
+        }
+        if (unlessCond != null) {
+            String unlessValue = p.getProperty(unlessCond);
+            if (unlessValue != null) {
+                if (unlessValue.equals("no") || unlessValue.equals("false")) {
+                    throw new BuildException(
+                            "property "
+                                    + unlessCond
+                                    + " used as unless condition has value "
+                                    + unlessValue
+                                    + " which suggests a misunderstanding of unless attributes");
+                }
+                return false;
+            }
+        }
+        if (libnames.length == 0) {
+            p.log("libnames not specified or empty.", Project.MSG_WARN);
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Sets case sensitivity of the file system. If not set, will default to
+     * the linker's case sensitivity.
+     * 
+     * @param isCaseSensitive
+     *            "true"|"on"|"yes" if file system is case sensitive,
+     *            "false"|"off"|"no" when not.
+     */
+    public void setCaseSensitive(boolean isCaseSensitive) {
+        explicitCaseSensitive = true;
+        set.setCaseSensitive(isCaseSensitive);
+    }
+    /**
+     * Sets the dataset. Used on OS390 if the libs are in a dataset.
+     * 
+     * @param dataset
+     *            The dataset to set
+     */
+    public void setDataset(String dataset) {
+        this.dataset = dataset;
+    }
+    /**
+     * Library directory.
+     * 
+     * @param dir
+     *            library directory
+     *  
+     */
+    public void setDir(File dir) throws BuildException {
+        set.setDir(dir);
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The library set will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            property name
+     */
+    public void setIf(String propName) {
+        ifCond = propName;
+    }
+    /**
+     * Comma-separated list of library names without leading prefixes, such as
+     * "lib", or extensions, such as ".so" or ".a".
+     *  
+     */
+    public void setLibs(CUtil.StringArrayBuilder libs) throws BuildException {
+        libnames = libs.getValue();
+        // If this is not active.. then it's ok if the lib names are invalid.
+        // so we can do a: <libset if="x.lib" dir="." libs="${x.lib}"/>
+        if (!isActive(getProject()))
+            return;
+        for (int i = 0; i < libnames.length; i++) {
+            int lastDot = libnames[i].lastIndexOf('.');
+            if (lastDot >= 0) {
+                String extension = libnames[i].substring(lastDot);
+                if (extension.equalsIgnoreCase(".lib")
+                        || extension.equalsIgnoreCase(".so")
+                        || extension.equalsIgnoreCase(".a")) {
+                    getProject().log(
+                            "Suspicious library name ending with \""
+                                    + extension + "\": " + libnames[i], Project.MSG_DEBUG );
+                }
+            }
+            if (libnames[i].length() >= 3
+                    && libnames[i].substring(0, 3).equalsIgnoreCase("lib")) {
+                getProject().log(
+                        "Suspicious library name starting with \"lib\": "
+                                + libnames[i], Project.MSG_DEBUG);
+            }
+        }
+    }
+    public void setProject(Project project) {
+        set.setProject(project);
+        super.setProject(project);
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the library set will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public void setUnless(String propName) {
+        unlessCond = propName;
+    }
+    
+    /**
+     * Sets the preferred library type. Supported values "shared", "static", and
+     * "framework".  "framework" is equivalent to "shared" on non-Darwin platforms. 
+     */
+    public void setType(LibraryTypeEnum type) {
+    	this.libraryType = type;
+    }
+    
+    public void visitLibraries(Project project, Linker linker, File[] libpath,
+            FileVisitor visitor) throws BuildException {
+        FileSet localSet = (FileSet) set.clone();
+        //
+        //   unless explicitly set
+        //      will default to the linker case sensitivity
+        //
+        if (!explicitCaseSensitive) {
+            boolean linkerCaseSensitive = linker.isCaseSensitive();
+            localSet.setCaseSensitive(linkerCaseSensitive);
+        }
+        //
+        //  if there was a libs attribute then
+        //     add the corresponding patterns to the FileSet
+        //
+        if (libnames != null && libnames.length > 0) {
+            String[] patterns = linker.getLibraryPatterns(libnames, libraryType);
+            //
+            //  if no patterns, then linker does not support libraries
+            //
+            if (patterns.length > 0) {
+		        for (int i = 0; i < patterns.length; i++) {
+		             PatternSet.NameEntry entry = localSet.createInclude();
+		             entry.setName(patterns[i]);
+		        }
+		        //
+		        //  if there was no specified directory then
+		        //     run through the libpath backwards
+		        //
+		        if (localSet.getDir(project) == null) {
+		            //
+		            //  scan libpath in reverse order
+		            //     to give earlier entries priority
+		            //
+		            for (int j = libpath.length - 1; j >= 0; j--) {
+		                FileSet clone = (FileSet) localSet.clone();
+		                clone.setDir(libpath[j]);
+		                DirectoryScanner scanner = clone.getDirectoryScanner(project);
+		                File basedir = scanner.getBasedir();
+		                String[] files = scanner.getIncludedFiles();
+		                for (int k = 0; k < files.length; k++) {
+		                    visitor.visit(basedir, files[k]);
+		                }
+		            }
+		        } else {
+		            DirectoryScanner scanner = localSet.getDirectoryScanner(project);
+		            File basedir = scanner.getBasedir();
+		            String[] files = scanner.getIncludedFiles();
+		            for (int k = 0; k < files.length; k++) {
+		                visitor.visit(basedir, files[k]);
+		            }
+		        }
+        	}
+        }
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
new file mode 100644
index 0000000000..82d7947bf2
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java
@@ -0,0 +1,48 @@
+/*
+ * 
+ * Copyright 2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+/**
+ * Enumeration of library types for LibrarySet
+ * 
+ * @author Curt Arnold
+ *  
+ */
+public class LibraryTypeEnum extends EnumeratedAttribute {
+    /**
+     * Constructor
+     * 
+     * Set by default to "shared"
+     * 
+     * @see java.lang.Object#Object()
+     */
+    public LibraryTypeEnum() {
+        setValue("shared");
+    }
+    /**
+     * Gets list of acceptable values
+     * 
+     * @see org.apache.tools.ant.types.EnumeratedAttribute#getValues()
+     */
+    public String[] getValues() {
+        return new String[]{"shared", // prefer shared libraries
+                "static", // prefer static libraries
+                "framework" // framework libraries (Mac OS/X)
+				            //  equiv to shared on other platforms
+        };
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
new file mode 100644
index 0000000000..89bff1881b
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/LinkerArgument.java
@@ -0,0 +1,28 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+/**
+ * A linker command line argument.
+ */
+public class LinkerArgument extends CommandLineArgument {
+    public LinkerArgument() {
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
new file mode 100644
index 0000000000..be0dbd537a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemIncludePath.java
@@ -0,0 +1,45 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import org.apache.tools.ant.Project;
+/**
+ * A system include path.
+ * 
+ * Files located using a system include path will not participate in dependency
+ * analysis.
+ * 
+ * Standard include paths for a compiler should not be specified since these
+ * should be determined from environment variables or configuration files by
+ * the compiler adapter.
+ * 
+ * Works like other paths in Ant with with the addition of "if" and "unless"
+ * conditions.
+ * 
+ * @author Curt Arnold
+ */
+public class SystemIncludePath extends ConditionalPath {
+    public SystemIncludePath(Project project) {
+        super(project);
+    }
+    public SystemIncludePath(Project p, String path) {
+        super(p, path);
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
new file mode 100644
index 0000000000..02d08c8ac8
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java
@@ -0,0 +1,37 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+/**
+ * A set of system library names. Timestamp or location of system libraries are
+ * not considered in dependency analysis.
+ * 
+ * Libraries can also be added to a link by specifying them in a fileset.
+ * 
+ * For most Unix-like compilers, syslibset will result in a series of -l and -L
+ * linker arguments. For Windows compilers, the library names will be used to
+ * locate the appropriate library files which will be added to the linkers
+ * input file list as if they had been specified in a fileset.
+ */
+public class SystemLibrarySet extends LibrarySet {
+    public SystemLibrarySet() {
+        super();
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
new file mode 100644
index 0000000000..2a18fca6d1
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/types/UndefineArgument.java
@@ -0,0 +1,153 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.types;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CUtil;
+
+import org.apache.tools.ant.BuildException;
+/**
+ * Preprocessor macro undefinition.
+ * 
+ * @author Mark A Russell <a
+ *         href="mailto:mark_russell@csgsystems.com">mark_russell@csg_systems.com
+ *         </a>
+ */
+public class UndefineArgument {
+    /**
+     * This method returns an array of UndefineArgument and DefineArgument's by
+     * merging a base list with an override list.
+     * 
+     * Any define in the base list with a name that appears in the override
+     * list is suppressed. All entries in the override list are preserved
+     *  
+     */
+    public static UndefineArgument[] merge(UndefineArgument[] base,
+            UndefineArgument[] override) {
+        if (base.length == 0) {
+            UndefineArgument[] overrideClone = (UndefineArgument[]) override
+                    .clone();
+            return overrideClone;
+        }
+        if (override.length == 0) {
+            UndefineArgument[] baseClone = (UndefineArgument[]) base.clone();
+            return baseClone;
+        }
+        Vector unduplicated = new Vector(base.length);
+        for (int i = 0; i < base.length; i++) {
+            UndefineArgument current = base[i];
+            String currentName = current.getName();
+            boolean match = false;
+            if (currentName == null) {
+                match = true;
+            } else {
+                for (int j = 0; j < override.length; j++) {
+                    UndefineArgument over = override[j];
+                    String overName = over.getName();
+                    if (overName != null && overName.equals(currentName)) {
+                        match = true;
+                        break;
+                    }
+                }
+            }
+            if (!match) {
+                unduplicated.addElement(current);
+            }
+        }
+        UndefineArgument[] combined = new UndefineArgument[unduplicated.size()
+                + override.length];
+        unduplicated.copyInto(combined);
+        int offset = unduplicated.size();
+        for (int i = 0; i < override.length; i++) {
+            combined[offset + i] = override[i];
+        }
+        return combined;
+    }
+    private boolean define = false;
+    private String ifCond;
+    private String name;
+    private String unlessCond;
+    public UndefineArgument() {
+    }
+    protected UndefineArgument(boolean isDefine) {
+        this.define = isDefine;
+    }
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+    /** Returns the name of the define */
+    public final String getName() {
+        return name;
+    }
+    /** Returns the value of the define */
+    public String getValue() {
+        return null;
+    }
+    /**
+     * Returns true if the define's if and unless conditions (if any) are
+     * satisfied.
+     * 
+     * @exception BuildException
+     *                throws build exception if name is not set
+     */
+    public final boolean isActive(org.apache.tools.ant.Project p)
+            throws BuildException {
+        if (name == null) {
+            throw new BuildException("<define> is missing name attribute");
+        }
+        return CUtil.isActive(p, ifCond, unlessCond);
+    }
+    /** Returns true if this is a define, false if an undefine. */
+    public final boolean isDefine() {
+        return define;
+    }
+    /**
+     * Sets the property name for the 'if' condition.
+     * 
+     * The define will be ignored unless the property is defined.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") will throw an exception when
+     * evaluated.
+     * 
+     * @param propName
+     *            property name
+     */
+    public final void setIf(String propName) {
+        ifCond = propName;
+    }
+    /** Set the name attribute */
+    public final void setName(String name) {
+        this.name = name;
+    }
+    /**
+     * Set the property name for the 'unless' condition.
+     * 
+     * If named property is set, the define will be ignored.
+     * 
+     * The value of the property is insignificant, but values that would imply
+     * misinterpretation ("false", "no") of the behavior will throw an
+     * exception when evaluated.
+     * 
+     * @param propName
+     *            name of property
+     */
+    public final void setUnless(String propName) {
+        unlessCond = propName;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
new file mode 100644
index 0000000000..7c66eb1cbb
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java
@@ -0,0 +1,389 @@
+package net.sf.antcontrib.cpptasks.userdefine;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import net.sf.antcontrib.cpptasks.CUtil;
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalFileSet;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+public class CommandLineUserDefine {
+
+    String command;
+    
+    /*
+     * The follows variable set at child class.
+     */
+    String includeFileFlag = null;
+    String entryPointFlag = null;
+    String subSystemFlag = null;
+    String mapFlag = null;
+    String pdbFlag = null;
+    String outputFileFlag = null;
+    String includePathDelimiter = null;
+    
+    /*
+     * get lib string if Vendor = "gcc", it should respectively aadd "-(" and ")-" 
+     * at library set before and end. This value set at userDefineCompiler class.
+     */
+    Vector<String> libSetList = new Vector<String>();
+    Vector<String> fileList = new Vector<String>();
+    public void command(CCTask cctask, UserDefineDef userdefine){
+        File workdir;
+        File outdir;
+        Project project = cctask.getProject();
+        if(userdefine.getWorkdir() == null) {
+            workdir = new File(".");
+        }
+        else {
+            workdir = userdefine.getWorkdir();
+        } 
+        
+        /*
+         * generate cmdline= command + args + includepath + endargs + outfile
+         */ 
+        Vector args = new Vector();
+        Vector argsWithoutSpace = new Vector();
+        Vector endargs = new Vector();
+        Vector endargsWithoutSpace = new Vector();
+        Vector includePath = new Vector();
+        
+        /*
+         * Generate cmdline = command        + 
+         *                    general args   + 
+         *                    outputflag     + outputfile
+         *                    subsystemFlag  + subsystemValue  +
+         *                    includeFlag    + includeFile     +
+         *                    includeFileincludpath            + 
+         *                    entryPointFlag + entryPointValue +
+         *                    mapFlag        + mapValue        +
+         *                    pdbFlag        + pdbValue        +
+         *                    endargs                          + 
+         *                   
+         * 
+         */
+        /*
+         * get Args.
+         */
+        CommandLineArgument[] argument = userdefine.getActiveProcessorArgs();
+        for (int j = 0; j < argument.length; j++) {
+            if (argument[j].getLocation() == 0) {
+                args.addElement(argument[j].getValue());
+            } else {
+                endargs.addElement(argument[j].getValue());
+            }
+        }
+        /*
+         * get include path.
+         */
+        String[] incPath = userdefine.getActiveIncludePaths();
+        for (int j = 0; j < incPath.length; j++) {
+            if(incPath[j].indexOf(' ') >= 0) {
+                includePath.addElement( includePathDelimiter + incPath[j]);
+                //includePath.addElement( includePathDelimiter + "\"" + incPath[j] + "\"");
+            }
+            else {
+                includePath.addElement( includePathDelimiter + incPath[j]);
+            }
+        }
+        /*
+         * Remove space in args and endargs.
+         */
+        for ( int i=0; i < args.size(); i++) {
+            String str = (String)args.get(i);
+            StringTokenizer st = new StringTokenizer(str);
+            while(st.hasMoreTokens()) {
+                argsWithoutSpace.addElement(st.nextToken());
+            }
+        }
+        for ( int i=0; i < endargs.size(); i++) {
+            String str = (String)endargs.get(i);
+            StringTokenizer st = new StringTokenizer(str);
+            while(st.hasMoreTokens()) {
+                endargsWithoutSpace.addElement(st.nextToken());
+            }
+        }
+        
+        int cmdLen = 0;
+        if(userdefine.getOutdir() == null) {
+            outdir = new File(".");
+            /*
+             * command + args + endargs + includepath + sourcefile
+             */
+            cmdLen = 1 + argsWithoutSpace.size() + endargsWithoutSpace.size() + includePath.size() + 1;
+        }
+        else {
+            outdir = userdefine.getOutdir();
+            /*
+             * command + args + endargs + includepath + sourcefile + outfile
+             */
+            cmdLen = 1 + argsWithoutSpace.size() + endargsWithoutSpace.size() + includePath.size() + 2;
+        }
+        if (includeFileFlag != null && includeFileFlag.trim().length() > 0){
+            cmdLen++;
+        }
+        if (entryPointFlag != null && entryPointFlag.trim().length() > 0){
+            cmdLen++;
+        }
+        if (subSystemFlag != null && subSystemFlag.trim().length() > 0){
+            cmdLen++;
+        }
+        if (mapFlag != null && mapFlag.trim().length() > 0){
+            cmdLen++;
+        }
+        if (pdbFlag != null && pdbFlag.trim().length() > 0){
+            cmdLen++;
+        }
+        if (libSetList != null && libSetList.size() > 0){
+            cmdLen = cmdLen + libSetList.size();
+        }
+        if (fileList != null){
+            cmdLen = cmdLen + fileList.size();
+        }
+        /*
+         * In gcc the "cr" flag should follow space then add outputfile name, otherwise
+         * it will pop error. 
+         */
+        if (outputFileFlag != null && outputFileFlag.trim().length() > 0){
+            if (outputFileFlag.trim().equalsIgnoreCase("-cr")){
+                cmdLen = cmdLen + 2;
+            }else {
+                cmdLen++;
+            }
+            
+        }
+        /*
+         *  for every source file
+         *  if file is header file, just skip it (add later)
+         */
+        Vector srcSets = userdefine.getSrcSets();
+        if (srcSets.size() == 0) {
+            String[] cmd = new String[cmdLen - 1];
+            int index = 0;
+            cmd[index++] = this.command;
+            
+           
+            
+            Iterator iter = argsWithoutSpace.iterator();
+            while (iter.hasNext()) {
+                cmd[index++] = project.replaceProperties((String)iter.next());
+                //cmd[index++] = (String)iter.next();
+            }
+            
+            iter = endargsWithoutSpace.iterator();
+            while (iter.hasNext()) {
+                cmd[index++] = (String)iter.next();
+            }
+            
+            /*
+             * "OutputFlag + outputFile" as first option follow command.exe.
+             */
+            if (outputFileFlag != null && outputFileFlag.trim().length() > 0){
+                if (outputFileFlag.trim().equalsIgnoreCase("-cr")){
+                    cmd[index++] = outputFileFlag;
+                    cmd[index++] = userdefine.getOutputFile();
+                }else {
+                    cmd[index++] =  outputFileFlag + userdefine.getOutputFile();
+                }
+            }
+            
+            /*
+             * Add fileList to cmd 
+             */
+            if (fileList != null && fileList.size()> 0){
+                for (int i = 0; i < fileList.size(); i++){
+                    cmd[index++] = fileList.get(i);
+                }
+            }
+            
+            if (subSystemFlag != null && subSystemFlag.trim().length() > 0){
+                cmd[index++] = subSystemFlag + userdefine.getSubSystemvalue();
+            }
+            if (includeFileFlag != null && includeFileFlag.trim().length() > 0){
+                cmd[index++] = includeFileFlag + userdefine.getIncludeFile();
+            }
+         
+            iter = includePath.iterator();
+            while (iter.hasNext()) {
+                cmd[index++] = (String)iter.next();
+            }
+            
+            if (entryPointFlag != null && entryPointFlag.trim().length() > 0){
+                //
+                // If GCC link use __ModuleEntrypoint instead of _ModuleEntryPoint;
+                //
+                if (entryPointFlag.equalsIgnoreCase("-e")){
+                    cmd[index++] = entryPointFlag + "_" + userdefine.getEntryPointvalue();
+                } else {
+                    cmd[index++] = entryPointFlag + userdefine.getEntryPointvalue();
+                }
+                
+            }
+            if (mapFlag != null && mapFlag.trim().length() > 0){
+                cmd[index++] = mapFlag + userdefine.getMapvalue();
+            }
+            if (pdbFlag != null && pdbFlag.trim().length() > 0){
+                cmd[index++] = pdbFlag + userdefine.getPdbvalue();
+            }
+
+            if (userdefine.getOutdir() != null){
+                // will add code to generate outfile name and flag
+                cmd[index++] = "/nologo";
+            }
+            
+            if (libSetList != null && libSetList.size() > 0){
+                for (int i = 0; i < libSetList.size(); i++){
+                    cmd[index++] = libSetList.get(i);
+                }
+            }
+
+            // execute the command
+            int retval = runCommand(cctask, workdir, cmd);
+            // if with monitor, add more code
+            if (retval != 0) {
+               throw new BuildException(this.command
+                       + " failed with return code " + retval,
+                       cctask.getLocation());
+            }
+        }
+        
+        //
+        // if have source file append source file in command land.
+        //
+        for (int i = 0; i < srcSets.size(); i++) {
+            ConditionalFileSet srcSet = (ConditionalFileSet) srcSets
+                    .elementAt(i);
+            if (srcSet.isActive()) {
+                // Find matching source files
+                DirectoryScanner scanner = srcSet.getDirectoryScanner(project);
+                // Check each source file - see if it needs compilation
+                String[] fileNames = scanner.getIncludedFiles();
+                for (int j = 0; j < fileNames.length; j++){
+                    String[] cmd = new String[cmdLen];
+                    int index = 0;
+                    cmd[index++] = this.command;
+                    
+                    
+                    
+                    Iterator iter = argsWithoutSpace.iterator();
+                    while (iter.hasNext()) {
+                        cmd[index++] = (String)iter.next();
+                    }
+                    
+                    iter = endargsWithoutSpace.iterator();
+                    while (iter.hasNext()) {
+                        cmd[index++] = (String)iter.next();
+                    }
+                    
+                    /*
+                     * Add outputFileFlag and output file to cmd
+                     */
+                    if (outputFileFlag != null && outputFileFlag.length()> 0){
+                        if (outputFileFlag.trim().equalsIgnoreCase("-cr")){
+                            cmd[index++] = outputFileFlag;
+                            cmd[index++] = userdefine.getOutputFile();
+                        }else {
+                            cmd[index++] =  outputFileFlag + userdefine.getOutputFile();
+                        }
+                    }
+                    
+                    /*
+                     * Add fileList to cmd 
+                     */
+                    if (fileList != null && fileList.size()> 0){
+                        for (int s = 0; s < fileList.size(); s++){
+                            cmd[index++] = fileList.get(s);
+                        }
+                    }
+                    if (subSystemFlag != null && subSystemFlag.length()> 0){
+                        cmd[index++] = subSystemFlag + userdefine.getSubSystemvalue();
+                    }
+                    if (includeFileFlag != null && includeFileFlag.length()> 0){
+                        cmd[index++] = includeFileFlag + userdefine.getIncludeFile();
+                    }
+                    
+                    iter = includePath.iterator();
+                    while (iter.hasNext()) {
+                        cmd[index++] = (String)iter.next();
+                    }
+                    if (userdefine.getOutdir() != null){
+                        // will add code to generate outfile name and flag
+                        cmd[index++] = "/nologo";
+                    }
+                    
+                    if (entryPointFlag != null && entryPointFlag.length()> 0){
+                        cmd[index++] = entryPointFlag + userdefine.getEntryPointvalue();
+                    }
+                    if (mapFlag != null && mapFlag.length() > 0){
+                        cmd[index++] = mapFlag + userdefine.getMapvalue();
+                    }
+                    if (pdbFlag != null && pdbFlag.length() > 0){
+                        cmd[index++] = pdbFlag + userdefine.getPdbvalue();
+                    }
+                    
+                    if (libSetList != null && libSetList.size() > 0){
+                        for (int k = 0; k < libSetList.size(); k++){
+                            cmd[index++] = libSetList.get(k);
+                        }
+                    }
+                    
+                    // execute the command
+                    cmd[index++] = scanner.getBasedir() + "/" + fileNames[j];
+                    for (int k = 0; k < cmd.length; k++){
+                    }
+                    int retval = runCommand(cctask, workdir, cmd);
+                    // if with monitor, add more code
+                    if (retval != 0) {
+                       throw new BuildException(this.command
+                               + " failed with return code " + retval,
+                               cctask.getLocation());
+                    }
+                }
+            }
+        }
+    }
+    
+    protected int runCommand(CCTask task, File workingDir, String[] cmdline)
+                    throws BuildException {
+        return CUtil.runCommand(task, workingDir, cmdline, false, null);
+
+    }
+
+    protected String getInputFileArgument(File outputDir, String filename,
+                    int index) {
+        //
+        // if there is an embedded space,
+        // must enclose in quotes
+        if (filename.indexOf(' ') >= 0) {
+            StringBuffer buf = new StringBuffer("\"");
+            buf.append(filename);
+            buf.append("\"");
+            return buf.toString();
+        }
+        return filename;
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java
new file mode 100644
index 0000000000..85d9a04e73
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java
@@ -0,0 +1,31 @@
+/*
+ * 
+ * Copyright 2002-2006 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.userdefine;
+
+import net.sf.antcontrib.cpptasks.types.CommandLineArgument;
+
+public class UserDefineArgument extends CommandLineArgument {
+    
+    public UserDefineArgument() {
+    }
+    
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                "Not an actual task, but looks like one for documentation purposes");
+    }
+
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java
new file mode 100644
index 0000000000..382975abb0
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java
@@ -0,0 +1,219 @@
+/*
+ * 
+ * Copyright 2002-2006 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.userdefine;
+
+import org.apache.tools.ant.Project;
+
+import net.sf.antcontrib.cpptasks.CCTask;
+import org.tianocore.build.toolchain.*;
+
+public class UserDefineCompiler extends CommandLineUserDefine {
+
+    public UserDefineCompiler(CCTask cctask, UserDefineDef userdefineDef) {
+        String arch = null;
+        String os = null;
+        String vendor = null;
+        String commandType = null;
+        Project project = cctask.getProject();
+        // get command string
+        if (cctask.getArch() == null) {
+            arch = project.getProperty("ARCH");
+            if (arch == null) {
+                arch = System.getProperty("os.arch");
+            }
+        } else {
+            arch = cctask.getArch();
+        }
+        arch = arch.toUpperCase();
+        if (cctask.getOs() == null) {
+            os = project.getProperty("OS");
+            if (os == null) {
+                os = System.getProperty("os.name");
+            }
+        } else {
+            os = cctask.getOs();
+        }
+
+        commandType = userdefineDef.getType();
+
+        if (commandType != null) {
+            if (ToolChainFactory.getValue(arch + "_" + commandType + "_VENDOR") != null
+                    && ToolChainFactory.getValue(
+                            arch + "_" + commandType + "_VENDOR").trim()
+                            .length() > 0) {
+                vendor = ToolChainFactory.getValue(arch + "_" + commandType
+                        + "_VENDOR");
+            } else if (ToolChainFactory.getValue(arch + "_VENDOR") != null) {
+                vendor = ToolChainFactory.getValue(arch + "_VENDOR");
+            }
+        }
+
+        // look if ARCH_VENDOR_OS_COMMANDTYPE is existed
+        if (arch != null && vendor != null && os != null && commandType != null) {
+            command = project.getProperty(arch + "_" + vendor + "_" + os + "_"
+                    + commandType);
+        }
+        // look if ARCH_VENDOR_COMMANDTYPE is existed
+        if (command == null) {
+            if (arch != null && vendor != null && commandType != null) {
+                command = project.getProperty(arch + "_" + vendor + "_"
+                        + commandType);
+            }
+        }
+        // look if ARCH_COMMANDTYPE is existed
+        if (command == null) {
+            if (arch != null && commandType != null) {
+                command = project.getProperty(arch + "_" + commandType);
+            }
+        }
+        // look if COMMANDTYPE is existed
+        if (command == null) {
+            if (commandType != null) {
+                command = project.getProperty(commandType);
+            }
+        }
+        // using the default value from VENDOR_OS_COMMANDTYPE or
+        // VENDOR_COMMANDTYPE
+        if (command == null) {
+            if (vendor != null && os != null && commandType != null) {
+                String str = vendor + "_" + os + "_" + commandType;
+                command = UserDefineMapping.getDefaultCommand(str);
+            }
+        }
+        // VENDOR_COMMANDTYPE
+        if (command == null) {
+            if (vendor != null && commandType != null) {
+                String str = vendor + "_" + commandType;
+                command = UserDefineMapping.getDefaultCommand(str);
+            }
+        }
+        // just give the name whatever
+        if (command == null) {
+            command = "cl";
+        }
+
+        // initialize the includePathDelimiter
+        if (userdefineDef.getIncludepathDelimiter() != null) {
+            includePathDelimiter = userdefineDef.getIncludepathDelimiter();
+        }
+        // else find VENDOR
+        else {
+            if (vendor != null) {
+                includePathDelimiter = UserDefineMapping
+                        .getIncludePathDelimiter(vendor, commandType);
+            }
+        }
+        if (includePathDelimiter == null) {
+            includePathDelimiter = "-I";
+        }
+        /*
+         * Set libSet.
+         */
+        if (userdefineDef.getLibSet() != null
+                && userdefineDef.getLibSet().size() > 0) {
+            String[] libList;
+            if (vendor.equalsIgnoreCase("GCC")) {
+                libSetList.add("-(");
+                for (int i = 0; i < userdefineDef.getLibSet().size(); i++) {
+                    libList = userdefineDef.getLibSet().get(i).getLibs();
+                    for (int j = 0; j < libList.length; j++) {
+                        libSetList.add(libList[j]);
+                    }
+                }
+                libSetList.add("-)");
+            } else {
+                for (int i = 0; i < userdefineDef.getLibSet().size(); i++) {
+                    libList = userdefineDef.getLibSet().get(i).getLibs();
+                    for (int j = 0; j < libList.length; j++) {
+                        libSetList.add(libList[j]);
+                    }
+                }
+            }
+        }
+        /*
+         * set includeFileFlag
+         */
+        if (userdefineDef.getIncludeFile() != null) {
+            if (userdefineDef.getIncludeFileFlag() != null) {
+                includeFileFlag = userdefineDef.getIncludeFileFlag();
+            } else {
+                includeFileFlag = UserDefineMapping.getCompellingIncFileFlag(
+                        vendor, commandType);
+            }
+        }
+        /*
+         * set entryPointFlag
+         */
+        if (userdefineDef.getEntryPointvalue() != null) {
+            if (userdefineDef.getEntryPointFlag() != null) {
+                entryPointFlag = userdefineDef.getEntryPointFlag();
+            } else {
+                entryPointFlag = UserDefineMapping.getEntryPointFlag(vendor,
+                        commandType);
+            }
+        }
+        /*
+         * set subSystemFlag
+         */
+        if (userdefineDef.getSubSystemvalue() != null) {
+            if (userdefineDef.getSubSystemFlag() != null) {
+                subSystemFlag = userdefineDef.getSubSystemFlag();
+            } else {
+                subSystemFlag = UserDefineMapping.getSubSystemFlag(vendor,
+                        commandType);
+            }
+        }
+        /*
+         * set mapFlag
+         */
+        if (userdefineDef.getMapvalue() != null) {
+            if (userdefineDef.getMapFlag() != null) {
+                mapFlag = userdefineDef.getMapFlag();
+            } else {
+                mapFlag = UserDefineMapping.getMapFlag(vendor, commandType);
+            }
+        }
+        /*
+         * set pdbFlag
+         */
+        if (userdefineDef.getPdbvalue() != null) {
+            if (userdefineDef.getPdbFlag() != null) {
+                pdbFlag = userdefineDef.getPdbFlag();
+            } else {
+                pdbFlag = UserDefineMapping.getPdbFlag(vendor, commandType);
+            }
+        }
+        /*
+         * set outputFileFlag
+         */
+        if (userdefineDef.getOutputFile() != null) {
+            if (userdefineDef.getOutPutFlag() != null) {
+                outputFileFlag = userdefineDef.getOutPutFlag();
+            } else {
+                outputFileFlag = UserDefineMapping.getOutputFileFlag(vendor,
+                        arch, commandType);
+            }
+        }
+
+        /*
+         * set fileList
+         */
+        if (userdefineDef.getFileList() != null) {
+            fileList = userdefineDef.getFileList();
+        }
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java
new file mode 100644
index 0000000000..f17edcf4ae
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java
@@ -0,0 +1,497 @@
+/*
+ * 
+ * Copyright 2002-2006 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.userdefine;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileList;
+import org.apache.tools.ant.types.FileSet;
+
+import sun.nio.cs.ext.TIS_620;
+
+import net.sf.antcontrib.cpptasks.ProcessorDef;
+import net.sf.antcontrib.cpptasks.types.AslcompilerArgument;
+import net.sf.antcontrib.cpptasks.types.ConditionalPath;
+import net.sf.antcontrib.cpptasks.types.IncludePath;
+import net.sf.antcontrib.cpptasks.types.LibrarySet;
+
+public class UserDefineDef extends ProcessorDef{
+    
+    public UserDefineDef () {}
+    
+    private String type = "CC";
+    private String includepathDelimiter;
+    
+    private File outdir;
+    private File workdir;
+
+    private String inputSuffix;
+    private String outputSuffix;
+    
+    private Vector<IncludePath> includePaths= new Vector<IncludePath>();
+    private Vector<FileList> fileSetList = new Vector<FileList>();
+    
+    /**
+     * New adding for support GCC toolchain.
+     * Most of those only have one value for example :
+     * entryPoint, mapFile, pdbFile, define those as element because 
+     * if attribut too much the command line is not good-lookinng.
+     */
+    
+    private Vector<UserDefineElement> includeFiles = new Vector<UserDefineElement>();
+    private Vector<UserDefineElement> outPutFiles = new Vector<UserDefineElement>();
+    private Vector<UserDefineElement> subSystem = new Vector<UserDefineElement>();
+    private Vector<UserDefineElement> entryPoint = new Vector<UserDefineElement>();
+    private Vector<UserDefineElement> map = new Vector<UserDefineElement>();
+    private Vector<UserDefineElement> pdb = new Vector<UserDefineElement>();
+    private Vector<LibrarySet> libSet = new Vector<LibrarySet>();
+    
+    public void execute() throws org.apache.tools.ant.BuildException {
+        throw new org.apache.tools.ant.BuildException(
+                        "Not an actual task, but looks like one for documentation purposes");
+    }
+
+
+    public void addConfiguredArgument(UserDefineArgument arg) {
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        addConfiguredProcessorArg(arg);
+    }
+    
+    /**
+     * Creates an include path.
+     */
+    public IncludePath createIncludePath() {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project must be set");
+        }
+        if (isReference()) {
+            throw noChildrenAllowed();
+        }
+        IncludePath path = new IncludePath(p);
+        includePaths.addElement(path);
+        return path;
+    }
+    
+    
+    /**
+     * Add a <includepath> if specify the file attribute
+     * 
+     * @throws BuildException
+     *             if the specify file not exist
+     */
+    protected void loadFile(Vector activePath, File file) throws BuildException {
+        FileReader fileReader;
+        BufferedReader in;
+        String str;
+        if (!file.exists()) {
+            throw new BuildException("The file " + file + " is not existed");
+        }
+        try {
+            fileReader = new FileReader(file);
+            in = new BufferedReader(fileReader);
+            while ((str = in.readLine()) != null) {
+                if (str.trim() == "") {
+                    continue;
+                }
+                str = getProject().replaceProperties(str);
+                activePath.addElement(str.trim());
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+    
+    /**
+     * Returns the specific include path.
+     */
+    public String[] getActiveIncludePaths() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getActiveIncludePaths();
+        }
+        return getActivePaths(includePaths);
+    }
+    
+    private String[] getActivePaths(Vector paths) {
+        Project p = getProject();
+        if (p == null) {
+            throw new java.lang.IllegalStateException("project not set");
+        }
+        Vector activePaths = new Vector(paths.size());
+        for (int i = 0; i < paths.size(); i++) {
+            ConditionalPath path = (ConditionalPath) paths.elementAt(i);
+            if (path.isActive(p)) {
+                if (path.getFile() == null) {
+                    String[] pathEntries = path.list();
+                    for (int j = 0; j < pathEntries.length; j++) {
+                        activePaths.addElement(pathEntries[j]);
+                    }
+                } else {
+                    loadFile(activePaths, path.getFile());
+                }
+            }
+        }
+        String[] pathNames = new String[activePaths.size()];
+        activePaths.copyInto(pathNames);
+        return pathNames;
+    }
+    
+    public String getIncludepathDelimiter() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getIncludepathDelimiter();
+        }
+        return includepathDelimiter;
+    }
+
+    public void setIncludepathDelimiter(String includepathDelimiter) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.includepathDelimiter = includepathDelimiter;
+    }
+
+    public String getInputSuffix() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getInputSuffix();
+        }
+        return inputSuffix;
+    }
+
+    public void setInputSuffix(String inputSuffix) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.inputSuffix = inputSuffix;
+    }
+
+    public File getOutdir() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getOutdir();
+        }
+        return outdir;
+    }
+
+    public void setOutdir(File outdir) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.outdir = outdir;
+    }
+
+    public String getOutputSuffix() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getOutputSuffix();
+        }
+        return outputSuffix;
+    }
+
+    public void setOutputSuffix(String outputSuffix) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.outputSuffix = outputSuffix;
+    }
+
+    public String getType() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getType();
+        }
+        return type;
+    }
+
+    public void setType(String type) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.type = type;
+    }
+
+    public File getWorkdir() {
+        if (isReference()) {
+            return ((UserDefineDef) getCheckedRef(UserDefineDef.class,
+                            "UserDefineDef")).getWorkdir();
+        }
+        return workdir;
+    }
+
+    public void setWorkdir(File workdir) {
+        if (isReference()) {
+            throw tooManyAttributes();
+        }
+        this.workdir = workdir;
+    }
+    
+    /**
+     * Add an libSet.
+     */
+    public LibrarySet createLibset() {
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        LibrarySet lib = new LibrarySet();
+        libSet.addElement(lib);
+        return lib;        
+    }
+    
+    public String getLibSetString(){
+        String libString = null;
+        for (int i = 0; i < libSet.size(); i++){
+            String[] libList = libSet.get(i).getLibs();
+            for (int j = 0; j < libList.length; j++){
+                libString = libString + libList[j] + " ";
+            }
+        }
+        return libString;
+    }
+    
+    public Vector<LibrarySet> getLibSet(){
+        return this.libSet;        
+    }
+    
+    /**
+     * Add map element
+     */
+    public void addMap(UserDefineElement mapElement){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }else{
+            this.map.addElement(mapElement);
+        }
+    }
+    
+    public Vector<UserDefineElement> getMap (){
+        return this.map;
+    }   
+    
+    public String getMapvalue (){
+        if (this.map.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.map.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getMapFlag(){
+        if (this.map.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.map.get(0).flag;
+        }
+        return null;
+    }
+    /**
+     *  Add pdb element
+     */
+    public void addPdb(UserDefineElement pdbElement){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        this.pdb.addElement(pdbElement);
+    }
+    
+    public Vector<UserDefineElement> getPdb(){
+        return this.pdb;
+    }
+    public String getPdbvalue (){
+        if (this.pdb.size() > 0){
+            /*
+             * If user set more than one pdb use the first one. 
+             * 
+             */
+            return this.pdb.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getPdbFlag(){
+        if (this.pdb.size() > 0){
+            /*
+             * If user set more than one pdb use the first one. 
+             */
+            return this.pdb.get(0).flag;
+        }
+        return null;
+    }
+    
+    /**
+     * add entryPoint element.
+     */
+    public void addEntryPoint(UserDefineElement entryPointElement){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        this.entryPoint.addElement(entryPointElement);
+    }
+    
+    public Vector<UserDefineElement> getEntryPoint(){
+        return this.entryPoint;
+    }
+    
+    public String getEntryPointvalue (){
+        if (this.entryPoint.size() > 0){
+            /*
+             * If user set more than one entryPoint use the first one. 
+             */
+            return this.entryPoint.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getEntryPointFlag(){
+        if (this.entryPoint.size() > 0){
+            /*
+             * If user set more than one entry point use the first one. 
+             */
+            return this.entryPoint.get(0).flag;
+        }
+        return null;
+    }
+    
+    /**
+     * Add subSystem element.
+     */
+    public void addSubSystem (UserDefineElement subSystem){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        this.subSystem.addElement(subSystem);
+    }
+    public Vector<UserDefineElement> getSubSystem (){
+        return this.subSystem;
+    }
+    
+    public String getSubSystemvalue (){
+        if (this.subSystem.size() > 0){
+            /*
+             * If user set more than one subsystem use the first one. 
+             */
+            return this.subSystem.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getSubSystemFlag(){
+        if (this.subSystem.size() > 0){
+            /*
+             * If user set more than one subsystem use the first one. 
+             */
+            return this.subSystem.get(0).flag;
+        }
+        return null;
+    }
+    /**
+     * Add includeFile element
+     */
+    public void addIncludeFile (UserDefineElement includeFile){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        this.includeFiles.addElement(includeFile);
+    }
+    public Vector<UserDefineElement> getIncludeFiles(){
+        return this.includeFiles;
+    }
+    
+    public String getIncludeFile (){
+        if (this.includeFiles.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.includeFiles.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getIncludeFileFlag(){
+        if (this.includeFiles.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.includeFiles.get(0).flag;
+        }
+        return null;
+    }
+    
+    /**
+     * Add OutputFile element
+     */
+    public void addOutputFile (UserDefineElement outPutFile){
+        if (isReference()){
+            throw noChildrenAllowed();
+        }
+        this.outPutFiles.addElement(outPutFile);
+    }
+    
+    public Vector<UserDefineElement> getOutputFiles(){
+        return this.outPutFiles;
+    }
+    
+    public String getOutputFile (){
+        if (this.outPutFiles.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.outPutFiles.get(0).value;
+        }
+        return null;
+        
+    }
+    public String getOutPutFlag(){
+        if (this.outPutFiles.size() > 0){
+            /*
+             * If user set more than one map use the first one. 
+             */
+            return this.outPutFiles.get(0).flag;
+        }
+        return null;
+    }
+    
+    /**
+     * Add fileSet list
+     */
+    public void addFileList(FileList fileSet){
+        this.fileSetList.addElement(fileSet);
+    }
+    
+    public Vector<String> getFileList(){
+        Project p = getProject();
+        Vector<String> fileListVector = new Vector<String>();
+        for (int i = 0; i < this.fileSetList.size(); i++){
+            String[] tempStrList = this.fileSetList.get(i).getFiles(p);
+            for (int j = 0; j < tempStrList.length; j++){
+                fileListVector .addElement(tempStrList[j]);
+            }
+        }
+        return fileListVector;
+    }
+}
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineElement.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineElement.java
new file mode 100644
index 0000000000..b8c852c51a
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineElement.java
@@ -0,0 +1,23 @@
+package net.sf.antcontrib.cpptasks.userdefine;
+
+public class UserDefineElement {
+    String flag = null;
+    String value = null;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+    
+}
+\ No newline at end of file
diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
new file mode 100644
index 0000000000..bb290efba2
--- /dev/null
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
@@ -0,0 +1,186 @@
+/*
+ * 
+ * Copyright 2001-2004 The Ant-Contrib project
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package net.sf.antcontrib.cpptasks.userdefine;
+public class UserDefineMapping {
+    // list of Arch: EBC, ARM, IA32, X64, IPF, PPC, NT32
+    public final static String[] arch = { "EBC", "ARM", "IA32", "X64", "IPF",
+            "PPC", "NT32" };
+
+    // list of OS: Linux, Windows
+    public final static String[] os = { "WINDOWS", "LINUX" };
+
+    // list of Vendor: Microsoft, Intel, Cygwin, Gcc
+    public final static String[] vendor = { "MSFT", "INTEL", "GCC", "CYGWIN" };
+
+    // list of Command Type: CC, LIB, LINK, ASL, ASM, ASMLINK
+    public final static String[] commandType = { "CC", "LIB", "LINK", "ASL",
+            "ASM", "ASMLINK", "PP" };
+
+    //
+    // flags mapping (Include compellingIncFileFlag,Path Delimiter, Output file
+    // flag,
+    // includepathfalge,
+    // )
+    // Examples: '/I' for MSFT cl.exe while '-I' for GCC
+    // '/Fo' for MSFT cl.exe while '-o' for GCC
+    //
+    public final static String[][] compellingIncFileFlag = {
+            { "MSFT_CC", "/FI" }, { "GCC_CC", "-include" },
+            { "INTEL_CC", "-FI" }, { "WINDDK_CC", "/FI" },
+            { "MSFT_ASM", "/FI" }, { "GCC_ASM", "-include" },
+            { "WINDDK_ASM", "/FI" } };
+
+    public final static String[][] includePathFlag = { { "MSFT_CC", "/I" },
+            { "GCC_CC", "-I" }, { "INTEL_CC", "/I" }, { "WINDDK_CC", "/I" },
+            { "MSFT_ASM", "/I" }, { "GCC_ASM", "-I" }, { "WINDDK_CC", "/I" },
+            { "MSFT_PP", "/I" }, { "GCC_PP", "-I" }, { "WINDDK_PP", "/I" } };
+
+    public final static String[][] outputFileFlag = { { "MSFT_CC", "/Fo" },
+            { "GCC_CC", "-o" }, { "INTEL_CC", "/Fo" }, { "WINDDK_CC", "/Fo" },
+            { "MSFT_LIB", "/OUT:" }, { "GCC_LIB", "-cr" },
+            { "INTEL_LIB", "/OUT:" }, { "WINDDK_LIB", "/OUT:" },
+            { "MSFT_LINK", "/OUT:" }, { "GCC_LINK", "-o" },
+            { "INTEL_LINK", "/OUT:" }, { "WINDDK_LINK", "/OUT:" },
+            { "MSFT_ASM", "/Fo" }, { "GCC_ASM", "-o" },
+            { "WINDDK_ASM", "/Fo" },{"WINDDK_IPF_ASM", "-o"} };
+
+    public final static String[][] subSystemFlag = {
+            { "MSFT_LIB", "/SUBSYSTEM:" }, { "GCC_LIB", "--subsystem=" },
+            { "WINDDk_LIB", "/SUBSYSTEM:" }, { "INTEL_LIB", "/SUBSYSTEM:" },
+            { "MSFT_LINK", "/SUBSYSTEM:" }, { "GCC_LINK", "--subsystem=" },
+            { "INTEL_LINK", "/SUBSYSTEM:" }, { "WINDDK_LINK", "/SUBSYSTEM:" } };
+
+    public final static String[][] outputFileSuffix = {
+            { "WINDOWS_ASM", ".obj" }, { "WINDOWS_CC", ".obj" },
+            { "LINUX_ASM", ".o" }, { "LINUX_CC", ".o" } };
+
+    public final static String[][] entryPointFlag = {
+            { "MSFT_LINK", "/ENTRY:" }, { "GCC_LINK", "-e" },
+            { "INTEL_LINK", "/ENTRY:" },
+            { "WINDDK_LINK", "/ENTRY:" } };
+
+    public final static String[][] mapFlag = { { "MSFT_LINK", "/MAP:" },
+            { "GCC_LINK", "" }, { "INTEL_LINK", "/MAP:" },
+            { "WINDDK_LINK", "/MAP:" } };
+
+    public final static String[][] pdbFlag = { { "MSFT_LINK", "/PDB:" },
+            { "GCC_LINK", "" }, { "INTEL_LINK", "" }, { "WINDDK_LINK", "/PDB:"} };
+
+    public static String getIncludePathDelimiter(String vendor,
+            String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < includePathFlag.length; i++) {
+            if (includePathFlag[i][0].equalsIgnoreCase(key)) {
+                return includePathFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getOutputFileFlag(String vendor, String arch, String commandType) {
+        /*
+         * First find outputfileFlag by vendor_arch_commandType
+         */
+        String key = vendor + "_" + arch + "_" + commandType;
+        for (int i = 0; i < outputFileFlag.length; i++) {
+            if (outputFileFlag[i][0].equalsIgnoreCase(key)) {
+                return outputFileFlag[i][1];
+            }
+        }
+        key = vendor + "_" + commandType;
+        for (int i = 0; i < outputFileFlag.length; i++) {
+            if (outputFileFlag[i][0].equalsIgnoreCase(key)) {
+                return outputFileFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getCompellingIncFileFlag(String vendor,
+            String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < compellingIncFileFlag.length; i++) {
+            if (compellingIncFileFlag[i][0].equalsIgnoreCase(key)) {
+                return compellingIncFileFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getSubSystemFlag(String vendor, String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < subSystemFlag.length; i++) {
+            if (subSystemFlag[i][0].equalsIgnoreCase(key)) {
+                return subSystemFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getEntryPointFlag(String vendor, String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < entryPointFlag.length; i++) {
+            if (entryPointFlag[i][0].equalsIgnoreCase(key)) {
+                return entryPointFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getMapFlag(String vendor, String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < mapFlag.length; i++) {
+            if (mapFlag[i][0].equalsIgnoreCase(key)) {
+                return mapFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    public static String getPdbFlag(String vendor, String commandType) {
+        String key = vendor + "_" + commandType;
+        for (int i = 0; i < pdbFlag.length; i++) {
+            if (pdbFlag[i][0].equalsIgnoreCase(key)) {
+                return pdbFlag[i][1];
+            }
+        }
+        return null;
+    }
+
+    //
+    // Well-known source file suffix and output file suffix relationship
+    // sourceExtension(Multiple),
+    // headExtension(Multiple) and outputSuffix(Single)
+    //
+
+    //
+    // Default command string such as 'cl' in MSFT while 'gcc' in GCC
+    //
+    public final static String[][] defaultCommand = { { "GCC", "gcc" },
+            { "MSFT_CC", "cl" }, { "MSFT_LIB", "lib" },
+            { "MSFT_LINK", "link" }, };
+
+    public static String getDefaultCommand(String toolchain) {
+        for (int i = 0; i < defaultCommand.length; i++) {
+            if (defaultCommand[i][0].equalsIgnoreCase(toolchain)) {
+                return defaultCommand[i][1];
+            }
+        }
+        return null;
+    }
+
+}
+\ No newline at end of file
diff --git a/Tools/Source/CreateMdkPkg/MANIFEST.MF b/Tools/Source/CreateMdkPkg/MANIFEST.MF
new file mode 100644
index 0000000000..28f83c0ce2
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: org.tianocore.packaging.workspace.ui.Welcome
diff --git a/Tools/Source/CreateMdkPkg/build.xml b/Tools/Source/CreateMdkPkg/build.xml
new file mode 100644
index 0000000000..1352d5d8d8
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/build.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="Setup" default="all" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>
+  </path>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>
+  <target name="all" depends="deleteTemp"/>
+  <target name="source">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="src" destdir="${buildDir}">
+      <classpath refid="classpath"/>
+      <compilerarg value="-Xlint"/>
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <delete file="${installLocation}/CreateMdkPkg.jar"/>
+  </target>
+  <target name="relocate" depends="source">
+    <delete file="${installLocation}/CreateMdkPkg.jar"/>
+    <copy todir="${buildDir}/Tools">
+      <fileset dir="${WORKSPACE}/Tools"/>
+    </copy>
+    <copy todir="${buildDir}/MdePkg">
+      <fileset dir="${WORKSPACE}/MdePkg"/>
+    </copy>
+    <copy file="${WORKSPACE}/build.xml"
+           todir="${buildDir}"/>
+    <copy file="${WORKSPACE}/DeveloperManual.doc"
+           todir="${buildDir}"/>
+    <copy file="${WORKSPACE}/edksetup.bat"
+           todir="${buildDir}"/>
+    <copy file="${WORKSPACE}/edksetup.sh"
+           todir="${buildDir}"/>
+  </target>
+  <target name="install" depends="relocate">
+    <jar destfile="${installLocation}/CreateMdkPkg.jar"
+      basedir="${buildDir}"
+      includes="**"
+      manifest="MANIFEST.MF"
+    />
+  </target>
+  <target name="deleteTemp" depends="install">
+    <delete dir="${buildDir}"/>
+  </target>
+</project>
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Log.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Log.java
new file mode 100644
index 0000000000..383ffa719a
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Log.java
@@ -0,0 +1,188 @@
+/** @file
+ 
+ The file is used to provides static interfaces to save log and error information 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.common;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import javax.swing.JOptionPane;
+
+/**
+ The class is used to provides static interfaces to save log and error information
+ 
+ @since CreateMdkPkg 1.0
+ 
+ **/
+public class Log {
+
+    //
+    //Log file
+    //
+    private static File fleLogFile = null;
+
+    //
+    //Err file
+    //
+    private static File fleErrFile = null;
+
+    //
+    //Log file name
+    //
+    static String strLogFileName = "Log.log";
+
+    //
+    //Err file name
+    //
+    static String strErrFileName = "Err.log";
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        try {
+            Log.log("Test", "test");
+            Log.err("Test1", "test1");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     This is the default constructor
+     Do nothing
+     
+     **/
+    public Log() {
+    }
+
+    /**
+     Call writeToLogFile to save log item and log information to log file
+     
+     @param strItem The log item
+     @param strLog The log information
+     
+     **/
+    public static void log(String strItem, String strLog) {
+        try {
+            writeToLogFile(strItem + ":" + strLog);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToLogFile to save log information to log file
+     
+     @param strLog The log information
+     
+     **/
+    public static void log(String strLog) {
+        try {
+            writeToLogFile(strLog);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToErrFile to save err item and err information to err file
+     
+     @param strItem The err item
+     @param strLog The err information
+     
+     **/
+    public static void err(String strItem, String strErr) {
+        try {
+            writeToErrFile("Error when " + strItem + ":" + strErr);
+            JOptionPane.showConfirmDialog(null, "Error when " + strItem + "::" + strErr, "Error",
+                                          JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToErrFile to save err information to err file
+     
+     @param strLog The err information
+     
+     **/
+    public static void err(String strErr) {
+        try {
+            writeToErrFile("Error::" + strErr);
+            JOptionPane.showConfirmDialog(null, "Error::" + strErr, "Error", JOptionPane.DEFAULT_OPTION,
+                                          JOptionPane.ERROR_MESSAGE);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Open log file and write log information
+     
+     @param strLog The log information
+     @throws IOException
+     
+     **/
+    private static void writeToLogFile(String strLog) throws IOException {
+        try {
+            if (fleLogFile == null) {
+                fleLogFile = new File(strLogFileName);
+                fleLogFile.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(fleLogFile, true);
+            fos.write((Tools.getCurrentDateTime() + "\r\n").getBytes());
+            fos.write((strLog + "\r\n").getBytes());
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Open err file and write err information
+     
+     @param strLog The log information
+     @throws IOException
+     
+     **/
+    private static void writeToErrFile(String strLog) throws IOException {
+        try {
+            if (fleErrFile == null) {
+                fleErrFile = new File(strErrFileName);
+                fleErrFile.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(fleErrFile, true);
+            fos.write((Tools.getCurrentDateTime() + "\r\n").getBytes());
+            fos.write((strLog + "\r\n").getBytes());
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Tools.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Tools.java
new file mode 100644
index 0000000000..2494b03815
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/common/Tools.java
@@ -0,0 +1,120 @@
+/** @file
+ 
+ The file is used to provides some useful interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.common;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ The class is used to provides some useful interfaces 
+ 
+ @since CreateMdkPkg 1.0
+ 
+ **/
+public class Tools {
+
+    /**
+     Used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        System.out.println(getCurrentDateTime());
+    }
+
+    /**
+     Get current date and time and format it as "yyyy-MM-dd HH:mm"
+     
+     @return formatted current date and time
+     
+     **/
+    public static String getCurrentDateTime() {
+        Date now = new Date(System.currentTimeMillis());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return sdf.format(now);
+    }
+
+    /**
+     Delete a folder and all its files
+     
+     @param fleFolderName The name of the folder which need be deleted
+     
+     @retval true - Delete successfully
+     @retval false - Delete successfully
+     
+     **/
+    public static boolean deleteFolder(File fleFolderName) {
+        boolean blnIsDeleted = true;
+        File[] aryAllFiles = fleFolderName.listFiles();
+
+        for (int indexI = 0; indexI < aryAllFiles.length; indexI++) {
+            if (blnIsDeleted) {
+                if (aryAllFiles[indexI].isDirectory()) {
+                    //
+                    //If is a directory, recursively call this function to delete sub folders
+                    //
+                    blnIsDeleted = deleteFolder(aryAllFiles[indexI]);
+                } else if (aryAllFiles[indexI].isFile()) {
+                    //
+                    //If is a file, delete it
+                    //
+                    if (!aryAllFiles[indexI].delete()) {
+                        blnIsDeleted = false;
+                    }
+                }
+            }
+        }
+        if (blnIsDeleted) {
+            fleFolderName.delete();
+        }
+        return blnIsDeleted;
+    }
+
+    /**
+     Generate a UUID
+     
+     @return the created UUID
+     
+     **/
+    public static String generateUuidString() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     Get all system properties and output to the console
+     
+     **/
+    public static void getSystemProperties() {
+        System.out.println(System.getProperty("java.class.version"));
+        System.out.println(System.getProperty("java.class.path"));
+        System.out.println(System.getProperty("java.ext.dirs"));
+        System.out.println(System.getProperty("os.name"));
+        System.out.println(System.getProperty("os.arch"));
+        System.out.println(System.getProperty("os.version"));
+        System.out.println(System.getProperty("file.separator"));
+        System.out.println(System.getProperty("path.separator"));
+        System.out.println(System.getProperty("line.separator"));
+        System.out.println(System.getProperty("user.name"));
+        System.out.println(System.getProperty("user.home"));
+        System.out.println(System.getProperty("user.dir"));
+        System.out.println(System.getProperty("PATH"));
+
+        System.out.println(System.getenv("PROCESSOR_REVISION"));
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/FrameworkPkg.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/FrameworkPkg.java
new file mode 100644
index 0000000000..e12b58438f
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/FrameworkPkg.java
@@ -0,0 +1,238 @@
+/** @file
+ 
+ The file is used to install .jar file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import javax.swing.JFrame;
+
+/**
+ The class is used to install .jar file
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class FrameworkPkg {
+    //
+    // Define class members
+    //
+    static JFrame frame;
+
+    private String pkg = null;
+
+    private JarFile jf = null;
+
+    /**
+     Main clase, used to test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        FrameworkPkg fp = new FrameworkPkg("C:\\Documents and Settings\\hchen30\\Desktop\\com.jar");
+        try {
+            fp.install("C:\\MyWorkspace" + System.getProperty("file.separator"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public FrameworkPkg() {
+
+    }
+
+    /**
+     This is the override constructor
+     
+     @param package_name
+     
+     **/
+    public FrameworkPkg(String package_name) {
+        pkg = package_name;
+    }
+
+    /**
+     Get package name
+     
+     @param package_name
+     
+     **/
+    public void setPkg(String package_name) {
+        pkg = package_name;
+    }
+
+    /**
+     Set Jarfile
+     
+     @throws IOException
+     
+     **/
+    public void setJarFile() throws IOException {
+        jf = new JarFile(pkg);
+    }
+
+    /**
+     Install the jar file to specific path
+     
+     @param dir The target path
+     @return 0 - success
+     @throws IOException
+     @throws BasePkgNotInstalled
+     @throws VerNotEqual
+     @throws GuidNotEqual
+     @throws SameAll
+     
+     **/
+    public int install(final String dir) throws IOException, BasePkgNotInstalled, VerNotEqual, GuidNotEqual, SameAll {
+        pre_install();
+        extract(dir);
+        post_install();
+        return 0;
+    }
+
+    /**
+     
+     @return
+     
+     **/
+    public int uninstall() {
+
+        return 0;
+    }
+
+    /**
+     Check before install
+     
+     @throws IOException
+     @throws BasePkgNotInstalled
+     @throws VerNotEqual
+     @throws GuidNotEqual
+     @throws SameAll
+     
+     **/
+    protected void pre_install() throws IOException, BasePkgNotInstalled, VerNotEqual, GuidNotEqual, SameAll {
+        jf = new JarFile(pkg);
+        if (false) {
+            throw new BasePkgNotInstalled();
+        }
+        if (false) {
+            throw new VerNotEqual();
+        }
+        if (false) {
+            throw new GuidNotEqual();
+        }
+        if (false) {
+            throw new SameAll();
+        }
+    }
+
+    /**
+     End of install
+     
+     @throws IOException
+     
+     **/
+    protected void post_install() throws IOException {
+        jf.close();
+
+    }
+
+    /**
+     Extract the jar file to specific dir
+     
+     @param dir The target path
+     @throws IOException
+     
+     **/
+    private synchronized void extract(String dir) throws IOException {
+
+        int i = 0;
+        try {
+            for (Enumeration e = jf.entries(); e.hasMoreElements(); i++) {
+                JarEntry je = (JarEntry) e.nextElement();
+                if (je.getName().contains("META-INF"))
+                    continue;
+                if (je.isDirectory()) {
+                    new File(dir + je.getName()).mkdirs();
+                    continue;
+                }
+
+                if (je != null) {
+                    //
+                    // Get an input stream for the entry.
+                    //
+                    InputStream entryStream = jf.getInputStream(je);
+
+                    try {
+                        //
+                        // Create the output file (clobbering the file if it exists).
+                        //
+                        FileOutputStream file = new FileOutputStream(dir + je.getName());
+
+                        try {
+                            //
+                            // Allocate a buffer for reading the entry data.
+                            //
+                            byte[] buffer = new byte[1024];
+                            int bytesRead;
+
+                            //
+                            // Read the entry data and write it to the output file.
+                            //    
+                            while ((bytesRead = entryStream.read(buffer)) != -1) {
+                                file.write(buffer, 0, bytesRead);
+                            }
+
+                            System.out.println(je.getName() + " extracted.");
+                        } finally {
+                            file.close();
+                        }
+                    } finally {
+                        entryStream.close();
+                    }
+                }
+            }
+        } finally {
+            jf.close();
+        }
+    }
+}
+
+class BasePkgNotInstalled extends Exception {
+    final static long serialVersionUID = 0;
+}
+
+class VerNotEqual extends Exception {
+    final static long serialVersionUID = 0;
+}
+
+class GuidNotEqual extends Exception {
+    final static long serialVersionUID = 0;
+}
+
+class SameAll extends Exception {
+    final static long serialVersionUID = 0;
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/MdkPkg.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/MdkPkg.java
new file mode 100644
index 0000000000..74250cc4a6
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/MdkPkg.java
@@ -0,0 +1,59 @@
+/** @file
+ 
+ The file is used to override FrameworkPkg to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging;
+
+import java.io.IOException;
+
+/**
+ The class is used to override FrameworkPkg to provides customized interfaces
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class MdkPkg extends FrameworkPkg {
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     @param strJarFile The jar file need be installed
+     @throws IOException
+     
+     **/
+    public MdkPkg(String strJarFile) throws IOException {
+        this.setPkg(strJarFile);
+        this.setJarFile();
+    }
+
+    /* (non-Javadoc)
+     * @see org.tianocore.packaging.FrameworkPkg#pre_install()
+     * 
+     * Override pre_install to do nothing
+     * 
+     */
+    protected void pre_install() {
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/ExitConfirm.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/ExitConfirm.java
new file mode 100644
index 0000000000..170ca6255d
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/ExitConfirm.java
@@ -0,0 +1,264 @@
+/** @file
+ 
+ The file is used to popup a exit confirmation window when program exists
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ **/
+package org.tianocore.packaging.common.ui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ The class is used to popup a exit confirmation window when program exists
+ It extends JDialog and implements ActionListener and WindowListener
+ 
+ @since CreateMdkPkg 1.0
+ 
+ **/
+public class ExitConfirm extends JDialog implements ActionListener, WindowListener {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -5875921789385911029L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelMessage = null;
+
+    private JLabel jLabelResume = null;
+
+    private JLabel jLabelExit = null;
+
+    private JButton jButtonResume = null;
+
+    private JButton jButtonExit = null;
+
+    public boolean isCancel = false;
+
+    /**
+     This method initializes jButtonResume
+     
+     @return javax.swing.JButton jButtonResume
+     
+     **/
+    private JButton getJButtonResume() {
+        if (jButtonResume == null) {
+            jButtonResume = new JButton();
+            jButtonResume.setText("Resume");
+            jButtonResume.setSize(new java.awt.Dimension(90, 20));
+            jButtonResume.setLocation(new java.awt.Point(150, 105));
+            jButtonResume.setMnemonic('R');
+            jButtonResume.addActionListener(this);
+        }
+        return jButtonResume;
+    }
+
+    /**
+     This method initializes jButtonExit    
+     
+     @return javax.swing.JButton jButtonExit
+     
+     **/
+    private JButton getJButtonExit() {
+        if (jButtonExit == null) {
+            jButtonExit = new JButton();
+            jButtonExit.setText("Exit");
+            jButtonExit.setSize(new java.awt.Dimension(90, 20));
+            jButtonExit.setLocation(new java.awt.Point(260, 105));
+            jButtonExit.setMnemonic('x');
+            jButtonExit.addActionListener(this);
+        }
+        return jButtonExit;
+    }
+
+    /**
+     Main clasee, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ExitConfirm(IFrame parentFrame, boolean modal) {
+        super(parentFrame, modal);
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setSize(500, 170);
+        this.setTitle("Exit");
+        this.setResizable(false);
+        this.setContentPane(getJContentPane());
+        this.addWindowListener(this);
+        //
+        //Set DO_NOTHING_ON_CLOSE when click Close button on title bar
+        //
+        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        centerWindow();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelExit = new JLabel();
+            jLabelExit.setSize(new java.awt.Dimension(450, 20));
+            jLabelExit.setLocation(new java.awt.Point(25, 70));
+            jLabelResume = new JLabel();
+            jLabelResume.setSize(new java.awt.Dimension(450, 20));
+            jLabelResume.setLocation(new java.awt.Point(25, 40));
+            jLabelMessage = new JLabel();
+            jLabelMessage.setSize(new java.awt.Dimension(450, 20));
+            jLabelMessage.setLocation(new java.awt.Point(25, 10));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelMessage, null);
+            jContentPane.add(jLabelResume, null);
+            jContentPane.add(jLabelExit, null);
+            jContentPane.add(getJButtonResume(), null);
+            jContentPane.add(getJButtonExit(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     Call setWarningMessage to set messages of frame when it is used for Setup
+     
+     **/
+    public void setSetupMessage() {
+        String strTitle = "Exit Setup";
+        String strMessage = "Setup is not complete. If you quit now, the program will not be installed.";
+        //String strResume = "You may run the setup program at a later time to complete the installation.";
+        String strResume = "";
+        String strExit = "To continue installing, click Resume. To quit the Setup program, click Exit.";
+        setWarningMessage(strTitle, strMessage, strResume, strExit);
+    }
+
+    /**
+     Call setWarningMessage to set messages of frame when it is used for Module Main GUI
+     
+     **/
+    public void setModuleMessage() {
+        String strTitle = "Exit";
+        String strMessage = "Do you really want to quit now?";
+        String strResume = "All unsaved module information will be lost.";
+        String strExit = "To continue editing module, click Resume. To quit the program, click Exit.";
+        setWarningMessage(strTitle, strMessage, strResume, strExit);
+    }
+
+    /**
+     Set message information via input data
+     
+     @param strTitle The title value
+     @param strMessage The main message value
+     @param strResume The resume message value
+     @param strExit The exit message value
+     
+     **/
+    private void setWarningMessage(String strTitle, String strMessage, String strResume, String strExit) {
+        this.setTitle(strTitle);
+        jLabelMessage.setText(strMessage);
+        jLabelResume.setText(strResume);
+        jLabelExit.setText(strExit);
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listern all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        //
+        //Set isCancel true when click button "Exit"
+        //
+        Object obj = arg0.getSource();
+        if (obj == jButtonResume) {
+            isCancel = false;
+        }
+        if (obj == jButtonExit) {
+            isCancel = true;
+        }
+        this.setVisible(false);
+    }
+
+    /**
+     Make the window in the center of the screen
+     
+     **/
+    private void centerWindow() {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - this.getSize().width) / 2, (d.height - this.getSize().height) / 2);
+    }
+
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosed(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosing(WindowEvent arg0) {
+        isCancel = false;
+        this.setVisible(false);
+    }
+
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/IFrame.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/IFrame.java
new file mode 100644
index 0000000000..211b9c3adb
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/common/ui/IFrame.java
@@ -0,0 +1,203 @@
+/** @file
+ 
+ The file is used to override Frame to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import javax.swing.JFrame;
+
+/**
+ The class is used to override Frame to provides customized interfaces 
+ It extends JFrame implements ActionListener and WindowListener
+ 
+ @since CreateMdkPkg 1.0
+ 
+ **/
+public class IFrame extends JFrame implements ActionListener, WindowListener {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -3324138961029300427L;
+
+    //
+    // Define class members
+    //
+    private ExitConfirm ec = null;
+
+    //
+    // To indicate the status while quit
+    // 0 - When setup (Default)
+    // 1 - Whne editing module
+    //
+    private int intExitType = 0;
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        IFrame i = new IFrame();
+        i.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public IFrame() {
+        super();
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    public void initialize() {
+        this.setResizable(false);
+        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        this.addWindowListener(this);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     @param intWidth The width of the dialog
+     @param intHeight The height of the dialog
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     Set the exit window type
+     
+     @param ExitType The input data of ExitType
+     
+     **/
+    protected void setExitType(int ExitType) {
+        this.intExitType = ExitType;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     *
+     * Override windowClosing to call this.onDisvisible()
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onDisvisible();
+    }
+
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosed(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     Define the actions when exit
+     
+     **/
+    public void onExit() {
+        ec = new ExitConfirm(this, true);
+        //
+        //Show different warning message via different ExitType
+        //
+        switch (intExitType) {
+        case 0:
+            ec.setSetupMessage();
+            break;
+        case 1:
+            ec.setModuleMessage();
+            break;
+        }
+        ec.setVisible(true);
+        if (ec.isCancel) {
+            this.dispose();
+            System.exit(0);
+        }
+    }
+
+    /**
+     Define the actions when disvisible
+     
+     **/
+    public void onDisvisible() {
+        ec = new ExitConfirm(this, true);
+        //
+        //Show different warning message via different ExitType
+        //
+        switch (intExitType) {
+        case 0:
+            ec.setSetupMessage();
+            break;
+        case 1:
+            ec.setModuleMessage();
+            break;
+        }
+        ec.setVisible(true);
+        if (ec.isCancel) {
+            this.dispose();
+        }
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/command/InstallWorkspace.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/command/InstallWorkspace.java
new file mode 100644
index 0000000000..47bd36fe0a
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/command/InstallWorkspace.java
@@ -0,0 +1,161 @@
+/** @file
+ 
+ The file is used to override AbstractCellEditor to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.command;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.MdkPkg;
+
+/**
+ The class is used to override AbstractCellEditor to provides customized interfaces 
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class InstallWorkspace {
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     Reserved
+     
+     **/
+    public InstallWorkspace() {
+        // TODO
+    }
+
+    /**
+     Check if exist target dir
+     
+     @param strInstallDir The install target dir
+     @retval true - The target exists
+     @retval false - The target doesn't exist
+     
+     **/
+    public static boolean isExistInstallDir(String strInstallDir) {
+        File id = new File(strInstallDir);
+        return id.exists();
+    }
+
+    /**
+     Create install target dir
+     
+     @param strInstallDir The install target dir
+     @retval true - Install success
+     @retval false - Install fail
+     
+     **/
+    public static boolean createInstallDir(String strInstallDir) {
+        File id = new File(strInstallDir);
+        try {
+            return id.mkdir();
+        } catch (Exception e) {
+            System.out.print(e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     Reserved
+     
+     @return boolean
+     
+     **/
+    public static boolean setSystemEnvironment() {
+        return true;
+    }
+
+    /**
+     Reserved 
+     
+     @return boolean
+     **/
+    public static boolean setToolChainPath() {
+        return true;
+    }
+
+    /**
+     Reserved
+     
+     @return boolean
+     **/
+    public static boolean setToolChain() {
+        return true;
+    }
+
+    /**
+     Reserved
+     
+     @return boolean
+     **/
+    public static boolean setFrameworkDatabase() {
+        return true;
+    }
+
+    /**
+     Delete setup files and directory
+     
+     @param strPath The delete target dir
+     @retval true - Delete success
+     @retval false - Delete fail
+     
+     **/
+    public static boolean delSetupPackage(String strPath) {
+        File f = new File(strPath);
+        try {
+            Tools.deleteFolder(f);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    /**
+     
+     @param strInstallDir The install target dir
+     @param strJarFile The install target file
+     @retval true - Install success
+     @retval false - Install fail
+     @throws IOException
+     
+     **/
+    public static boolean installPackage(String strInstallDir, String strJarFile) throws IOException {
+        Log.log("Install Dir", strInstallDir);
+        Log.log("Jar File Path", strJarFile);
+
+        MdkPkg mp = new MdkPkg(strJarFile);
+        try {
+            mp.install(strInstallDir + System.getProperty("file.separator"));
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.log("Install Err", e.toString());
+        }
+        return false;
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Finish.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Finish.java
new file mode 100644
index 0000000000..aab046f570
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Finish.java
@@ -0,0 +1,295 @@
+/** @file
+ 
+ The file is used to show a Finish page in the last step of setup
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.tianocore.packaging.common.ui.IFrame;
+
+/**
+ The class is used to show a Finish page in the last step of setup
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class Finish extends IFrame implements ActionListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 9055339173915836187L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JTextArea jTextAreaTitle = null;
+
+    private JTextArea jTextAreaContent = null;
+
+    private JPanel jPanel = null;
+
+    private JButton jButtonFinish = null;
+
+    private JLabel jLabel = null;
+
+    private JLabel jLabel1 = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTextArea jTextAreaComment = null;
+
+    private String strInstallDir = "";
+
+    /**
+     This method initializes jTextAreaTitle 
+     
+     @return javax.swing.JTextArea jTextAreaTitle
+     
+     **/
+    private JTextArea getJTextAreaTitle() {
+        if (jTextAreaTitle == null) {
+            jTextAreaTitle = new JTextArea();
+            jTextAreaTitle.setLocation(new java.awt.Point(0, 0));
+            jTextAreaTitle.setText("     Click button \"Install\" to start installation");
+            jTextAreaTitle.setFont(new java.awt.Font("Dialog", java.awt.Font.BOLD, 14));
+            jTextAreaTitle.setEditable(false);
+            jTextAreaTitle.setSize(new java.awt.Dimension(495, 20));
+        }
+        return jTextAreaTitle;
+    }
+
+    /**
+     This method initializes jTextAreaContent 
+     
+     @return javax.swing.JTextArea jTextAreaContent
+     
+     **/
+    private JTextArea getJTextAreaContent() {
+        if (jTextAreaContent == null) {
+            jTextAreaContent = new JTextArea();
+            jTextAreaContent.setLocation(new java.awt.Point(0, 20));
+            jTextAreaContent.setText("");
+            jTextAreaContent.setEditable(false);
+            jTextAreaContent.setSize(new java.awt.Dimension(495, 35));
+        }
+        return jTextAreaContent;
+    }
+
+    /**
+     This method initializes jPanel 
+     
+     @return javax.swing.JPanel jPanel
+     
+     **/
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            jLabel1 = new JLabel();
+            jLabel1.setText("");
+            jLabel1.setLocation(new java.awt.Point(30, 40));
+            jLabel1.setSize(new java.awt.Dimension(435, 20));
+            jLabel = new JLabel();
+            jLabel.setText("");
+            jLabel.setLocation(new java.awt.Point(30, 15));
+            jLabel.setSize(new java.awt.Dimension(435, 20));
+            jPanel = new JPanel();
+            jPanel.setLayout(null);
+            jPanel.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+            jPanel.setSize(new java.awt.Dimension(494, 251));
+            jPanel.setLocation(new java.awt.Point(0, 55));
+            jPanel.add(jLabel, null);
+            jPanel.add(jLabel1, null);
+            jPanel.add(getJScrollPane(), null);
+        }
+        return jPanel;
+    }
+
+    /**
+     This method initializes jButtonFinish 
+     
+     @return javax.swing.JButton jButtonFinish
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonFinish == null) {
+            jButtonFinish = new JButton();
+            jButtonFinish.setText("Finish");
+            jButtonFinish.setBounds(new java.awt.Rectangle(360, 315, 90, 20));
+            jButtonFinish.setEnabled(true);
+            jButtonFinish.setSelected(false);
+            jButtonFinish.setMnemonic('C');
+            jButtonFinish.addActionListener(this);
+        }
+        return jButtonFinish;
+    }
+
+    /**
+     This method initializes jScrollPane 
+     
+     @return javax.swing.JScrollPane jScrollPane
+     
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setLocation(new java.awt.Point(30, 65));
+            jScrollPane.setSize(new java.awt.Dimension(435, 180));
+            jScrollPane.setViewportView(getJTextAreaComment());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTextAreaComment 
+     
+     @return javax.swing.JTextArea jTextAreaComment
+     
+     **/
+    private JTextArea getJTextAreaComment() {
+        if (jTextAreaComment == null) {
+            jTextAreaComment = new JTextArea();
+            jTextAreaComment.setEditable(false);
+            jTextAreaComment.setLineWrap(true);
+            jTextAreaComment.setWrapStyleWord(false);
+        }
+        return jTextAreaComment;
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     **/
+    public static void main(String[] args) {
+        Finish f = new Finish();
+        f.setVisible(true);
+    }
+
+    /**
+     This is the override constructor
+     
+     @param InstallDir The install target dir
+     
+     **/
+    public Finish(String InstallDir) {
+        super();
+        this.strInstallDir = InstallDir;
+        init();
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public Finish() {
+        super();
+        init();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 390);
+
+        this.setContentPane(getJContentPane());
+        this.setTitle("Setup - Installing");
+        this.centerWindow();
+        this.getRootPane().setDefaultButton(jButtonFinish);
+        switchFinish();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
+            jContentPane.add(getJTextAreaTitle(), null);
+            jContentPane.add(getJTextAreaContent(), null);
+            jContentPane.add(getJPanel(), null);
+            jContentPane.add(getJButtonCancel(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        Object obj = arg0.getSource();
+
+        if (obj == jButtonFinish) {
+            this.dispose();
+            System.exit(0);
+        }
+    }
+
+    /**
+    Change all message values to Finish contents.
+    
+    **/
+    private void switchFinish() {
+        this.setTitle("Setup - Finish");
+        jTextAreaTitle.setText("     Congratulations");
+        jTextAreaContent.setText("           Your workspace was installed!");
+        jLabel.setText("The MDK package was installed successfully");
+        jLabel1.setText("Now you can start the trip with EFI");
+        jTextAreaComment.setText("Please add \"WORKSPACE=" + this.strInstallDir
+                                 + "\" into your system environment variable");
+        jButtonFinish.setEnabled(true);
+        this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        jButtonFinish.setText("Finish");
+    }
+
+    //    private void switchInstall() {
+    //        jTextAreaTitle.setText("     Installation is in process...");
+    //        jLabel.setText("The MDK package was being installed...");
+    //        jLabel1.setText("Just waiting for a second");
+    //        jButtonFinish.setEnabled(false);
+    //        jButtonFinish.setText("Finish");
+    //    }
+    
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     * 
+     * Override windowClosing to exit directly
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.dispose();
+        System.exit(0);
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/LicenseAgreement.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/LicenseAgreement.java
new file mode 100644
index 0000000000..4661743a57
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/LicenseAgreement.java
@@ -0,0 +1,403 @@
+/** @file
+ 
+ The class is used to show a License Agreement page in
+ the process of setup
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import org.tianocore.packaging.common.ui.IFrame;
+
+/**
+ The class is used to show a License Agreement page in
+ the process of setup
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class LicenseAgreement extends IFrame implements ActionListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 5507683268692334188L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JTextArea jTextArea = null;
+
+    private JTextArea jTextArea1 = null;
+
+    private JPanel jPanel = null;
+
+    private JButton jButtonBack = null;
+
+    private JButton jButtonNext = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabel = null;
+
+    private JRadioButton jRadioButtonAgree = null;
+
+    private JRadioButton jRadioButtonDisagree = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTextArea jTextArea2 = null;
+
+    private JLabel jLabel1 = null;
+
+    private Welcome w = null;
+
+    private SelectDestinationDirectory sdd = null;
+
+    /**
+     This method initializes jTextArea 
+     
+     @return javax.swing.JTextArea jTextArea
+     
+     **/
+    private JTextArea getJTextArea() {
+        if (jTextArea == null) {
+            jTextArea = new JTextArea();
+            jTextArea.setLocation(new java.awt.Point(0, 0));
+            jTextArea.setText("    License Agreement");
+            jTextArea.setFont(new java.awt.Font("Dialog", java.awt.Font.BOLD, 14));
+            jTextArea.setEditable(false);
+            jTextArea.setSize(new java.awt.Dimension(495, 20));
+        }
+        return jTextArea;
+    }
+
+    /**
+     This method initializes jTextArea1 
+     
+     @return javax.swing.JTextArea jTextArea1
+     
+     **/
+    private JTextArea getJTextArea1() {
+        if (jTextArea1 == null) {
+            jTextArea1 = new JTextArea();
+            jTextArea1.setLocation(new java.awt.Point(0, 20));
+            jTextArea1.setText("           Please read the following important information before continuing.");
+            jTextArea1.setEditable(false);
+            jTextArea1.setSize(new java.awt.Dimension(495, 35));
+        }
+        return jTextArea1;
+    }
+
+    /**
+     This method initializes jPanel 
+     
+     @return javax.swing.JPanel jPanel
+     
+     **/
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            jLabel1 = new JLabel();
+            jLabel1.setText(" this agreement before continuing with the installation.");
+            jLabel1.setLocation(new java.awt.Point(30, 35));
+            jLabel1.setSize(new java.awt.Dimension(435, 20));
+            jLabel = new JLabel();
+            jLabel.setText("Please read the following License Agreement. You must accept the terms of");
+            jLabel.setLocation(new java.awt.Point(30, 15));
+            jLabel.setSize(new java.awt.Dimension(435, 20));
+            jPanel = new JPanel();
+            jPanel.setLayout(null);
+            jPanel.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+            jPanel.setSize(new java.awt.Dimension(494, 251));
+            jPanel.setLocation(new java.awt.Point(0, 55));
+            jPanel.add(jLabel, null);
+            jPanel.add(getJRadioButtonAgree(), null);
+            jPanel.add(getJRadioButtonDisagree(), null);
+            jPanel.add(getJScrollPane(), null);
+            jPanel.add(jLabel1, null);
+        }
+        return jPanel;
+    }
+
+    /**
+     This method initializes jButtonBack 
+     
+     @return javax.swing.JButton jButtonBack
+     
+     **/
+    private JButton getJButtonBack() {
+        if (jButtonBack == null) {
+            jButtonBack = new JButton();
+            jButtonBack.setText("Back");
+            jButtonBack.setSize(new java.awt.Dimension(90, 20));
+            jButtonBack.setLocation(new java.awt.Point(200, 315));
+            jButtonBack.setMnemonic('B');
+            jButtonBack.addActionListener(this);
+        }
+        return jButtonBack;
+    }
+
+    /**
+     This method initializes jButtonNext 
+     
+     @return javax.swing.JButton jButtonNext
+     
+     **/
+    private JButton getJButtonNext() {
+        if (jButtonNext == null) {
+            jButtonNext = new JButton();
+            jButtonNext.setText("Next");
+            jButtonNext.setBounds(new java.awt.Rectangle(292, 315, 90, 20));
+            jButtonNext.setEnabled(false);
+            jButtonNext.setMnemonic('N');
+            jButtonNext.addActionListener(this);
+        }
+        return jButtonNext;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 315, 90, 20));
+            jButtonCancel.setMnemonic('C');
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jRadioButtonAgree 
+     
+     @return javax.swing.JRadioButton jRadioButtonAgree
+     
+     **/
+    private JRadioButton getJRadioButtonAgree() {
+        if (jRadioButtonAgree == null) {
+            jRadioButtonAgree = new JRadioButton();
+            jRadioButtonAgree.setText("I accept the agreement");
+            jRadioButtonAgree.setLocation(new java.awt.Point(30, 200));
+            jRadioButtonAgree.setSize(new java.awt.Dimension(156, 19));
+            jRadioButtonAgree.addActionListener(this);
+        }
+        return jRadioButtonAgree;
+    }
+
+    /**
+     This method initializes jRadioButtonDisagree 
+     
+     @return javax.swing.JRadioButton jRadioButtonDisagree
+     
+     **/
+    private JRadioButton getJRadioButtonDisagree() {
+        if (jRadioButtonDisagree == null) {
+            jRadioButtonDisagree = new JRadioButton();
+            jRadioButtonDisagree.setText("I do not accept the agreement");
+            jRadioButtonDisagree.setLocation(new java.awt.Point(30, 220));
+            jRadioButtonDisagree.setSize(new java.awt.Dimension(248, 19));
+            jRadioButtonDisagree.addActionListener(this);
+        }
+        return jRadioButtonDisagree;
+    }
+
+    /**
+     This method initializes jScrollPane 
+     
+     @return javax.swing.JScrollPane jScrollPane
+     
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setSize(new java.awt.Dimension(435, 140));
+            jScrollPane.setVerticalScrollBarPolicy(javax.swing.JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+            jScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+            jScrollPane.setViewportView(getJTextArea2());
+            jScrollPane.setLocation(new java.awt.Point(30, 55));
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTextArea2 
+     
+     @return javax.swing.JTextArea jTextArea2
+     
+     **/
+    private JTextArea getJTextArea2() {
+        if (jTextArea2 == null) {
+            jTextArea2 = new JTextArea();
+            jTextArea2.setEditable(false);
+            jTextArea2.setWrapStyleWord(false);
+            jTextArea2.setLineWrap(true);
+            jTextArea2.setText("Copyright (c) 2006, Intel Corp.\n"
+                               + "All rights reserved. This program and the accompanying materials "
+                               + "are licensed and made available under the terms and conditions of the BSD License "
+                               + "which may be found at http://opensource.org/licenses/bsd-license.php\n\n\n"
+                               + "THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS, "
+                               + "WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.");
+        }
+        return jTextArea2;
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        LicenseAgreement la = new LicenseAgreement();
+        la.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public LicenseAgreement() {
+        super();
+        init();
+    }
+
+    /**
+     This is the override constructor
+
+     @param welcome The input data of Welcome
+     
+     **/
+    public LicenseAgreement(Welcome welcome) {
+        super();
+        init();
+        w = welcome;
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 390);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Setup - License Agreement");
+        this.centerWindow();
+        this.getRootPane().setDefaultButton(jButtonNext);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
+            jContentPane.add(getJTextArea(), null);
+            jContentPane.add(getJTextArea1(), null);
+            jContentPane.add(getJPanel(), null);
+            jContentPane.add(getJButtonBack(), null);
+            jContentPane.add(getJButtonNext(), null);
+            jContentPane.add(getJButtonCancel(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        Object obj = arg0.getSource();
+        //
+        // Disable button next when select jRadioButtonDisagree
+        //
+        if (obj == jRadioButtonDisagree) {
+            if (jRadioButtonDisagree.isSelected()) {
+                jRadioButtonAgree.setSelected(false);
+                jButtonNext.setEnabled(false);
+                jButtonNext.setFocusable(false);
+            }
+            if (!jRadioButtonAgree.isSelected() && !jRadioButtonDisagree.isSelected()) {
+                jRadioButtonDisagree.setSelected(true);
+            }
+        }
+        
+        //
+        // Enable button next when select jRadioButtonAgree
+        //
+        if (obj == jRadioButtonAgree) {
+            if (jRadioButtonAgree.isSelected()) {
+                jRadioButtonDisagree.setSelected(false);
+                jButtonNext.setEnabled(true);
+                jButtonNext.setFocusable(true);
+            }
+            if (!jRadioButtonAgree.isSelected() && !jRadioButtonDisagree.isSelected()) {
+                jRadioButtonAgree.setSelected(true);
+            }
+        }
+
+        if (obj == jButtonBack) {
+            this.setVisible(false);
+            w.setVisible(true);
+        }
+
+        //
+        // Show next page when click button Next
+        //
+        if (obj == jButtonNext) {
+            if (sdd == null) {
+                sdd = new SelectDestinationDirectory(this);
+            }
+            this.setVisible(false);
+            sdd.setVisible(true);
+        }
+
+        if (obj == jButtonCancel) {
+            this.onExit();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     * 
+     * Override windowClosing to show confirm quit dialog
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onExit();
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/SelectDestinationDirectory.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/SelectDestinationDirectory.java
new file mode 100644
index 0000000000..4f167dcfec
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/SelectDestinationDirectory.java
@@ -0,0 +1,469 @@
+/** @file
+ 
+ The file is used to show a Select Destination Directory page in
+ the process of setup
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IFrame;
+import org.tianocore.packaging.workspace.command.InstallWorkspace;
+
+/**
+ The class is used to show a Select Destination Directory page in
+ the process of setup
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class SelectDestinationDirectory extends IFrame implements ActionListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -2924500118774744205L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JTextArea jTextArea = null;
+
+    private JTextArea jTextArea1 = null;
+
+    private JPanel jPanel = null;
+
+    private JButton jButtonBack = null;
+
+    private JButton jButtonNext = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabel = null;
+
+    private JLabel jLabel1 = null;
+
+    private JTextField jTextFieldInstallDir = null;
+
+    private JButton jButtonBrowse = null;
+
+    private JLabel jLabel2 = null;
+
+    private LicenseAgreement la = null;
+
+    /**
+     This method initializes jTextArea 
+     
+     @return javax.swing.JTextArea jTextArea
+     
+     **/
+    private JTextArea getJTextArea() {
+        if (jTextArea == null) {
+            jTextArea = new JTextArea();
+            jTextArea.setLocation(new java.awt.Point(0, 0));
+            jTextArea.setText("    Select Destination Directory");
+            jTextArea.setFont(new java.awt.Font("Dialog", java.awt.Font.BOLD, 14));
+            jTextArea.setEditable(false);
+            jTextArea.setSize(new java.awt.Dimension(495, 20));
+        }
+        return jTextArea;
+    }
+
+    /**
+     This method initializes jTextArea1 
+     
+     @return javax.swing.JTextArea jTextArea1
+     
+     **/
+    private JTextArea getJTextArea1() {
+        if (jTextArea1 == null) {
+            jTextArea1 = new JTextArea();
+            jTextArea1.setLocation(new java.awt.Point(0, 20));
+            jTextArea1.setText("           Where should MDK package be installed?");
+            jTextArea1.setEditable(false);
+            jTextArea1.setSize(new java.awt.Dimension(495, 35));
+        }
+        return jTextArea1;
+    }
+
+    /**
+     This method initializes jPanel 
+     
+     @return javax.swing.JPanel jPanel
+     
+     **/
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            jLabel2 = new JLabel();
+            jLabel2.setText("At least 10 MB of free disk space is required");
+            jLabel2.setLocation(new java.awt.Point(30, 225));
+            jLabel2.setSize(new java.awt.Dimension(290, 20));
+            jLabel1 = new JLabel();
+            jLabel1.setText("To continue, click Next. If you wuold like to select different folder, click Browse.");
+            jLabel1.setLocation(new java.awt.Point(30, 55));
+            jLabel1.setSize(new java.awt.Dimension(435, 20));
+            jLabel = new JLabel();
+            jLabel.setText("Setup will install MDK package into the following folders:");
+            jLabel.setLocation(new java.awt.Point(30, 15));
+            jLabel.setSize(new java.awt.Dimension(435, 20));
+            jPanel = new JPanel();
+            jPanel.setLayout(null);
+            jPanel.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED));
+            jPanel.setSize(new java.awt.Dimension(494, 251));
+            jPanel.setLocation(new java.awt.Point(0, 55));
+            jPanel.add(jLabel, null);
+            jPanel.add(jLabel1, null);
+            jPanel.add(getJTextField(), null);
+            jPanel.add(getJButtonBrowse(), null);
+            jPanel.add(jLabel2, null);
+        }
+        return jPanel;
+    }
+
+    /**
+     This method initializes jButtonBack 
+     
+     @return javax.swing.JButton jButtonBack
+     
+     **/
+    private JButton getJButtonBack() {
+        if (jButtonBack == null) {
+            jButtonBack = new JButton();
+            jButtonBack.setText("Back");
+            jButtonBack.setSize(new java.awt.Dimension(90, 20));
+            jButtonBack.setLocation(new java.awt.Point(200, 315));
+            jButtonBack.setMnemonic('B');
+            jButtonBack.addActionListener(this);
+        }
+        return jButtonBack;
+    }
+
+    /**
+     This method initializes jButtonNext 
+     
+     @return javax.swing.JButton jButtonNext
+     
+     **/
+    private JButton getJButtonNext() {
+        if (jButtonNext == null) {
+            jButtonNext = new JButton();
+            jButtonNext.setText("Next");
+            jButtonNext.setBounds(new java.awt.Rectangle(292, 315, 90, 20));
+            jButtonNext.setEnabled(true);
+            jButtonNext.setMnemonic('N');
+            jButtonNext.addActionListener(this);
+        }
+        return jButtonNext;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 315, 90, 20));
+            jButtonCancel.setMnemonic('C');
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldInstallDir 
+     
+     @return javax.swing.JTextField jTextFieldInstallDir
+     
+     **/
+    private JTextField getJTextField() {
+        if (jTextFieldInstallDir == null) {
+            jTextFieldInstallDir = new JTextField();
+            jTextFieldInstallDir.setLocation(new java.awt.Point(30, 90));
+            jTextFieldInstallDir.setSize(new java.awt.Dimension(320, 20));
+            jTextFieldInstallDir.setText("C:\\MyWorkspace");
+        }
+        return jTextFieldInstallDir;
+    }
+
+    /**
+     This method initializes jButtonBrowse 
+     
+     @return javax.swing.JButton jButtonBrowse
+     
+     **/
+    private JButton getJButtonBrowse() {
+        if (jButtonBrowse == null) {
+            jButtonBrowse = new JButton();
+            jButtonBrowse.setText("Browse");
+            jButtonBrowse.setSize(new java.awt.Dimension(90, 20));
+            jButtonBrowse.setLocation(new java.awt.Point(370, 90));
+            jButtonBrowse.addActionListener(this);
+        }
+        return jButtonBrowse;
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        SelectDestinationDirectory sdd = new SelectDestinationDirectory();
+        sdd.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public SelectDestinationDirectory() {
+        super();
+        init();
+    }
+
+    /**
+     This is the override constructor
+     
+     @param licenseagreement The input data of licenseagreement
+     
+     **/
+    public SelectDestinationDirectory(LicenseAgreement licenseagreement) {
+        super();
+        init();
+        la = licenseagreement;
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 390);
+        this.setTitle("Setup - Select Destination Directory");
+        this.setContentPane(getJContentPane());
+        this.centerWindow();
+        this.getRootPane().setDefaultButton(jButtonNext);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
+            jContentPane.add(getJTextArea(), null);
+            jContentPane.add(getJTextArea1(), null);
+            jContentPane.add(getJPanel(), null);
+            jContentPane.add(getJButtonBack(), null);
+            jContentPane.add(getJButtonNext(), null);
+            jContentPane.add(getJButtonCancel(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        Object obj = arg0.getSource();
+
+        if (obj == jButtonBack) {
+            this.setVisible(false);
+            la.setVisible(true);
+        }
+
+        //
+        // Show next page if click button Next
+        //
+        if (obj == jButtonNext) {
+            if (createWorkspace(jTextFieldInstallDir.getText())) {
+                if (initWorkspace(jTextFieldInstallDir.getText())) {
+                    this.setVisible(false);
+                    Finish f = new Finish(jTextFieldInstallDir.getText());
+                    f.setVisible(true);
+                }
+            }
+        }
+
+        if (obj == jButtonCancel) {
+            this.onExit();
+        }
+
+        if (obj == jButtonBrowse) {
+            JFileChooser fc = new JFileChooser();
+            fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            int result = fc.showOpenDialog(new JPanel());
+            if (result == JFileChooser.APPROVE_OPTION) {
+                jTextFieldInstallDir.setText(fc.getCurrentDirectory().toString() + System.getProperty("file.separator")
+                                             + fc.getSelectedFile().getName());
+            }
+        }
+    }
+
+    /**
+     Create workspace to target dir
+     
+     @param strInstallDir The install target dir
+     @retval true - Create success
+     @retval false - Create fail
+     
+     **/
+    private boolean createWorkspace(String strInstallDir) {
+        boolean bolCreateDirectory = true;
+        int intResult;
+
+        //
+        //Check if the Install Dir exists
+        //
+        Log.log("is Exist Install Dir");
+        if (InstallWorkspace.isExistInstallDir(strInstallDir)) {
+            intResult = JOptionPane.showConfirmDialog(null, strInstallDir + " already exists, continue anyway?",
+                                                      "Override", JOptionPane.YES_NO_OPTION);
+            if (intResult != JOptionPane.YES_OPTION) {
+                return false;
+            } else {
+                bolCreateDirectory = false;
+            }
+        }
+
+        //
+        //Create the directory
+        //
+        Log.log("Create Directory");
+        if (bolCreateDirectory) {
+            if (!InstallWorkspace.createInstallDir(strInstallDir)) {
+                intResult = JOptionPane.showConfirmDialog(null, "Cannot create direcotry " + strInstallDir
+                                                                + " in system. Click OK to exist.", "Error",
+                                                          JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     Init created workspace
+     
+     @param strInstallDir The dir of workspace
+     @retval true - Init Success
+     @retval false - Init fail
+     
+     **/
+    private boolean initWorkspace(String strInstallDir) {
+        String strJarFile = System.getProperty("user.dir") + System.getProperty("file.separator") + "CreateMdkPkg.jar";
+
+        //
+        //Install package
+        //
+        Log.log("Install Package");
+        try {
+            if (!InstallWorkspace.installPackage(strInstallDir, strJarFile)) {
+                JOptionPane.showConfirmDialog(null, "Cannot intall package in system. Click OK to exist.", "Error",
+                                              JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+                return false;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        //
+        //Update framework database
+        //
+        Log.log("Set Framework Database");
+        if (!InstallWorkspace.setFrameworkDatabase()) {
+            JOptionPane.showConfirmDialog(null, "Cannot create workspace database in system. Click OK to exist.",
+                                          "Error", JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+            return false;
+        }
+
+        //
+        //Set System Environment
+        //
+        Log.log("Set System Environment");
+        if (!InstallWorkspace.setSystemEnvironment()) {
+            JOptionPane.showConfirmDialog(null, "Cannot set WORKSPACE variable in system. Click OK to exist.", "Error",
+                                          JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+            return false;
+        }
+
+        //
+        //Set Tool Chain Path
+        //
+        Log.log("Set Tool Chain Path");
+        if (!InstallWorkspace.setToolChainPath()) {
+            JOptionPane.showConfirmDialog(null, "Cannot set Tool Chain path variable in system. Click OK to exist.",
+                                          "Error", JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+            return false;
+        }
+
+        //
+        //Install tool chain
+        //
+        Log.log("Set Tool Chain");
+        if (!InstallWorkspace.setToolChain()) {
+            JOptionPane.showConfirmDialog(null, "Cannot set Tool Chain in system. Click OK to exist.", "Error",
+                                          JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+            return false;
+        }
+
+        //
+        //Delete setup files
+        //
+        Log.log("Delete Setup Files");
+        try {
+            InstallWorkspace.delSetupPackage(strInstallDir + System.getProperty("file.separator") + "org");
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.log(e.getMessage());
+        }
+
+        return true;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     * 
+     * Override windowClosing to show confirm quit dialog
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onExit();
+    }
+}
diff --git a/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Welcome.java b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Welcome.java
new file mode 100644
index 0000000000..aa2e5861be
--- /dev/null
+++ b/Tools/Source/CreateMdkPkg/src/org/tianocore/packaging/workspace/ui/Welcome.java
@@ -0,0 +1,272 @@
+/** @file
+ 
+ The file is used to show a welcome page in the process of setup 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+
+import org.tianocore.packaging.common.ui.IFrame;
+
+/**
+ The class is used to show a welcome page in the process of setup
+ 
+ @since CreateMdkPkg 1.0
+
+ **/
+public class Welcome extends IFrame implements ActionListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 8160041311175680637L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JPanel jPanel = null;
+
+    private JTextArea jTextArea = null;
+
+    private JTextArea jTextArea1 = null;
+
+    private JTextArea jTextArea2 = null;
+
+    private JTextArea jTextArea3 = null;
+
+    private JButton jButtonNext = null;
+
+    private JButton jButtonCancel = null;
+
+    private LicenseAgreement la = null;
+
+    /**
+     This method initializes jPanel 
+     
+     @return javax.swing.JPanel jPanel
+     
+     **/
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            jPanel = new JPanel();
+            jPanel.setLayout(null);
+            jPanel.setSize(new java.awt.Dimension(495, 355));
+            jPanel.setLocation(new java.awt.Point(0, 0));
+            jPanel.add(getJTextArea(), null);
+            jPanel.add(getJTextArea1(), null);
+            jPanel.add(getJTextArea2(), null);
+            jPanel.add(getJTextArea3(), null);
+            jPanel.add(getJButtonNext(), null);
+            jPanel.add(getJButtonCancel(), null);
+        }
+        return jPanel;
+    }
+
+    /**
+     This method initializes jTextArea 
+     
+     @return javax.swing.JTextArea jTextArea
+     
+     **/
+    private JTextArea getJTextArea() {
+        if (jTextArea == null) {
+            jTextArea = new JTextArea();
+            jTextArea.setFont(new java.awt.Font("Times New Roman", java.awt.Font.BOLD, 24));
+            jTextArea.setSize(new java.awt.Dimension(495, 70));
+            jTextArea.setLocation(new java.awt.Point(0, 0));
+            jTextArea.setEnabled(true);
+            jTextArea.setEditable(false);
+            jTextArea.setText("Welcome to the MDK Package Setup Wizard");
+        }
+        return jTextArea;
+    }
+
+    /**
+     This method initializes jTextArea1 
+     
+     @return javax.swing.JTextArea jTextArea1
+     
+     **/
+    private JTextArea getJTextArea1() {
+        if (jTextArea1 == null) {
+            jTextArea1 = new JTextArea();
+            jTextArea1.setText("This will install MDK Package on your computer. ");
+            jTextArea1.setSize(new java.awt.Dimension(495, 40));
+            jTextArea1.setEnabled(true);
+            jTextArea1.setEditable(false);
+            jTextArea1.setLocation(new java.awt.Point(0, 70));
+        }
+        return jTextArea1;
+    }
+
+    /**
+     This method initializes jTextArea2 
+     
+     @return javax.swing.JTextArea jTextArea2
+     
+     **/
+    private JTextArea getJTextArea2() {
+        if (jTextArea2 == null) {
+            jTextArea2 = new JTextArea();
+            jTextArea2.setSize(new java.awt.Dimension(495, 50));
+            jTextArea2
+                      .setText("It is strongly recommended that you exit all other programs before running this installation program.");
+            jTextArea2.setLineWrap(true);
+            jTextArea2.setEnabled(true);
+            jTextArea2.setEditable(false);
+            jTextArea2.setLocation(new java.awt.Point(0, 110));
+        }
+        return jTextArea2;
+    }
+
+    /**
+     This method initializes jTextArea3 
+     
+     @return javax.swing.JTextArea jTextArea3
+     
+     **/
+    private JTextArea getJTextArea3() {
+        if (jTextArea3 == null) {
+            jTextArea3 = new JTextArea();
+            jTextArea3.setBounds(new java.awt.Rectangle(0, 160, 495, 150));
+            jTextArea3.setEnabled(true);
+            jTextArea3.setEditable(false);
+            jTextArea3.setText("Click Nex to continue. Or click Cancel to exit Setup");
+        }
+        return jTextArea3;
+    }
+
+    /**
+     This method initializes jButtonNext 
+     
+     @return javax.swing.JButton jButtonNext
+     
+     **/
+    private JButton getJButtonNext() {
+        if (jButtonNext == null) {
+            jButtonNext = new JButton();
+            jButtonNext.setText("Next");
+            jButtonNext.setSize(new java.awt.Dimension(90, 20));
+            jButtonNext.setLocation(new java.awt.Point(290, 320));
+            jButtonNext.setMnemonic('N');
+            jButtonNext.addActionListener(this);
+        }
+        return jButtonNext;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.setLocation(new java.awt.Point(390, 320));
+            jButtonCancel.setMnemonic('C');
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     **/
+    public static void main(String[] args) {
+        Welcome w = new Welcome();
+        w.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public Welcome() {
+        super();
+        init();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 390);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Welcome");
+        this.centerWindow();
+        this.getRootPane().setDefaultButton(jButtonNext);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJPanel(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        Object obj = arg0.getSource();
+        //
+        // Show next page if click button Next
+        //
+        if (obj == jButtonNext) {
+            if (la == null) {
+                la = new LicenseAgreement(this);
+            }
+            this.setVisible(false);
+            la.setVisible(true);
+        }
+        if (obj == jButtonCancel) {
+            this.onExit();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     * 
+     * Override windowClosing to show confirm quit dialog
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onExit();
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/build.xml b/Tools/Source/FrameworkTasks/build.xml
new file mode 100644
index 0000000000..0a99a44b48
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/build.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="FrameworkTasks" default="all">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="workspace" value="${env.WORKSPACE}"/>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${workspace}/Tools/Jars"/>
+  <target name="all" depends="install"/>
+  <target name="source">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="." destdir="${buildDir}">
+      <classpath>
+        <fileset dir="${workspace}/Tools/Jars">
+          <include name="*.jar"/>
+        </fileset>
+      </classpath>
+      <compilerarg value="-Xlint"/>
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <if>
+      <available file="${installLocation}/frameworktasks.jar"/>
+      <then>
+        <echo message="You must manually remove the file: ${installLocation}/frameworktasks.jar"/>
+        <echo message="Java has already loaded the file, and cannot remove it within ANT!"/>
+      </then>
+    </if>
+  </target>
+  <target name="install" depends="source">
+    <copy file="frameworktasks.tasks" toDir="${buildDir}"/>
+    <jar destfile="${installLocation}/frameworktasks.jar"
+      basedir="${buildDir}"
+      includes="**"
+    />
+  </target>
+</project>
diff --git a/Tools/Source/FrameworkTasks/frameworktasks.tasks b/Tools/Source/FrameworkTasks/frameworktasks.tasks
new file mode 100644
index 0000000000..f8bafabb0b
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/frameworktasks.tasks
@@ -0,0 +1,11 @@
+fwimage=org.tianocore.framework.tasks.FwImageTask
+setstamp=org.tianocore.framework.tasks.SetStampTask
+gendepex=org.tianocore.framework.tasks.GenDepexTask
+gensection=org.tianocore.framework.tasks.GenSectionTask
+genffsfile=org.tianocore.framework.tasks.GenFfsFileTask
+vfrcompile=org.tianocore.framework.tasks.VfrCompilerTask
+strgather=org.tianocore.framework.tasks.StrGatherTask
+genfvimage=org.tianocore.framework.tasks.GenFvImageTask
+guidchk= org.tianocore.framework.tasks.GuidChkTask
+gencrc32section=org.tianocore.framework.tasks.GenCRC32SectionTask
+makedeps=org.tianocore.framework.tasks.MakeDeps
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java
new file mode 100644
index 0000000000..4410ecdda1
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Compress.java
@@ -0,0 +1,78 @@
+/** @file
+ Compress class.
+
+ This class is to call CompressDll.dll to compress section.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+
+/**
+
+  This class is to call CompressDll.dll to compress section.
+ 
+**/
+public class Compress {
+    byte[] inputBuffer;
+    byte[] outputBuffer;
+    int    size;
+
+    static {
+        String dllPath;
+
+        dllPath = GenFfsFileTask.path;
+        dllPath = dllPath + 
+                  File.separator + 
+                  "CompressDll.dll";
+
+        System.load(dllPath);
+    }
+
+    /**
+      CallCompress
+    
+      This function is to call the compressDll.dll to compress the contents in
+      buffer.
+      
+      @param  inputBuffer       The input buffer.
+      @param  size              The size of buffer in byte.
+      @param  dllPath           The compressDll.dll path.
+      @return                   The buffer contained the comrpessed input.
+    **/
+    public native byte[] CallCompress (byte[] inputBuffer, int size, String dllPath);
+
+    /**
+      Construct function
+      
+      This function is to initialize the class member and call the compress 
+      function.
+      
+      @param inBuffer           The input buffer.         
+      @param size               The size of buffer in byte.
+    **/
+    public Compress (byte[] inBuffer, int size){
+        this.inputBuffer   = inBuffer;
+        this.size          = size;        
+        String path        = GenFfsFileTask.path;
+
+        //
+        //  Call Compress function.
+        //
+        this.outputBuffer  = CallCompress (
+                                          this.inputBuffer, 
+                                          this.size,
+                                          path                          
+                                          );
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java
new file mode 100644
index 0000000000..5992b1d708
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressHeader.java
@@ -0,0 +1,78 @@
+/** @file
+ CompressHeader class.
+
+ This class is to generate the compressed section header.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+  
+  Internal class: This class is to generate the compressed section header.
+
+**/
+public class CompressHeader {
+    
+    /**
+      CommonSectionHeader
+      
+      This class define the compressed header structor.
+    
+    **/
+    public class CommonSectionHeader {
+        byte[] Size = new byte[3];
+        byte   type;
+    }
+    
+    ///
+    /// Section header.
+    ///
+    public CommonSectionHeader SectionHeader = new CommonSectionHeader();
+    
+    ///
+    /// Length of uncompress section in byte.
+    ///
+    public int                 UncompressLen;
+    /// 
+    /// Compress type.
+    ///
+    public byte                CompressType;
+    
+    ///
+    /// The size of compress header in byte. 
+    ///
+    public int GetSize (){
+        return 9;
+    }
+    
+    ///
+    /// Write class member to buffer. 
+    ///
+    public void StructToBuffer (byte[] Buffer){
+        if (Buffer.length != GetSize()) {
+            throw new BuildException ("CompressHeader Buffer size is not correct!");
+        }
+        for (int i = 0; i < 3; i++){
+            Buffer[i] = SectionHeader.Size[i];
+        }
+        Buffer[3] = SectionHeader.type;
+        Buffer[4] = (byte)(UncompressLen  & 0xff);
+        Buffer[5] = (byte)((UncompressLen & 0xff00)>>8);
+        Buffer[6] = (byte)((UncompressLen & 0xff0000)>>16);
+        Buffer[7] = (byte)((UncompressLen & 0xff000000)>>24);
+        Buffer[8] = CompressType;
+    }
+    
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java
new file mode 100644
index 0000000000..8def4ebc95
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CompressSection.java
@@ -0,0 +1,209 @@
+/** @file
+ CompressSection class.
+
+ CompressSection indicate that all section which in it should be compressed.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+
+package org.tianocore.framework.tasks;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+
+
+/**
+  CompressSection
+  
+  CompressSection indicate that all section which in it should be compressed. 
+ 
+**/
+public class CompressSection implements Section, FfsTypes{
+    //
+    // The attribute of compressName.
+    //
+    String compressName = "";
+    //
+    // The list contained the SectFile element.
+    //
+    List<Object>   SectList     = new ArrayList<Object>();
+
+    /**
+      toBuffer
+      
+      This function is to collect all sectFile and compress it , then output
+      the result to buffer.
+      
+      @param Buffer     The point of output buffer
+      
+    **/
+    public void toBuffer (DataOutputStream Buffer){
+        
+        Section    sect;
+        File       compressOut;
+    
+        //
+        //  Get section file in compress node.
+        //
+        try{
+            compressOut = new File ("Compress.temp");
+            FileOutputStream fo = new FileOutputStream (compressOut.getName());
+            DataOutputStream Do = new DataOutputStream (fo);
+            
+            //
+            //  Get each section which under the compress {};
+            //  And add it is contains to File;
+            //
+            Iterator SectionIter = SectList.iterator();
+            while (SectionIter.hasNext()){
+                sect = (Section)SectionIter.next();
+                
+                //
+                //  Call each section class's toBuffer function.
+                //
+                try {
+                    sect.toBuffer(Do);
+                }
+                catch (BuildException e) {
+                    System.out.print(e.getMessage());
+                    throw new BuildException ("Compress.toBuffer failed at section");
+                }    
+                            
+            }
+            Do.close();    
+            
+            //
+            //  Get contain to Buffer
+            //
+            FileInputStream fi = new FileInputStream (compressOut.getName());
+            DataInputStream di = new DataInputStream (fi);
+            byte[] fileBuffer  = new byte[(int)compressOut.length()];
+            di.read(fileBuffer);
+            
+            //
+            //  Call compress
+            //
+            Compress myCompress = new Compress(fileBuffer, fileBuffer.length);            
+            
+            //
+            //  Add Compress header
+            //
+            CompressHeader Ch        = new CompressHeader();
+            Ch.SectionHeader.Size[0] = (byte)((myCompress.outputBuffer.length +
+                                               Ch.GetSize()) &
+                                               0xff
+                                              );
+            Ch.SectionHeader.Size[1] = (byte)(((myCompress.outputBuffer.length + 
+                                                Ch.GetSize())&
+                                               0xff00) >> 8
+                                              );
+            Ch.SectionHeader.Size[2] = (byte)(((myCompress.outputBuffer.length + 
+                                                Ch.GetSize()) & 
+                                               0xff0000) >> 16
+                                             );
+            Ch.SectionHeader.type    = (byte) EFI_SECTION_COMPRESSION;
+            
+            //
+            //  Note: The compressName was not effective now. Using the
+            //  EFI_STANDARD_COMPRSSION for compressType .
+            //  That is follow old Genffsfile tools. Some code will be added for 
+            //  the different compressName;
+            //
+            Ch.UncompressLen         = fileBuffer.length;
+            Ch.CompressType          = EFI_STANDARD_COMPRESSION; 
+            
+            //
+            //  Change header struct to byte buffer
+            //
+            byte [] headerBuffer = new byte[Ch.GetSize()];
+            Ch.StructToBuffer(headerBuffer);
+            
+            //
+            //  First add CompressHeader to Buffer, then add Compress data.
+            //
+            Buffer.write (headerBuffer);
+            Buffer.write(myCompress.outputBuffer);            
+                
+            //
+            //  4 Byte aligment 
+            //
+            int size = Ch.GetSize() + myCompress.outputBuffer.length;
+            
+            while ((size & 0x03) != 0){
+                size ++;
+                Buffer.writeByte(0);
+            }
+            
+            //
+            //  Delete temp file
+            //
+            di.close();
+            compressOut.delete();
+                
+        }
+        catch (Exception e){
+            throw new BuildException("compress.toBuffer failed!\n");
+        }    
+    }
+
+    /**
+      getCompressName
+      
+      This function is to get compressName.
+      
+      @return            The compressName.
+    **/
+    public String getCompressName() {
+        return compressName;
+    }
+
+    /**
+      setCompressName
+      
+      This function is to set compressName.
+      
+      @param compressName The string of compressName
+    **/
+    public void setCompressName(String compressName) {
+        this.compressName = compressName;
+    }
+
+    /**
+      addSectFile
+      
+      This function is to add sectFile element to SectList.
+      
+      @param sectFile    SectFile element which succeed from section class.
+    **/
+    public void addSectFile (SectFile sectFile) {
+        SectList.add(sectFile);
+            
+    }    
+    
+    /**
+      addTool
+      
+      This function is to add tool element to SectList.
+      @param tool        Tool element which succeed from section class.
+    **/
+    public void addTool (Tool tool) {
+        SectList.add(tool);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java
new file mode 100644
index 0000000000..8c3f6be222
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Database.java
@@ -0,0 +1,112 @@
+/** @file
+ Database class.
+
+ Database represents an exceplicity name list of database file. 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+  Database
+  
+  Database represents an exceplicity name list of database file. 
+ 
+**/
+public class Database implements NestElement{
+    ///
+    /// name of database file
+    ///
+    private String name = "";
+    ///
+    /// name of file including database files
+    /// 
+    private File file;
+    ///
+    /// the database file name list
+    ///
+    private List<String> nameList = new ArrayList<String>();
+    
+    /**
+      getName
+      
+      This function is to get class member "name".
+      
+      @return             class member "name".
+    **/
+    public String getName() {
+        return this.name;
+    }
+    /**
+      setName
+      
+      This function is to set class member "name".
+      
+      @param name : name of database file.
+    **/
+    public void setName(String name) {
+        this.name = " -db " + name;
+    }
+
+    /**
+      toString
+      
+      This function is to call getName() function.
+      @return       class member "name".  
+    **/
+    public String toString() {
+        return getName();
+    }
+    
+    /**
+      getFile
+      
+      This function is to get file which include the database file list.
+      
+      @return      class member "file"
+      
+    **/
+    public File getFile() {
+        return this.file;
+    }
+    /**
+      setFile
+      
+      This function is to set class member "file".
+      
+      @param file  The file which include the database file list. 
+    **/
+    public void setFile(File file) {
+        this.file = file;
+    }
+ 
+
+    public void setList(String fileNameList) {
+        if (fileNameList != null && fileNameList.length() > 0) {
+            StringTokenizer tokens = new StringTokenizer(fileNameList, " \t,;", false);
+            while (tokens.hasMoreTokens()) {
+                String fileName = tokens.nextToken().trim();
+                if (fileName.length() > 0) {
+                    this.nameList.add(fileName);
+                }
+            }
+        }
+    }
+
+    public List<String> getList() {
+        return nameList;
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java
new file mode 100644
index 0000000000..6f12f00f43
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiDefine.java
@@ -0,0 +1,56 @@
+/** @file
+ EfiDefine class.
+
+ EfiDefine class records the UEFI return status value.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.framework.tasks;
+
+/**
+  EfiDefine class.
+
+  EfiDefine class records the UEFI return status value.
+**/
+public interface EfiDefine {
+    //
+    // EFI define Interface for define constant related to UEFI.
+    //  
+    static final int EFI_SUCCESS                = 0;
+    static final int EFI_LOAD_ERROR             = 0x80000001;
+    static final int EFI_INVALID_PARAMETER      = 0x80000002;
+    static final int EFI_UNSUPPORTED            = 0x80000003;
+    static final int EFI_BAD_BUFFER_SIZE        = 0x80000004;
+    static final int EFI_BUFFER_TOO_SMALL       = 0x80000005;
+    static final int EFI_NOT_READY              = 0x80000006;
+    static final int EFI_DEVICE_ERROR           = 0x80000007;
+    static final int EFI_WRITE_PROTECTED        = 0x80000008;
+    static final int EFI_OUT_OF_RESOURCES       = 0x80000009;
+    static final int EFI_VOLUME_CORRUPTED       = 0x8000000a;
+    static final int EFI_VOLUME_FULL            = 0x8000000b;
+    static final int EFI_NO_MEDIA               = 0x8000000c;
+    static final int EFI_MEDIA_CHANGED          = 0x8000000d;
+    static final int EFI_NOT_FOUND              = 0x8000000e;
+    static final int EFI_ACCESS_DENIED          = 0x8000000f;
+    static final int EFI_NO_RESPONSE            = 0x80000010;
+    static final int EFI_NO_MAPPING             = 0x80000011;
+    static final int EFI_TIMEOUT                = 0x80000012;
+    static final int EFI_NOT_STARTED            = 0x80000013;
+    static final int EFI_ALREADY_STARTED        = 0x80000014;
+    static final int EFI_ABORTED                = 0x80000015;
+    static final int EFI_ICMP_ERROR             = 0x80000016;
+    static final int EFI_TFTP_ERROR             = 0x80000017;
+    static final int EFI_PROTOCOL_ERROR         = 0x80000018;
+    static final int EFI_INCOMPATIBLE_VERSION   = 0x80000019;
+    static final int EFI_SECURITY_VIOLATION     = 0x80000020;
+    static final int EFI_CRC_ERROR              = 0x80000021;
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
new file mode 100644
index 0000000000..452f65394e
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
@@ -0,0 +1,185 @@
+/** @file
+ FfsHeader 
+
+ FfsHeader class describe the struct of Ffs file header.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+  FfsHeader
+  
+  FfsHeader class describe the struct of Ffs file header.
+**/
+public class FfsHeader {
+
+    /**
+      FfsGuid
+      
+      FfsGuid is interal class of FfsHeader, it describe the struct of Guid.
+    **/
+    public class FfsGuid {
+
+        int    data1      = 0;
+        short  data2      = 0;
+        short  data3      = 0;
+        byte[] data4      = new byte[8];        
+        byte[] dataBuffer = new byte[16];
+
+        /**
+          bufferToStruct 
+          
+          This function is to convert GUID to ffsGuid class member.
+          
+          @param   dataBuffer   Buffer contained the GUID value in byte.
+                                For example: if the input string as : "A6F691AC
+                                31C8 4444 854C E2C1A6950F92"
+                                Then Data1: AC91F6A6
+                                Data2: C831
+                                Data3: 4444
+                                Data4: 4C85E2C1A6950F92
+        **/     
+        public void bufferToStruct (byte[] dataBuffer){
+            if (dataBuffer.length != 16) {
+                throw new BuildException ("Buffer is not fitting GUID type!");
+            }
+
+            data1 = (int)(dataBuffer[3]& 0xff);
+            data1 = data1 << 8;     
+            data1 = (int)data1 | (dataBuffer[2]& 0xff);         
+            data1 = ((data1 << 8) & 0xffff00)   | (dataBuffer[1]& 0xff);
+            data1 = ((data1 << 8) & 0xffffff00) | (dataBuffer[0]& 0xff);
+
+
+            data2 = (short) (dataBuffer[5] & 0xff);
+            data2 = (short)((data2 << 8) | (dataBuffer[4]& 0xff));
+
+            data3 = (short)(dataBuffer[7] & 0xff);
+            data3 = (short)((data3 << 8) | (dataBuffer[6] & 0xff));
+
+            for (int i = 0; i < 8; i++) {
+                data4[i] = dataBuffer[i+8];
+            }
+
+        }
+
+        /**
+          structToBuffer
+          
+          This function is to store ffsHeader class member to buffer.
+          
+          @return        Byte buffer which contained the ffsHeader class member
+        **/
+        public byte[] structToBuffer (){
+
+            byte[] buffer = new byte [16];  
+
+            buffer[3] = (byte)(data1 & 0x000000ff);
+            buffer[2] = (byte)((data1 & 0x0000ff00)>> 8);
+            buffer[1] = (byte)((data1 & 0x00ff0000)>> 16); 
+            buffer[0] = (byte)((data1 & 0xff000000)>> 24);
+
+            buffer[5] = (byte)(data2 & 0x00ff);
+            buffer[4] = (byte)((data2 & 0xff00)>> 8);
+
+            buffer[7] = (byte)(data3 & 0x00ff);
+            buffer[6] = (byte)((data3 & 0xff00)>> 8);
+
+            for (int i = 8; i < 16; i++) {
+                buffer[i] = data4[i-8];
+            }               
+            return buffer;
+        }
+
+
+    }
+
+    /**
+      integrityCheckSum
+      
+      This class is used to record the struct of checksum.
+    **/
+    public class integrityCheckSum {
+        byte header;
+        byte file;
+    }
+
+    ///
+    /// Guid
+    ///
+    FfsGuid name = new FfsGuid();
+
+    ///
+    /// CheckSum
+    ///
+    integrityCheckSum integrityCheck = new integrityCheckSum();
+
+    ///
+    /// File type
+    ///
+    byte   fileType;
+    ///
+    /// Ffs attributes.
+    ///
+    byte   ffsAttributes;
+    ///
+    /// Ffs file size
+    ///
+    byte[] ffsFileSize = new byte[3];
+    ///
+    /// Ffs state.
+    ///
+    byte   ffsState;
+
+    /**
+      structToBuffer
+      
+      This function is to store FfsHeader class member to buffer.
+      
+      @return   Byte buffer which contained the FfsHeader class member.
+    **/
+    public byte[] structToBuffer () {
+        int i;
+        byte[] buffer1;         
+        byte[] buffer = new byte[24];
+        buffer1       = name.structToBuffer();
+
+        for (i = 0; i < 16; i++) {
+            buffer[i] = buffer1[i];
+        }
+
+        buffer[16] = integrityCheck.header;
+        buffer[17] = integrityCheck.file;
+        buffer[18] = fileType;
+        buffer[19] = ffsAttributes;
+
+        for (i=20; i < 23; i++) {
+            buffer[i] = ffsFileSize[i-20];
+        }
+
+        buffer[23] = ffsState;
+        return buffer;
+    }
+
+    /**
+      getSize
+      
+      This function is to get the size of FfsHeader in byte.
+      
+      @return          The size of FfsHeader.
+    **/
+    public int getSize(){
+        return 24;
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java
new file mode 100644
index 0000000000..6afc3a90ad
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsTypes.java
@@ -0,0 +1,115 @@
+/** @file
+ FfsTypes class.
+
+ FfsType class record the costant value of Ffs File attribute, type, and 
+ architecture.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+
+/**
+  FfsType
+  
+  FfsType class record the costant value of Ffs File attribute, type, and 
+  architecture.
+  
+**/
+public interface FfsTypes {
+    //
+    // Ffs file attributes
+    //
+    static final int FFS_ATTRIB_TAIL_PRESENT             = 0x01;
+
+    static final int FFS_ATTRIB_RECOVERY                 = 0x02;
+
+    static final int FFS_ATTRIB_HEADER_EXTENSION         = 0x04;
+
+    static final int FFS_ATTRIB_DATA_ALIGNMENT           = 0x38;
+
+    static final int FFS_ATTRIB_CHECKSUM                 = 0x40;
+
+    //
+    // Ffs states difinitions
+    //
+    static final int EFI_FILE_HEADER_CONSTRUCTION        = 0x01;
+
+    static final int EFI_FILE_HEADER_VALID               = 0x02;
+
+    static final int EFI_FILE_DATA_VALID                 = 0x04;
+
+    static final int EFI_FILE_MARKED_FOR_UPDATE          = 0x08;
+
+    static final int EFI_FILE_DELETED                    = 0x10;
+
+    static final int EFI_FILE_HEADER_INVALID             = 0x20;
+
+    //
+    // FFS_FIXED_CHECKSUM is the default checksum value used when the
+    // FFS_ATTRIB_CHECKSUM attribute bit is clear note this is NOT an
+    // architecturally defined value, but is in this file for implementation
+    // convenience
+    //
+    static final int FFS_FIXED_CHECKSUM = 0x5a;
+
+    //
+    // Architectural file types
+    //
+    static final int EFI_FV_FILETYPE_ALL                   = 0x00;
+
+    static final int EFI_FV_FILETYPE_RAW                   = 0x01;
+
+    static final int EFI_FV_FILETYPE_FREEFORM              = 0x02;
+
+    static final int EFI_FV_FILETYPE_SECURITY_CORE         = 0x03;
+
+    static final int EFI_FV_FILETYPE_PEI_CORE              = 0x04;
+
+    static final int EFI_FV_FILETYPE_DXE_CORE              = 0x05;
+
+    static final int EFI_FV_FILETYPE_PEIM                  = 0x06;
+
+    static final int EFI_FV_FILETYPE_DRIVER                = 0x07;
+
+    static final int EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER  = 0x08;
+
+    static final int EFI_FV_FILETYPE_APPLICATION           = 0x09;
+
+    static final int EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE = 0x0B;
+
+    static final int EFI_FV_FILETYPE_FFS_PAD               = 0xF0;
+
+    //
+    // Ffs file type
+    //
+    static final String EFI_FV_FFS_FILETYPE_STR            = ".FFS";
+    static final String EFI_FV_DXE_FILETYPE_STR            = ".DXE";
+    static final String EFI_FV_PEI_FILETYPE_STR            = ".PEI";
+    static final String EFI_FV_APP_FILETYPE_STR            = ".APP";
+    static final String EFI_FV_FVI_FILETYPE_STR            = ".FVI";
+    static final String EFI_FV_SEC_FILETYPE_STR            = ".SEC";
+    
+    //
+    //  Section Type copy from EfiImageFormat.h
+    //
+    static final int  EFI_SECTION_COMPRESSION              = 0x01;
+    static final int  EFI_SECTION_GUID_DEFINED             = 0x02;
+    
+    //
+    //  CompressionType values, we currently don't support 
+    //  "EFI_CUSTOMIZED_COMPRESSION".
+    //
+    static final int  EFI_NOT_COMPRESSED                   = 0x00;
+    static final int  EFI_STANDARD_COMPRESSION             = 0x01;
+    static final int  EFI_CUSTOMIZED_COMPRESSION           = 0x02;
+    
+
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
new file mode 100644
index 0000000000..982fd65096
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
@@ -0,0 +1,72 @@
+/** @file
+ FileParser class.
+
+ FileParser class is to parse file which contains the list of file name and 
+ add those files to list.
+  
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+import java.io.*;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+
+/**
+  FileParser class.
+
+  FileParser class is to parse file which contains the list of file name and 
+  add those files to list.
+**/
+public class  FileParser {
+    /**
+      loadFile
+     
+      This function is to add files to array from input file which contains the 
+      files list.
+      @param  project  The current project.
+      @param  list     File array.
+      @param  file     File which contains the file list.
+      @param  tag      Target of architecture.
+      @throws BuildException
+    **/
+    public static synchronized void loadFile(Project project, List<Object> list, File file, String tag) throws BuildException{
+        FileReader fileReader;
+        BufferedReader in;
+        String str;
+        
+        if (!file.exists()) {
+            throw new BuildException("The file" + file + "is not exist");           
+        } 
+        try {
+            fileReader = new FileReader(file);
+            in = new BufferedReader(fileReader);
+            while((str=in.readLine())!= null){
+                if (str.trim()==""){
+                    continue;
+                }
+                str = project.replaceProperties(str);
+                if (str.trim().substring(0,2).equalsIgnoreCase(tag)) {
+                    list.add(str.trim());
+                } else {
+                    list.add(tag + " " + str.trim());
+                }
+                
+            }
+        } catch (Exception e){
+            System.out.println(e.getMessage());
+            
+        }
+    }
+    
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
new file mode 100644
index 0000000000..48262e543c
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -0,0 +1,199 @@
+/** @file
+ FwImageTask class.
+
+ FwImageTask is used to call FwImage.ext to generate the FwImage.
+  
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+  FwImageTask class.
+
+  FwImageTask is used to call FwImage.ext to generate the FwImage.
+**/
+public class FwImageTask extends Task implements EfiDefine{
+    ///
+    /// time&data 
+    ///
+    private String time = "";
+    ///
+    /// input PE image
+    /// 
+    private String peImage = "";
+    ///
+    /// output EFI image
+    /// 
+    private String outImage = "";
+    ///
+    /// component type
+    ///
+    private String componentType = "";
+
+    /**
+     * assemble tool command line & execute tool command line
+     * 
+     * @throws BuildException
+     */
+    /**
+      execute 
+      
+      FwimageTask execute function is to assemble tool command line & execute
+      tool command line
+      
+      @throws BuidException
+    **/
+    public void execute() throws BuildException {
+
+        Project project = this.getOwningTarget().getProject();
+        //
+        // absolute path of efi tools
+        //
+        String path = project.getProperty("env.Framework_Tools_Path");
+        String command;
+        if (path == null) {
+            command = "fwimage";
+        } else {
+            command = path + "/" + "fwimage";
+        }
+        //
+        // argument of tools
+        //
+        String argument = time + componentType + peImage + outImage;
+        //
+        // return value of fwimage execution
+        //
+        int revl = -1;
+
+        try {
+            Commandline cmdline = new Commandline();
+            cmdline.setExecutable(command);
+            cmdline.createArgument().setLine(argument);
+
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                    Project.MSG_INFO, Project.MSG_WARN);
+            Execute runner = new Execute(streamHandler, null);
+
+            runner.setAntRun(project);
+            runner.setCommandline(cmdline.getCommandline());
+            System.out.println(Commandline.toString(cmdline.getCommandline()));
+
+            revl = runner.execute();
+            if (EFI_SUCCESS == revl) {
+                //
+                // command execution success
+                //
+                System.out.println("fwimage successed!");
+            } else {
+                //
+                // command execution fail
+                //
+                System.out.println("fwimage failed. (error="
+                        + Integer.toHexString(revl) + ")");
+                throw new BuildException("fwimage failed. (error="
+                        + Integer.toHexString(revl) + ")");
+
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    /**
+      setTime
+      
+      This function is to set operation of class member "time".
+      
+      @param time            string of time
+    **/
+    public void setTime(String time) {
+        this.time = " -t " + time;
+    }
+
+    /**
+      getTime
+      
+      This function is to get class member "time"
+      @return time          string of time
+    **/
+    public String getTime() {
+        return this.time;
+    }
+
+    /**
+      getPeImage
+      
+      This function is to get class member "peImage".
+      @return                name of PE image
+    **/
+    public String getPeImage() {
+        return this.peImage;
+    }
+
+    /**
+      setPeImage
+      
+      This function is to set class member "peImage"
+      @param  peImage        name of PE image
+    **/
+    public void setPeImage(String peImage) {
+        this.peImage = " " + peImage;
+    }
+
+    /**
+      getOutImage
+      
+      This function is to get class member "outImage".
+      @return                 name of output EFI image
+    **/
+    public String getOutImage() {
+        return this.outImage;
+    }
+
+    /**
+      setOutImage
+      
+      This function is to set class member "outImage".
+      @param outImage         name of output EFI image
+    **/
+    public void setOutImage(String outImage) {
+        this.outImage = " " + outImage;
+    }
+
+    /**
+      getComponentType
+      
+      This function is to get class member "componentType".
+      
+      @return                 string of componentType
+    **/
+    public String getComponentType() {
+        return this.componentType;
+    }
+
+    /**
+      setComponentType
+      
+      This function is to set class member "componentType".
+      @param  componentType   string of component type
+    **/
+    public void setComponentType(String componentType) {
+        this.componentType = " " + componentType;
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
new file mode 100644
index 0000000000..ca426dfa69
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
@@ -0,0 +1,183 @@
+/** @file
+ GenCRC32SectionTask class.
+
+ GenCRC32SectionTask is to call GenCRC32Section.exe to generate crc32 section.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.framework.tasks;
+
+import java.util.*;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+  GenCRC32SectionTask
+  
+  GenCRC32SectionTask is to call GenCRC32Section.exe to generate crc32 section. 
+  
+**/
+public class GenCRC32SectionTask extends Task implements EfiDefine{
+    ///
+    /// output file
+    ///
+    private String outputFile;
+    ///
+    /// inputFile list
+    ///
+    private List<Object> inputFileList = new ArrayList<Object>();
+    
+    ///
+    /// Project
+    ///
+    static private Project project;
+    
+    /**
+      execute
+      
+      GenCRC32SectionTask execute is to assemble tool command line & execute
+      tool command line
+      
+      @throws BuildException
+    **/
+    public void execute() throws BuildException {
+        
+        project = this.getOwningTarget().getProject(); 
+        ///
+        /// absolute path of efi tools
+        ///
+        String path = project.getProperty("env.Framework_Tools_Path"); 
+        String command;
+        if (path == null) {
+            command = "gencrc32section";
+        } else {
+            command = path + "/" + "gencrc32section" ;
+        }
+        // 
+        // string line of input files 
+        // 
+        String inputFiles = list2Str(inputFileList, ""); 
+        // 
+        // assemble argument 
+        //
+        String argument =  inputFiles + outputFile; 
+        // 
+        // return value of fwimage execution 
+        //
+        int revl = -1; 
+        
+        try {
+            Commandline cmdline = new Commandline();
+            cmdline.setExecutable(command);
+            cmdline.createArgument().setLine(argument);
+            
+            LogStreamHandler streamHandler = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
+            Execute runner = new Execute(streamHandler, null);
+            
+            runner.setAntRun(project);
+            runner.setCommandline(cmdline.getCommandline());
+            System.out.println(Commandline.toString(cmdline.getCommandline()));
+            
+            revl = runner.execute();
+            if (EFI_SUCCESS == revl){
+                //
+                //  command execution success 
+                //
+                System.out.println("gencrc32section succeeded!");
+            }
+            else
+            {
+                // 
+                // command execution fail
+                //
+                System.out.println("gencrc32section failed. (error=" + 
+                    Integer.toHexString(revl) + 
+                    ")"
+                    );
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+        
+    }
+
+    /**
+      addInputFile
+     
+      This function is to add a inputFile element into list
+      @param inputFile : inputFile element
+    **/
+    public void addInputfile(InputFile inputFile) {
+        inputFileList.add(inputFile);
+    }
+    
+    /**
+     get class member "outputFile"
+     * @return name of output file
+     */
+    public String getOutputFile() {
+        return this.outputFile;
+    }
+    /**
+     * set class member "outputFile"
+     * @param outputFile : outputFile parameter 
+     */
+    public void setOutputFile(String outputFile) {
+        this.outputFile = " -o " + outputFile;
+    };
+    
+    /**
+     * transfer List to String
+     * @param list : nested element list
+     * @param tag : interval tag of parameter
+     * @return string line of parameters 
+     */
+    private String list2Str(List list, String tag) {
+        /*
+         * string line for return
+         */
+        String paraStr = " -i"; 
+        /*
+         * nested element in list
+         */
+        NestElement element; 
+        /*
+         * iterator of nested element list
+         */
+        Iterator elementIter = list.iterator(); 
+        /*
+         * string parameter list
+         */
+        List<Object> strList = new ArrayList<Object>();   
+        
+        while (elementIter.hasNext()) {
+            element = (NestElement) elementIter.next();
+            if (null != element.getFile()) {
+                FileParser.loadFile(project, strList, element.getFile(), tag);
+            } else {
+                paraStr = paraStr + element.getName();
+            }
+        }
+        /*
+         * iterator of string parameter list
+         */
+        Iterator strIter = strList.iterator();  
+        while (strIter.hasNext()) {
+            paraStr = paraStr + " " + strIter.next();
+        }
+        return paraStr;
+    }   
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
new file mode 100644
index 0000000000..a13b74960c
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
@@ -0,0 +1,166 @@
+/** @file
+ GenDepexTask class.
+
+ GenDepexTask is to call GenDepex.exe to generate depex section.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+/**
+  GenDepexTask
+  
+  GenDepexTask is to call GenDepex.exe to generate depex section.
+
+**/
+public class GenDepexTask extends Task implements EfiDefine {
+    ///
+    /// output binary dependency files name
+    ///
+    private String outputFile = "";
+    ///
+    /// input pre-processed dependency text files name
+    ///
+    private String inputFile = "";
+    ///
+    /// padding integer value
+    ///
+    private String padding = "";
+    /**
+      execute
+      
+      GenDepexTask execute is to assemble tool command line & execute tool
+      command line.
+     */
+    public void execute() throws BuildException {
+
+        Project project = this.getOwningTarget().getProject();
+        //
+        // absolute path of edk tools
+        //
+        String path = project.getProperty("env.Framework_Tools_Path");
+        String command;
+        if (path == null) {
+            command = "gendepex";
+        } else {
+            command = path + "/" + "gendepex";
+        }
+        //
+        // argument of GenDepex tool
+        //
+        String argument = inputFile + outputFile + padding;
+        //
+        // reture value of GenDepex execution
+        //
+        int returnVal = -1;
+
+        try {
+            Commandline commandLine = new Commandline();
+            commandLine.setExecutable(command);
+            commandLine.createArgument().setLine(argument);
+
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                    Project.MSG_INFO, Project.MSG_WARN);
+
+            Execute runner = new Execute(streamHandler, null);
+            runner.setAntRun(project);
+            runner.setCommandline(commandLine.getCommandline());
+
+            System.out.println(Commandline.toString(commandLine
+                    .getCommandline()));
+
+            returnVal = runner.execute();
+            if (EFI_SUCCESS == returnVal) {
+                //
+                // command execution success
+                //
+                System.out.println("GenDepex execute successed!");
+
+            } else {
+                //
+                // command execution fail
+                //
+                System.out.println("GenDepex failed. (error="
+                        + Integer.toHexString(returnVal) + ")");
+                throw new BuildException("GenDepex failed. (error="
+                        + Integer.toHexString(returnVal) + ")");
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    /**
+      setOutputFile
+      
+      This function is to set class member "outputFile"
+      @param outputFileName        name of output file
+    **/
+    public void setOutputFile(String outputFileName) {
+        this.outputFile = " -O " + outputFileName;
+    }
+
+    /**
+      getOutputFile
+      
+      This function is to get class member "outputFile".
+     
+      @return name of ouput file
+    **/
+    public String getOutputFile() {
+        return this.outputFile;
+    }
+
+    /**
+      setInputFile
+      
+      This function is to set class member "inputFile".
+      @param inputFileName          name of inputFile
+    **/
+    public void setInputFile(String inputFileName) {
+        this.inputFile = " -I " + inputFileName;
+    }
+
+    /**
+      getInputFile
+      
+      This function is to get class member "inputFile"
+      @return                       name of input file
+    **/
+    public String getInputFile() {
+        return this.inputFile;
+    }
+
+    /**
+      setPadding
+      
+      This function is to set class member "padding"
+      @param paddingNum             padding value
+    **/
+    public void setPadding(String paddingNum) {
+        this.padding = " -P " + paddingNum;
+    }
+
+    /**
+      getPadding
+      
+      This function is to get class member "padding"
+      @return                       value of padding
+    **/
+    public String getPadding() {
+        return this.padding;
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
new file mode 100644
index 0000000000..00712d8bb6
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -0,0 +1,878 @@
+/** @file
+ GenFfsFileTask class.
+
+ GenFfsFileTaks is to generate ffs file.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+  GenFfsFileTask
+  
+  GenFfsFileTaks is to generate ffs file.
+
+**/
+public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
+    /**
+      *  GenFfsFile Task Class
+      *  class member 
+      *      -baseName               : module baseName
+      *      -ffsFileGuid            : module Guid.
+      *      -ffsFileType            : Ffs file type.  
+      *      -ffsAttributeRecovery   : The file is required for recovery.
+      *      -ffsAligment            : The file data alignment (0 if none required).  See FFS 
+      *                                specification for supported alignments (0-7 are only possible 
+      *                                 values).     *
+      *      -ffsAttributeCheckSum   : The file data is checksummed.  If this is FALSE a 
+      *                                value of 0x5A will be inserted in the file 
+      *                                checksum field of the file header.     *
+      *      -sectFileDir            : specifies the full path to the component build directory.
+      *                                Required.
+      *      -ffsAttrib              : Data recorde attribute added result.
+      *      -sectionList            : List recorded all section elemet in task.
+      */
+    ///
+    /// module baseName
+    ///
+    String  baseName        = "";
+    ///
+    /// module Guid
+    ///
+    String  ffsFileGuid        = "";
+    ///
+    /// Ffs file type
+    ///
+    String  ffsFileType        = "";
+    ///
+    /// ffsAttribHeaderExtension value is used to set the corresponding bit in 
+    /// the output FFS file header 
+    ///
+    boolean ffsAttribHeaderExtension = false;
+    ///
+    /// ffsAttribTailPresent value is used to set the corresponding bit in the 
+    /// output FFS file header
+    ///
+    boolean ffsAttribTailPresent     = false;
+    ///
+    /// ffsAttribRecovery value is used to set the corresponding bit in the 
+    /// output FFS file header
+    ///
+    boolean ffsAttribRecovery        = false;
+    ///
+    /// ffsAligenment value is used to set the corresponding bit in the output 
+    /// FFS file header.The specified FFS alignment must be a value between 0 
+    /// and 7 inclusive
+    ///
+    int     ffsAlignment       = 0;
+    ///
+    /// ffsAttribChecksum value is used to set the corresponding bit in the 
+    /// output FFS file header
+    ///
+    boolean FfsAttribChecksum        = false;
+    ///
+    /// Attribute is used to record the sum of all bit in the output FFS file.
+    ///
+    byte    attributes      = 0;
+    ///
+    /// The output directory of ffs file.
+    ///
+    String  outputDir       = "";
+    ///
+    /// List of section.
+    ///
+    List<Object> sectionList  = new ArrayList<Object>();
+
+    ///
+    /// The path of Framewor_Tools_Paht.
+    ///
+    static String path = "";  
+
+    /**
+      execute
+      
+      GenFfsFileTask execute is to generate ffs file according to input section 
+      dscriptive information.
+     */
+    public void execute() throws BuildException {
+        Section           sect;
+        int               fileSize;
+        int               fileDataSize;
+        File              ffsFile;
+        FfsHeader         ffsHeader = new FfsHeader();  
+        String            ffsSuffix = "";
+        String            outputPath = "";
+
+        //
+        //  Get Fraemwork_Tools_Path
+        //
+        Project pj = this.getOwningTarget().getProject();
+        path       = pj.getProperty("env.Framework_Tools_Path");
+
+        //
+        //  Check does the BaseName, Guid, FileType set value.
+        //
+        if (this.baseName.equals("")) {
+            throw new BuildException ("Must set BaseName!\n");
+        }
+
+        if (this.ffsFileGuid.equals("")) {
+            throw new BuildException ("Must set ffsFileGuid!\n");
+        }
+
+        if (this.ffsFileType.equals("")) {
+            throw new BuildException ("Must set ffsFileType!\n");
+        }
+
+        //
+        //  Create ffs file. File name = FfsFileGuid + BaseName + ffsSuffix.
+        //  If outputDir's value was set,  file will output to the outputDir.
+        //
+        ffsSuffix = TypeToSuffix (this.ffsFileType);
+        if (!this.outputDir.equals("")) {
+            String temp;
+            outputPath = this.outputDir;
+            temp       = outputPath.replace('\\', File.separatorChar);
+            outputPath = temp.replace('/', File.separatorChar);
+            if (outputPath.charAt(outputPath.length()-1) != File.separatorChar) {
+                outputPath = outputPath + File.separator;
+            }
+
+        }
+
+        ffsFile = new File (outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix);  
+        System.out.print("General Ffs file: file name is:\n");
+        System.out.print(outputPath + this.ffsFileGuid + '-' + this.baseName + ffsSuffix);
+        System.out.print("\n");
+
+        //
+        //  Create file output stream -- dataBuffer.
+        //   
+        try {
+            FileOutputStream dataFs     = new FileOutputStream (ffsFile.getAbsolutePath());
+            DataOutputStream dataBuffer = new DataOutputStream (dataFs);
+
+            //
+            //  Search SectionList find earch section and call it's 
+            //  ToBuffer function.
+            //
+            Iterator sectionIter = this.sectionList.iterator();
+            while (sectionIter.hasNext()) {
+                sect = (Section)sectionIter.next(); 
+
+                try {
+                    //
+                    //  The last section don't need 4 byte ffsAligment.
+                    //
+                    sect.toBuffer((DataOutputStream)dataBuffer);
+                } catch (Exception e) {
+                    throw new BuildException (e.getMessage());
+                }
+            }
+            dataBuffer.close();
+        } catch (Exception e) {
+            throw new BuildException (e.getMessage());
+        }
+
+        //
+        //  Creat Ffs file header
+        //
+        try {
+
+            //
+            //  create input stream to read file data
+            //
+            byte[] fileBuffer  = new byte[(int)ffsFile.length()];
+            FileInputStream fi = new FileInputStream (ffsFile.getAbsolutePath());
+            DataInputStream di = new DataInputStream (fi);
+            di.read(fileBuffer);
+            di.close(); 
+
+
+            //
+            //  Add GUID to header struct
+            //
+            if (this.ffsFileGuid != null) {
+                stringToGuid (this.ffsFileGuid, ffsHeader.name);
+            }
+
+            ffsHeader.ffsAttributes = this.attributes;
+            if ((ffsHeader.fileType = stringToType(this.ffsFileType))== -1) {
+                throw new BuildException ("FFS_FILE_TYPE unknow!\n");
+            }
+
+
+            //
+            //  Adjust file size. The function is used to tripe the last 
+            //  section padding of 4 binary boundary. 
+            //  
+            //
+            if (ffsHeader.fileType != EFI_FV_FILETYPE_RAW) {
+
+                fileDataSize = adjustFileSize (fileBuffer);
+
+            } else {
+                fileDataSize = fileBuffer.length;
+            }
+
+            //
+            //  1. add header size to file size
+            //
+            fileSize = fileDataSize + ffsHeader.getSize();
+
+            if ((ffsHeader.ffsAttributes & FFS_ATTRIB_TAIL_PRESENT) != 0) {
+                if (ffsHeader.fileType == EFI_FV_FILETYPE_FFS_PAD) {
+
+                    throw new BuildException (
+                                             "FFS_ATTRIB_TAIL_PRESENT=TRUE is " +
+                                             "invalid for PAD files"
+                                             );
+                }
+                if (fileSize == ffsHeader.getSize()) {
+                    throw new BuildException (
+                                             "FFS_ATTRIB_TAIL_PRESENT=TRUE is " +
+                                             "invalid for 0-length files"
+                                             );            
+                }
+                fileSize = fileSize + 2;
+            }
+
+            //
+            //  2. set file size to header struct
+            //
+            ffsHeader.ffsFileSize[0] = (byte)(fileSize & 0x00FF);
+            ffsHeader.ffsFileSize[1] = (byte)((fileSize & 0x00FF00)>>8);
+            ffsHeader.ffsFileSize[2] = (byte)(((int)fileSize & 0xFF0000)>>16);
+
+            //
+            //  Fill in checksums and state, these must be zero for checksumming
+            //
+            ffsHeader.integrityCheck.header = calculateChecksum8 (
+                                                                 ffsHeader.structToBuffer(),
+                                                                 ffsHeader.getSize()
+                                                                 );
+
+            if ((this.attributes & FFS_ATTRIB_CHECKSUM) != 0) {
+                if ((this.attributes & FFS_ATTRIB_TAIL_PRESENT) != 0) {
+                    ffsHeader.integrityCheck.file = calculateChecksum8 (
+                                                                       fileBuffer, 
+                                                                       fileDataSize
+                                                                       );
+                } else {
+                    ffsHeader.integrityCheck.file = calculateChecksum8 (
+                                                                       fileBuffer,
+                                                                       fileDataSize
+                                                                       );
+                }
+            } else {
+                ffsHeader.integrityCheck.file = FFS_FIXED_CHECKSUM;
+            }
+
+            //
+            //   Set the state now. Spec says the checksum assumes the state is 0.
+            //
+            ffsHeader.ffsState = EFI_FILE_HEADER_CONSTRUCTION | 
+                                 EFI_FILE_HEADER_VALID | 
+                                 EFI_FILE_DATA_VALID;
+
+
+            //
+            // create output stream to first write header data in file, then write sect data in file.
+            //
+            FileOutputStream headerFfs = new FileOutputStream (ffsFile.getAbsolutePath());
+            DataOutputStream ffsBuffer = new DataOutputStream (headerFfs);
+
+            //
+            //  Add header struct and file data to FFS file
+            //
+            ffsBuffer.write(ffsHeader.structToBuffer());
+            for (int i = 0; i< fileDataSize; i++) {
+                ffsBuffer.write(fileBuffer[i]);
+            }
+
+            //
+            //  If there is a tail, then set it
+            //
+            if ((this.attributes & FFS_ATTRIB_TAIL_PRESENT) != 0) {
+                short tailValue ;
+                byte [] tailByte = new byte[2];
+
+                //
+                //  reverse tailvalue , integritycheck.file as hight byte, and 
+                //  integritycheck.header as low byte.
+                //
+                tailValue = (short)(ffsHeader.integrityCheck.header & 0xff);
+                tailValue = (short)((tailValue) | ((ffsHeader.integrityCheck.file << 8) & 0xff00)); 
+                tailValue = (short)~tailValue;
+
+                //
+                //  Change short to byte[2]
+                //
+                tailByte[0] = (byte)(tailValue & 0xff);
+                tailByte[1] = (byte)((tailValue & 0xff00)>>8);  
+                ffsBuffer.write(tailByte[0]);
+                ffsBuffer.write(tailByte[1]);
+            }
+
+            //
+            //  close output stream. Note if don't close output stream 
+            //  the buffer can't be rewritten to file. 
+            //
+            ffsBuffer.close();
+            System.out.print ("Successful create ffs file!\n");
+        } catch (Exception e) {
+            throw new BuildException (e.getMessage());
+        }
+    }   
+
+    /**
+      addCompress
+      
+      This function is to add compress section to section list.
+      @param compress   Section of compress   
+    **/
+    public void addCompress(CompressSection compress) {
+        this.sectionList.add(compress);
+    }
+
+    /**
+      addTool
+      
+      This function is to add tool section to section list.
+      @param tool       Section of tool
+    **/
+    public void addTool(Tool tool) {
+        this.sectionList.add(tool);
+    }
+
+    /**
+      addSectionFile
+      
+      This function is to add sectFile section to section list.
+      @param sectFile    Section of sectFile.
+    **/
+    public void addSectFile (SectFile sectFile) {
+        this.sectionList.add(sectFile);   
+    }
+
+    /**
+      getBaseName
+      
+      This function is to get basename
+      
+      @return              String of base name
+    **/
+    public String getBaseName() {
+        return this.baseName;
+    }
+
+    /**
+      setBaseName
+      
+      This function is to set base name.
+      @param  baseName
+    **/
+    public void setBaseName(String baseName) {
+        this.baseName = baseName.trim();
+    }
+
+    /**
+      getFfsAligment
+      
+      This function is to get the ffsAligment
+      @return  The value of ffsAligment.
+    **/
+    public int getFfsAligment() {
+        return this.ffsAlignment;
+    }
+
+    /**
+      setFfsAligment
+      
+      This function is to set ffsAligment 
+      @param  ffsAligment     The value of ffsAligment.
+    **/
+    public void setFfsAligment(int ffsAligment) {
+        this.ffsAlignment = ffsAligment;
+        if (this.ffsAlignment > 7) {
+            throw new BuildException ("FFS_ALIGMENT Scope is 0-7");
+        } else {
+            attributes |= (((byte)this.ffsAlignment) << 3);
+        }
+    }
+
+    /**
+      getFfsAttribCheckSum
+      
+      This function is to get ffsAttribCheckSum
+      
+      @return                      Value of ffsAttribChecksum 
+    **/
+    public boolean getFfsAttribChecksum() {
+        return this.FfsAttribChecksum;
+    }
+
+    /**
+      setFfsAttribChecksum
+      
+      This function is to set ffsAttribChecksum
+      @param ffsAttributeCheckSum  Value of ffsAttribCheckSum
+    **/
+    public void setFfsAttribChecksum(boolean ffsAttributeCheckSum) {
+        this.FfsAttribChecksum = ffsAttributeCheckSum;
+        if (ffsAttributeCheckSum) {
+            attributes |= FFS_ATTRIB_CHECKSUM;
+        }
+    }
+
+    /**
+      getFfsAttribRecovery
+      
+      This function is to get ffsAttribRecovery
+      @return                        Value of ffsAttribRecovery
+    **/
+    public boolean getFfsAttribRecovery() {
+        return this.ffsAttribRecovery;
+    }
+
+    /**
+      setRecovery
+      
+      This function is to set ffsAttributeRecovery
+      
+      @param  ffsAttributeRecovery    Value of ffsAttributeRecovery
+    **/
+    public void setRecovery(boolean ffsAttributeRecovery) {
+        this.ffsAttribRecovery = ffsAttributeRecovery;
+        if (ffsAttributeRecovery) {
+            attributes |= FFS_ATTRIB_RECOVERY;
+        }
+    }
+
+    /**
+      getFileGuid
+      
+      This function is to get fileGuid
+      @return          Guid
+    **/
+    public String getFileGuid() {
+        return this.ffsFileGuid;
+    }
+
+    /**
+      setFileGuid
+      
+      This function is to set fileGuid
+      @param ffsFileGuid    String of GUID
+    **/
+    public void setFileGuid(String ffsFileGuid) {
+        this.ffsFileGuid = ffsFileGuid.trim();
+    }
+
+    /**
+      getFfsFileType
+      
+      This function is to get ffsFileType.
+      
+      @return               value of ffsFileType
+    **/
+    public String getFfsFileType() {
+        return this.ffsFileType;
+    }
+
+    /**
+      setFfsFileType
+      
+      This function is to set ffsFileType.
+      
+      @param ffsFileType      
+    **/
+    public void setFfsFileType(String ffsFileType) {
+        this.ffsFileType = ffsFileType.trim();
+    }
+
+    /**
+      ffsAttribHeaderExtension
+      
+      This function is to get ffsAttribHeaderExtension
+      
+      @return             Value of ffsAttribHeaderExtension
+    **/
+    public boolean isFfsAttribHeaderExtension() {
+        return this.ffsAttribHeaderExtension;
+    }
+
+    /**
+      setHeaderExension
+      
+      This function is to set headerExtension
+      @param headerExtension     Value of headerExension
+    **/
+    public void setHeaderExtension(boolean headerExtension) {
+        this.ffsAttribHeaderExtension = headerExtension;
+        if (headerExtension) {
+            attributes |= FFS_ATTRIB_HEADER_EXTENSION;
+        }
+    }
+
+    /**
+      isFfsAttribTailPresent
+      
+      This function is to get ffsAttribTailPresent value.
+      @return          Value of ffsAttribTailPresent.
+    **/
+    public boolean isFfsAttribTailPresent() {
+        return this.ffsAttribTailPresent;
+    }
+
+    /**
+      setFfsAttribTailPresent
+      
+      This function is to set ffsAttribTailPresent.
+      @param tailPresent  Value of ffsAttribTailPresent.
+    **/
+    public void setFfsAttribTailPresent(boolean tailPresent) {
+        this.ffsAttribTailPresent = tailPresent;
+        if (tailPresent) {
+            attributes |= FFS_ATTRIB_TAIL_PRESENT;
+        }
+    }   
+
+
+    /**
+      stringToGuid
+      
+      This function is to convert string to GUID.
+     * @param GuidStr         String of GUID.
+     * @param Guid            GUID form.
+     */
+    private void stringToGuid (String GuidStr, FfsHeader.FfsGuid Guid){   
+
+        int i  = 0;
+        int j  = 0;
+        int k  = 0;
+        char   [] charArry;
+        String [] SplitStr;
+
+        byte[] buffer = new byte[16];
+        if (GuidStr.length()!=36) {
+            throw new BuildException ("Guid length is not correct!");
+        }
+
+
+        SplitStr = GuidStr.split("-");
+        if (SplitStr.length != 5) {
+            throw new BuildException ("Guid type is not correct!");
+        }
+
+
+
+        for (i= 0; i < SplitStr.length; i++) {
+            String str = SplitStr[i];         
+            charArry   = str.toCharArray();
+
+            for (j =0; j < (str.toCharArray().length)/2; j++) {
+
+                buffer[k] = hexCharToByte (charArry[j*2]);        
+                buffer[k] = (byte)( buffer[k]& 0x0f);       
+                buffer[k] = (byte)((buffer[k]<< 4));
+                buffer[k] = (byte)( buffer[k]& 0xf0);       
+                buffer[k] = (byte)( buffer[k]|hexCharToByte(charArry[j*2+1]));
+                k++;            
+            }
+        }
+        Guid.bufferToStruct(buffer);
+    }
+
+    /**
+      typeToSuffix
+      
+      This function is to get suffix of ffs file according to ffsFileType.
+      
+      @param  ffsFileType    ffsFileType
+      @return                The suffix of ffs file
+    **/
+    private String TypeToSuffix (String ffsFileType){
+        if (ffsFileType.equals("EFI_FV_FILETYPE_ALL")) {
+            return "";
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_RAW")) {
+            return EFI_FV_FFS_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FREEFORM")) {
+            return EFI_FV_FFS_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_SECURITY_CORE")) {
+            return EFI_FV_SEC_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_PEI_CORE")) {
+            return EFI_FV_PEI_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_DXE_CORE")) {
+            return EFI_FV_DXE_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_PEIM")) {
+            return EFI_FV_PEI_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_DRIVER")) {
+            return  EFI_FV_DXE_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER")) {
+            return EFI_FV_PEI_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_APPLICATION")) {
+            return EFI_FV_APP_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE")) {
+            return EFI_FV_FVI_FILETYPE_STR;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FFS_PAD")) {
+            return EFI_FV_FFS_FILETYPE_STR;
+        }
+        return "";
+    }
+
+
+    /**
+      stringToType
+      
+      This function is to get ffsFileType integer value according to ffsFileType.
+      @param   ffsFileType       String value of ffsFileType
+      @return                    Integer value of ffsFileType.
+    **/
+    private byte stringToType (String ffsFileType){
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_ALL")) {
+            return(byte)EFI_FV_FILETYPE_ALL;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_RAW")) {
+            return(byte)EFI_FV_FILETYPE_RAW;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FREEFORM")) {
+            return(byte)EFI_FV_FILETYPE_SECURITY_CORE;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_SECURITY_CORE")) {
+            return(byte)EFI_FV_FILETYPE_SECURITY_CORE;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_PEI_CORE")) {
+            return(byte) EFI_FV_FILETYPE_PEI_CORE;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_DXE_CORE")) {
+            return(byte)EFI_FV_FILETYPE_DXE_CORE;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_PEIM")) {
+            return(byte)EFI_FV_FILETYPE_PEIM;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_DRIVER")) {
+            return(byte) EFI_FV_FILETYPE_DRIVER;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER")) {
+            return(byte)EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_APPLICATION")) {
+            return(byte)EFI_FV_FILETYPE_APPLICATION;
+        }
+
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE")) {
+            return(byte)EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE;
+        }
+        if (ffsFileType.equals("EFI_FV_FILETYPE_FFS_PAD")) {
+            return(byte) EFI_FV_FILETYPE_FFS_PAD;
+        }
+
+        return -1;
+    }
+
+
+
+    /**
+      calculateCheckSum8
+      
+      This function is to calculate the value needed for a valid UINT8 checksum
+      @param  buffer  Byte buffer containing byte data of component.
+      @param  size    Size of the buffer.
+      @return         The 8 bit checksum value needed.
+    **/
+    private byte calculateChecksum8 (byte[] buffer, int size){
+        return(byte) (0x100 - calculateSum8 (buffer, size));
+    }
+
+
+    /**
+      calculateSum8
+      
+      This function is to calculate the UINT8 sum for the requested region.
+      @param buffer   Byte buffer containing byte data of component
+      @param size     Size of the buffer.
+      @return         The 8 bit checksum value needed.
+    **/ 
+    private short calculateSum8 (byte[] buffer, int size){
+        int   Index;
+        byte  Sum;
+        Sum   = 0;
+
+        //
+        // Perform the word sum for buffer
+        //
+        for (Index = 0; Index < size; Index++) {
+            Sum = (byte) (Sum + buffer[Index]);     
+        }
+
+        return(byte) Sum; 
+    }
+
+    /**
+      hexCharToByte
+      
+      This function is to convert hex character to byte
+      
+      @param     hexChar          hex character
+      @return                     Byte which corresponding to the character.
+    **/
+    private byte hexCharToByte (char hexChar){
+        switch (hexChar) {
+        case '0':
+            return(byte)0x00;
+        case '1':
+            return(byte)0x01;
+        case '2':
+            return(byte)0x02;
+        case '3':
+            return(byte)0x03;
+        case '4':
+            return(byte)0x04;
+        case '5':
+            return(byte)0x05;
+        case '6':
+            return(byte)0x06;
+        case '7':
+            return(byte)0x07;
+        case '8':
+            return(byte)0x08;
+        case '9':
+            return(byte)0x09;
+        case 'a':
+        case 'A':
+            return(byte)0x0a;
+        case 'b':
+        case 'B':
+            return(byte)0x0b;
+        case 'c':
+        case 'C':
+            return(byte)0x0c;
+
+        case 'd':
+        case 'D':           
+            return(byte)0x0d;
+
+        case 'e':
+        case 'E':
+            return(byte)0x0e;
+        case 'f':
+        case 'F':
+            return(byte)0x0f;
+
+        default:
+            return(byte)0xff;  
+        }
+    }
+
+    /**
+      adjustFileSize
+      
+      This function is used to adjusts file size to insure sectioned file is exactly the right length such
+      that it ends on exactly the last byte of the last section.  ProcessScript()
+      may have padded beyond the end of the last section out to a 4 byte boundary.
+      This padding is stripped.  
+      
+      @param    buffer  Byte buffer contains a section stream
+      @return           Corrected size of file.
+    **/
+    private int adjustFileSize (byte[] buffer){ 
+
+        int orignalLen         = buffer.length;
+        int adjustLen          = 0;
+        int sectionPoint       = 0;
+        int nextSectionPoint   = 0;
+        int sectionLen         = 0;
+        int totalLen           = 0;
+        int firstSectionHeader = 0;
+
+
+        firstSectionHeader = buffer[0]& 0xff;
+        firstSectionHeader = ((buffer[1]&0xff)<<8) | firstSectionHeader;
+        firstSectionHeader = ((buffer[2]&0xff)<<16)| firstSectionHeader;
+
+
+        while (sectionPoint < buffer.length) {
+            sectionLen = buffer[0 + sectionPoint]& 0xff;
+            sectionLen = ((buffer[1 + sectionPoint]&0xff)<<8)| sectionLen;
+            sectionLen = ((buffer[2 + sectionPoint]&0xff)<<16)| sectionLen; 
+            totalLen   = totalLen + sectionLen;
+
+            if (totalLen == orignalLen) {
+                return totalLen;
+            }
+
+            sectionPoint     = sectionPoint + sectionLen;
+            adjustLen        = sectionPoint;
+
+            nextSectionPoint = (sectionPoint + 0x03) & (~0x03);
+            totalLen         = totalLen + nextSectionPoint - sectionLen;
+            sectionPoint     = nextSectionPoint;
+        }
+        return adjustLen;
+    }
+
+    /**
+      getOutputDir
+      
+      This function is to get output directory.
+      
+      @return                Path of output directory.
+    **/
+    public String getOutputDir() {
+        return outputDir;
+    }
+
+    /**
+      setOutputDir
+      
+      This function is to set output directory.
+      
+      @param outputDir        The output direcotry.
+    **/
+    public void setOutputDir(String outputDir) {
+        this.outputDir = outputDir;
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
new file mode 100644
index 0000000000..cd1e421263
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -0,0 +1,154 @@
+/** @file
+ GenFvImageTask class.
+
+ GenFvImageTask is to call GenFvImage.exe to generate FvImage.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.framework.tasks;
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+  GenFvImageTask
+  
+  GenFvImageTask is to call GenFvImage.exe to generate the FvImage.
+  
+**/
+public class GenFvImageTask extends Task implements EfiDefine{
+    ///
+    /// The name of input inf file
+    ///
+    private String infFile="";
+    ///
+    /// The target architecture.
+    ///
+    private String arch="";
+    
+    /**
+      execute
+      
+      GenFvImageTask execute is to assemble tool command line & execute tool
+      command line.
+    **/
+    public void execute() throws BuildException  {
+        Project project = this.getOwningTarget().getProject();
+        String path = project.getProperty("env.Framework_Tools_Path");
+        String command = "";
+        
+        if (path == null){
+            path = "";
+        }else {
+            path = path + File.separatorChar;
+        }
+        
+        if (arch.equalsIgnoreCase("")){
+            command = path + "GenFvImage";
+        }
+        if (arch.equalsIgnoreCase("ia32")){
+            command = path + "GenFvImage_IA32";
+        }   
+        if (arch.equalsIgnoreCase("x64")){
+            command = path + "GenFvImage_X64";
+        }
+        if (arch.equalsIgnoreCase("ipf")){
+            command = path + "GenFvImage_IPF";
+        }
+        String argument = infFile;
+        
+        try {
+            
+            Commandline commandLine = new Commandline();
+            commandLine.setExecutable(command);
+            commandLine.createArgument().setLine(argument);
+            
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                                                   Project.MSG_INFO,
+                                                   Project.MSG_WARN);
+            //
+            // create a execute object and set it's commandline
+            //
+            Execute runner = new Execute(streamHandler,null);
+            runner.setAntRun(project);
+            runner.setCommandline(commandLine.getCommandline());            
+            System.out.println(Commandline.toString(commandLine.getCommandline()));
+            
+            int revl = -1;
+            //
+            //  user execute class call external programs - GenFvImage
+            //
+            revl = runner.execute();
+            // 
+            // execute command line success!
+            //
+            if (EFI_SUCCESS == revl){
+                System.out.println("GenFvImage succeeded!");
+            } else {
+                
+            // 
+            // execute command line failed! 
+            //
+                throw new BuildException("GenFvImage failed !(error =" + 
+                    Integer.toHexString(revl) + ")");
+            }
+            
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }       
+    }
+    /**
+      getInfFile
+      
+      This function is to get class member of infFile
+      @return String    name of infFile
+    **/
+    public String getInfFile() {
+        return infFile;
+    }
+    
+    /**
+      setInfFile
+      
+      This function is to set class member of infFile.
+      
+      @param infFile  name of infFile
+    **/
+    public void setInfFile(String infFile) {
+        this.infFile = "-I " + infFile;
+    }
+    
+    /**
+      getArch
+      
+      This function is to get class member of arch.
+      @return           The target architecture.
+    **/
+    public String getArch() {
+        return arch;
+    }
+    
+    /**
+      setArch
+      
+      This function is to set class member of arch. 
+      
+      @param arch       The target architecture.
+    **/
+    public void setArch(String arch) {
+        this.arch = arch;
+    }   
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
new file mode 100644
index 0000000000..e432a2ce41
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
@@ -0,0 +1,215 @@
+/** @file
+ GenSectionTask class.
+
+ GenSectionTask is to call GenSection.exe to generate Section.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+**/
+
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+public class GenSectionTask extends Task implements EfiDefine {
+    ///
+    /// inputfile name
+    ///
+    private String inputFile = "";
+    ///
+    /// outputfile name
+    ///
+    private String outputFile = "";
+    ///
+    /// section type
+    ///
+    private String sectionType = "";
+    ///
+    /// version number
+    ///
+    private String versionNum = "";
+    ///
+    /// interface string
+    ///
+    private String interfaceString = "";
+
+    /**
+      execute
+      
+      GenSectionTaks execute is to assemble tool command line & execute tool
+      command line.
+      
+      @throws BuildException
+    **/
+    public void execute() throws BuildException {
+        String command;
+        Project project = this.getOwningTarget().getProject();
+        //
+        // absolute path of efi tools
+        //
+        String path = project.getProperty("env.Framework_Tools_Path");
+        if (path == null) {
+            command = "gensection";
+        } else {
+            command = path + "/" + "gensection";
+        }
+        //
+        // argument of tools
+        //
+        String argument = inputFile + outputFile + sectionType + versionNum
+                + interfaceString;
+        //
+        // return value of gensection execution
+        //
+        int revl = -1;
+
+        try {
+            Commandline cmdline = new Commandline();
+            cmdline.setExecutable(command);
+            cmdline.createArgument().setLine(argument);
+
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                    Project.MSG_INFO, Project.MSG_WARN);
+            Execute runner = new Execute(streamHandler, null);
+
+            runner.setAntRun(project);
+            runner.setCommandline(cmdline.getCommandline());
+            System.out.println(Commandline.toString(cmdline.getCommandline()));
+
+            revl = runner.execute();
+            if (EFI_SUCCESS == revl) {
+                //
+                // command execution success
+                //
+                System.out.println("gensection successed!");
+            } else {
+                //
+                // command execution fail
+                //
+                System.out.println("gensection failed. (error="
+                        + Integer.toHexString(revl) + ")");
+                throw new BuildException("gensection failed. (error="
+                        + Integer.toHexString(revl) + ")");
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    /**
+      getInputFile
+      
+      This function is to get class member "inputFile".
+      
+      @return                    name of input file
+    **/
+    public String getInputFile() {
+        return this.inputFile;
+    }
+
+    /**
+      setInputFile
+      
+      This function is to set class member "inputFile".
+      
+      @param inputFile            name of input file
+    **/
+    public void setInputFile(String inputFile) {
+        this.inputFile = " -i " + inputFile;
+    }
+
+    /**
+      getOutputFile
+      
+      This function is to get class member "outputFile".
+      
+      @return                      name of output file
+    **/
+    public String getOutputFile() {
+        return this.outputFile;
+    }
+
+    /**
+      setOutputfile
+      
+      This function is to set class member "outputFile".
+      @param  outputFile            name of output file
+    **/
+    public void setOutputfile(String outputFile) {
+        this.outputFile = " -o " + outputFile;
+    }
+
+    /**
+      getSectionType
+      
+      This function is to get class member "sectionType".
+      
+      @return                        sectoin type
+    **/
+    public String getSectionType() {
+        return this.sectionType;
+    }
+
+    /**
+      setSectionType
+      
+      This function is to set class member "sectionType".
+      
+      @param sectionType              section type
+    **/
+    public void setSectionType(String sectionType) {
+        this.sectionType = " -s " + sectionType;
+    }
+
+    /**
+      getVersionNum
+      
+      This function is to get class member "versionNum".
+      @return                         version number
+    **/
+    public String getVersionNum() {
+        return this.versionNum;
+    }
+
+    /**
+      setVersionNume
+      
+      This function is to set class member "versionNum".
+      @param versionNum               version number
+    **/
+    public void setVersionNum(String versionNum) {
+        this.versionNum = " -v " + versionNum;
+    }
+
+    /**
+      getInterfaceString
+      
+      This function is to get class member "interfaceString".
+      @return                         interface string
+    **/
+    public String getInterfaceString() {
+        return this.interfaceString;
+    }
+
+    /**
+      setInterfaceString
+      
+      This funcion is to set class member "interfaceString".
+      @param interfaceString            interface string
+    **/
+    public void setInterfaceString(String interfaceString) {
+        this.interfaceString = " -a " + "\"" + interfaceString + "\"";
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java
new file mode 100644
index 0000000000..69feb4e03d
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java
@@ -0,0 +1,367 @@
+/** @file
+ GuidChkTask class.
+
+ GuidChkTask is to call GuidChk.exe to generate Section.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+**/
+package org.tianocore.framework.tasks;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+  GuidChkTask
+  
+  GuidChkTask is to call GuidChk.exe to generate Section.
+  
+**/
+public class GuidChkTask extends Task implements EfiDefine{
+    /**
+     *  GuidChk task class
+     *  class member
+     *    -exDir   : directory name of exclusion searching  
+     *    -exFile  : file name of exclusion searching
+     *    -exExt   : extension name of exclusion searching
+     *    -exSubDir: extesnion name of sub dir which excluded searching
+     *    -outFile : out put file wrote internal GUID+basename list
+     *    -chkGui  : check for duplicate guids
+     *    -chkSign : check for duplicate signatures
+     *    -printGuiDef : if set will print guid+defined symbol name
+     *    -printAllGuid: if set will print all GUIDS found
+     *    -outPut  : redirection file name
+     *    -fos     : out put redirect to this file 
+     *    
+     */
+    ///
+    /// Directory name of exclusion searching 
+    ///
+    private String exDir = "";
+    ///
+    /// File name of exclusion searching.
+    ///
+    private String exFile = "";
+    ///
+    /// Extension name of exclusion searching.
+    ///
+    private String exExt = "";
+    ///
+    /// Extesnion name of sub dir which excluded searching.
+    ///
+    private String exSubDir = "";
+    ///
+    /// Out put file wrote internal GUID+basename list
+    ///
+    private String outFile = "";
+    ///
+    /// Check for duplicate guids.
+    ///
+    private String chkGui = "";
+    ///
+    /// Check for duplicate signatures
+    ///
+    private String chkSign = "";
+    ///
+    /// If set will print guid+defined symbol name
+    ///
+    private String printGuiDef = "";
+    ///
+    /// If set will print all GUIDS found
+    ///
+    private String printAllGuid = "";
+    ///
+    /// redirection file name.
+    ///
+    private String outPut = "";
+    ///
+    /// out put redirect to this file.
+    ///
+    protected PrintWriter fos = null;
+    
+    //
+    // overload class execute method
+    //   
+    public void execute() throws BuildException {
+        Project project = this.getOwningTarget().getProject();
+        String path = project.getProperty("env.Framework_Tools_Path");
+        String command;
+        if (path == null) {
+            command = "GuidChk";
+        } else {
+            command = path + File.separatorChar + "GuidChk";
+        }
+        String argument = exDir +
+                          exFile +
+                          exExt +
+                          exSubDir +
+                          outFile +
+                          chkGui +
+                          chkSign +
+                          printGuiDef + 
+                          printAllGuid;     
+        try {
+            System.out.println(command + " " + argument);
+            //
+            // execute command line 
+            //
+            Process proc = Runtime.getRuntime().exec(command + "" + argument);
+            //
+            // if set output, redirect out put to output file, else print output to screen
+            //         
+            if ( !this.outPut.equals("")) {
+                fos = new PrintWriter(this.outPut);
+                BufferedReader bin = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+                String line = bin.readLine();
+                while (line != null ){                  
+                fos.println(line);
+                line = bin.readLine();
+                }
+                fos.close();
+            }
+            else {
+                BufferedReader bin = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+                String line = bin.readLine();
+                System.out.println(line);
+                while (line != null ){
+                    System.out.print(line);
+                    line = bin.readLine();
+                }               
+            }                      
+            System.out.println("GuidChkTask Success!");
+        } catch (Exception e) {
+            System.out.println("GuidChkTask failed!");
+            System.out.println(e.getMessage());
+            
+        }
+    }
+    /**
+      getChkGui
+      
+      This function is to get the string of flag of ChkGui
+      
+      @return                     string of flag of ChkGui
+    **/
+    public String getChkGui() {
+        return chkGui;
+    }
+    
+    /**
+      setChkGui
+      
+      This function is to set chkGui
+      
+      @param chkGui               set class member of chkGui
+    **/
+    public void setChkGui(String chkGui) {
+        if (chkGui.equals("on")||(chkGui.equals("ON"))){
+            this.chkGui = " -g ";
+        }
+        
+    }
+    
+    /**
+      getChkSign
+      
+      This function is to get chkSign
+      
+      @return                  chkSign
+    **/
+    public String getChkSign() {
+        return chkSign;
+    }
+    
+    /**
+      setChkSign
+      
+      This function is to set class member of chkSign
+     * @param chkSign
+     */
+    public void setChkSign(String chkSign) {
+        if (chkSign.equals("on")|| chkSign.equals("ON")){
+            this.chkSign = " -s ";
+        }       
+    }
+    /**
+      getExDir
+      
+      This function is to get class member of exDir
+      
+      @return                 exDir
+    **/
+    public String getExDir() {
+        return exDir;
+    }
+    
+    /**
+      setExDir
+      
+      This function is to set class member of exDir
+      
+      @param                   exDir
+    **/
+    public void setExDir(String exDir) {
+        this.exDir = " -d " + exDir;
+    }
+    
+    /**
+      getExExt
+      
+      This function is to get class member of exExt
+      
+      @return                    exExt
+    **/
+    public String getExExt() {
+        return exExt;
+    }
+    
+    /**
+      setExExt
+      
+      This function is to set class member of exExt
+      @param                      exExt
+    **/
+    public void setExExt(String exExt) {
+        this.exExt = " -e " + exExt;
+    }
+    
+    /**
+      getExFile
+      
+      This function is to get class member of exFile
+      @return                    exFile
+    **/
+    public String getExFile() {
+        return exFile;
+    }
+    
+    /**
+      setExFile
+      
+      This function is to set class member of exFile.
+      
+     @param                       exFile
+    **/
+    public void setExFile(String exFile) {
+        this.exFile = " -f " + exFile;
+    }
+    
+    /**
+      getExSubDir
+      
+      This function is to get class member of exSubDir
+      
+      @return                      exSubDir
+    **/
+    public String getExSubDir() {
+        return exSubDir;
+    }
+    
+    /**
+      setExSubDir
+      
+      This function is to set class member of exSubDir.
+     @param                         exSubDir
+    **/
+    public void setExSubDir(String exSubDir) {
+        this.exSubDir = " -u " + exSubDir;
+    }
+    
+    /**
+      getOutFile
+      
+      This function is to get outFile
+      
+     @return                        outFile
+    **/
+    public String getOutFile() {
+        return outFile;
+    }
+    /**
+     * set class member of outFile
+     * @param outFile
+     */
+    public void setOutFile(String outFile) {
+        this.outFile = " -b " + outFile;
+    }
+    /**
+      getPrintGuidDef
+      
+      This function is to get printGuidDef
+      
+      @return     flage of printing (guid+defined symbol name)
+    **/
+    public String getPrintGuiDef() {
+        return printGuiDef;
+    }
+    
+    
+    /**
+      setPrintGuidDef
+      
+      This function is to set class member of printGuiDef.
+      @param       printGuiDef
+    **/
+    public void setPrintGuiDef(String printGuiDef) {
+        if (printGuiDef.equals("on")|| printGuiDef.equals("ON")){
+            this.printGuiDef = " -x ";
+        }
+        
+    }
+    
+    /**
+      getOutput
+      
+      This function is to get output
+      
+      @return       name of outPut file
+    **/
+    public String getOutPut() {
+        return outPut;
+    }
+    
+    /**
+      setOutPut
+      
+      This function is to set class member of outPut.
+      @param outPut
+    **/
+    public void setOutPut(String outPut) {
+        this.outPut = outPut;
+    }
+    
+    /**
+      getPrintAllGuid
+      
+      This function is to get printAllGuid
+      @return         printAllGuid
+    **/
+    public String getPrintAllGuid() {
+        return printAllGuid;
+    }
+    
+    /**
+      setPrintAllGuid
+      
+      This function is to set class member of printAllGuid.
+      @param          printAllGuid
+    **/
+    public void setPrintAllGuid(String printAllGuid) {
+        if (printAllGuid.equals("on")||printAllGuid.equals("ON")) {
+            this.printAllGuid = " -p ";
+        }       
+    }
+}
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
new file mode 100644
index 0000000000..3a30488cea
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
@@ -0,0 +1,123 @@
+/** @file
+This file is used to nest elements which is meant for include path name
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+public class IncludePath implements NestElement {
+    /**
+     IncludePath nested element Class
+     class member
+         -name : name of include path 
+         -file : name of file including include path
+     **/
+    private String path = "";
+    private File file;
+    private List<String> nameList = new ArrayList<String>();
+    
+    /**
+     get class member "file"
+
+     @returns   The File object
+     **/
+    public File getFile() {
+        return this.file;
+    }
+
+    /**
+     set class member "file"
+
+     @param     file    The name of include path
+     **/
+    public void setFile(File file) {
+        this.file = file;
+    }
+    
+    /**
+     get class member "file"
+
+     @returns   The name of include path
+     **/
+    public String getPath() {
+        return this.path;
+    }
+    
+    /**
+     get class member "name"
+
+     @returns   The name of include path
+     **/
+    public String getName() {
+        return this.path;
+    }
+    
+    /**
+     set class member "name"
+
+     @param     name    The name of include path
+     **/
+    public void setName(String name){
+        this.path = "-I " + name;
+    }
+
+    /**
+     set class member "path"
+
+     @param     name    name of file including include paths 
+     **/
+    public void setPath(String name) {
+        this.path = " -I " + name;
+    }
+
+    /**
+     override Object.toString()
+
+     @returns   name of file including include paths 
+     **/
+    public String toString() {
+        return getPath();
+    }
+ 
+    /**
+     set class member "list"
+
+     @param     fileNameList    name list of include paths, sperated by space, tab,
+                                comma or semi-comma
+     **/
+    public void setList(String fileNameList) {
+        if (fileNameList != null && fileNameList.length() > 0) {
+            StringTokenizer tokens = new StringTokenizer(fileNameList, " \t,;", false);
+            while (tokens.hasMoreTokens()) {
+                String fileName = tokens.nextToken().trim();
+                if (fileName.length() > 0) {
+                    this.nameList.add(fileName);
+                }
+            }
+        }
+    }
+
+    /**
+     get class member "list"
+
+     @returns   The include paths list.
+     **/
+    public List<String> getList() {
+        return nameList;
+    }
+}
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java
new file mode 100644
index 0000000000..b940e8da4b
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Input.java
@@ -0,0 +1,44 @@
+/** @file
+This file is used to nest elements which is meant for file path
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+/**
+ Input class is defined to be as nested elements of other elements, to specify 
+ the path of file(s)
+ **/
+public class Input {
+    private String filePath;
+    
+    public Input() {
+        
+    }
+
+    /**
+     Standard set method of ANT task, for "file" attribute
+
+     @param     path    The path of a file
+     **/
+    public void setFile(String path) {
+        filePath = path;
+    }
+
+    /**
+     Standard get method of ANT task, for "file" attribute
+
+     @returns   The path of current specified file.
+     **/
+    public String getFile() {
+        return filePath;
+    }
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java
new file mode 100644
index 0000000000..b08a38007b
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/InputFile.java
@@ -0,0 +1,95 @@
+/** @file
+This file is used to nest elements which is meant for specifying files
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+public class InputFile implements NestElement {
+    /**
+     InputFile nested element Class
+     class member
+         -name : name of input file 
+         -file : name of file including input files
+     **/
+    private String name = "";
+    private File file;
+    private List<String> nameList = new ArrayList<String>();
+    
+    /**
+     get class member "name"
+     @returns name parameter
+     **/
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     set class member "name"
+     @param     name    name of input file  
+     **/
+    public void setName(String name) {
+        this.name = " " + name;
+    }
+
+    public String toString() {
+        return getName();
+    }
+    
+    /**
+     get class member "file"
+     @returns file parameter
+     **/
+    public File getFile() {
+        return this.file;
+    }
+
+    /**
+     set class member "file"
+     @param     ext     name of file including input files  
+     **/
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    /**
+     set class member "list"
+
+     @param     fileNameList    name list of include paths, sperated by space, tab,
+                                comma or semi-comma
+     **/
+    public void setList(String fileNameList) {
+        if (fileNameList != null && fileNameList.length() > 0) {
+            StringTokenizer tokens = new StringTokenizer(fileNameList, " \t,;", false);
+            while (tokens.hasMoreTokens()) {
+                String fileName = tokens.nextToken().trim();
+                if (fileName.length() > 0) {
+                    this.nameList.add(fileName);
+                }
+            }
+        }
+    }
+
+    /**
+     get class member "list"
+
+     @returns   The include paths list.
+     **/
+    public List<String> getList() {
+        return nameList;
+    }
+}
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
new file mode 100644
index 0000000000..a90d36225d
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -0,0 +1,443 @@
+/** @file
+This file is to wrap MakeDeps.exe tool as ANT task, which is used to generate
+dependency files for source code.
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ Class MakeDeps is used to wrap MakeDeps.exe as an ANT task.
+ **/
+public class MakeDeps extends Task {
+
+    //
+    // private members, use set/get to access them
+    //
+    private static final String cmdName = "MakeDeps";
+    private static final String target  = "dummy";
+    private String              includePath = null;
+    private String              depsFile = null;
+    private String              subDir = null;
+    private boolean             quietMode = true;
+    private boolean             ignoreError = true;
+    private String              extraDeps = "";
+    private List<IncludePath>   includePathList = new ArrayList<IncludePath>();
+    private List<Input>         inputFileList = new ArrayList<Input>();
+
+    public MakeDeps() {
+
+    }
+
+    /**
+     The Standard execute method for ANT task. It will check if it's necessary
+     to generate the dependency list file. If no file is found or the dependency
+     is changed, it will compose the command line and call MakeDeps.exe to
+     generate the dependency list file.
+
+     @throws    BuildException
+     **/
+    public void execute() throws BuildException {
+        ///
+        /// check if the dependency list file is uptodate or not
+        ///
+        if (isUptodate()) {
+            return;
+        }
+
+        Project prj  = this.getOwningTarget().getProject();
+        String  toolPath = prj.getProperty("env.Framework_Tools_Path");
+        ///
+        /// compose full tool path
+        ///
+        if (toolPath == null || toolPath.length() == 0) {
+            toolPath = "./" + cmdName;
+        } else {
+            if (toolPath.endsWith("/") || toolPath.endsWith("\\")) {
+                toolPath = toolPath + cmdName;
+            } else {
+                toolPath = toolPath + "/" + cmdName;
+            }
+        }
+
+        ///
+        /// compose tool arguments
+        ///
+        StringBuffer args = new StringBuffer(4096);
+        if (ignoreError) {
+            args.append(" -ignorenotfound");
+        }
+        if (quietMode) {
+            args.append(" -q");
+        }
+        if (subDir != null && subDir.length() > 0) {
+            args.append(" -s ");
+            args.append(subDir);
+        }
+
+        ///
+        /// if there's no source files, we can do nothing about dependency
+        /// 
+        if (inputFileList.size() == 0) {
+            throw new BuildException("No source files specified to scan");
+        }
+
+        ///
+        /// compose source file arguments
+        ///
+        Iterator iterator = inputFileList.iterator();
+        while (iterator.hasNext()) {
+            Input inputFile = (Input)iterator.next();
+            args.append(" -f ");
+            args.append(cleanupPathName(inputFile.getFile()));
+        }
+
+        ///
+        /// compose search pathes argument
+        ///
+        StringBuffer includePathArg = new StringBuffer(4096);
+        if (includePath != null && includePath.length() > 0) {
+            StringTokenizer pathTokens = new StringTokenizer(includePath, ";");
+            while (pathTokens.hasMoreTokens()) {
+                String tmpPath = pathTokens.nextToken().trim();
+                if (tmpPath.length() == 0) {
+                    continue;
+                }
+
+                includePathArg.append(" -i ");
+                includePathArg.append(cleanupPathName(tmpPath));
+            }
+        }
+        iterator = includePathList.iterator();
+        while (iterator.hasNext()) {
+            IncludePath path = (IncludePath)iterator.next();
+            includePathArg.append(cleanupPathName(path.getPath()));
+        }
+        args.append(includePathArg);
+
+        ///
+        /// We don't need a real target. So just a "dummy" is given
+        ///
+        args.append(" -target dummy");
+        args.append(" -o ");
+        args.append(cleanupPathName(depsFile));
+
+        ///
+        /// prepare to execute the tool
+        ///
+        Commandline cmd = new Commandline();
+        cmd.setExecutable(toolPath);
+        cmd.createArgument().setLine(args.toString());
+
+        LogStreamHandler streamHandler = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN);
+        Execute runner = new Execute(streamHandler, null);
+
+        runner.setAntRun(prj);
+        runner.setCommandline(cmd.getCommandline());
+
+        int result = 0;
+        try {
+            result = runner.execute();
+        } catch (IOException e) {
+            throw new BuildException(e.getMessage());
+        }
+
+        if (result != 0) {
+            log ("MakeDeps failed");
+            return;
+        }
+
+        // change the old DEP file format (makefile compatible) to just file list
+        if (!cleanup()) {
+            throw new BuildException(depsFile + " was not generated");
+        }
+    }
+
+    ///
+    /// Remove any duplicated path separator or inconsistent path separator
+    ///
+    private String cleanupPathName(String path) {
+        String separator = "\\" + File.separator;
+        String duplicateSeparator = separator + "{2}";
+        path = Path.translateFile(path);
+        path = path.replaceAll(duplicateSeparator, separator);
+
+        return path;
+    }
+
+    /**
+     Set method for "DepsFile" attribute
+
+     @param     name    The name of dependency list file
+     **/
+    public void setDepsFile(String name) {
+        depsFile = cleanupPathName(name);
+    }
+
+    /**
+     Get method for "DepsFile" attribute
+
+     @returns   The name of dependency list file
+     **/
+    public String getDepsFile() {
+        return depsFile;
+    }
+
+    /**
+     Set method for "IgnoreError" attribute
+
+     @param     ignore    flag to control error handling (true/false)
+     **/
+    public void setIgnoreError(boolean ignore) {
+        ignoreError = ignore;
+    }
+
+    /**
+     Get method for "IgnoreError" attribute
+
+     @returns   The value of current IgnoreError flag
+     **/
+    public boolean getIgnoreError() {
+        return ignoreError;
+    }
+
+    /**
+     Set method for "QuietMode" attribute
+
+     @param     quiet   flag to control the output information (true/false)
+     **/
+    public void setQuietMode(boolean quiet) {
+        quietMode = quiet;
+    }
+
+    /**
+     Get method for "QuietMode" attribute
+
+     @returns   value of current QuietMode flag
+     **/
+    public boolean getQuietMode() {
+        return quietMode;
+    }
+
+    /**
+     Set method for "SubDir" attribute
+
+     @param     dir     The name of sub-directory in which source files will be scanned
+     **/
+    public void setSubDir(String dir) {
+        subDir = dir;
+    }
+
+    /**
+     Get method for "SubDir" attribute
+
+     @returns   The name of sub-directory
+     **/
+    public String getSubDir() {
+        return subDir;
+    }
+
+    /**
+     Set method for "IncludePath" attribute
+
+     @param     path    The name of include path
+     **/
+    public void setIncludePath(String path) {
+        includePath = cleanupPathName(path);
+    }
+
+    /**
+     Get method for "IncludePath" attribute
+
+     @returns   The name of include path
+     **/
+    public String getIncludePath() {
+        return includePath;
+    }
+
+    /**
+     Set method for "ExtraDeps" attribute
+
+     @param     deps    The name of dependency file specified separately
+     **/
+    public void setExtraDeps(String deps) {
+        extraDeps = deps;
+    }
+
+    /**
+     Get method for "ExtraDeps" attribute
+
+     @returns   The name of dependency file specified separately
+     **/
+    public String getExtraDeps () {
+        return extraDeps;
+    }
+
+    /**
+     Add method for "IncludePath" nested element
+
+     @param     path    The IncludePath object from nested IncludePath type of element
+     **/
+    public void addIncludepath(IncludePath path) {
+        includePathList.add(path);
+    }
+
+    /**
+     Add method for "Input" nested element
+
+     @param     input   The Input object from nested Input type of element
+     **/
+    public void addInput(Input inputFile) {
+        inputFileList.add(inputFile);
+    }
+
+    /**
+     The original file generated by MakeDeps.exe is for makefile uses. The target
+     part (before :) is not useful for ANT. This method will do the removal.
+
+     @returns   true    if cleaned files is saved successfully
+     @returns   false   if error occurs in file I/O system
+     **/
+    private boolean cleanup() {
+        File df = new File(depsFile);
+
+        if (!df.exists()) {
+            return false;
+        }
+
+        LineNumberReader    lineReader = null;
+        FileReader          fileReader = null;
+        try {
+            fileReader = new FileReader(df);
+            lineReader = new LineNumberReader(fileReader);
+
+            ///
+            /// clean-up each line in deps file
+            //
+            String line = null;
+            StringBuffer cleanedLines = new StringBuffer(4096);
+            while ((line = lineReader.readLine()) != null) {
+                Pattern pattern = Pattern.compile(target + "[ ]*:[ ]*(.+)");
+                Matcher matcher = pattern.matcher(line);
+
+                while (matcher.find()) {
+                    ///
+                    /// keep the file name after ":"
+                    ///
+                    String filePath = line.substring(matcher.start(1), matcher.end(1));
+                    filePath = cleanupPathName(filePath);
+                    cleanedLines.append(filePath);
+                    cleanedLines.append("\n");
+                }
+            }
+            lineReader.close();
+            fileReader.close();
+
+            ///
+            /// we may have explicitly specified dependency files
+            ///
+            StringTokenizer fileTokens = new StringTokenizer(extraDeps, ";");
+            while (fileTokens.hasMoreTokens()) {
+                cleanedLines.append(cleanupPathName(fileTokens.nextToken()));
+                cleanedLines.append("\n");
+            }
+
+            ///
+            /// overwrite old dep file with new content
+            ///
+            FileWriter fileWriter = null;
+            fileWriter = new FileWriter(df);
+            fileWriter.write(cleanedLines.toString());
+            fileWriter.close();
+        } catch (IOException e) {
+            log (e.getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     Check if the dependency list file should be (re-)generated or not.
+
+     @returns   true    The dependency list file is uptodate. No re-generation is needed.
+     @returns   false   The dependency list file is outofdate. Re-generation is needed.
+     **/
+    private boolean isUptodate() {
+        File df = new File(depsFile);
+        if (!df.exists()) {
+            return false;
+        }
+
+        ///
+        /// If the source file(s) is newer than dependency list file, we need to
+        /// re-generate the dependency list file
+        ///
+        long depsFileTimeStamp = df.lastModified();
+        Iterator iterator = inputFileList.iterator();
+        while (iterator.hasNext()) {
+            Input inputFile = (Input)iterator.next();
+            File sf = new File(inputFile.getFile());
+            if (sf.lastModified() > depsFileTimeStamp) {
+                return false;
+            }
+        }
+
+        ///
+        /// If the source files haven't been changed since last time the dependency
+        /// list file was generated, we need to check each file in the file list to
+        /// see if any of them is changed or not. If anyone of them is newer than
+        /// the dependency list file, MakeDeps.exe is needed to run again.
+        ///
+        LineNumberReader    lineReader = null;
+        FileReader          fileReader = null;
+        boolean             ret = true;
+        try {
+            fileReader = new FileReader(df);
+            lineReader = new LineNumberReader(fileReader);
+
+            String line = null;
+            while ((line = lineReader.readLine()) != null) {
+                File sourceFile = new File(line);
+                if (sourceFile.lastModified() > depsFileTimeStamp) {
+                    ret = false;
+                    break;
+                }
+            }
+            lineReader.close();
+            fileReader.close();
+        } catch (IOException e) {
+            log (e.getMessage());
+        }
+
+        return ret;
+    }
+}
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java
new file mode 100644
index 0000000000..f64fa7cab9
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/NestElement.java
@@ -0,0 +1,40 @@
+/** @file
+This file is to define common interfaces for nested element of frameworktasks
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ Interface NestElement is just to define common interfaces for nested element
+ **/
+public interface NestElement {
+    /**
+     nested element Interface for up-casting  
+     **/
+    
+    public String getName();
+
+    public void setName(String name);
+
+    public String toString();
+
+    public File getFile();
+
+    public void setFile(File file);
+
+    public void setList(String fileNameList);
+
+    public List<String> getList();
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
new file mode 100644
index 0000000000..35576478d1
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
@@ -0,0 +1,108 @@
+/** @file
+This file is to define nested element which is meant for specifying section file
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import org.apache.tools.ant.BuildException;
+
+/**
+ Class SectFile is to define a class corresponding to ANT nested element. It's
+ used to specify section file(s) when used with GenFfsFile task
+ **/
+public class SectFile implements Section {
+    private String fileName = ""; /// section file name
+
+    /**
+     Get method of ANT task/datatype for "FileName" attribute
+  
+     @returns The name of section file
+     **/
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     Set method of ANT task/datatype for "FileName" attribute
+  
+     @param   fileName    The name of section file
+     **/
+    public void setFileName(String fileName) {
+        this.fileName = fileName;   
+    }
+
+    public SectFile (){
+    }
+
+    /**
+     Put the content of section file into specified buffer with extra bytes for 
+     alignment requirement.
+  
+     @param   Buffer  buffer to contain the section file content with alignment
+     **/
+    public void toBuffer (DataOutputStream Buffer){
+        File   sectFile;
+        byte   data;
+        long   fileLen;
+
+        ///
+        /// open file
+        ///
+        sectFile = new File (this.fileName);  
+
+        ///
+        /// check if file exist.
+        ///     
+        if (! sectFile.exists()) {
+            throw new BuildException("The file  " + this.fileName + "  is not exist!\n");     
+        }
+
+
+        ///
+        /// Read section file and add it's contains to buffer.
+        ///
+        try {
+
+            FileInputStream fs = new FileInputStream (sectFile.getAbsoluteFile());
+            DataInputStream In = new DataInputStream (fs);
+            fileLen            = sectFile.length();
+
+            int i = 0;
+            while (i < fileLen) {
+                data = In.readByte();
+                Buffer.writeByte(data);
+                i++;
+            }
+
+            ///
+            /// 4 byte alignment
+            ///
+            while ((fileLen & 0x03)!= 0) {
+                fileLen ++;
+                Buffer.writeByte(0);
+            } 
+
+            ///
+            /// close inputStream
+            ///
+            In.close();
+
+        } catch (Exception e) {
+            System.out.print(e.getMessage());
+            throw new BuildException("section file2Buffer failed!\n");            
+        }
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java
new file mode 100644
index 0000000000..3f56eaf0a5
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Section.java
@@ -0,0 +1,23 @@
+/** @file
+This file is to define interface for manipulating section file
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.DataOutputStream;
+
+/**
+ Section interface is for geting the contain buffer form compress, tool, and sectFile  
+ **/
+public interface Section {
+    public void toBuffer (DataOutputStream Buffer);
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java
new file mode 100644
index 0000000000..b3dbfb0b6a
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SetStampTask.java
@@ -0,0 +1,136 @@
+/** @file
+This file is to define an ANT task to wrap setstamp.exe tool
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+ Class SetStampTask is a wrap class for setstamp.exe.
+ **/
+public class SetStampTask extends Task implements EfiDefine {
+    /**
+     SetStamp Task Class
+     class member
+         -peFile  : file of PE
+         -timeFile: Txt file of time
+     **/ 
+    
+    private String peFile = "";
+
+    private String timeFile = "";
+
+    /**
+     assemble tool command line & execute tool command line
+     
+     @throws BuildException
+     **/
+    public void execute() throws BuildException {
+
+        Project project = this.getOwningTarget().getProject();
+        ///
+        /// absolute path of edk tools
+        ///
+        String path = project.getProperty("env.Framework_Tools_Path");
+        String command;
+        if (path == null) {
+            command = "setstamp";
+        } else {
+            command = path + "/" + "setstamp";
+        }
+        ///
+        /// argument of SetStamp tool
+        ///
+        String argument = peFile + timeFile;
+        ///
+        /// reture value of SetStamp execution
+        ///
+        int returnVal = -1;
+
+        try {
+            Commandline commandLine = new Commandline();
+            commandLine.setExecutable(command);
+            commandLine.createArgument().setLine(argument);
+
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                    Project.MSG_INFO, Project.MSG_WARN);
+
+            Execute runner = new Execute(streamHandler, null);
+            runner.setAntRun(project);
+            runner.setCommandline(commandLine.getCommandline());
+
+            System.out.println(Commandline.toString(commandLine
+                    .getCommandline()));
+
+            returnVal = runner.execute();
+            if (EFI_SUCCESS == returnVal) {
+                ///
+                /// command execution success
+                ///
+                System.out.println("SetStamp execute successed!");
+            } else {
+                ///
+                /// command execution fail
+                ///
+                System.out.println("SetStamp failed. (error="
+                        + Integer.toHexString(returnVal) + ")");
+                throw new BuildException("SetStamp failed. (error="
+                        + Integer.toHexString(returnVal) + ")");
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    /**
+     set operation of class member "peFile"
+     
+     @param     peFile  name of PE File
+     **/
+    public void setPeFile(String peFile) {
+        this.peFile = " " + peFile;
+    }
+
+    /**
+     get operation of class member "peFile"
+     
+     @return    peFile  name of PE file
+     **/
+    public String getPeFile() {
+        return this.peFile;
+    }
+
+    /**
+     set operation of class member "timeFile"
+     
+     @param     timeFile    name of time file
+     **/
+    public void setTimeFile(String timeFile) {
+        this.timeFile = " " + timeFile;
+    }
+
+    /**
+     get class member "timeFile"
+     
+     @returns   name of time file
+     **/
+    public String getTimeFile() {
+        return this.timeFile;
+    }
+
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java
new file mode 100644
index 0000000000..d766ed2c58
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SkipExt.java
@@ -0,0 +1,83 @@
+/** @file
+This file is to define nested element which is meant for specifying skipped file list
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+/**
+ SkipExt nested element Class
+ class member
+     -name : extension name of skiped file 
+     -file : name of file including ext
+ **/
+public class SkipExt implements NestElement {
+    private String name = "";
+    private File file;
+    private List<String> nameList = new ArrayList<String>();
+    
+    /**
+     get class member "name"
+     @returns name parameter
+     **/
+    public String getName() {
+        return this.name;
+    }
+    /**
+     set class member "name"
+     @param     name    extension name of skiped file  
+     **/
+    public void setName(String name) {
+        this.name = " -skipext " + name;
+    }
+
+    public String toString() {
+        return getName();
+    }
+
+    /**
+     get class member "file"
+     @returns file parameter
+     **/
+    public File getFile() {
+        return this.file;
+    }
+    /**
+     set class member "file"
+     @param name of file including ext  
+     **/
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public void setList(String fileNameList) {
+        if (fileNameList != null && fileNameList.length() > 0) {
+            StringTokenizer tokens = new StringTokenizer(fileNameList, " \t,;", false);
+            while (tokens.hasMoreTokens()) {
+                String fileName = tokens.nextToken().trim();
+                if (fileName.length() > 0) {
+                    this.nameList.add(fileName);
+                }
+            }
+        }
+    }
+
+    public List<String> getList() {
+        return nameList;
+    }
+ 
+}
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
new file mode 100644
index 0000000000..670f6838f2
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
@@ -0,0 +1,527 @@
+/** @file
+This file is to define an ANT task which wraps StrGather.exe tool.
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.util.*;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+ StrGather Task Class
+ class memberg
+      -commandType    : command type [parse/scan/dump] 
+      -baseName       : base name of component 
+      -verbose        : level of verbose [all/read/write]
+      -outputDatabase : file name of output database file
+      -databaseList   : file name list of database files
+      -inputFileList  : file name list of input files
+      -newDatabase    : whether to need new database [ture/false]
+      -unquotedString : whether to unquoted strings are used [ture/false]
+      -includePathList: path list of include paths
+      -ignoreNotFound : whether to ignore a given STRING_TOKEN(STR) is not found in database [ture/false]
+      -skipExtList    : skip scan of files with extension name
+      -outputString   : write string data to filename 
+      -outputDefines  : write string defines to filename 
+      -outputUnicode  : dump database to unicode file filename
+      -lang           : only dump for the language 
+      -indirectionFile: specify an indirection file
+      -outputHpk      : create an HII export pack of the strings
+ **/
+public class StrGatherTask extends Task implements EfiDefine {
+    ///
+    /// common options
+    ///
+    private String commandType = "";
+
+    private String baseName = "";
+
+    ///
+    /// "all/read/write"
+    ///
+    private String verbose = "";
+
+    private String outputDatabase = "";
+
+    private List<Object> databaseList = new ArrayList<Object>();
+
+    private List<Object> inputFileList = new ArrayList<Object>();
+
+    ///
+    /// parse options newDatabase -- "ture/false" unquoteString -- "ture/false"
+    ///
+    private String newDatabase = "";
+
+    private String unquotedString = "";
+
+    private List<Object> includePathList = new ArrayList<Object>();
+
+    ///
+    /// scan options ignoreNotFound -- "ture/false"
+    ///
+    private String ignoreNotFound = "";
+
+    private List<Object> skipExtList = new ArrayList<Object>();
+
+    ///
+    /// dump options
+    ///
+    private String outputString = "";
+
+    private String outputDefines = "";
+
+    private String outputUnicode = "";
+
+    private String lang = "";
+
+    private String indirectionFile = "";
+
+    private String outputHpk = "";
+
+    ///
+    /// global variable
+    ///
+    static private Project project;
+
+    /**
+     assemble tool command line & execute tool command line
+     
+     @throws BuildException
+     **/
+    public void execute() throws BuildException {
+
+        project = this.getOwningTarget().getProject();
+        ///
+        /// absolute path of efi tools
+        ///
+        String path = project.getProperty("env.Framework_Tools_Path"); 
+        String command;
+        if (path == null) {
+            command = "strgather";
+        } else {
+            command = path + "/" + "strgather";
+        }
+
+        ///
+        /// transfer nested elements into string
+        ///
+        String databases = list2Str(databaseList, "-db");
+        String skipExts = list2Str(skipExtList, "-skipext");
+        String includePaths = list2Str(includePathList, "-I");
+        String inputFiles = list2Str(inputFileList, "");
+
+        ///
+        /// assemble argument
+        ///
+        String argument = commandType + verbose + databases + baseName
+                + outputDatabase + includePaths + newDatabase + unquotedString
+                + skipExts + ignoreNotFound + outputString + outputDefines
+                + outputUnicode + lang + indirectionFile + outputHpk
+                + inputFiles;
+        ///
+        /// return value of fwimage execution
+        ///
+        int revl = -1;
+
+        try {
+            Commandline cmdline = new Commandline();
+            cmdline.setExecutable(command);
+            cmdline.createArgument().setLine(argument);
+
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                    Project.MSG_INFO, Project.MSG_WARN);
+            Execute runner = new Execute(streamHandler, null);
+
+            runner.setAntRun(project);
+            runner.setCommandline(cmdline.getCommandline());
+            System.out.println(Commandline.toString(cmdline.getCommandline()));
+
+            revl = runner.execute();
+            if (EFI_SUCCESS == revl) {
+                ///
+                /// command execution success
+                ///
+                System.out.println("strgather succeeded!");
+            } else {
+                ///
+                /// command execution fail
+                ///
+                System.out.println("strgather failed. (error="
+                        + Integer.toHexString(revl) + ")");
+                throw new BuildException("strgather failed. (error="
+                        + Integer.toHexString(revl) + ")");
+            }
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+    /**
+     get class member "commandType"
+     
+     @returns commandType parameter
+     **/
+    public String getCommandType() {
+        return this.commandType;
+    }
+
+    /**
+     set class member ""
+     
+     @param     commandType     type of strgather command [parse/scan/dump]
+     **/
+    public void setCommandType(String commandType) {
+        this.commandType = " -" + commandType;
+    }
+
+    /**
+     get class member "verbose"
+     
+     @returns verbose parameter
+     **/
+    public String getVerbose() {
+        return this.verbose;
+    }
+
+    /**
+     set class member "verbose"
+     
+     @param     verbose     verbose level [all/read/write]
+     **/
+    public void setVerbose(String verbose) {
+        if (verbose.equals("all")) {
+            ///
+            /// for verbose output
+            ///
+            this.verbose = " -v ";
+        } else if (verbose.equals("read")) {
+            ///
+            /// for verbose output when reading database
+            ///
+            this.verbose = " -vdbr ";
+        } else if (verbose.equals("write")) {
+            ///
+            /// for verbose output when writing database
+            ///
+            this.verbose = " -vdbw ";
+        }
+    }
+
+    /**
+     get class member baseName
+     
+     @returns baseName parameter
+     **/
+    public String getBaseName() {
+        return this.baseName;
+    }
+
+    /**
+     set class member baseName
+     
+     @param     baseName    name of the output files of .c and .h
+     **/
+    public void setBaseName(String baseName) {
+        this.baseName = " -bn " + baseName;
+    }
+
+    /**
+     get class member "outputDatabase"
+     
+     @returns outputDatabase parameter
+     **/
+    public String getOutputDatabase() {
+        return this.outputDatabase;
+    }
+
+    /**
+     set class member "outputDatabase"
+     
+     @param     outputDatabase  filename of output database file
+     **/
+    public void setOutputDatabase(String outputDatabase) {
+        this.outputDatabase = " -od " + outputDatabase;
+    }
+
+    /**
+     get class member "newDatabase"
+     
+     @returns newDatabase parameter
+     **/
+    public String getNewDatabse() {
+        return this.newDatabase;
+    }
+
+    /**
+     set class member "newDatabase"
+     
+     @param     newDatabase     whether to not read in existing database file
+     **/
+    public void setNewDatabase(String newDatabase) {
+        if (newDatabase.equals("true")) {
+            this.newDatabase = " -newdb ";
+        }
+    }
+
+    /**
+     get class member "unquotedString"
+     
+     @returns unquotedString parameter
+     **/
+    public String getUnquotedString() {
+        return this.unquotedString;
+    }
+
+    /**
+     set class member "unquotedString"
+     
+     @param unquotedString :
+                whether to indicate that unquoted strings are used
+     **/
+    public void setUnquotedString(String unquotedString) {
+        if (unquotedString.equals("true")) {
+            this.unquotedString = " -uqs ";
+        }
+    }
+
+    /**
+     get class member "ignoreNotFound"
+     
+     @returns ignoreNotFound parameter
+     **/
+    public String getIgnoreNotFound() {
+        return this.ignoreNotFound;
+    }
+
+    /**
+     set class member "ignoreNotFound"
+     
+     @param     ignoreNotFound  whether to ignore if a given STRING_TOKEN(STR) 
+                                is not found in the database
+     **/
+    public void setIgnoreNotFound(String ignoreNotFound) {
+        if (ignoreNotFound.equals("true")) {
+            this.ignoreNotFound = " -ignorenotfound ";
+        }
+    }
+
+    /**
+     get class member "outputString"
+     
+     @returns outputString parameter
+     **/
+    public String getOutputString() {
+        return this.outputString;
+    }
+
+    /**
+     set class member "outputString"
+     
+     @param     outputString    filename of string data file
+     **/
+    public void setOutputString(String outputString) {
+        this.outputString = " -oc " + outputString;
+    }
+
+    /**
+     get class member "outputDefines"
+     
+     @returns outputDefines parameter
+     **/
+    public String getOutputDefines() {
+        return this.outputDefines;
+    }
+
+    /**
+     set class member "outputDefines"
+     
+     @param     outputDefines   filename of string defines file
+     **/
+    public void setOutputDefines(String outputDefines) {
+        this.outputDefines = " -oh " + outputDefines;
+    }
+
+    /**
+     get class member "outputUnicode"
+     
+     @returns outputUnicode parameter
+     **/
+    public String getOutputUnicode() {
+        return this.outputUnicode;
+    }
+
+    /**
+     set class member "outputUnicode"
+     
+     @param     outputUnicode   filename of unicode file to be dumped database
+     **/
+    public void setOutputUnicode(String outputUnicode) {
+        this.outputUnicode = " -ou " + outputUnicode;
+    }
+
+    /**
+     get class member "lang"
+     
+     @returns lang parameter
+     **/
+    public String getLang() {
+        return this.lang;
+    }
+
+    /**
+     set class member "lang"
+     
+     @param     lang    language of dump
+     **/
+    public void setLang(String lang) {
+        this.lang = " -lang " + lang;
+    }
+
+    /**
+     get class member "indirectionFile"
+     
+     @returns indirectionFile parameter
+     **/
+    public String getIndirectionFile() {
+        return this.indirectionFile;
+    }
+
+    /**
+     set class member "indirectionFile"
+     
+     @param     indirectionFile     filename of indirection file
+     **/
+    public void setIndirectionFile(String indirectionFile) {
+        this.indirectionFile = " -if " + indirectionFile;
+    }
+
+    /**
+     get class member "outputHpk"
+     
+     @returns outputHpk parameter
+     **/
+    public String getOutputHpk() {
+        return this.outputHpk;
+    }
+
+    /**
+     set class member "outputHpk"
+     
+     @param     outputHpk   filename of output HII export pack of the strings
+     **/
+    public void setOutputHpk(String outputHpk) {
+        this.outputHpk = " -hpk " + outputHpk;
+    }
+
+    /**
+     add a skipExt element into list
+     
+     @param     skipExt     skipExt element
+     **/
+    public void addSkipext(SkipExt skipExt) {
+        skipExtList.add(skipExt);
+    };
+
+    /**
+     add a includePath element into list
+     
+     @param     includePath     includePath element
+     **/
+    public void addIncludepath(IncludePath includePath) {
+        includePathList.add(includePath);
+    };
+
+    /**
+     add a inputFile element into list
+     
+     @param     inputFile   inputFile element
+     **/
+    public void addInputfile(InputFile inputFile) {
+        inputFileList.add(inputFile);
+    };
+
+    /**
+     add a database element into list
+     
+     @param database :
+                database element
+     **/
+    public void addDatabase(Database database) {
+        databaseList.add(database);
+    }
+
+    /**
+     transfer List to String
+     
+     @param     list    nested element list
+     @param     tag     interval tag of parameter
+
+     @returns string line of parameters
+     **/
+    private String list2Str(List list, String tag) {
+        ///
+        /// string line for return
+        ///
+        String paraStr = "";
+        ///
+        /// nested element in list
+        ///
+        NestElement element;
+        ///
+        /// iterator of nested element list
+        ///
+        Iterator elementIter = list.iterator();
+        ///
+        /// string parameter list
+        ///
+        List<Object> strList = new ArrayList<Object>();
+
+        while (elementIter.hasNext()) {
+            element = (NestElement) elementIter.next();
+            if (null != element.getFile()) {
+                ///
+                /// nested element include file
+                ///
+                FileParser.loadFile(project, strList, element.getFile(), tag);
+            } 
+
+            if (element.getName().length() > 0) {
+                ///
+                /// nested element include name 
+                ///
+                paraStr = paraStr + " " + element.getName();
+            }
+
+            List<String> nameList = element.getList();
+            if (nameList.size() > 0) {
+                Iterator nameIter = nameList.iterator();
+                while (nameIter.hasNext()) {
+                    paraStr = paraStr + " " + tag + " " + (String)nameIter.next();
+                }
+            }
+        }
+        ///
+        /// iterator of string parameter list
+        ///
+        Iterator strIter = strList.iterator();
+        while (strIter.hasNext()) {
+            paraStr = paraStr + " " + strIter.next();
+        }
+        return paraStr;
+    }
+
+}
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
new file mode 100644
index 0000000000..36b095a6e7
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
@@ -0,0 +1,194 @@
+/** @file
+This file is to define nested element which is meant for specifying a tool
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+ Class Tool is to define an external tool to be used for genffsfile
+ **/
+public class Tool implements EfiDefine, Section {
+
+    String toolName     = "";
+    List<Object>   toolArgList  = new ArrayList<Object>();
+    String outputPath;
+    String outPutFileName ;
+    List<Input>    inputFiles = new ArrayList<Input>();
+
+    /**
+     Call extern tool
+
+     @param     buffer  The buffer to put the result with alignment
+     **/
+    public void toBuffer (DataOutputStream buffer){
+        File           OutputFile;
+        byte           data;
+
+        ///
+        /// call extern tool
+        ///
+        try {
+            executeTool ();
+        } catch (Exception e) {
+            throw new BuildException("Call tools failed!\n");
+        }
+
+        ///
+        /// check if file exist
+        ///
+        OutputFile = new File (this.outPutFileName);
+        long fileLen = OutputFile.length();
+        if (!OutputFile.exists()) {
+            throw new BuildException("The file " + outPutFileName + " is not exist!\n");
+        }
+
+        ///
+        /// Read output file and write it's cotains to buffer
+        ///
+        try {
+            FileInputStream fs  = new FileInputStream (this.outPutFileName);
+            DataInputStream In  = new DataInputStream (fs);
+
+            int i = 0;
+            while (i < fileLen) {
+                data = In.readByte();
+                buffer.writeByte(data);
+                i ++;
+            }
+
+            ///
+            /// 4 byte alignment
+            ///
+            while ((fileLen & 0x03) != 0) {
+                fileLen++;
+                buffer.writeByte(0);
+            }
+            In.close();
+
+        } catch (Exception e) {
+            System.out.print(e.getMessage());
+            throw new BuildException("Call tool2buffer failed!\n");
+        }
+    }
+
+    ///
+    /// execute external tool for genffsfile
+    ///
+    private void executeTool () {
+        String command   = "";
+        String argument  = "";
+        command          = toolName;
+        Iterator argIter = toolArgList.iterator();
+        Iterator inputIter = inputFiles.iterator();
+        ToolArg toolArg;
+        Input file = null;
+
+        ///
+        /// argument of tools
+        ///
+        while (argIter.hasNext()) {
+            toolArg = (ToolArg)argIter.next();
+            argument = argument + toolArg.getLine() + " ";
+
+        }
+
+        ///
+        /// input files for tools
+        ///
+        argument = argument + "-i ";
+        while (inputIter.hasNext()) {
+            file = (Input)inputIter.next();
+            argument = argument + file.getFile() + " ";
+        }
+
+        outPutFileName = outputPath + File.separatorChar + (new File(file.getFile())).getName() + ".crc";
+        argument       = argument + " -o " + outPutFileName; 
+
+        try {
+
+            ///
+            /// execute command line
+            ///
+            Process crcProcess = Runtime.getRuntime().exec(command + " " + argument);
+            crcProcess.waitFor();
+        } catch (Exception e) {
+            System.out.print (e.getMessage());
+            throw new BuildException("Execute tools fails!\n");
+        }
+    }
+
+    /**
+     Add method of ANT task/datatype for nested ToolArg type of element
+
+     @param     toolArg     The ToolArg object containing arguments for the tool
+     **/
+    public void addToolArg (ToolArg toolArg) {
+        toolArgList.add (toolArg);
+    }
+
+    /**
+     Get method of ANT task/datatype for attribute "OutputPath"
+
+     @returns   The name of output path
+     **/
+    public String getOutputPath() {
+        return outputPath;
+    }
+
+    /**
+     Set method of ANT task/datatype for attribute "OutputPath"
+
+     @param     outputPath  The name of output path
+     **/
+    public void setOutputPath(String outPutPath) {
+        this.outputPath = outPutPath;
+    }
+
+    /**
+     Get method of ANT task/datatype for attribute "ToolName"
+
+     @returns   The name of the tool.
+     **/
+    public String getToolName() {
+        return toolName;
+    }
+
+    /**
+     Set method of ANT task/datatype for attribute "ToolName"
+
+     @param     toolName    The name of the tool
+     **/
+    public void setToolName(String toolName) {
+        this.toolName = toolName;
+    }
+
+    /**
+     Add method of ANT task/datatype for nested Input type of element
+
+     @param     file    The Input objec which represents a file
+     **/
+    public void addInput(Input file) {
+        inputFiles.add(file);
+    }
+}
+
+
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java
new file mode 100644
index 0000000000..b5fbdfe81e
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ToolArg.java
@@ -0,0 +1,42 @@
+/** @file
+This file is to define nested element which is meant for specifying tool arguments
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+/**
+ Class ToolArg is just used to specify arguments for genffsfile tool
+ **/
+public class ToolArg {
+    ///
+    /// keep the argument string
+    ///
+    private String line = "";
+
+    /**
+     Get method of ANT task/datatype for attribute "line"
+
+     @returns   The argument string
+     **/
+    public String getLine() {
+        return line;
+    }
+
+    /**
+     Set method of ANT task/datatype for attribute "line"
+
+     @param     line    The argument string
+     **/
+    public void setLine(String line) {
+        this.line = line;
+    }   
+}
+\ No newline at end of file
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
new file mode 100644
index 0000000000..dbd796e01e
--- /dev/null
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -0,0 +1,221 @@
+/** @file
+This file is to define an ANT task which wraps VfrCompile.exe tool
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.framework.tasks;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.LogStreamHandler;
+import org.apache.tools.ant.types.Commandline;
+
+/**
+ VfrcompilerTask Task Class
+  class member 
+      -createListFile  : create an output IFR listing file.
+      -outPutDir       : deposit all output files to directory OutputDir (default=cwd)
+      -createIfrBinFile: create an IFR HII pack file
+      -vfrFile         : name of the input VFR script file
+      -processArg      : c processer argument
+      -includepathList : add IncPath to the search path for VFR included files
+ **/
+public class VfrCompilerTask extends Task implements EfiDefine {
+    private String createListFile = "";
+    private String outPutDir = "";
+    private String createIfrBinFile = "";
+    private String processerArg ="";
+    private String vfrFile;
+
+    private List<Object> includepathList = new ArrayList<Object>();
+
+    /**
+     get class member of createList file
+
+     @returns file name of createList
+     **/
+    public String getCreateListFile() {
+        return createListFile;
+    }
+
+    /**
+     set class member of createList file
+
+     @param     createListFile  if createList string equal "on" set '-l' flag
+     **/
+    public void setCreateListFile(String createListFile) {
+        if (createListFile.equals("ON")||createListFile.equals("on"))
+            this.createListFile = " -l";
+    }
+
+    /**
+     get output dir 
+
+     @returns name of output dir
+     **/
+    public String getOutPutDir() {
+        return outPutDir;
+    }
+
+    /**
+     set class member of outPutDir
+
+     @param     outPutDir   The directory name for ouput file
+     **/
+    public void setOutPutDir(String outPutDir) {
+        this.outPutDir = " -od " + outPutDir;
+    }
+
+
+    /**
+     get class member of ifrBinFile
+
+     @return file name of ifrBinFile
+     **/
+    public String getCreateIfrBinFile() {
+        return createIfrBinFile;
+    }
+
+    /**
+     set class member of ifrBinFile 
+
+     @param     createIfrBinFile    The flag to specify if the IFR binary file should
+                                    be generated or not
+     */
+    public void setCreateIfrBinFile(String createIfrBinFile) {
+        if (createIfrBinFile.equals("ON") || createIfrBinFile.equals("on"));
+        this.createIfrBinFile = " -ibin";
+    }
+
+    /**
+     get class member of vfrFile
+
+     @returns name of vfrFile
+     **/
+    public String getVfrFile() {
+        return vfrFile;
+    }
+
+    /**
+     set class member of vfrFile 
+
+     @param     vfrFile The name of VFR file
+     **/
+    public void setVfrFile(String vfrFile) {
+        this.vfrFile = " " + vfrFile;
+    }
+
+    /**
+     add includePath in includepath List 
+
+     @param     includepath The IncludePath object which represents include path
+     **/
+    public void addIncludepath(IncludePath includepath){
+        includepathList.add(includepath);
+    }
+
+
+    /**
+     get class member of processerArg
+
+     @returns processer argument
+     **/
+    public String getProcesserArg() {
+        return processerArg;
+    }
+
+
+    /**
+     set class member of processerArg
+
+     @param     processerArg    The processor argument
+     */
+    public void setProcesserArg(String processerArg) {
+        this.processerArg = " -ppflag " + processerArg;
+    }
+
+    /**
+     The standard execute method of ANT task.
+     **/
+    public void execute() throws BuildException {
+        Project project = this.getProject();
+        String  toolPath= project.getProperty("env.Framework_Tools_Path");
+        String  command;
+        if (toolPath == null) {
+            command = "VfrCompile";
+        } else {
+            command = toolPath + "/" + "VfrCompile";
+        }
+        List<Object> includePath = new ArrayList<Object>();     
+        String incPath = "";        
+
+        int  count = includepathList.size();    
+        IncludePath path;
+        for (int i = 0; i < count; i++) {
+            path = (IncludePath) includepathList.get(i);
+            if (path.getFile() != null) {
+                FileParser.loadFile( project,includePath,path.getFile(), "-I");             
+            }
+        }
+        for (int i = 0; i < count; i++) {
+            incPath = incPath + " " + includepathList.get(i);
+        }
+        count =  includePath.size();
+        for (int i = 0; i < count; i++) {
+            incPath = incPath + " " + includePath.get(i);
+        }
+        String argument = this.createIfrBinFile +
+                          this.processerArg + 
+                          incPath +
+                          this.outPutDir + 
+                          this.createListFile +
+                          this.vfrFile ;
+        try {
+            ///
+            /// constructs the command-line
+            ///
+            Commandline commandLine = new Commandline();
+            commandLine.setExecutable(command);
+            commandLine.createArgument().setLine(argument);
+
+            ///
+            /// configures the Execute object
+            ///
+            LogStreamHandler streamHandler = new LogStreamHandler(this,
+                                                                  Project.MSG_INFO,
+                                                                  Project.MSG_WARN);
+
+            Execute runner = new Execute(streamHandler,null);
+            runner.setAntRun(project);
+            runner.setCommandline(commandLine.getCommandline());
+
+            System.out.println(Commandline.toString(commandLine.getCommandline()));         
+            int returnVal = runner.execute();
+            if (EFI_SUCCESS == returnVal) {
+                System.out.println("VfrCompiler execution succeeded!");
+            } else {
+                System.out.println("VfrCompiler failed. (error=" + 
+                                   Integer.toHexString(returnVal) + ")");  
+                throw new BuildException("VfrCompiler failed. (error=" + 
+                                         Integer.toHexString(returnVal) + ")");
+            }
+
+        } catch (IOException e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/GenBuild.tasks b/Tools/Source/GenBuild/GenBuild.tasks
new file mode 100644
index 0000000000..c767cfb1dd
--- /dev/null
+++ b/Tools/Source/GenBuild/GenBuild.tasks
@@ -0,0 +1,11 @@
+FPDParser          = org.tianocore.build.fpd.FpdParserTask
+bl                 = org.tianocore.build.global.VariableTask
+bf                 = org.tianocore.build.global.LibBuildFileGenerator
+GenBuild           = org.tianocore.build.GenBuildTask
+ToolChainSetup     = org.tianocore.build.toolchain.ToolChainTask
+Expand             = org.tianocore.build.ExpandTask
+OutputDirSetup     = org.tianocore.build.OutputDirSetupTask
+OnDependency       = org.tianocore.build.global.OnDependency
+sourcefiles        = org.tianocore.build.global.DpFileList
+targetfiles        = org.tianocore.build.global.DpFileList
+file               = org.tianocore.build.global.DpFile
diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Source/GenBuild/build.xml
new file mode 100644
index 0000000000..38801f1495
--- /dev/null
+++ b/Tools/Source/GenBuild/build.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="GenBuild" default="all" basedir=".">
+
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars" includes="SurfaceArea.jar"/>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>
+  </path>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
+  <target name="all" depends="install"/>
+  <target name="source">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="." destdir="${buildDir}">
+      <classpath refid="classpath"/>
+      <compilerarg value="-Xlint"/>
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <if>
+      <available file="${installLocation}/GenBuild.jar"/>
+      <then>
+        <echo message="You must manually remove the file: ${installLocation}/GenBuild.jar"/>
+        <echo message="Java has already loaded the file, and cannot remove it within ANT!"/>
+      </then>
+    </if>
+  </target>
+  <target name="install" depends="source">
+    <copy file="GenBuild.tasks" toDir="${buildDir}"/>
+    <jar destfile="${installLocation}/GenBuild.jar"
+      basedir="${buildDir}"
+      includes="**"
+    />
+  </target>
+</project>
diff --git a/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java b/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java
new file mode 100644
index 0000000000..d3df8cf7a6
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/ExpandTask.java
@@ -0,0 +1,52 @@
+/** @file
+  This file is ANT task Expand. 
+  
+  Expand task is used to prepare ANT properties for further build. 
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import org.tianocore.build.global.GlobalData;
+
+/**
+  Expand task is used to prepare ANT properties for further build. 
+  <p>Current, prepare the dependent Library instance list for <code>LIBS</code></p>
+ 
+  @since GenBuild 1.0
+**/
+public class ExpandTask extends Task {
+    
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public ExpandTask () {
+    }
+    
+    /**
+      ANT task's entry point, will be called after init().
+      
+      Set <code>LIBS</code> for further build usage. 
+    **/
+    public void execute() throws BuildException {
+        
+        String[] libraries = GlobalData.getModuleLibrary(getProject().getProperty("BASE_NAME"));
+        String str = "";
+        for (int i = 0; i < libraries.length; i ++){
+            str += " " + GlobalData.getLibrary(libraries[i]);
+        }
+        getProject().setProperty("LIBS", str);
+       
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
new file mode 100644
index 0000000000..dbbddba3db
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -0,0 +1,390 @@
+/** @file
+  File is FfsProcess class which is used to get the corresponding FFS layout
+  information for driver module. 
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/** 
+  <p><code>FfsProcess</code> is a class to find the corresponding FFS layout. </p>
+  
+  <p>Property <code>COMMON_FILE</code> specified which file to search. The element
+  in <code>COMMON_FILE</code> is like following: </p>
+  
+  <pre>
+    &lt;Ffs type="APPLICATION"&gt;
+      &lt;Attribute Name="FFS_FILETYPE" Value="EFI_FV_FILETYPE_APPLICATION" /&gt;
+      &lt;Attribute Name="FFS_ATTRIB_CHECKSUM" Value="TRUE" /&gt;
+      &lt;Sections EncapsulationType="Compress"&gt;
+        &lt;Sections EncapsulationType="Guid-Defined"&gt;
+          &lt;Section SectionType="EFI_SECTION_PE32" /&gt; 
+          &lt;Section SectionType="EFI_SECTION_USER_INTERFACE" /&gt;
+          &lt;Section SectionType="EFI_SECTION_VERSION" /&gt; 
+        &lt;/Sections&gt;
+      &lt;/Sections&gt;
+    &lt;/Ffs&gt;
+  </pre>
+ 
+  @since GenBuild 1.0
+**/
+public class FfsProcess {
+
+    ///
+    /// Xml Document Node for corresponding FFS layout
+    ///
+    private Node ffs;
+
+    ///
+    /// ANT script to call GenFfs
+    ///
+    private Element ffsNode = null;
+
+    ///
+    /// Module base name
+    ///
+    private String basename;
+
+    ///
+    /// Sections type: normal
+    ///
+    private static int MODE_NONE = 0;
+
+    ///
+    /// Sections type: compress
+    ///
+    private static int MODE_COMPRESS = 1;
+
+    ///
+    /// Sections type: guid-define
+    ///
+    private static int MODE_GUID_DEFINED = 2;
+
+    ///
+    /// mapping from section type to section output file extension
+    ///
+    public static final String[][] sectionExt = { { "EFI_SECTION_FREEFORM_SUBTYPE_GUID", ".sec" },
+                                                 { "EFI_SECTION_VERSION", ".ver" },
+                                                 { "EFI_SECTION_USER_INTERFACE", ".ui" },
+                                                 { "EFI_SECTION_DXE_DEPEX", ".dpx" },
+                                                 { "EFI_SECTION_PEI_DEPEX", ".dpx" }, 
+                                                 { "EFI_SECTION_PE32", ".pe32" },
+                                                 { "EFI_SECTION_PIC", ".pic" }, 
+                                                 { "EFI_SECTION_TE", ".tes" },
+                                                 { "EFI_SECTION_RAW", ".sec" }, 
+                                                 { "EFI_SECTION_COMPRESSION", ".sec" },
+                                                 { "EFI_SECTION_GUID_DEFINED", ".sec" },
+                                                 { "EFI_SECTION_COMPATIBILITY16", ".sec" },
+                                                 { "EFI_SECTION_FIRMWARE_VOLUME_IMAGE", ".sec" } };
+
+    /**
+      search in the type, if componentType is listed in type, return true; 
+      otherwise return false.
+      
+      @param type a list supported component type separated by comma
+      @param componentType current module component type
+      @return whether componentType is one of type 
+    **/
+    private boolean isMatch(String type, String componentType) {
+        String[] items = type.split("[ \t]*,[ \t]*");
+        for (int i = 0; i < items.length; i++) {
+            if (items[i].equalsIgnoreCase(componentType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+      Find the corresponding FFS layout in <code>COMMON_FILE</code> if it
+      does not specify in module's surface area. 
+      
+      @param buildType Current module's component type
+      @param project Ant project
+      @return whether find the corresponding FFS layout
+      @throws BuildException
+              If specified COMMON_FILE XML file is not valide.
+    **/
+    public boolean initSections(String buildType, Project project) throws BuildException {
+        //
+        // first try to sections defined in PLATFORM level
+        //
+
+        //
+        // if module specify sections itself, it's okay
+        // otherwise find sections from WORKSPACE default setting with
+        // ComponentType
+        //
+        if (ffs == null) {
+            File file = new File(project.getProperty("COMMON_FILE"));
+            //
+            // if common file is not existed, just return
+            //
+            if (!file.exists()) {
+                return false;
+            }
+            DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance();
+            try {
+                DocumentBuilder dombuilder = domfac.newDocumentBuilder();
+                InputStream is = new FileInputStream(file);
+                Document doc = dombuilder.parse(is);
+                Element root = doc.getDocumentElement();
+                NodeList items = root.getChildNodes();
+                for (int i = 0; i < items.getLength(); i++) {
+                    Node node = items.item(i);
+                    if (node.getNodeType() == Node.ELEMENT_NODE) {
+                        String nodeName = node.getNodeName();
+                        if (nodeName.equalsIgnoreCase("Ffs")) {
+                            NamedNodeMap attr = node.getAttributes();
+                            Node type = attr.getNamedItem("type");
+                            if (type != null) {
+                                if (isMatch(type.getTextContent(), buildType)) {
+                                    ffs = node;
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                throw new BuildException("Parse COMMON_FILE [" + file.getPath() + "] error!\n" + e.getMessage());
+            }
+        }
+        if (ffs == null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    
+    /**
+      Recursive parse the FFS layout. Find out all section type here used. 
+      
+      @param document BaseName_build.xml Xml document
+      @param basename Module's base name
+      @param guid Module's GUID
+      @param targetFilename Module's final file name (GUID-BaseName.APP)
+      @return List of section type
+    **/
+    public String[] getGenSectionElements(Document document, String basename, String guid, String targetFilename) {
+        this.basename = basename;
+        if (ffs == null) {
+            return new String[0];
+        }
+        Vector<String> sectionList = new Vector<String>();
+        XmlCursor cursor = null;
+        try {
+            cursor = XmlObject.Factory.parse(ffs).newCursor();
+        } catch (Exception e) {
+            return null;
+        }
+        int mode = MODE_NONE;
+        Element root = document.createElement("genffsfile");
+        root.setAttribute("outputDir", "${BIN_DIR}");
+        root.setAttribute("BaseName", basename);
+        root.setAttribute("fileGuid", guid);
+        cursor.toFirstChild();
+        if (cursor.toFirstChild()) {
+            do {
+                if (cursor.getName().getLocalPart().equalsIgnoreCase("Attribute")) {
+                    String name = cursor.getAttributeText(new QName("Name"));
+                    String value = cursor.getAttributeText(new QName("Value"));
+                    root.setAttribute(changeAttributeName(name), value);
+                } else if (cursor.getName().getLocalPart().equalsIgnoreCase("Section")) {
+                    cursor.push();
+                    dealSection(mode, document, root, cursor, sectionList);
+                    cursor.pop();
+                } else if (cursor.getName().getLocalPart().equalsIgnoreCase("Sections")) {
+                    cursor.push();
+                    dealSections(mode, document, root, cursor, sectionList);
+                    cursor.pop();
+                }
+            } while (cursor.toNextSibling());
+        }
+        //
+        // Check dependency 
+        //
+        Element outofdateEle = document.createElement("OnDependency");
+        Element sourceEle = document.createElement("sourcefiles");
+        String[] result = new String[sectionList.size()];
+        for (int i = 0; i < sectionList.size(); i++) {
+            result[i] = (String) sectionList.get(i);
+            Element pathEle = document.createElement("file");
+            pathEle.setAttribute("name", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename
+                                         + getSectionExt(result[i]));
+            sourceEle.appendChild(pathEle);
+        }
+        outofdateEle.appendChild(sourceEle);
+        Element targetEle = document.createElement("targetfiles");
+        Element fileEle = document.createElement("file");
+        fileEle.setAttribute("name", "${BIN_DIR}\\" + targetFilename);
+        targetEle.appendChild(fileEle);
+        outofdateEle.appendChild(targetEle);
+        Element sequentialEle = document.createElement("sequential");
+        sequentialEle.appendChild(root);
+        outofdateEle.appendChild(sequentialEle);
+        ffsNode = outofdateEle;
+        return result;
+    }
+
+    /**
+      Change the attribute name. For example: 
+      
+      <pre>
+          Before change: FFS_ATTRIB_CHECKSUM 
+          After  change: ffsATTRIBCHECKSUM
+      </pre>
+      
+      @param name Original attribute name
+      @return Changed attribute name
+    **/
+    private String changeAttributeName(String name) {
+        String[] strs = name.split("_");
+        String str = strs[0].toLowerCase();
+        for (int j = 1; j < strs.length; j++) {
+            str += strs[j];
+        }
+        return str;
+    }
+
+    /**
+      Recursively deal with Sections. If sections does not specify a type, then omit it.
+      
+      @param mode Current node mode (MODE_NONE | MODE_COMPREE | MODE_GUID_DEFINED)
+      @param doc Xml Document
+      @param root Root Node
+      @param cursor Current FFS layout cursor
+      @param list List of section type here used
+    **/
+    private void dealSections(int mode, Document doc, Element root, XmlCursor cursor, Vector<String> list) {
+        String type = cursor.getAttributeText(new QName("EncapsulationType"));
+        if (type == null) {
+            if (cursor.toFirstChild()) {
+                do {
+                    if (cursor.getName().getLocalPart().equalsIgnoreCase("Section")) {
+                        cursor.push();
+                        dealSection(mode, doc, root, cursor, list);
+                        cursor.pop();
+                    } else if (cursor.getName().getLocalPart().equalsIgnoreCase("Sections")) {
+                        cursor.push();
+                        dealSections(mode, doc, root, cursor, list);
+                        cursor.pop();
+                    }
+                } while (cursor.toNextSibling());
+            }
+            return;
+        }
+        Element ele;
+        if (type.equalsIgnoreCase("COMPRESS")) {
+            mode = MODE_COMPRESS;
+            //
+            // <compress compressName = "dummy">
+            //
+            ele = doc.createElement("compress");
+            ele.setAttribute("compressName", "dummy");
+        } else {
+            mode = MODE_GUID_DEFINED;
+            //
+            // <tool toolName="${OEMTOOLPATH}\toolname"
+            // outputPath = "${DEST_DIR_OUTPUT}">
+            //
+            ele = doc.createElement("tool");
+            ele.setAttribute("toolName", "${WORKSPACE_DIR}" + File.separatorChar + "Tools" + File.separatorChar + "Bin"
+                                         + File.separatorChar + "GenCRC32Section");
+            ele.setAttribute("outputPath", "${DEST_DIR_OUTPUT}");
+        }
+        if (cursor.toFirstChild()) {
+            do {
+                if (cursor.getName().getLocalPart().equalsIgnoreCase("Section")) {
+                    cursor.push();
+                    dealSection(mode, doc, ele, cursor, list);
+                    cursor.pop();
+                } else if (cursor.getName().getLocalPart().equalsIgnoreCase("Sections")) {
+                    cursor.push();
+                    dealSections(mode, doc, ele, cursor, list);
+                    cursor.pop();
+                }
+            } while (cursor.toNextSibling());
+        }
+        root.appendChild(ele);
+    }
+    
+    /**
+      Recursively deal with section.
+      
+      @param mode Current node mode (MODE_NONE | MODE_COMPREE | MODE_GUID_DEFINED)
+      @param doc Xml Document
+      @param root Root Node
+      @param cursor Current FFS layout cursor
+      @param list List of section type here used
+    **/
+    private void dealSection(int mode, Document doc, Element root, XmlCursor cursor, Vector<String> list) {
+        String type = cursor.getAttributeText(new QName("SectionType"));
+        list.addElement(type);
+        if (mode == MODE_GUID_DEFINED) {
+            //
+            // <input file="${DEST_DIR_OUTPUT}\Bds.pe32"/>
+            //
+            Element ele = doc.createElement("input");
+            ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+            root.appendChild(ele);
+        } else {
+            //
+            // <sectFile fileName= "..."/>
+            //
+            Element ele = doc.createElement("sectFile");
+            ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+            root.appendChild(ele);
+        }
+    }
+
+    /**
+       Get the corresponding section file suffix.
+       
+      @param type Section type
+      @return Corresponding section file extension
+    **/
+    private String getSectionExt(String type) {
+        for (int i = 0; i < sectionExt.length; i++) {
+            if (sectionExt[i][0].equalsIgnoreCase(type)) {
+                return sectionExt[i][1];
+            }
+        }
+        return ".sec";
+    }
+
+    /**
+      Return the ANT script to call GenFfs Tool.
+      
+      @return ANT script to call GenFfs Tool
+    **/
+    public Element getFfsNode() {
+        return ffsNode;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
new file mode 100644
index 0000000000..87650af827
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
@@ -0,0 +1,225 @@
+/** @file
+  File is FileProcess class which is used to generate ANT script to build 
+  source files. 
+  
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build;
+
+import java.io.File;
+import java.util.Set;
+
+import org.apache.tools.ant.Project;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+  <p><code>FileProcess</code> is class to generate ANT script to build source
+  files.</p>
+  
+  <p>If file does not specify file type, <code>FileProcess</code> will judge 
+  by its extension. Following is the current supported extensions. </p>
+  
+  <pre>   
+          .c         |      C_Code
+          .asm       |      Assembly
+          .s         |      IPF_Assembly_Code
+          .h         |      Header
+          .lib       |      Static_Library
+          .i         |      IPF_PP_Code
+          .vfr       |      Vfr
+          .uni       |      Unicode
+          .dxs       |      Dependency_File
+          .bmp       |      Graphics
+          .efi       |      EFI
+  </pre>
+  
+  @since GenBuild 1.0
+**/
+public class FileProcess {
+    ///
+    ///  The mapping information about source suffix, result suffix, file type.
+    ///
+    public final String[][] fileTypes = { { ".c", ".obj", "C_Code" }, { ".asm", ".obj", "Assembly" },
+                                         { ".s", ".obj", "IPF_Assembly_Code" }, { ".h", "", "Header" },
+                                         { ".lib", "", "Static_Library" }, { ".src", ".c", "" },
+                                         { ".i", ".obj", "IPF_PP_Code" }, { ".vfr", ".obj", "Vfr" },
+                                         { ".uni", "", "Unicode" }, { ".dxs", "", "Dependency_File" },
+                                         { ".bmp", "", "Graphics" }, { ".efi", "", "EFI" } };
+
+    ///
+    /// Current ANT context. 
+    ///
+    private Project project;
+
+    ///
+    /// Current module's include pathes
+    ///
+    private Set<String> includes;
+
+    ///
+    /// Current source files. 
+    ///
+    private Set<String> sourceFiles;
+    
+    ///
+    /// Xml Document.
+    ///
+    private Document document;
+    
+    ///
+    /// The flag to ensure all unicode files build before others. 
+    ///
+    private boolean unicodeFirst = true;
+    
+    ///
+    /// The flag present whether current module contains Unicode files or not.
+    ///
+    private boolean unicodeExist = false;
+
+    /**
+      Initialize the project, includes, sourceFiles, document members.
+      
+      @param project ANT project
+      @param includes Module include pathes
+      @param sourceFiles Modules source files
+      @param document XML document
+    **/
+    public void init(Project project, Set<String> includes, Set<String> sourceFiles, Document document) {
+        this.document = document;
+        this.includes = includes;
+        this.project = project;
+        this.sourceFiles = sourceFiles;
+    }
+
+    /**
+      Parse file without file type. 
+      
+      @param filename Source file name
+      @param root Root node
+      @param unicodeFirst whether build Unicode file firstly or not
+    **/
+    public synchronized void parseFile(String filename, Node root, boolean unicodeFirst) {
+        this.unicodeFirst = unicodeFirst;
+        parseFile(filename, root);
+    }
+    
+    /**
+      Get whether current module contains Unicode files or not.
+      
+      @return Whether current module contains Unicode files or not
+    **/
+    public boolean isUnicodeExist() {
+        return unicodeExist;
+    }
+
+    /**
+      Parse file.
+      
+      @param filename Source file name
+      @param filetype Source file type
+      @param root Root node
+      @param unicodeFirst whether build Unicode file firstly or not
+    **/
+    public synchronized void parseFile(String filename, String filetype, Node root, boolean unicodeFirst) {
+        this.unicodeFirst = unicodeFirst;
+        parseFile(filename, filetype, root);
+    }
+    
+    /**
+      Find out source file's type. 
+      
+      @param filename Source file name
+      @param root Root node
+    **/
+    public synchronized void parseFile(String filename, Node root) {
+        boolean flag = false;
+        for (int i = 0; i < fileTypes.length; i++) {
+            if (filename.toLowerCase().endsWith(fileTypes[i][0])) {
+                flag = true;
+                parseFile(filename, fileTypes[i][2], root);
+            }
+        }
+        if (!flag) {
+            System.out.println("Warning: File " + filename + " is not known from its suffix.");
+        }
+    }
+
+    /**
+      Parse file. If flag <code>unicodeFirst</code> is true, then build all
+      unicode files firstly. 
+      
+      <p>Note that AutoGen.c is processed specially. It's output path is always
+      <code>${DEST_DIR_OUTPUT}</code>, others are <code>${DEST_DIR_OUTPUT}</code>
+      and relative to module path. </p>
+      
+      @param filename Source file name
+      @param filetype Source file type
+      @param root Root node
+    **/
+    public synchronized void parseFile(String filename, String filetype, Node root) {
+        if (unicodeFirst) {
+            if ( ! filetype.equalsIgnoreCase("Unicode")){
+                return ;
+            }
+            unicodeExist= true;
+        } else {
+            if (filetype.equalsIgnoreCase("Unicode")){
+                return ;
+            }
+        }
+        sourceFiles.add(filename);
+        if (filetype.equalsIgnoreCase("Header")) {
+            return;
+        }
+        if (filetype.equalsIgnoreCase("IPF_PP_Code")) {
+            return;
+        }
+        String module_path = project.getProperty("MODULE_DIR");
+        File moduleFile = new File(module_path);
+        File sourceFile = new File(filename);
+        // If source file is AutoGen.c, then Filepath is .
+        String sourceFilepath;
+        String sourceFilename;
+        if (sourceFile.getPath().endsWith("AutoGen.c")) {
+            sourceFilepath = ".";
+            sourceFilename = "AutoGen";
+            filetype = "AUTOGEN";
+        } else {
+            // sourceFile.
+            String str = sourceFile.getPath().substring(moduleFile.getPath().length() + 1);
+            int index = str.lastIndexOf(File.separatorChar);
+            sourceFilepath = ".";
+            if (index > 0) {
+                sourceFilepath = str.substring(0, index);
+                str = str.substring(index + 1);
+            }
+            sourceFilename = str;
+            index = str.lastIndexOf('.');
+            if (index > 0) {
+                sourceFilename = str.substring(0, index);
+            }
+        }
+        // <Build_filetype FILEPATH="" FILENAME="" />
+        Element ele = document.createElement("Build_" + filetype);
+        ele.setAttribute("FILEPATH", sourceFilepath);
+        ele.setAttribute("FILENAME", sourceFilename);
+        String[] includePaths = includes.toArray(new String[includes.size()]);
+        Element includesEle = document.createElement("EXTRA.INC");
+        for (int i = 0; i < includePaths.length; i++) {
+            Element includeEle = document.createElement("includepath");
+            includeEle.setAttribute("path", includePaths[i]);
+            includesEle.appendChild(includeEle);
+        }
+        ele.appendChild(includesEle);
+        root.appendChild(ele);
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
new file mode 100644
index 0000000000..2d91991b8a
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -0,0 +1,1170 @@
+/** @file
+  This file is ANT task GenBuild. 
+ 
+  The file is used to parse a specified Module, and generate its build time 
+  ANT script build.xml, then call the the ANT script to build the module.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Ant;
+import org.apache.xmlbeans.XmlObject;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.tianocore.build.autogen.AutoGen;
+import org.tianocore.build.autogen.CommonDefinition;
+import org.tianocore.build.fpd.FpdParserTask;
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.OutputManager;
+import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.build.toolchain.ToolChainFactory;
+import org.tianocore.FilenameDocument;
+import org.tianocore.MsaHeaderDocument;
+import org.tianocore.MsaLibHeaderDocument;
+
+/**
+  <p>
+  <code>GenBuildTask</code> is an ANT task that can be used in ANT build
+  system. The main function of this task is to parse module's surface area,
+  then generate the corresponding <em>BaseName_build.xml</em> (the real ANT
+  build script) and call this to build the module.
+  </p>
+  
+  <p>
+  The usage is (take module <em>HelloWorld</em> for example):
+  </p>
+  
+  <pre>
+   &lt;GenBuild baseName=&quot;HelloWorld&quot; 
+             mbdFilename=&quot;${MODULE_DIR}/HelloWorld.mbd&quot; 
+             msaFilename=&quot;${MODULE_DIR}/HelloWorld.msa&quot;/&gt;
+  </pre>
+  
+  <p>
+  This task calls <code>AutoGen</code> to generate <em>AutoGen.c</em> and
+  <em>AutoGen.h</em>. The task also parses the development environment
+  configuration files, such as collecting package information, setting compiler
+  flags and so on.
+  </p>
+  
+  
+  @since GenBuild 1.0
+**/
+public class GenBuildTask extends Task {
+
+    ///
+    /// Module surface area file.
+    ///
+    File msaFilename;
+
+    ///
+    /// Module build description file.
+    ///
+    File mbdFilename;
+
+    ///
+    /// Module surface area information after overrided.
+    ///
+    public Map<String, XmlObject> map = new HashMap<String, XmlObject>();
+
+    ///
+    /// Module's base name.
+    ///
+    private String baseName;
+
+    ///
+    /// Current build Arch, such as IA32, X64, IPF and so on.
+    ///
+    private String arch;
+
+    ///
+    /// Module's GUID (Globally Unique Identifier).
+    ///
+    private String guid;
+
+    ///
+    /// Module's component type, such as SEC, LIBRARY, BS_DRIVER and so on.
+    ///
+    private String componentType;
+
+    ///
+    /// This value is used in build time. Override module's component type. When
+    /// search FFS (Sections information) in common file, buildtype instead of
+    /// component type.
+    ///
+    private String buildType;
+
+    ///
+    /// List all required includes for current build module.
+    ///
+    public Set<String> includes = new LinkedHashSet<String>();
+
+    ///
+    /// List all libraries for current build module.
+    ///
+    public Set<String> libraries = new LinkedHashSet<String>();
+
+    ///
+    /// List all source files for current build module.
+    ///
+    public Set<String> sourceFiles = new LinkedHashSet<String>();
+
+    ///
+    /// Flag to identify what surface area files are specified. Current value is
+    /// <em>NO_SA</em>, <em>ONLY_MSA</em>, <em>ONLY_LIBMSA</em>,
+    /// <em>MSA_AND_MBD</em> or <em>LIBMSA_AND_LIBMBD</em>.
+    /// 
+    /// @see org.tianocore.build.global.GlobaData
+    ///
+    private int flag = GlobalData.NO_SA;
+
+    ///
+    /// The information at the header of <em>build.xml</em>.
+    ///
+    private String info = "====================================================================\n"
+                        + "DO NOT EDIT \n"
+                        + "File auto-generated by build utility\n"
+                        + "\n"
+                        + "Abstract:\n"
+                        + "Auto-generated ANT build file for building of EFI Modules/Platforms\n"
+                        + "=====================================================================";
+
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public GenBuildTask() {
+    }
+
+    /**
+      ANT task's entry point, will be called after init(). The main steps is described
+      as following: 
+      <ul>
+      <li> Judge current build mode (MODULE | PACKAGE | PLATFORM). This step will execute
+      only once in whole build process; </li>
+      <li> Initialize global information (Framework DB, SPD files and all MSA files 
+      listed in SPD). This step will execute only once in whole build process; </li>
+      <li> Restore some important ANT property. If current build is single module 
+      build, here will set many default values; </li>
+      <li> Get the current module's overridded surface area information from 
+      global data; </li> 
+      <li> Set up the output directories, including BIN_DIR, DEST_DIR_OUTPUT and
+      DEST_DIR_DEBUG; </li>
+      <li> Get module dependent library instances and include pathes; </li>
+      <li> Judge whether current module is built. If yes, skip it; </li>
+      <li> Call AutoGen and PCD to generate AutoGen.c & AutoGen.h </li>
+      <li> Set up the compile flags; </li>
+      <li> Generate BaseName_build.xml; </li>
+      <li> Call to BaseName_build.xml, and build the current module. </li>
+      </ul>
+      
+      <p>Build is dependent on BuildMacro.xml which define many macro. </p> 
+      
+      @throws BuildException
+              From module build, exception from module surface area invalid.
+    **/
+    public void execute() throws BuildException {
+        System.out.println("Module [" + baseName + "] start.");
+        OutputManager.update(getProject());
+        GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db",
+                            getProject().getProperty("WORKSPACE_DIR"));
+        recallFixedProperties();
+        arch = getProject().getProperty("ARCH");
+        arch = arch.toUpperCase();
+        map = GlobalData.getDoc(baseName);
+        //
+        // Initialize SurfaceAreaQuery
+        //
+        SurfaceAreaQuery.setDoc(map);
+        //
+        // Setup Output Management
+        //
+        String[] outdir = SurfaceAreaQuery.getOutputDirectory();
+        OutputManager.update(getProject(), outdir[1], outdir[0]);
+
+        updateIncludesAndLibraries();
+
+        if (GlobalData.isModuleBuilt(baseName, arch)) {
+            return;
+        } else {
+            GlobalData.registerBuiltModule(baseName, arch);
+        }
+        //
+        // Call AutoGen
+        //
+        AutoGen autogen = new AutoGen(getProject().getProperty("DEST_DIR_DEBUG"), baseName, arch);
+        autogen.genAutogen();
+        //
+        // Update parameters
+        //
+        updateParameters();
+        //
+        // Update flags like CC_FLAGS, LIB_FLAGS etc.
+        //
+        flagsSetup();
+        GlobalData.addLibrary(baseName, getProject().getProperty("BIN_DIR") + File.separatorChar + baseName + ".lib");
+        GlobalData.addModuleLibrary(baseName, libraries);
+        //
+        // If ComponentType is USER_DEFINED,
+        // then call the exist BaseName_build.xml directly.
+        //
+        if (buildType.equalsIgnoreCase("CUSTOM_BUILD")) {
+            System.out.println("Call user-defined " + baseName + "_build.xml");
+            Ant ant = new Ant();
+            ant.setProject(getProject());
+            ant.setAntfile(getProject().getProperty("MODULE_DIR") + File.separatorChar + baseName + "_build.xml");
+            ant.setInheritAll(true);
+            ant.init();
+            ant.execute();
+            return;
+        }
+        //
+        // Generate ${BASE_NAME}_build.xml file
+        //
+        System.out.println("Generate " + baseName + "_build.xml");
+        genBuildFile();
+        System.out.println("Call the " + baseName + "_build.xml");
+        Ant ant = new Ant();
+        ant.setProject(getProject());
+        ant.setAntfile(getProject().getProperty("DEST_DIR_OUTPUT") + File.separatorChar + baseName + "_build.xml");
+        ant.setInheritAll(true);
+        ant.init();
+        ant.execute();
+    }
+
+    /**
+      Get the dependent library instances and include package name from 
+      surface area, and initialize module include pathes. 
+     
+    **/
+    private void updateIncludesAndLibraries() {
+        List<String> rawIncludes = SurfaceAreaQuery.getIncludePackageName(arch);
+        if (rawIncludes != null) {
+            Iterator iter = rawIncludes.iterator();
+            while (iter.hasNext()) {
+                String packageName = (String) iter.next();
+                includes.add("${WORKSPACE_DIR}" + File.separatorChar + GlobalData.getPackagePath(packageName)
+                             + File.separatorChar + "Include");
+                includes.add("${WORKSPACE_DIR}" + File.separatorChar + GlobalData.getPackagePath(packageName)
+                             + File.separatorChar + "Include" + File.separatorChar + "${ARCH}");
+            }
+        }
+        includes.add("${DEST_DIR_DEBUG}");
+        List<String> rawLibraries = SurfaceAreaQuery.getLibraryInstance(this.arch, CommonDefinition.AlwaysConsumed);
+        if (rawLibraries != null) {
+            Iterator iter = rawLibraries.iterator();
+            while (iter.hasNext()) {
+                libraries.add((String) iter.next());
+            }
+        }
+        normalize();
+    }
+
+    /**
+      Normalize all dependent library instance and include pathes' format. 
+     
+    **/
+    private void normalize() {
+        String[] includesArray = includes.toArray(new String[includes.size()]);
+        includes.clear();
+        for (int i = 0; i < includesArray.length; i++) {
+            includes.add((new File(includesArray[i])).getPath());
+        }
+        String[] librariesArray = libraries.toArray(new String[libraries.size()]);
+        libraries.clear();
+        for (int i = 0; i < librariesArray.length; i++) {
+            libraries.add((new File(librariesArray[i])).getPath());
+        }
+    }
+
+    /**
+      Restore some important ANT property. If current build is single module 
+      build, here will set many default values.
+      
+      <p> If current build is single module build, then the default <code>ARCH</code>
+      is <code>IA32</code>. Also set up the properties <code>PACKAGE</code>, 
+      <code>PACKAGE_DIR</code>, <code>TARGET</code> and <code>MODULE_DIR</code></p>
+      
+      <p> Note that for package build, package name is stored in <code>PLATFORM</code>
+      and package directory is stored in <code>PLATFORM_DIR</code>. </p> 
+     
+      @see org.tianocore.build.global.OutputManager
+    **/
+    private void recallFixedProperties() {
+        //
+        // If build is for module build
+        //
+        if (getProject().getProperty("PACKAGE_DIR") == null) {
+            ToolChainFactory toolChainFactory = new ToolChainFactory(getProject());
+            toolChainFactory.setupToolChain();
+            //
+            // PACKAGE PACKAGE_DIR ARCH (Default) COMMON_FILE BUILD_MACRO
+            //
+            if (getProject().getProperty("ARCH") == null) {
+                getProject().setProperty("ARCH", "IA32");
+            }
+            String packageName = GlobalData.getPackageNameForModule(baseName);
+            getProject().setProperty("PACKAGE", packageName);
+            
+            String packageDir = GlobalData.getPackagePath(packageName);
+            getProject().setProperty("PACKAGE_DIR",
+                                     getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + packageDir);
+            
+            getProject().setProperty("TARGET", toolChainFactory.getCurrentTarget());
+            
+            getProject().setProperty("MODULE_DIR",
+                                     getProject().replaceProperties(getProject().getProperty("MODULE_DIR")));
+        }
+        if (OutputManager.PLATFORM != null) {
+            getProject().setProperty("PLATFORM", OutputManager.PLATFORM);
+        }
+        if (OutputManager.PLATFORM_DIR != null) {
+            getProject().setProperty("PLATFORM_DIR", OutputManager.PLATFORM_DIR);
+        }
+    }
+
+    /**
+      The whole BaseName_build.xml is composed of seven part. 
+      <ul>
+      <li> ANT properties; </li>
+      <li> Dependent module (dependent library instances in most case); </li>
+      <li> Source files; </li>
+      <li> Sections if module is not library; </li>
+      <li> Output (different for library module and driver module); </li>
+      <li> Clean; </li>
+      <li> Clean all. </li>
+      </ul>
+      
+      @throws BuildException
+              Error throws during BaseName_build.xml generating. 
+    **/
+    private void genBuildFile() throws BuildException {
+        FfsProcess fp = new FfsProcess();
+        DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder dombuilder = domfac.newDocumentBuilder();
+            Document document = dombuilder.newDocument();
+            Comment rootComment = document.createComment(info);
+            //
+            // create root element and its attributes
+            //
+            Element root = document.createElement("project");
+            //
+            // root.setAttribute("name", base_name);
+            //
+            root.setAttribute("default", "main");
+            root.setAttribute("basedir", ".");
+            //
+            // element for External ANT tasks
+            //
+            root.appendChild(document.createComment("Apply external ANT tasks"));
+            Element ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "frameworktasks.tasks");
+            root.appendChild(ele);
+            ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "cpptasks.tasks");
+            root.appendChild(ele);
+            ele = document.createElement("typedef");
+            ele.setAttribute("resource", "cpptasks.types");
+            root.appendChild(ele);
+            ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "net/sf/antcontrib/antlib.xml");
+            root.appendChild(ele);
+            //
+            // elements for Properties
+            //
+            root.appendChild(document.createComment("All Properties"));
+            ele = document.createElement("property");
+            ele.setAttribute("name", "BASE_NAME");
+            ele.setAttribute("value", baseName);
+            root.appendChild(ele);
+            //
+            // Generate the default target,
+            // which depends on init, sections and output target
+            //
+            root.appendChild(document.createComment("Default target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "main");
+            ele.setAttribute("depends", "libraries, sourcefiles, sections, output");
+            root.appendChild(ele);
+            //
+            // compile all source files
+            //
+            root.appendChild(document.createComment("Compile all dependency Library instances."));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "libraries");
+            //
+            // Parse all sourfiles but files specified in sections
+            //
+            applyLibraryInstance(document, ele);
+            root.appendChild(ele);
+            //
+            // compile all source files
+            //
+            root.appendChild(document.createComment("sourcefiles target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "sourcefiles");
+            //
+            // Parse all sourfiles but files specified in sections
+            //
+            applyCompileElement(document, ele);
+            root.appendChild(ele);
+            //
+            // generate the init target
+            // main purpose is create all nessary pathes
+            // generate the sections target
+            //
+            root.appendChild(document.createComment("sections target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "sections");
+            applySectionsElement(document, ele, fp);
+            root.appendChild(ele);
+            //
+            // generate the output target
+            //
+            root.appendChild(document.createComment("output target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "output");
+            applyOutputElement(document, ele, fp);
+            root.appendChild(ele);
+            //
+            // generate the clean target
+            //
+            root.appendChild(document.createComment("clean target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "clean");
+            applyCleanElement(document, ele);
+            root.appendChild(ele);
+            //
+            // generate the Clean All target
+            //
+            root.appendChild(document.createComment("Clean All target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "cleanall");
+            applyDeepcleanElement(document, ele);
+            root.appendChild(ele);
+            //
+            // add the root element to the document
+            //
+            document.appendChild(rootComment);
+            document.appendChild(root);
+            //
+            // Prepare the DOM document for writing
+            //
+            Source source = new DOMSource(document);
+            //
+            // Prepare the output file
+            //
+            File file = new File(getProject().getProperty("DEST_DIR_OUTPUT") + File.separatorChar + baseName
+                                 + "_build.xml");
+            //
+            // generate all directory path
+            //
+            (new File(file.getParent())).mkdirs();
+            Result result = new StreamResult(file);
+            //
+            // Write the DOM document to the file
+            //
+            Transformer xformer = TransformerFactory.newInstance().newTransformer();
+            xformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            xformer.transform(source, result);
+        } catch (Exception ex) {
+            throw new BuildException("Module [" + baseName + "] generating build file failed.\n" + ex.getMessage());
+        }
+    }
+
+    /**
+      Generate the clean elements for BaseName_build.xml. 
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applyCleanElement(Document document, Node root) {
+        String[] libinstances = libraries.toArray(new String[libraries.size()]);
+        for (int i = 0; i < libinstances.length; i++) {
+            File file = new File(GlobalData.getModulePath(libinstances[i]) + File.separatorChar + "build.xml");
+
+            Element ifEle = document.createElement("if");
+            Element availableEle = document.createElement("available");
+            availableEle.setAttribute("file", file.getPath());
+            ifEle.appendChild(availableEle);
+            Element elseEle = document.createElement("then");
+
+            Element ele = document.createElement("ant");
+            ele.setAttribute("antfile", file.getPath());
+            ele.setAttribute("inheritAll", "false");
+            ele.setAttribute("target", libinstances[i] + "_clean");
+            //
+            // Workspace_DIR
+            //
+            Element property = document.createElement("property");
+            property.setAttribute("name", "WORKSPACE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}");
+            ele.appendChild(property);
+            //
+            // Package Dir
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                           + GlobalData.getPackagePathForModule(libinstances[i]));
+            ele.appendChild(property);
+            //
+            // ARCH
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "ARCH");
+            property.setAttribute("value", "${ARCH}");
+            ele.appendChild(property);
+            //
+            // TARGET
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "TARGET");
+            property.setAttribute("value", "${TARGET}");
+            ele.appendChild(property);
+            //
+            // PACKAGE
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE");
+            property.setAttribute("value", GlobalData.getPackageNameForModule(libinstances[i]));
+            ele.appendChild(property);
+
+            elseEle.appendChild(ele);
+            ifEle.appendChild(elseEle);
+            root.appendChild(ifEle);
+        }
+    }
+
+    /**
+      Generate the cleanall elements for BaseName_build.xml. 
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applyDeepcleanElement(Document document, Node root) {
+        String[] libinstances = libraries.toArray(new String[libraries.size()]);
+        for (int i = 0; i < libinstances.length; i++) {
+            File file = new File(GlobalData.getModulePath(libinstances[i]) + File.separatorChar + "build.xml");
+
+            Element ifEle = document.createElement("if");
+            Element availableEle = document.createElement("available");
+            availableEle.setAttribute("file", file.getPath());
+            ifEle.appendChild(availableEle);
+            Element elseEle = document.createElement("then");
+
+            Element ele = document.createElement("ant");
+            ele.setAttribute("antfile", file.getPath());
+            ele.setAttribute("inheritAll", "false");
+            ele.setAttribute("target", libinstances[i] + "_cleanall");
+            //
+            // Workspace_DIR
+            //
+            Element property = document.createElement("property");
+            property.setAttribute("name", "WORKSPACE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}");
+            ele.appendChild(property);
+            //
+            // Package Dir
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                           + GlobalData.getPackagePathForModule(libinstances[i]));
+            ele.appendChild(property);
+            //
+            // ARCH
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "ARCH");
+            property.setAttribute("value", "${ARCH}");
+            ele.appendChild(property);
+            //
+            // TARGET
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "TARGET");
+            property.setAttribute("value", "${TARGET}");
+            ele.appendChild(property);
+            //
+            // PACKAGE
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE");
+            property.setAttribute("value", GlobalData.getPackageNameForModule(libinstances[i]));
+            ele.appendChild(property);
+
+            elseEle.appendChild(ele);
+            ifEle.appendChild(elseEle);
+            root.appendChild(ifEle);
+        }
+    }
+
+    /**
+      Generate the dependent library instances elements for BaseName_build.xml. 
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applyLibraryInstance(Document document, Node root) {
+        String[] libinstances = libraries.toArray(new String[libraries.size()]);
+        for (int i = 0; i < libinstances.length; i++) {
+            Element ele = document.createElement("ant");
+            File file = new File(GlobalData.getModulePath(libinstances[i]) + File.separatorChar + "build.xml");
+            ele.setAttribute("antfile", file.getPath());
+            ele.setAttribute("inheritAll", "false");
+            ele.setAttribute("target", libinstances[i]);
+            //
+            // Workspace_DIR
+            //
+            Element property = document.createElement("property");
+            property.setAttribute("name", "WORKSPACE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}");
+            ele.appendChild(property);
+            //
+            // Package Dir
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE_DIR");
+            property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                           + GlobalData.getPackagePathForModule(libinstances[i]));
+            ele.appendChild(property);
+            //
+            // ARCH
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "ARCH");
+            property.setAttribute("value", "${ARCH}");
+            ele.appendChild(property);
+            //
+            // TARGET
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "TARGET");
+            property.setAttribute("value", "${TARGET}");
+            ele.appendChild(property);
+            //
+            // PACKAGE
+            //
+            property = document.createElement("property");
+            property.setAttribute("name", "PACKAGE");
+            property.setAttribute("value", GlobalData.getPackageNameForModule(libinstances[i]));
+            ele.appendChild(property);
+            root.appendChild(ele);
+        }
+        Element expand = document.createElement("Expand");
+        root.appendChild(expand);
+    }
+    
+    /**
+      Generate the build source files elements for BaseName_build.xml. 
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applyCompileElement(Document document, Node root) {
+        FileProcess fileProcess = new FileProcess();
+        fileProcess.init(getProject(), includes, sourceFiles, document);
+        Node[] files = this.getSourceFiles();
+        //
+        // Parse all unicode files
+        //
+        for (int i = 0; i < files.length; i++) {
+            String filetype = getFiletype(files[i]);
+            if (filetype != null) {
+                fileProcess.parseFile(getFilename(files[i]), filetype, root, true);
+            } else {
+                fileProcess.parseFile(getFilename(files[i]), root, true);
+            }
+        }
+        if (fileProcess.isUnicodeExist()) {
+            Element ele = document.createElement("Build_Unicode_Database");
+            ele.setAttribute("FILEPATH", ".");
+            ele.setAttribute("FILENAME", "${BASE_NAME}");
+            root.appendChild(ele);
+        }
+
+        //
+        // Parse AutoGen.c & AutoGen.h
+        //
+        if (!baseName.equalsIgnoreCase("Shell")) {
+            fileProcess.parseFile(getProject().getProperty("DEST_DIR_DEBUG") + File.separatorChar + "AutoGen.c", root,
+                                  false);
+        }
+        //
+        // Parse all source files
+        //
+        for (int i = 0; i < files.length; i++) {
+            String filetype = getFiletype(files[i]);
+            if (filetype != null) {
+                fileProcess.parseFile(getFilename(files[i]), filetype, root, false);
+            } else {
+                fileProcess.parseFile(getFilename(files[i]), root, false);
+            }
+        }
+        //
+        // root.appendChild(parallelEle);
+        //
+        Iterator iter = sourceFiles.iterator();
+        String str = "";
+        while (iter.hasNext()) {
+            str += " " + (String) iter.next();
+        }
+        getProject().setProperty("SOURCE_FILES", str);
+    }
+
+    /**
+      Generate the section elements for BaseName_build.xml. Library module will
+      skip this process.  
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applySectionsElement(Document document, Node root, FfsProcess fp) {
+        if (fp.initSections(buildType, getProject())) {
+            String targetFilename = guid + "-" + baseName + FpdParserTask.getSuffix(componentType);
+            String[] list = fp.getGenSectionElements(document, baseName, guid, targetFilename);
+
+            for (int i = 0; i < list.length; i++) {
+                Element ele = document.createElement(list[i]);
+                ele.setAttribute("FILEPATH", ".");
+                ele.setAttribute("FILENAME", "${BASE_NAME}");
+                root.appendChild(ele);
+            }
+        }
+    }
+
+    /**
+      Generate the output elements for BaseName_build.xml. If module is library,
+      call the <em>LIB</em> command, else call the <em>GenFfs</em> command. 
+      
+      @param document current BaseName_build.xml XML document
+      @param root Root element for current
+    **/
+    private void applyOutputElement(Document document, Node root, FfsProcess fp) {
+        if (flag == GlobalData.ONLY_LIBMSA || flag == GlobalData.LIBMSA_AND_LIBMBD) {
+            //
+            // call Lib command
+            //
+            Element cc = document.createElement("Build_Library");
+            cc.setAttribute("FILENAME", baseName);
+            root.appendChild(cc);
+        }
+        //
+        // if it is a module but library
+        //
+        else {
+            if (fp.getFfsNode() != null) {
+                root.appendChild(fp.getFfsNode());
+            }
+        }
+    }
+
+    /**
+      Get file name from node. If some wrong, return string with zero length. 
+      
+       @param node Filename node of MSA/MBD or specified in each Section
+       @return File name
+    **/
+    private String getFilename(Node node) {
+        String path = null;
+        String filename = "${MODULE_DIR}" + File.separatorChar;
+        String str = "";
+        try {
+            FilenameDocument file = (FilenameDocument) XmlObject.Factory.parse(node);
+            str = file.getFilename().getStringValue().trim();
+            path = file.getFilename().getPath();
+        } catch (Exception e) {
+            str = "";
+        }
+        if (path != null) {
+            filename += path + File.separatorChar + str;
+        } else {
+            filename += str;
+        }
+        return getProject().replaceProperties(filename);
+    }
+
+    /**
+      Get file type from node. If some wrong or not specified, return 
+      <code>null</code>.  
+      
+      @param node Filename node of MSA/MBD or specified in each Section
+      @return File type
+    **/
+    private String getFiletype(Node node) {
+        String str = null;
+        try {
+            FilenameDocument file = (FilenameDocument) XmlObject.Factory.parse(node);
+            str = file.getFilename().getFileType();
+        } catch (Exception e) {
+            str = null;
+        }
+        return str;
+    }
+
+    /**
+      Return all source files but AutoGen.c.
+      
+      @return source files Node array
+    **/
+    public Node[] getSourceFiles() {
+        XmlObject[] files = SurfaceAreaQuery.getSourceFiles(arch);
+        if (files == null) {
+            return new Node[0];
+        }
+        Vector<Node> vector = new Vector<Node>();
+        for (int i = 0; i < files.length; i++) {
+            vector.addElement(files[i].getDomNode());
+        }
+        //
+        // To be consider sourcefiles from Sections
+        //
+        return vector.toArray(new Node[vector.size()]);
+    }
+
+    /**
+      Get current module's base name. 
+      
+      @return base name
+    **/
+    public String getBaseName() {
+        return baseName;
+    }
+
+    /**
+      Set MBD surface area file. For ANT use.
+      
+      @param mbdFilename Surface Area file
+    **/
+    public void setMbdFilename(File mbdFilename) {
+        this.mbdFilename = mbdFilename;
+    }
+
+    /**
+      Set MSA surface area file. For ANT use.
+      
+      @param msaFilename Surface Area file
+    **/
+    public void setMsaFilename(File msaFilename) {
+        this.msaFilename = msaFilename;
+    }
+
+    /**
+      Compile flags setup. 
+      
+      <p> Take command <code>CC</code> and arch <code>IA32</code> for example, 
+      Those flags are from <code>ToolChainFactory</code>: </p>
+      <ul>
+      <li> IA32_CC </li>
+      <li> IA32_CC_STD_FLAGS </li>
+      <li> IA32_CC_GLOBAL_FLAGS </li>
+      <li> IA32_CC_GLOBAL_ADD_FLAGS </li>
+      <li> IA32_CC_GLOBAL_SUB_FLAGS </li>
+      </ul>
+      Those flags can user-define: 
+      <ul>
+      <li> IA32_CC_PROJ_FLAGS </li>
+      <li> IA32_CC_PROJ_ADD_FLAGS </li>
+      <li> IA32_CC_PROJ_SUB_FLAGS </li>
+      <li> CC_PROJ_FLAGS </li>
+      <li> CC_PROJ_ADD_FLAGS </li>
+      <li> CC_PROJ_SUB_FLAGS </li>
+      <li> CC_FLAGS </li>
+      <li> IA32_CC_FLAGS </li>
+      </ul>
+      
+      <p> The final flags is composed of STD, GLOBAL and PROJ. If CC_FLAGS or
+      IA32_CC_FLAGS is specified, STD, GLOBAL and PROJ will not affect. </p>
+      
+      Note that the <code>ToolChainFactory</code> executes only once 
+      during whole build process. 
+    **/
+    private void flagsSetup() {
+        Project project = getProject();
+        //
+        // If ToolChain has been set up before, do nothing.
+        //
+        ToolChainFactory toolChainFactory = new ToolChainFactory(project);
+        toolChainFactory.setupToolChain();
+
+        String[] cmd = ToolChainFactory.commandType;
+        Set<String> addSet = new HashSet<String>(40);
+        Set<String> subSet = new HashSet<String>(40);
+        for (int i = 0; i < cmd.length; i++) {
+            String str = ToolChainFactory.getValue(arch + "_" + cmd[i]);
+            //
+            // Command line path+command name
+            //
+            if (str != null) {
+                project.setProperty(cmd[i], str);
+            }
+            //
+            // ARCH_CMD_STD_FLAGS
+            //
+            str = ToolChainFactory.getValue(arch + "_" + cmd[i] + "_STD_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+                project.setProperty(cmd[i] + "_STD_FLAGS", str);
+            }
+            //
+            // ARCH_CMD_GLOBAL_FLAGS
+            //
+            str = ToolChainFactory.getValue(arch + "_" + cmd[i] + "_GLOBAL_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // ARCH_CMD_GLOBAL_ADD_FLAGS
+            //
+            str = ToolChainFactory.getValue(arch + "_" + cmd[i] + "_GLOBAL_ADD_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // ARCH_CMD_GLOBAL_SUB_FLAGS
+            //
+            str = ToolChainFactory.getValue(arch + "_" + cmd[i] + "_GLOBAL_SUB_FLAGS");
+            if (str != null) {
+                putFlagsToSet(subSet, str);
+            }
+            //
+            // ARCH_CMD_PROJ_FLAGS
+            //
+            str = project.getProperty(arch + "_" + cmd[i] + "_PROJ_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // ARCH_CMD_PROG_FLAGS
+            //
+            str = project.getProperty(arch + "_" + cmd[i] + "_PROJ_ADD_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // ARCH_CMD_PROG_FLAGS
+            //
+            str = project.getProperty(arch + "_" + cmd[i] + "_PROJ_SUB_FLAGS");
+            if (str != null) {
+                putFlagsToSet(subSet, str);
+            }
+            //
+            // CMD_PROJ_FLAGS
+            //
+            str = project.getProperty(cmd[i] + "_PROJ_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // CMD_PROG_FLAGS
+            //
+            str = project.getProperty(cmd[i] + "_PROJ_ADD_FLAGS");
+            if (str != null) {
+                putFlagsToSet(addSet, str);
+            }
+            //
+            // CMD_PROG_FLAGS
+            //
+            str = project.getProperty(cmd[i] + "_PROJ_SUB_FLAGS");
+            if (str != null) {
+                putFlagsToSet(subSet, str);
+            }
+            //
+            // If IA32_CC_FLAGS or IA32_LIB_FLAGS .. has defined in BuildOptions
+            //
+            if ((str = project.getProperty(arch + "_" + cmd[i] + "_FLAGS")) != null) {
+                project.setProperty(cmd[i] + "_FLAGS", getRawFlags(addSet, subSet));
+                addSet.clear();
+                subSet.clear();
+                putFlagsToSet(addSet, project.replaceProperties(str));
+                project.setProperty(cmd[i] + "_FLAGS", project.replaceProperties(getFlags(addSet, subSet)));
+                addSet.clear();
+                subSet.clear();
+            }
+            //
+            // If CC_FLAGS or LIB_FLAGS .. has defined in BuildOptions
+            //
+            else if ((str = project.getProperty(cmd[i] + "_FLAGS")) != null) {
+                project.setProperty(cmd[i] + "_FLAGS", getRawFlags(addSet, subSet));
+                addSet.clear();
+                subSet.clear();
+                putFlagsToSet(addSet, project.replaceProperties(str));
+                project.setProperty(cmd[i] + "_FLAGS", project.replaceProperties(getFlags(addSet, subSet)));
+                addSet.clear();
+                subSet.clear();
+            } else {
+                project.setProperty(cmd[i] + "_FLAGS", getFlags(addSet, subSet));
+                addSet.clear();
+                subSet.clear();
+            }
+        }
+        project.setProperty("C_FLAGS", project.getProperty("CC_FLAGS"));
+    }
+
+    /**
+      Initialize some properties will be used in current module build, including
+      user-defined option from <em>Option</em> of <em>BuildOptions</em> in 
+      surface area. 
+    **/
+    private void updateParameters() {
+        getProject().setProperty("OBJECTS", "");
+        getProject().setProperty("SDB_FILES", "");
+        getProject().setProperty("BASE_NAME", baseName);
+        if (map.get("MsaHeader") != null) {
+            flag = GlobalData.MSA_AND_MBD;
+            MsaHeaderDocument.MsaHeader header = ((MsaHeaderDocument) map.get("MsaHeader")).getMsaHeader();
+            guid = header.getGuid().getStringValue();
+            componentType = header.getComponentType().toString();
+        } 
+        
+        else if (map.get("MsaLibHeader") != null) {
+            flag = GlobalData.LIBMSA_AND_LIBMBD;
+            MsaLibHeaderDocument.MsaLibHeader header = ((MsaLibHeaderDocument) map.get("MsaLibHeader"))
+                                                                                                       .getMsaLibHeader();
+            guid = header.getGuid().getStringValue();
+            componentType = header.getComponentType().toString();
+        }
+        
+        if (componentType != null) {
+            getProject().setProperty("COMPONENT_TYPE", componentType);
+        }
+        
+        if (guid != null) {
+            getProject().setProperty("FILE_GUID", guid);
+        }
+        //
+        // Get all options and set to properties
+        //
+        String[][] options = SurfaceAreaQuery.getOptions(arch);
+        for (int i = 0; i < options.length; i++) {
+            if (options[i][0] != null && options[i][1] != null) {
+                getProject().setProperty(options[i][0], getProject().replaceProperties(options[i][1]));
+            }
+        }
+
+        buildType = getProject().getProperty("BUILD_TYPE");
+        if (buildType == null) {
+            buildType = componentType;
+        }
+
+    }
+
+    /**
+      Separate the string and instore in set.
+       
+      <p> String is separated by Java Regulation Expression 
+      "[^\\\\]?(\".*?[^\\\\]\")[ \t,]+". </p>
+      
+      <p>For example: </p>
+      
+      <pre>
+        "/nologo", "/W3", "/WX"
+        "/C", "/DSTRING_DEFINES_FILE=\"BdsStrDefs.h\""
+      </pre>
+      
+      @param set store the separated string
+      @param str string to separate
+    **/
+    private void putFlagsToSet(Set<String> set, String str) {
+        Pattern myPattern = Pattern.compile("[^\\\\]?(\".*?[^\\\\]\")[ \t,]+");
+        Matcher matcher = myPattern.matcher(str + " ");
+        while (matcher.find()) {
+            String item = str.substring(matcher.start(1), matcher.end(1));
+            if (!set.contains(item)) {
+                set.add(item);
+            }
+        }
+    }
+    
+    /**
+      Generate the final flags string will be used by compile command. 
+      
+      @param add the add flags set
+      @param sub the sub flags set
+      @return final flags after add set substract sub set
+    **/
+    private String getFlags(Set<String> add, Set<String> sub) {
+        String result = "";
+        add.removeAll(sub);
+        Iterator iter = add.iterator();
+        while (iter.hasNext()) {
+            String str = getProject().replaceProperties((String) iter.next());
+            result += str.substring(1, str.length() - 1) + " ";
+        }
+        return result;
+    }
+
+    /**
+      Generate the flags string with original format. The format is defined by 
+      Java Regulation Expression "[^\\\\]?(\".*?[^\\\\]\")[ \t,]+". </p>
+      
+      <p>For example: </p>
+      
+      <pre>
+        "/nologo", "/W3", "/WX"
+        "/C", "/DSTRING_DEFINES_FILE=\"BdsStrDefs.h\""
+      </pre>
+      
+      @param add the add flags set
+      @param sub the sub flags set
+      @return flags with original format
+    **/
+    private String getRawFlags(Set<String> add, Set<String> sub) {
+        String result = "";
+        add.removeAll(sub);
+        Iterator iter = add.iterator();
+        while (iter.hasNext()) {
+            String str = getProject().replaceProperties((String) iter.next());
+            result += "\"" + str.substring(1, str.length() - 1) + "\", ";
+        }
+        return result;
+    }
+
+    /**
+      Set base name. For ANT use.
+      
+      @param baseName Base name
+    **/
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/OutputDirSetupTask.java b/Tools/Source/GenBuild/org/tianocore/build/OutputDirSetupTask.java
new file mode 100644
index 0000000000..c2b7cc997b
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/OutputDirSetupTask.java
@@ -0,0 +1,190 @@
+/** @file
+  
+  This file is an ANT task OutputDirSetupTask. 
+  
+  This task main purpose is to setup some necessary properties for Package,
+  Platform or Module clean. 
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.xmlbeans.XmlObject;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.OutputManager;
+import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.build.toolchain.ToolChainFactory;
+
+/**
+  <code>OutputDirSetupTask</code> is an ANT task that can be used in ANT build
+  system. The main function of this task is to initialize some basic information
+  for Package|Platform|Module clean or cleanall usage. 
+  
+  <p>Here is an example: </p> 
+  <pre>
+     &lt;OutputDirSetup baseName="HelloWorld" 
+                     mbdFilename="${MODULE_DIR}\HelloWorld.mbd" 
+                     msaFilename="${MODULE_DIR}\HelloWorld.msa" /&gt;
+  </pre>
+  
+  <p>Note that all this task doing is part of GenBuildTask. </p>
+  
+  @since GenBuild 1.0
+  @see org.tianocore.build.GenBuildTask
+**/
+public class OutputDirSetupTask extends Task {
+    
+    ///
+    /// Module surface area file.
+    ///
+    File msaFilename;
+
+    ///
+    /// Module build description file.
+    ///
+    File mbdFilename;
+    
+    ///
+    /// Module surface area information after overrided.
+    ///
+    public Map<String, XmlObject> map = new HashMap<String, XmlObject>();
+    
+    ///
+    /// Module's base name.
+    ///
+    private String baseName;
+    
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public OutputDirSetupTask () {
+    }
+    
+    /**
+      ANT task's entry point, will be called after init(). The main steps is described
+      as following: 
+      <ul>
+      <li> Judge current build mode (MODULE | PACKAGE | PLATFORM). This step will execute
+      only once in whole build process; </li>
+      <li> Initialize global information (Framework DB, SPD files and all MSA files 
+      listed in SPD). This step will execute only once in whole build process; </li>
+      <li> Restore some important ANT property. If current build is single module 
+      build, here will set many default values; </li>
+      <li> Get the current module's overridded surface area information from 
+      global data; </li> 
+      <li> Set up the output directories, including BIN_DIR, DEST_DIR_OUTPUT and
+      DEST_DIR_DEBUG; </li>
+      </ul>
+      
+      @throws BuildException
+              From module build, exception from module surface area invalid.
+    **/
+    public void execute() throws BuildException {
+        System.out.println("Deleting module [" + baseName + "] start.");
+        OutputManager.update(getProject());
+        GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db", getProject()
+                        .getProperty("WORKSPACE_DIR"));
+        recallFixedProperties();
+        map = GlobalData.getDoc(baseName);
+        //
+        // Initialize SurfaceAreaQuery
+        //
+        SurfaceAreaQuery.setDoc(map);
+        //
+        // Setup Output Management
+        //
+        String[] outdir = SurfaceAreaQuery.getOutputDirectory();
+        OutputManager.update(getProject(), outdir[1], outdir[0]);
+    }
+    
+    /**
+      Get current module's base name. 
+      
+      @return base name
+    **/
+    public String getBaseName() {
+        return baseName;
+    }
+
+    /**
+      Set base name. For ANT use.
+      
+      @param baseName Base name
+    **/
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    /**
+      Set MBD surface area file. For ANT use.
+      
+      @param mbdFilename Surface Area file
+    **/
+    public void setMbdFilename(File mbdFilename) {
+        this.mbdFilename = mbdFilename;
+    }
+
+    /**
+      Set MSA surface area file. For ANT use.
+      
+      @param msaFilename Surface Area file
+    **/
+    public void setMsaFilename(File msaFilename) {
+        this.msaFilename = msaFilename;
+    }
+    
+    /**
+      Restore some important ANT property. If current build is single module 
+      build, here will set many default values.
+      
+      <p> If current build is single module build, then the default <code>ARCH</code>
+      is <code>IA32</code>. Also set up the properties <code>PACKAGE</code>, 
+      <code>PACKAGE_DIR</code>, <code>TARGET</code> and <code>MODULE_DIR</code></p>
+      
+      <p> Note that for package build, package name is stored in <code>PLATFORM</code>
+      and package directory is stored in <code>PLATFORM_DIR</code>. </p> 
+     
+      @see org.tianocore.build.global.OutputManager
+    **/
+    private void recallFixedProperties(){
+        //
+        // If build is for module build
+        //
+        if (getProject().getProperty("PACKAGE_DIR") == null) {
+            ToolChainFactory toolChainFactory = new ToolChainFactory(getProject());
+            toolChainFactory.setupToolChain();
+            //
+            // PACKAGE PACKAGE_DIR ARCH (Default) COMMON_FILE BUILD_MACRO
+            //
+            if (getProject().getProperty("ARCH") == null){
+                getProject().setProperty("ARCH", "IA32");
+            }
+            String packageName = GlobalData.getPackageNameForModule(baseName);
+            getProject().setProperty("PACKAGE", packageName);
+            String packageDir = GlobalData.getPackagePath(packageName);
+            getProject().setProperty("PACKAGE_DIR", getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + packageDir);
+            getProject().setProperty("TARGET", toolChainFactory.getCurrentTarget());
+            getProject().setProperty("MODULE_DIR", getProject().replaceProperties(getProject().getProperty("MODULE_DIR")));
+        }
+        if (OutputManager.PLATFORM != null) {
+            getProject().setProperty("PLATFORM", OutputManager.PLATFORM);
+        }
+        if (OutputManager.PLATFORM_DIR != null) {
+            getProject().setProperty("PLATFORM_DIR", OutputManager.PLATFORM_DIR);
+        }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
new file mode 100644
index 0000000000..f1e9c5b4ec
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -0,0 +1,2006 @@
+/** @file
+ AutoGen class.
+
+ This class is to generate Autogen.h and Autogen.c according to module surface area
+ or library surface area.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.build.autogen;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.Spd;
+import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.GuidsDocument;
+import org.tianocore.LibraryClassDocument.LibraryClass;
+import org.tianocore.PPIsDocument;
+import org.tianocore.ProtocolsDocument;
+import org.tianocore.build.pcd.action.PCDAutoGenAction;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.xmlbeans.XmlObject;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+  This class is to generate Autogen.h and Autogen.c according to module surface
+  area or library surface area.
+**/
+public class AutoGen {
+    ///
+    /// The output path of Autogen.h and Autogen.c
+    ///
+    private String outputPath;
+
+    ///
+    /// The base name of module or library.
+    ///
+    private String baseName;
+
+    ///
+    /// The build architecture
+    ///
+    private String arch;
+
+    ///
+    /// PcdAutogen instance which is used to manage how to generate the PCD
+    /// information.
+    ///
+    private PCDAutoGenAction myPcdAutogen;
+
+    ///
+    /// The protocl list which records in module or library surface area and
+    /// it's dependence on library instance surface area.
+    ///
+    private List<String> mProtocolList = new ArrayList<String>();
+
+    ///
+    /// The Ppi list which recorded in module or library surface area and its
+    /// dependency on library instance surface area.
+    ///
+    private List<String> mPpiList = new ArrayList<String>();
+
+    ///
+    /// The Guid list which recoreded in module or library surface are and it's
+    /// dependence on library instance surface area.
+    ///
+    private List<GuidsDocument.Guids.GuidEntry> mGuidList = new ArrayList<GuidsDocument.Guids.GuidEntry>();
+
+    /**
+      Construct function
+      
+      This function mainly initialize some member variable.
+      
+      @param outputPath    Output path of AutoGen file.
+      @param baseName      Module base name.
+      @param arch          Target architecture.
+    **/
+    public AutoGen(String outputPath, String baseName, String arch) {
+        this.outputPath = outputPath;
+        this.baseName = baseName;
+        this.arch = arch;
+
+    }
+
+    /**
+      saveFile function
+      
+      This function save the content in stringBuffer to file.
+      
+      @param fileName      The name of file.
+      @param fileBuffer    The content of AutoGen file in buffer.
+      @return              "true" successful, "false" failed.
+    **/
+    private boolean saveFile(String fileName, StringBuffer fileBuffer) {
+        try {
+            File autoGenH = new File(fileName);
+
+            //
+            // if the file exists, compare their content
+            //
+            if (autoGenH.exists()) {
+                FileReader fIn = new FileReader(autoGenH);
+                char[] oldFileBuffer = new char[(int) autoGenH.length()];
+                fIn.read(oldFileBuffer, 0, (int) autoGenH.length());
+                fIn.close();
+
+                //
+                // if we got the same file, don't re-generate it to prevent
+                // sources depending on it from re-building
+                //
+                if (fileBuffer.toString().compareTo(new String(oldFileBuffer)) == 0) {
+                    return true;
+                }
+            }
+            FileWriter fOut = new FileWriter(autoGenH);
+            fOut.write(fileBuffer.toString());
+            fOut.close();
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+      genAutogen function
+      
+      This function call libGenAutoGen or moduleGenAutogen function, which
+      dependence on generate library autogen or module autogen.
+      
+      @throws BuildException    Failed to creat AutoGen.c & AutoGen.h.
+    **/
+    public void genAutogen() throws BuildException {
+        try {
+            //
+            // If outputPath do not exist, create it.
+            //
+            File path = new File(outputPath);
+            path.mkdirs();
+
+            //
+            // Check current is library or not, then call the corresponding
+            // function.
+            //
+            if (SurfaceAreaQuery.getComponentType().equalsIgnoreCase(
+                    CommonDefinition.LibraryStr)) {
+                libGenAutogen();
+            } else {
+                moduleGenAutogen();
+            }
+
+        } catch (Exception e) {
+            throw new BuildException(
+                    "Failed to create AutoGen.c & AutoGen.h!\n"
+                            + e.getMessage());
+        }
+    }
+
+    /** 
+      moduleGenAutogen function
+    
+      This function generates AutoGen.c & AutoGen.h for module.
+     
+      @throws BuildException  Faile to create module AutoGen.c & AutoGen.h.
+    **/
+    void moduleGenAutogen() throws BuildException {
+
+        try {
+            moduleGenAutogenC();
+            moduleGenAutogenH();
+        } catch (Exception e) {
+            throw new BuildException(
+                    "Faile to create module AutoGen.c & AutoGen.h!\n"
+                            + e.getMessage());
+        }
+    }
+
+    /**
+      libGenAutogen function
+      
+      This function generates AutoGen.c & AutoGen.h for library.
+      
+      @throws BuildException
+                  Faile to create library AutoGen.c & AutoGen.h
+    **/
+    void libGenAutogen() throws BuildException {
+        try {
+            libGenAutogenC();
+            libGenAutogenH();
+        } catch (Exception e) {
+            throw new BuildException(
+                    "Faile to create library AutoGen.c & AutoGen.h!\n"
+                            + e.getMessage());
+        }
+    }
+
+    /**
+      moduleGenAutogenH
+     
+      This function generates AutoGen.h for module.
+      
+      @throws BuildException
+                  Failed to generate AutoGen.h.
+    **/
+    void moduleGenAutogenH() throws BuildException {
+
+        List<String> libClassIncludeH;
+        String moduleType;
+        List<String> headerFileList;
+
+        StringBuffer fileBuffer = new StringBuffer(8192);
+        
+        //
+        // Write Autogen.h header notation 
+        //
+        fileBuffer.append(CommonDefinition.autogenHNotation);
+        
+        //
+        // Add #ifndef  ${BaseName}_AUTOGENH
+        //     #def     ${BseeName}_AUTOGENH
+        //
+        fileBuffer.append("#ifndef    " + this.baseName.toUpperCase() + "_AUTOGENH\r\n");
+        fileBuffer.append("#define    " + this.baseName.toUpperCase() + "_AUTOGENH\r\n\r\n");
+        
+        //
+        // Write the specification version and release version at the begine
+        // of autogen.h file.
+        // Note: the specification version and release version should
+        // be got from module surface area instead of hard code by it's moduleType.
+        //
+        moduleType = SurfaceAreaQuery.getModuleType();
+        switch (CommonDefinition.getModuleType(moduleType)) {
+        case CommonDefinition.ModuleTypeDxeCore:
+        case CommonDefinition.ModuleTypeDxeDriver:
+        case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+        case CommonDefinition.ModuleTypeDxeSmmDriver:
+        case CommonDefinition.ModuleTypeDxeSalDriver:
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            fileBuffer.append(CommonDefinition.autoGenHLine1);
+            break;
+        default:
+            fileBuffer.append(CommonDefinition.autoGenHVersionDefault);
+            break;
+        }
+        switch (CommonDefinition.getModuleType(moduleType)) {
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            fileBuffer.append(CommonDefinition.autoGenHReleaseDefault);
+            break;
+        default:
+            fileBuffer.append(CommonDefinition.autoGenHLine2);
+            break;
+        }
+
+        //
+        // Add "extern int __make_me_compile_correctly;" at begin of 
+        // AutoGen.h.
+        //
+        fileBuffer.append(CommonDefinition.autoGenHbegin);
+
+        //
+        // Write consumed package's mdouleInfo related .h file to autogen.h
+        //
+        List<String> consumedPkgList = SurfaceAreaQuery
+                .getIncludePackageName(this.arch);
+        if (consumedPkgList != null) {
+            headerFileList = IncludesToAutogenH(consumedPkgList, moduleType);
+            for (int i = 0; i < headerFileList.size(); i++) {
+                fileBuffer.append(headerFileList.get(i));
+            }
+        }
+
+        //
+        // Write library class's related *.h file to autogen.h.
+        //
+        LibraryClass[] libClassList = SurfaceAreaQuery
+                .getLibraryClassArray(CommonDefinition.AlwaysConsumed);
+        if (libClassList != null) {
+            libClassIncludeH = LibraryClassToAutogenH(libClassList);
+            for (int i = 0; i < libClassIncludeH.size(); i++) {
+                fileBuffer.append(libClassIncludeH.get(i));
+            }
+        }
+
+        libClassList = SurfaceAreaQuery
+                .getLibraryClassArray(CommonDefinition.AlwaysProduced);
+        if (libClassList != null) {
+            libClassIncludeH = LibraryClassToAutogenH(libClassList);
+            for (int i = 0; i < libClassIncludeH.size(); i++) {
+                fileBuffer.append(libClassIncludeH.get(i));
+            }
+        }
+        fileBuffer.append("\r\n");
+        
+        //
+        // Write PCD autogen information to AutoGen.h.
+        //
+        if (this.myPcdAutogen != null) {
+            fileBuffer.append(this.myPcdAutogen.OutputH());
+        }
+
+        //
+        // Append the #endif at AutoGen.h
+        //
+        fileBuffer.append("#endif\r\n");
+        
+        //
+        // Save string buffer content in AutoGen.h.
+        //
+        if (!saveFile(outputPath + File.separatorChar + "AutoGen.h", fileBuffer)) {
+            throw new BuildException("Failed to generate AutoGen.h !!!");
+        }
+    }
+    
+    /**
+      moduleGenAutogenC
+   
+      This function generates AutoGen.c for module.
+    
+      @throws BuildException
+                Failed to generate AutoGen.c.
+    **/
+    void moduleGenAutogenC() throws BuildException {
+
+        StringBuffer fileBuffer = new StringBuffer(8192);
+        //
+        // Write Autogen.c header notation 
+        //
+        fileBuffer.append(CommonDefinition.autogenCNotation);
+        
+        //
+        // Write #include <AutoGen.h> at beginning of AutoGen.c
+        //
+        fileBuffer.append(CommonDefinition.includeAutogenH);
+        
+        //
+        // Write DriverBinding/ComponentName/DriverConfiguration/DriverDialog
+        // to AutoGen.c
+        //
+        ExternsDriverBindingToAutoGenC(fileBuffer);
+
+        //
+        // Write DriverExitBootServicesEvent/DriverSetVirtualAddressMapEvent
+        // to Autogen.c
+        //
+        ExternCallBackToAutoGenC(fileBuffer);
+
+        //
+        // Write EntryPoint to autgoGen.c
+        //
+        String[] entryPointList = SurfaceAreaQuery.getModuleEntryPointArray();
+        if (entryPointList != null) {
+            EntryPointToAutoGen(entryPointList, fileBuffer);
+        }
+
+        //
+        // Write Guid to autogen.c
+        //
+        String guid = SurfaceAreaQuery.getModuleGuid();
+        fileBuffer
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");
+        if (guid == null) {
+            throw new BuildException("Guid value must set!\n");
+        }
+
+        //
+        // Formate Guid as ANSI c form.Example:
+        // {0xd2b2b828, 0x826, 0x48a7,{0xb3, 0xdf, 0x98, 0x3c, 0x0, 0x60, 0x24, 0xf0}}
+        //
+        fileBuffer.append(Spd.formatGuidName(guid));
+        fileBuffer.append("};\r\n");
+
+        //
+        // Generate library instance consumed protocol, guid, ppi, pcd list.
+        // Save those to this.protocolList, this.ppiList, this.pcdList,
+        // this.guidList. Write Consumed library constructor and desconstuct to
+        // autogen.c
+        //
+        LibInstanceToAutogenC(fileBuffer);
+
+        //
+        // Write consumed ppi, guid, protocol to autogen.c
+        //
+        ProtocolGuidToAutogenC(fileBuffer);
+        PpiGuidToAutogenC(fileBuffer);
+        GuidGuidToAutogenC(fileBuffer);
+
+        //
+        // Call pcd autogen. PCDAutoGenAction tool only need module name and
+        // isPcdEmulatedDriver as parameter. Library inherits PCD and module's
+        // PCD information has been collected in FPDParser task by
+        // CollectPCDAction. 
+        // Note : when PCD image tool ready,
+        // isPCDEmulatedDriver parameter will be removed.
+        //
+        try {
+            this.myPcdAutogen = new PCDAutoGenAction(baseName, 
+                                                     baseName.equalsIgnoreCase("PcdEmulatorPeim"));
+            this.myPcdAutogen.execute();
+        } catch (Exception e) {
+            throw new BuildException("PCD Autogen failed:" + e.getMessage());
+        }
+
+        if (this.myPcdAutogen != null) {
+            fileBuffer.append(this.myPcdAutogen.OutputC());
+        }
+
+        if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {
+            throw new BuildException("Failed to generate AutoGen.c !!!");
+        }
+
+    }
+    
+    /**
+      libGenAutogenH
+   
+      This function generates AutoGen.h for library.
+    
+      @throws BuildException
+                Failed to generate AutoGen.c.
+    **/
+    void libGenAutogenH() throws BuildException {
+
+        List<String> libClassIncludeH;
+        String moduleType;
+        List<String> headerFileList;
+        StringBuffer fileBuffer = new StringBuffer(10240);
+
+        //
+        // Write Autogen.h header notation 
+        //
+        fileBuffer.append(CommonDefinition.autogenHNotation);
+        
+        //
+        // Add #ifndef  ${BaseName}_AUTOGENH
+        //     #def     ${BseeName}_AUTOGENH
+        //
+        fileBuffer.append("#ifndef    " + this.baseName.toUpperCase() + "_AUTOGENH\r\n");
+        fileBuffer.append("#define    " + this.baseName.toUpperCase() + "_AUTOGENH\r\n\r\n");
+        
+        //
+        // Write EFI_SPECIFICATION_VERSION and EDK_RELEASE_VERSION 
+        // to autogen.h file.
+        // Note: the specification version and release version should
+        // be get from module surface area instead of hard code.
+        //
+        fileBuffer.append(CommonDefinition.autoGenHbegin);
+        fileBuffer.append(CommonDefinition.autoGenHLine1);
+        fileBuffer.append(CommonDefinition.autoGenHLine2);
+
+        //
+        // Write consumed package's mdouleInfo related *.h file to autogen.h.
+        // 
+        moduleType = SurfaceAreaQuery.getModuleType();
+        List<String> cosumedPkglist = SurfaceAreaQuery
+                .getIncludePackageName(this.arch);
+        headerFileList = IncludesToAutogenH(cosumedPkglist, moduleType);
+        for (int i = 0; i < headerFileList.size(); i++) {
+            fileBuffer.append(headerFileList.get(i));
+        }
+
+        //
+        // Write library class's related *.h file to autogen.h
+        //
+        LibraryClass[] libClassList = SurfaceAreaQuery
+                .getLibraryClassArray(CommonDefinition.AlwaysConsumed);
+        if (libClassList != null) {
+            libClassIncludeH = LibraryClassToAutogenH(libClassList);
+            for (int i = 0; i < libClassIncludeH.size(); i++) {
+                fileBuffer.append(libClassIncludeH.get(i));
+            }
+        }
+
+        libClassList = SurfaceAreaQuery
+                .getLibraryClassArray(CommonDefinition.AlwaysProduced);
+        if (libClassList != null) {
+            libClassIncludeH = LibraryClassToAutogenH(libClassList);
+            for (int i = 0; i < libClassIncludeH.size(); i++) {
+                fileBuffer.append(libClassIncludeH.get(i));
+            }
+        }
+        fileBuffer.append("\r\n");
+        
+        //
+        // Write PCD information to library AutoGen.h.
+        //
+        if (this.myPcdAutogen != null) {
+            fileBuffer.append(this.myPcdAutogen.OutputH());
+        }
+
+        //
+        // Append the #endif at AutoGen.h
+        //
+        fileBuffer.append("#endif\r\n");
+        
+        //
+        // Save content of string buffer to AutoGen.h file.
+        //
+        if (!saveFile(outputPath + File.separatorChar + "AutoGen.h", fileBuffer)) {
+            throw new BuildException("Failed to generate AutoGen.h !!!");
+        }
+    }
+
+    /**
+      libGenAutogenC
+   
+      This function generates AutoGen.h for library.
+    
+      @throws BuildException
+                Failed to generate AutoGen.c.
+    **/
+    void libGenAutogenC() throws BuildException {
+        StringBuffer fileBuffer = new StringBuffer(10240);
+
+        //
+        // Write Autogen.c header notation 
+        //
+        fileBuffer.append(CommonDefinition.autogenCNotation);
+        
+        fileBuffer.append(CommonDefinition.autoGenCLine1);
+        fileBuffer.append("\r\n");
+
+        //
+        // Call pcd autogen. PCDAutoGenAction tool only need module name and
+        // isPcdEmulatedDriver as parameter. Library inherit PCD and module's
+        // PCD information has been collected in FPDParser task by
+        // CollectPCDAction. 
+        // Note : when PCD image tool ready,
+        // isPCDEmulatedDriver parameter will be removed.
+        //
+        try {
+            this.myPcdAutogen = new PCDAutoGenAction(baseName, baseName
+                    .equalsIgnoreCase("PcdEmulatorPeim"));
+            this.myPcdAutogen.execute();
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+
+        if (this.myPcdAutogen != null) {
+            fileBuffer.append(this.myPcdAutogen.OutputC());
+        }
+
+        if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {
+            throw new BuildException("Failed to generate AutoGen.c !!!");
+        }
+    }
+
+    /**
+      LibraryClassToAutogenH
+      
+      This function returns *.h files declared by library classes which are 
+      consumed or produced by current build module or library.
+      
+      @param   libClassList     List of library class which consumed or produce
+                                by current build module or library.
+      @return  includeStrList   List of *.h file.             
+    **/
+    List<String> LibraryClassToAutogenH(LibraryClass[] libClassList) {
+        List<String> includStrList = new ArrayList<String>();
+        String includerName;
+        String str = "";
+       
+        //
+        // Get include file from GlobalData's SPDTable according to 
+        // library class name.
+        //
+        for (int i = 0; i < libClassList.length; i++) {
+            includerName = GlobalData.getLibClassIncluder(libClassList[i]
+                    .getStringValue());
+            if (includerName != null) {
+                str = CommonDefinition.include + " " + "<";
+                str = str + includerName + ">\r\n";
+                includStrList.add(str);
+                includerName = null;
+            }
+        }
+        return includStrList;
+    }
+
+    /**
+      IncludesToAutogenH
+      
+      This function add include file in AutoGen.h file.
+      @param   packageNameList   List of module depended package.
+      @param   moduleType        Module type.
+      @return 
+    **/
+    List<String> IncludesToAutogenH(List<String> packageNameList,
+            String moduleType) {
+
+        List<String> includeStrList = new ArrayList<String>();
+        String packageName = "";
+        String includeStr = "";
+
+        //
+        // Get include file from moduleInfo file
+        //
+        for (int i = 0; i < packageNameList.size(); i++) {
+            packageName = packageNameList.get(i);
+            includeStr = GlobalData.getModuleInfoByPackageName(packageName,
+                    moduleType);
+            includeStrList.add(includeStr);
+        }
+        return includeStrList;
+    }
+
+    /**
+      EntryPointToAutoGen 
+      
+      This function convert <ModuleEntryPoint> & <ModuleUnloadImage> information
+      in mas to AutoGen.c
+      
+      @param  entryPointList    List of entry point.                            
+      @param  fileBuffer        String buffer fo AutoGen.c.
+      @throws Exception
+    **/
+    void EntryPointToAutoGen(String[] entryPointList, StringBuffer fileBuffer)
+            throws BuildException {
+
+        String typeStr = SurfaceAreaQuery.getModuleType();
+        
+        //
+        // The parameters and return value of entryPoint is difference
+        // for difference module type.
+        //
+        switch (CommonDefinition.getModuleType(typeStr)) {
+
+        case CommonDefinition.ModuleTypePeiCore:
+            if (entryPointList.length != 1 || entryPointList[0].equals("")) {
+                throw new BuildException(
+                        "Module type = 'PEI_CORE', only have one module entry point!");
+            } else {
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append("EFIAPI\r\n");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (\r\n");
+                fileBuffer
+                        .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");
+                fileBuffer
+                        .append("  IN VOID                        *OldCoreData\r\n");
+                fileBuffer.append("  );\r\n\r\n");
+
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append("EFIAPI\r\n");
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");
+                fileBuffer
+                        .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");
+                fileBuffer
+                        .append("  IN VOID                        *OldCoreData\r\n");
+                fileBuffer.append("  )\r\n\r\n");
+                fileBuffer.append("{\r\n");
+                fileBuffer.append("  return ");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (PeiStartupDescriptor, OldCoreData);\r\n");
+                fileBuffer.append("}\r\n\r\n");
+            }
+            break;
+
+        case CommonDefinition.ModuleTypeDxeCore:
+            fileBuffer.append("const UINT32 _gUefiDriverRevision = 0;\r\n");
+            if (entryPointList.length != 1 || entryPointList[0].equals("")) {
+                throw new BuildException(
+                        "Module type = 'DXE_CORE', only have one module entry point!");
+            } else {
+
+                fileBuffer.append("VOID\r\n");
+                fileBuffer.append("EFIAPI\r\n");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (\n");
+                fileBuffer.append("  IN VOID  *HobStart\r\n");
+                fileBuffer.append("  );\r\n\r\n");
+
+                fileBuffer.append("VOID\r\n");
+                fileBuffer.append("EFIAPI\r\n");
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");
+                fileBuffer.append("  IN VOID  *HobStart\r\n");
+                fileBuffer.append("  )\r\n\r\n");
+                fileBuffer.append("{\r\n");
+                fileBuffer.append("  ");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (HobStart);\r\n");
+                fileBuffer.append("}\r\n\r\n");
+            }
+            break;
+
+        case CommonDefinition.ModuleTypePeim:
+            int entryPointCount = 0;
+            fileBuffer
+                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPeimRevision = 0;\r\n");
+            for (int i = 0; i < entryPointList.length; i++) {
+                if (!entryPointList[i].equals("")) {
+                    fileBuffer.append("EFI_STATUS\r\n");
+                    fileBuffer.append("EFIAPI\r\n");
+                    fileBuffer.append(entryPointList[i]);
+                    fileBuffer.append(" (\r\n");
+                    fileBuffer
+                            .append("  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r\n");
+                    fileBuffer
+                            .append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");
+                    fileBuffer.append("  );\r\n");
+                    entryPointCount++;
+                } else {
+                    break;
+                }
+            }
+
+            fileBuffer.append("EFI_STATUS\r\n");
+            fileBuffer.append("EFIAPI\r\n");
+            fileBuffer.append("ProcessModuleEntryPointList (\r\n");
+            fileBuffer.append("  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r\n");
+            fileBuffer.append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");
+            fileBuffer.append("  )\r\n\r\n");
+            fileBuffer.append("{\r\n");
+
+            if (entryPointCount == 0) {
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");
+            } else if (entryPointCount == 1) {
+                fileBuffer.append("  return ");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (FfsHeader, PeiServices);\r\n");
+            } else {
+                fileBuffer.append("  EFI_STATUS  Status;\r\n");
+                fileBuffer.append("  EFI_STATUS  CombinedStatus;\r\n\r\n");
+                fileBuffer.append("  CombinedStatus = EFI_LOAD_ERROR;\r\n\r\n");
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("  Status = ");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (FfsHeader, PeiServices)\r\n");
+                        fileBuffer
+                                .append("  if (!EFI_ERROR (Status) || EFI_ERROR (CombinedStatus)) {\r\n");
+                        fileBuffer.append("    CombinedStatus = Status;\r\n");
+                        fileBuffer.append("  }\r\n\r\n");
+                    } else {
+                        break;
+                    }
+                }
+                fileBuffer.append("  return CombinedStatus;\r\n");
+            }
+            fileBuffer.append("}\r\n\r\n");
+            break;
+
+        case CommonDefinition.ModuleTypeDxeSmmDriver:
+            entryPointCount = 0;
+            for (int i = 0; i < entryPointList.length; i++) {
+                if (!entryPointList[i].equals("")) {
+                    fileBuffer.append("EFI_STATUS\r\n");
+                    fileBuffer.append("EFIAPI\r\n");
+                    fileBuffer.append(entryPointList[i]);
+                    fileBuffer.append(" (\r\n");
+                    fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");
+                    fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");
+                    fileBuffer.append("  );\r\n");
+                    entryPointCount++;
+                } else {
+                    break;
+                }
+            }
+            fileBuffer
+                    .append("GLOBAL_REMOVE_IF_UNREFERENCED  const UINT8  _gDriverEntryPointCount = ");
+            fileBuffer.append(Integer.toString(entryPointCount));
+            fileBuffer.append(";\r\n");
+            fileBuffer
+                    .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");
+            fileBuffer
+                    .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n\r\n");
+
+            fileBuffer.append("EFI_STATUS\r\n");
+            fileBuffer.append("EFIAPI\r\n");
+            fileBuffer.append("ProcessModuleEntryPointList (\r\n");
+            fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");
+            fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");
+            fileBuffer.append("  )\r\n\r\n");
+            fileBuffer.append("{\r\n");
+
+            for (int i = 0; i < entryPointList.length; i++) {
+                if (!entryPointList[i].equals("")) {
+                    fileBuffer
+                            .append("  if (SetJump (&mJumpContext) == 0) {\r\n");
+                    fileBuffer.append("    ExitDriver (");
+                    fileBuffer.append(entryPointList[i]);
+                    fileBuffer.append(" (ImageHandle, SystemTable));\r\n");
+                    fileBuffer.append("    ASSERT (FALSE);\r\n");
+                    fileBuffer.append("  }\r\n");
+                } else {
+                    break;
+                }
+            }
+            fileBuffer.append("  return mDriverEntryPointStatus;\r\n");
+            fileBuffer.append("}\r\n\r\n");
+
+            fileBuffer.append("VOID\r\n");
+            fileBuffer.append("EFIAPI\r\n");
+            fileBuffer.append("ExitDriver (\r\n");
+            fileBuffer.append("  IN EFI_STATUS  Status\n");
+            fileBuffer.append("  )\r\n\r\n");
+            fileBuffer.append("{\r\n");
+            fileBuffer
+                    .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");
+            fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");
+            fileBuffer.append("  }\r\n");
+            fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");
+            fileBuffer.append("  ASSERT (FALSE);\r\n");
+            fileBuffer.append("}\r\n\r\n");
+
+            //
+            // Add "ModuleUnloadImage" for DxeSmmDriver module type;
+            //
+            entryPointList = SurfaceAreaQuery.getModuleUnloadImageArray();
+            entryPointCount = 0;
+            if (entryPointList != null) {
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("EFI_STATUS\r\n");
+                        fileBuffer.append("EFIAPI\r\n");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (\r\n");
+                        fileBuffer
+                                .append("  EFI_HANDLE        ImageHandle\r\n");
+                        fileBuffer.append("  );\r\n");
+                        entryPointCount++;
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            fileBuffer
+                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");
+            fileBuffer.append(Integer.toString(entryPointCount));
+            fileBuffer.append(";\r\n\r\n");
+
+            if (entryPointList != null) {
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("EFI_STATUS\r\n");
+                        fileBuffer.append("EFIAPI\r\n");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (\r\n");
+                        fileBuffer
+                                .append("  EFI_HANDLE        ImageHandle\r\n");
+                        fileBuffer.append("  );\r\n");
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            fileBuffer.append("EFI_STATUS\r\n");
+            fileBuffer.append("EFIAPI\r\n");
+            fileBuffer.append("ProcessModuleUnloadList (\r\n");
+            fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");
+            fileBuffer.append("  )\r\n");
+            fileBuffer.append("{\r\n");
+
+            if (entryPointCount == 0) {
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");
+            } else if (entryPointCount == 1) {
+                fileBuffer.append("  return ");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append("(ImageHandle);\r\n");
+            } else {
+                fileBuffer.append("  EFI_STATUS  Status;\r\n\r\n");
+                fileBuffer.append("  Status = EFI_SUCCESS;\r\n\r\n");
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");
+                        fileBuffer.append("    ");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append("(ImageHandle);\r\n");
+                        fileBuffer.append("  } else {\r\n");
+                        fileBuffer.append("    Status = ");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append("(ImageHandle);\r\n");
+                        fileBuffer.append("  }\r\n");
+                    } else {
+                        break;
+                    }
+                }
+                fileBuffer.append("  return Status;\r\n");
+            }
+            fileBuffer.append("}\r\n\r\n");
+            break;
+
+        case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+        case CommonDefinition.ModuleTypeDxeDriver:
+        case CommonDefinition.ModuleTypeDxeSalDriver:
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            entryPointCount = 0;
+            fileBuffer.append("const UINT32 _gUefiDriverRevision = 0;\r\n");
+            for (int i = 0; i < entryPointList.length; i++) {
+                if (!entryPointList[i].equals("")) {
+                    fileBuffer.append("EFI_STATUS\r\n");
+                    fileBuffer.append("EFIAPI\r\n");
+                    fileBuffer.append(entryPointList[i]);
+                    fileBuffer.append(" (\r\n");
+                    fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");
+                    fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");
+                    fileBuffer.append("  );\r\n");
+                    entryPointCount++;
+                } else {
+                    break;
+                }
+            }
+
+            fileBuffer
+                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverEntryPointCount = ");
+            fileBuffer.append(Integer.toString(entryPointCount));
+            fileBuffer.append(";\r\n");
+            if (entryPointCount > 1) {
+                fileBuffer
+                        .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");
+                fileBuffer
+                        .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n");
+            }
+            fileBuffer.append("\n");
+
+            fileBuffer.append("EFI_STATUS\r\n");
+            fileBuffer.append("EFIAPI\r\n");
+            fileBuffer.append("ProcessModuleEntryPointList (\r\n");
+            fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");
+            fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");
+            fileBuffer.append("  )\r\n\r\n");
+            fileBuffer.append("{\r\n");
+
+            if (entryPointCount == 0) {
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");
+            } else if (entryPointCount == 1) {
+                fileBuffer.append("  return (");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append(" (ImageHandle, SystemTable));\r\n");
+            } else {
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer
+                                .append("  if (SetJump (&mJumpContext) == 0) {\r\n");
+                        fileBuffer.append("    ExitDriver (");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (ImageHandle, SystemTable));\r\n");
+                        fileBuffer.append("    ASSERT (FALSE);\r\n");
+                        fileBuffer.append("  }\r\n");
+                    } else {
+                        break;
+                    }
+                }
+                fileBuffer.append("  return mDriverEntryPointStatus;\r\n");
+            }
+            fileBuffer.append("}\r\n\r\n");
+
+            fileBuffer.append("VOID\n");
+            fileBuffer.append("EFIAPI\n");
+            fileBuffer.append("ExitDriver (\r\n");
+            fileBuffer.append("  IN EFI_STATUS  Status\n");
+            fileBuffer.append("  )\r\n\r\n");
+            fileBuffer.append("{\r\n");
+            if (entryPointCount <= 1) {
+                fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");
+                fileBuffer
+                        .append("    ProcessLibraryDestructorList (gImageHandle, gST);\r\n");
+                fileBuffer.append("  }\r\n");
+                fileBuffer
+                        .append("  gBS->Exit (gImageHandle, Status, 0, NULL);\r\n");
+            } else {
+                fileBuffer
+                        .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");
+                fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");
+                fileBuffer.append("  }\r\n");
+                fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");
+                fileBuffer.append("  ASSERT (FALSE);\r\n");
+            }
+            fileBuffer.append("}\r\n\r\n");
+
+            //
+            // Add ModuleUnloadImage for DxeDriver and UefiDriver module type.
+            //
+            entryPointList = SurfaceAreaQuery.getModuleUnloadImageArray();
+            entryPointCount = 0;
+            if (entryPointList != null) {
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("EFI_STATUS\r\n");
+                        fileBuffer.append("EFIAPI\r\n");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (\r\n");
+                        fileBuffer
+                                .append("  EFI_HANDLE        ImageHandle\r\n");
+                        fileBuffer.append("  );\r\n");
+                        entryPointCount++;
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            fileBuffer
+                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");
+            fileBuffer.append(Integer.toString(entryPointCount));
+            fileBuffer.append(";\r\n\r\n");
+
+            if (entryPointList != null) {
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("EFI_STATUS\r\n");
+                        fileBuffer.append("EFIAPI\r\n");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append(" (\r\n");
+                        fileBuffer
+                                .append("  EFI_HANDLE        ImageHandle\r\n");
+                        fileBuffer.append("  );\r\n");
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            fileBuffer.append("EFI_STATUS\n");
+            fileBuffer.append("EFIAPI\n");
+            fileBuffer.append("ProcessModuleUnloadList (\r\n");
+            fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");
+            fileBuffer.append("  )\r\n");
+            fileBuffer.append("{\r\n");
+
+            if (entryPointCount == 0) {
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");
+            } else if (entryPointCount == 1) {
+                fileBuffer.append("  return ");
+                fileBuffer.append(entryPointList[0]);
+                fileBuffer.append("(ImageHandle);\r\n");
+            } else {
+                fileBuffer.append("  EFI_STATUS  Status;\r\n\r\n");
+                fileBuffer.append("  Status = EFI_SUCCESS;\r\n\r\n");
+                for (int i = 0; i < entryPointList.length; i++) {
+                    if (!entryPointList[i].equals("")) {
+                        fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");
+                        fileBuffer.append("    ");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append("(ImageHandle);\r\n");
+                        fileBuffer.append("  } else {\r\n");
+                        fileBuffer.append("    Status = ");
+                        fileBuffer.append(entryPointList[i]);
+                        fileBuffer.append("(ImageHandle);\r\n");
+                        fileBuffer.append("  }\r\n");
+                    } else {
+                        break;
+                    }
+                }
+                fileBuffer.append("  return Status;\r\n");
+            }
+            fileBuffer.append("}\r\n\r\n");
+            break;
+        }
+    }
+
+    /**
+      PpiGuidToAutogenc 
+    
+      This function gets GUIDs from SPD file accrodeing to <PPIs> information and 
+      write those GUIDs to AutoGen.c.
+    
+      @param   fileBuffer         String Buffer for Autogen.c file.
+      @throws  BuildException     Guid must set value!
+    **/
+    void PpiGuidToAutogenC(StringBuffer fileBuffer) throws BuildException {
+        String[] cNameGuid = null;
+        boolean isEqual = false;
+
+        PPIsDocument.PPIs.Ppi[] ppiList = SurfaceAreaQuery.getPpiArray(null);
+        if (ppiList != null) {
+            for (int i = 0; i < ppiList.length; i++) {
+                isEqual = false;
+                for (int j = 0; j < this.mPpiList.size(); j++) {
+                    if (this.mPpiList.get(j).equalsIgnoreCase(
+                            ppiList[i].getStringValue())) {
+                        isEqual = true;
+                    }
+                }
+                if (!isEqual) {
+                    this.mPpiList.add(ppiList[i].getStringValue());
+                }
+            }
+        }
+
+        PPIsDocument.PPIs.PpiNotify[] ppiNotifyList = SurfaceAreaQuery
+                .getPpiNotifyArray(null);
+        if (ppiNotifyList != null) {
+            for (int i = 0; i < ppiNotifyList.length; i++) {
+                isEqual = false;
+                for (int j = 0; j < this.mPpiList.size(); j++) {
+                    if (this.mPpiList.get(j).equalsIgnoreCase(
+                            ppiNotifyList[i].getStringValue())) {
+                        isEqual = true;
+                    }
+                }
+                if (!isEqual) {
+                    this.mPpiList.add(ppiNotifyList[i].getStringValue());
+                }
+            }
+        }
+
+        for (int i = 0; i < this.mPpiList.size(); i++) {
+            if (this.mPpiList.get(i) != null) {
+                cNameGuid = GlobalData.getPpiInfoGuid(this.mPpiList.get(i));
+                if (cNameGuid != null) {
+                    fileBuffer
+                            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");
+                    fileBuffer.append(cNameGuid[0]);
+                    fileBuffer.append(" =     { ");
+                    fileBuffer.append(cNameGuid[1]);
+                    fileBuffer.append(" } ;");
+                }
+            } else {
+                throw new BuildException("Guid must set value!");
+            }
+        }
+    }
+
+    /**
+      ProtocolGuidToAutogenc 
+    
+      This function gets GUIDs from SPD file accrodeing to <Protocol> 
+      information and write those GUIDs to AutoGen.c.
+    
+      @param   fileBuffer         String Buffer for Autogen.c file.
+      @throws  BuildException     Protocol name must set.
+    **/
+    void ProtocolGuidToAutogenC(StringBuffer fileBuffer) throws BuildException {
+        String[] cNameGuid = null;
+        boolean isEqual = false;
+
+        ProtocolsDocument.Protocols.Protocol[] protocolList = SurfaceAreaQuery
+                .getProtocolArray(null);
+        if (protocolList != null) {
+            for (int i = 0; i < protocolList.length; i++) {
+                isEqual = false;
+                for (int j = 0; j < this.mProtocolList.size(); j++) {
+                    if (this.mProtocolList.get(j).equalsIgnoreCase(
+                            protocolList[i].getStringValue())) {
+                        isEqual = true;
+                    }
+                }
+                if (!isEqual) {
+                    this.mProtocolList.add(protocolList[i].getStringValue());
+
+                }
+            }
+        }
+
+        ProtocolsDocument.Protocols.ProtocolNotify[] protocolNotifyList = SurfaceAreaQuery
+                .getProtocolNotifyArray(null);
+        if (protocolNotifyList != null) {
+            for (int i = 0; i < protocolNotifyList.length; i++) {
+                isEqual = false;
+                for (int j = 0; j < this.mProtocolList.size(); j++) {
+                    if (this.mProtocolList.get(j).equalsIgnoreCase(
+                            protocolNotifyList[i].getStringValue())) {
+                        isEqual = true;
+                    }
+                }
+                if (!isEqual) {
+                    this.mProtocolList.add(protocolNotifyList[i]
+                            .getStringValue());
+
+                }
+            }
+        }
+        if (this.mProtocolList.size() > 0) {
+            for (int i = 0; i < this.mProtocolList.size(); i++) {
+                if (this.mProtocolList.get(i) != null) {
+                    cNameGuid = GlobalData
+                            .getProtocolInfoGuid(this.mProtocolList.get(i));
+                    if (cNameGuid != null) {
+                        fileBuffer
+                                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");
+                        fileBuffer.append(cNameGuid[0]);
+                        fileBuffer.append(" =     { ");
+                        fileBuffer.append(cNameGuid[1]);
+                        fileBuffer.append(" } ;");
+                    }
+                } else {
+                    throw new BuildException("Protocol name must set!");
+                }
+            }
+        }
+    }
+
+    /**
+      GuidGuidToAutogenc
+    
+      This function gets GUIDs from SPD file accrodeing to <Guids> information
+      and write those GUIDs to AutoGen.c.
+    
+      @param  fileBuffer       String Buffer for Autogen.c file.
+    
+    **/
+    void GuidGuidToAutogenC(StringBuffer fileBuffer) {
+        String[] cNameGuid = null;
+        boolean isEqual = false;
+        GuidsDocument.Guids.GuidEntry[] guidList = SurfaceAreaQuery
+                .getGuidEntryArray(null);
+
+        if (guidList != null) {
+            for (int i = 0; i < guidList.length; i++) {
+                for (int j = 0; j < this.mGuidList.size(); j++) {
+                    isEqual = false;
+                    if (this.mGuidList.get(j).getCName().equalsIgnoreCase(
+                            guidList[i].getCName().toString())) {
+                        isEqual = true;
+                        break;
+                    }
+                }
+                if (!isEqual) {
+                    this.mGuidList.add(guidList[i]);
+
+                }
+
+            }
+        }
+
+        for (int i = 0; i < this.mGuidList.size(); i++) {
+            if (this.mGuidList.get(i).getCName() != null) {
+                cNameGuid = GlobalData.getGuidInfoGuid(this.mGuidList.get(i)
+                        .getCName());
+                if (cNameGuid != null) {
+                    fileBuffer
+                            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");
+                    fileBuffer.append(cNameGuid[0]);
+                    fileBuffer.append(" =     { ");
+                    fileBuffer.append(cNameGuid[1]);
+                    fileBuffer.append("} ;");
+                }
+            }
+        }
+    }
+
+    /**
+      LibInstanceToAutogenC
+      
+      This function adds dependent library instance to autogen.c,which includeing 
+      library's constructor, destructor, and library dependent ppi, protocol, guid,
+      pcd information.
+         
+      @param  fileBuffer              String buffer for AutoGen.c
+      @throws BuildException          
+    **/
+    void LibInstanceToAutogenC(StringBuffer fileBuffer) throws BuildException {
+        int index;
+        boolean isEqual = false;
+
+        String moduleType = SurfaceAreaQuery.getModuleType();
+        List<String> libConstructList = new ArrayList<String>();
+        List<String> libDestructList = new ArrayList<String>();
+
+        String libConstructName = null;
+        String libDestructName = null;
+        List<String> libraryList = SurfaceAreaQuery.getLibraryInstance(
+                this.arch, CommonDefinition.AlwaysConsumed);
+
+        try {
+            if (libraryList != null) {
+                //
+                // Reorder library instance sequence.
+                //
+                AutogenLibOrder libOrder = new AutogenLibOrder(libraryList);
+                List orderList = libOrder.orderLibInstance();
+                
+                if (orderList != null) {
+                    //
+                    // Process library instance one by one.
+                    //
+                    for (int i = 0; i < orderList.size(); i++) {
+                        
+                        //
+                        // Get library instance basename.
+                        //
+                        String libInstanceName = orderList.get(i).toString();
+                        
+                        //
+                        // Get override map
+                        //
+                        Map<String, XmlObject> libDoc = GlobalData
+                                .getDoc(libInstanceName);
+                        SurfaceAreaQuery.push(libDoc);
+                        
+                        //
+                        // Get <PPis>, <Protocols>, <Guids> list of this library
+                        // instance.
+                        //
+                        PPIsDocument.PPIs.Ppi[] ppiList = SurfaceAreaQuery
+                                .getPpiArray(null);
+                        PPIsDocument.PPIs.PpiNotify[] ppiNotifyList = SurfaceAreaQuery
+                                .getPpiNotifyArray(null);
+                        ProtocolsDocument.Protocols.Protocol[] protocolList = SurfaceAreaQuery
+                                .getProtocolArray(null);
+                        ProtocolsDocument.Protocols.ProtocolNotify[] protocolNotifyList = SurfaceAreaQuery
+                                .getProtocolNotifyArray(null);
+                        GuidsDocument.Guids.GuidEntry[] guidList = SurfaceAreaQuery
+                                .getGuidEntryArray(null);
+
+                        //
+                        // Add those ppi, protocol, guid in global ppi, protocol, guid
+                        // list.
+                        //
+                        if (ppiList != null) {
+                            for (index = 0; index < ppiList.length; index++) {
+                                isEqual = false;
+                                for (int j = 0; j < this.mPpiList.size(); j++) {
+                                    if (this.mPpiList.get(j).equalsIgnoreCase(
+                                            ppiList[index].getStringValue())) {
+                                        isEqual = true;
+                                    }
+                                }
+                                if (!isEqual) {
+                                    this.mPpiList.add(ppiList[index]
+                                            .getStringValue());
+                                }
+                            }
+                        }
+                        if (ppiNotifyList != null) {
+                            for (index = 0; index < ppiNotifyList.length; index++) {
+                                isEqual = false;
+                                for (int j = 0; j < this.mPpiList.size(); j++) {
+                                    if (this.mPpiList.get(j).equalsIgnoreCase(
+                                            ppiNotifyList[index]
+                                                    .getStringValue())) {
+                                        isEqual = true;
+                                    }
+                                }
+                                if (!isEqual) {
+                                    this.mPpiList.add(ppiNotifyList[index]
+                                            .getStringValue());
+                                }
+                            }
+                        }
+                        if (protocolList != null) {
+                            for (index = 0; index < protocolList.length; index++) {
+                                isEqual = false;
+                                for (int j = 0; j < this.mProtocolList.size(); j++) {
+                                    if (this.mProtocolList.get(j)
+                                            .equalsIgnoreCase(
+                                                    protocolList[index]
+                                                            .getStringValue())) {
+                                        isEqual = true;
+                                    }
+                                }
+                                if (!isEqual) {
+                                    this.mProtocolList.add(protocolList[index]
+                                            .getStringValue());
+                                }
+                            }
+                        }
+                        if (protocolNotifyList != null) {
+                            for (index = 0; index < protocolNotifyList.length; index++) {
+                                isEqual = false;
+                                for (int j = 0; j < this.mProtocolList.size(); j++) {
+                                    if (this.mProtocolList.get(j)
+                                            .equalsIgnoreCase(
+                                                    protocolNotifyList[index]
+                                                            .getStringValue())) {
+                                        isEqual = true;
+                                    }
+                                }
+                                if (!isEqual) {
+                                    this.mProtocolList
+                                            .add(protocolNotifyList[index]
+                                                    .getStringValue());
+                                }
+                            }
+                        }
+                        if (guidList != null) {
+                            for (index = 0; index < guidList.length; index++) {
+                                isEqual = false;
+                                for (int j = 0; j < this.mGuidList.size(); j++) {
+                                    if (this.mGuidList.get(j).getCName()
+                                            .equalsIgnoreCase(
+                                                    guidList[index].getCName())) {
+                                        isEqual = true;
+                                    }
+                                }
+                                if (!isEqual) {
+                                    this.mGuidList.add(guidList[index]);
+                                }
+                            }
+                        }
+
+                        //
+                        // If not yet parse this library instance's constructor
+                        // element,parse it.
+                        //
+                        if (!GlobalData.isHaveLibInstance(libInstanceName)) {
+                            libConstructName = SurfaceAreaQuery
+                                    .getLibConstructorName();
+                            libDestructName = SurfaceAreaQuery
+                                    .getLibDestructorName();
+
+                            GlobalData.setLibInstanceInfo(libInstanceName,
+                                    libConstructName, libDestructName);
+                        } else {
+                            libConstructName = GlobalData
+                                    .getLibInstanceConstructor(libInstanceName);
+                            libDestructName = GlobalData
+                                    .getLibInstanceDestructor(libInstanceName);
+                        }
+                        SurfaceAreaQuery.pop();
+                        //
+                        // Add dependent library instance constructor function.
+                        //
+                        if (libConstructName != null) {
+                            libConstructList.add(libConstructName);
+                        }
+                        //
+                        // Add dependent library instance destructor fuction.
+                        //
+                        if (libDestructName != null) {
+                            libDestructList.add(libDestructName);
+                        }
+                    }
+
+                }
+
+                //
+                // Add library constructor to AutoGen.c
+                //
+                LibConstructorToAutogenC(libConstructList, moduleType,
+                        fileBuffer/* autogenC */);
+                //
+                // Add library destructor to AutoGen.c
+                //
+                LibDestructorToAutogenC(libDestructList, moduleType,
+                        fileBuffer/* autogenC */);
+            }
+
+        } catch (Exception e) {
+            throw new BuildException(e.getMessage());
+        }
+    }
+
+ 
+    /**
+      LibConstructorToAutogenc
+    
+      This function writes library constructor list to AutoGen.c. The library 
+      constructor's parameter and return value depend on module type.
+    
+      @param  libInstanceList        List of library construct name.
+      @param  moduleType             Module type.
+      @param  fileBuffer             String buffer for AutoGen.c
+      @throws Exception              
+    **/
+    void LibConstructorToAutogenC(List<String> libInstanceList,
+            String moduleType, StringBuffer fileBuffer) throws Exception {
+        boolean isFirst = true;
+
+        //
+        // The library constructor's parameter and return value depend on 
+        // module type.
+        //
+        for (int i = 0; i < libInstanceList.size(); i++) {
+            switch (CommonDefinition.getModuleType(moduleType)) {
+            case CommonDefinition.ModuleTypeBase:
+                fileBuffer.append("RETURN_STATUS\r\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  VOID\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+
+            case CommonDefinition.ModuleTypePeiCore:
+            case CommonDefinition.ModuleTypePeim:
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer
+                        .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");
+                fileBuffer
+                        .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+
+            case CommonDefinition.ModuleTypeDxeCore:
+            case CommonDefinition.ModuleTypeDxeDriver:
+            case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+            case CommonDefinition.ModuleTypeDxeSmmDriver:
+            case CommonDefinition.ModuleTypeDxeSalDriver:
+            case CommonDefinition.ModuleTypeUefiDriver:
+            case CommonDefinition.ModuleTypeUefiApplication:
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+            }
+        }
+
+        //
+        // Add ProcessLibraryConstructorList in AutoGen.c
+        //
+        fileBuffer.append("VOID\r\n");
+        fileBuffer.append("ProcessLibraryConstructorList (\r\n");
+        switch (CommonDefinition.getModuleType(moduleType)) {
+        case CommonDefinition.ModuleTypeBase:
+            fileBuffer.append("  VOID\r\n");
+            break;
+
+        case CommonDefinition.ModuleTypePeiCore:
+        case CommonDefinition.ModuleTypePeim:
+            fileBuffer.append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");
+            fileBuffer
+                    .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");
+            break;
+
+        case CommonDefinition.ModuleTypeDxeCore:
+        case CommonDefinition.ModuleTypeDxeDriver:
+        case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+        case CommonDefinition.ModuleTypeDxeSmmDriver:
+        case CommonDefinition.ModuleTypeDxeSalDriver:
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");
+            fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");
+            break;
+        }
+
+        fileBuffer.append("  )\r\n");
+        fileBuffer.append("{\r\n");
+
+        for (int i = 0; i < libInstanceList.size(); i++) {
+            if (isFirst) {
+                fileBuffer.append("  EFI_STATUS  Status;\r\n");
+                fileBuffer.append("\r\n");
+                isFirst = false;
+            }
+            switch (CommonDefinition.getModuleType(moduleType)) {
+            case CommonDefinition.ModuleTypeBase:
+                fileBuffer.append("  Status = ");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append("();\r\n");
+                fileBuffer.append("  VOID\r\n");
+                break;
+            case CommonDefinition.ModuleTypePeiCore:
+            case CommonDefinition.ModuleTypePeim:
+                fileBuffer.append("  Status = ");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (FfsHeader, PeiServices);\r\n");
+                break;
+            case CommonDefinition.ModuleTypeDxeCore:
+            case CommonDefinition.ModuleTypeDxeDriver:
+            case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+            case CommonDefinition.ModuleTypeDxeSmmDriver:
+            case CommonDefinition.ModuleTypeDxeSalDriver:
+            case CommonDefinition.ModuleTypeUefiDriver:
+            case CommonDefinition.ModuleTypeUefiApplication:
+                fileBuffer.append("  Status = ");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (ImageHandle, SystemTable);\r\n");
+                break;
+            }
+            fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");
+        }
+        fileBuffer.append("}\r\n");
+    }
+
+    /**
+      LibDestructorToAutogenc
+    
+      This function writes library destructor list to AutoGen.c. The library 
+      destructor's parameter and return value depend on module type.
+    
+      @param  libInstanceList        List of library destructor name.
+      @param  moduleType             Module type.
+      @param  fileBuffer             String buffer for AutoGen.c
+      @throws Exception              
+    **/
+    void LibDestructorToAutogenC(List<String> libInstanceList,
+            String moduleType, StringBuffer fileBuffer) throws Exception {
+        boolean isFirst = true;
+        for (int i = 0; i < libInstanceList.size(); i++) {
+            switch (CommonDefinition.getModuleType(moduleType)) {
+            case CommonDefinition.ModuleTypeBase:
+                fileBuffer.append("RETURN_STATUS\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  VOID\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+            case CommonDefinition.ModuleTypePeiCore:
+            case CommonDefinition.ModuleTypePeim:
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer
+                        .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");
+                fileBuffer
+                        .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+            case CommonDefinition.ModuleTypeDxeCore:
+            case CommonDefinition.ModuleTypeDxeDriver:
+            case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+            case CommonDefinition.ModuleTypeDxeSmmDriver:
+            case CommonDefinition.ModuleTypeDxeSalDriver:
+            case CommonDefinition.ModuleTypeUefiDriver:
+            case CommonDefinition.ModuleTypeUefiApplication:
+                fileBuffer.append("EFI_STATUS\r\n");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");
+                fileBuffer.append("  );\r\n");
+                break;
+            }
+        }
+
+        //
+        // Write ProcessLibraryDestructor list to autogen.c
+        //
+        switch (CommonDefinition.getModuleType(moduleType)) {
+        case CommonDefinition.ModuleTypeBase:
+        case CommonDefinition.ModuleTypePeiCore:
+        case CommonDefinition.ModuleTypePeim:
+            break;
+        case CommonDefinition.ModuleTypeDxeCore:
+        case CommonDefinition.ModuleTypeDxeDriver:
+        case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+        case CommonDefinition.ModuleTypeDxeSmmDriver:
+        case CommonDefinition.ModuleTypeDxeSalDriver:
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            fileBuffer.append("VOID\r\n");
+            fileBuffer.append("ProcessLibraryDestructorList (\r\n");
+            fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");
+            fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");
+            fileBuffer.append("  )\r\n");
+            fileBuffer.append("{\r\n");
+
+            for (int i = 0; i < libInstanceList.size(); i++) {
+                if (isFirst) {
+                    fileBuffer.append("  EFI_STATUS  Status;\r\n");
+                    fileBuffer.append("\r\n");
+                    isFirst = false;
+                }
+                fileBuffer.append("  Status = ");
+                fileBuffer.append(libInstanceList.get(i));
+                fileBuffer.append("(ImageHandle, SystemTable);\r\n");
+                fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");
+            }
+            fileBuffer.append("}\r\n");
+            break;
+        }
+    }
+
+    /**
+      ExternsDriverBindingToAutoGenC
+      
+      This function is to write DRIVER_BINDING, COMPONENT_NAME, 
+      DRIVER_CONFIGURATION, DRIVER_DIAGNOSTIC in AutoGen.c.
+      
+      @param  fileBuffer             String buffer for AutoGen.c
+     */
+    void ExternsDriverBindingToAutoGenC(StringBuffer fileBuffer)
+            throws BuildException {
+
+        //
+        // Check what <extern> contains. And the number of following elements
+        // under <extern> should be same. 1. DRIVER_BINDING 2. COMPONENT_NAME
+        // 3.DRIVER_CONFIGURATION 4. DRIVER_DIAGNOSTIC
+        //
+        
+        String[] drvBindList = SurfaceAreaQuery.getDriverBindingArray();
+        
+        //
+        // If component name protocol,component configuration protocol,
+        // component diagnostic protocol is not null or empty, check 
+        // if every one have the same number of the driver binding protocol.
+        //
+        if (drvBindList == null || drvBindList.length == 0) {
+            return;
+        }
+
+        String[] compNamList = SurfaceAreaQuery.getComponentNameArray();
+        String[] compConfList = SurfaceAreaQuery.getDriverConfigArray();
+        String[] compDiagList = SurfaceAreaQuery.getDriverDiagArray();
+
+        int BitMask = 0;
+
+        //
+        // Write driver binding protocol extern to autogen.c
+        //
+        for (int i = 0; i < drvBindList.length; i++) {
+            fileBuffer.append("extern EFI_DRIVER_BINDING_PROTOCOL ");
+            fileBuffer.append(drvBindList[i]);
+            fileBuffer.append(";\r\n");
+        }
+
+        //
+        // Write component name protocol extern to autogen.c
+        //
+        if (compNamList != null && compNamList.length != 0) {
+            if (drvBindList.length != compNamList.length) {
+                throw new BuildException(
+                        "Different number of Driver Binding and Component Name protocols!");
+            }
+
+            BitMask |= 0x01;
+            for (int i = 0; i < compNamList.length; i++) {
+                fileBuffer.append("extern EFI_COMPONENT_NAME_PROTOCOL ");
+                fileBuffer.append(compNamList[i]);
+                fileBuffer.append(";\r\n");
+            }
+        }
+
+        //
+        // Write driver configration protocol extern to autogen.c
+        //
+        if (compConfList != null && compConfList.length != 0) {
+            if (drvBindList.length != compConfList.length) {
+                throw new BuildException(
+                        "Different number of Driver Binding and Driver Configuration protocols!");
+            }
+
+            BitMask |= 0x02;
+            for (int i = 0; i < compConfList.length; i++) {
+                fileBuffer.append("extern EFI_DRIVER_CONFIGURATION_PROTOCOL ");
+                fileBuffer.append(compConfList[i]);
+                fileBuffer.append(";\r\n");
+            }
+        }
+
+        //
+        // Write driver dignastic protocol extern to autogen.c
+        //
+        if (compDiagList != null && compDiagList.length != 0) {
+            if (drvBindList.length != compDiagList.length) {
+                throw new BuildException(
+                        "Different number of Driver Binding and Driver Configuration protocols!");
+            }
+
+            BitMask |= 0x04;
+            for (int i = 0; i < compDiagList.length; i++) {
+                fileBuffer.append("extern EFI_DRIVER_DIAGNOSTICS_PROTOCOL ");
+                fileBuffer.append(compDiagList[i]);
+                fileBuffer.append(";\r\n");
+            }
+        }
+
+        //
+        // Write driver module protocol bitmask.
+        //
+        fileBuffer
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverModelProtocolBitmask = ");
+        fileBuffer.append(Integer.toString(BitMask));
+        fileBuffer.append(";\r\n");
+
+        //
+        // Write driver module protocol list entry
+        //
+        fileBuffer
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINTN  _gDriverModelProtocolListEntries = ");
+
+        fileBuffer.append(Integer.toString(drvBindList.length));
+        fileBuffer.append(";\r\n");
+
+        //
+        // Write drive module protocol list to autogen.c
+        //
+        fileBuffer
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DRIVER_MODEL_PROTOCOL_LIST  _gDriverModelProtocolList[] = {");
+        for (int i = 0; i < drvBindList.length; i++) {
+            if (i != 0) {
+                fileBuffer.append(",");
+            }
+            fileBuffer.append("\r\n {\r\n");
+            fileBuffer.append("  &");
+            fileBuffer.append(drvBindList[i]);
+            fileBuffer.append(", \r\n");
+
+            if (compNamList != null) {
+                fileBuffer.append("  &");
+                fileBuffer.append(compNamList[i]);
+                fileBuffer.append(", \r\n");
+            } else {
+                fileBuffer.append("  NULL, \r\n");
+            }
+
+            if (compConfList != null) {
+                fileBuffer.append("  &");
+                fileBuffer.append(compConfList[i]);
+                fileBuffer.append(", \r\n");
+            } else {
+                fileBuffer.append("  NULL, \r\n");
+            }
+
+            if (compDiagList != null) {
+                fileBuffer.append("  &");
+                fileBuffer.append(compDiagList[i]);
+                fileBuffer.append(", \r\n");
+            } else {
+                fileBuffer.append("  NULL, \r\n");
+            }
+            fileBuffer.append("  }");
+        }
+        fileBuffer.append("\r\n};\r\n");
+    }
+
+    /**
+      ExternCallBackToAutoGenC
+    
+      This function adds <SetVirtualAddressMapCallBack> and <ExitBootServicesCallBack>
+      infomation to AutoGen.c
+    
+      @param  fileBuffer           String buffer for AutoGen.c
+      @throws BuildException
+    **/
+    void ExternCallBackToAutoGenC(StringBuffer fileBuffer)
+            throws BuildException {
+        String[] setVirtualList = SurfaceAreaQuery
+                .getSetVirtualAddressMapCallBackArray();
+        String[] exitBootList = SurfaceAreaQuery
+                .getExitBootServicesCallBackArray();
+        String moduleType = SurfaceAreaQuery.getModuleType();
+        boolean UefiOrDxeModule = false;
+        int Count = 0;
+        int i;
+
+        switch (CommonDefinition.getModuleType(moduleType)) {
+        case CommonDefinition.ModuleTypeDxeDriver:
+        case CommonDefinition.ModuleTypeDxeRuntimeDriver:
+        case CommonDefinition.ModuleTypeDxeSalDriver:
+        case CommonDefinition.ModuleTypeUefiDriver:
+        case CommonDefinition.ModuleTypeUefiApplication:
+            //
+            // Entry point lib for these module types needs to know the count
+            // of entryPoint.
+            //
+            UefiOrDxeModule = true;
+            fileBuffer
+                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverSetVirtualAddressMapEventCount = ");
+
+            //
+            // If the list is not valid or has no entries set count to zero else
+            // set count to the number of valid entries
+            //
+            Count = 0;
+            if (setVirtualList != null) {
+                for (i = 0; i < setVirtualList.length; i++) {
+                    if (setVirtualList[i].equalsIgnoreCase("")) {
+                        break;
+                    }
+                }
+                Count = i;
+            }
+
+            fileBuffer.append(Integer.toString(Count));
+            fileBuffer.append(";\r\n\r\n");
+            break;
+        default:
+            break;
+        }
+
+        if (setVirtualList == null) {
+            if (UefiOrDxeModule) {
+                //
+                // No data so make a NULL list
+                //
+                fileBuffer
+                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {\r\n");
+                fileBuffer.append("  NULL\r\n");
+                fileBuffer.append("};\r\n\r\n");
+            }
+        } else {
+            //
+            // Write SetVirtualAddressMap function definition.
+            //
+            for (i = 0; i < setVirtualList.length; i++) {
+                if (setVirtualList[i].equalsIgnoreCase("")) {
+                    break;
+                }
+                fileBuffer.append("VOID\r\n");
+                fileBuffer.append("EFIAPI\n");
+                fileBuffer.append(setVirtualList[i]);
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  IN EFI_EVENT  Event,\r\n");
+                fileBuffer.append("  IN VOID       *Context\r\n");
+                fileBuffer.append("  );\r\n\r\n");
+            }
+
+            //
+            // Write SetVirtualAddressMap entry point array.
+            //
+            fileBuffer
+                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {");
+            for (i = 0; i < setVirtualList.length; i++) {
+                if (setVirtualList[i].equalsIgnoreCase("")) {
+                    break;
+                }
+
+                if (i == 0) {
+                    fileBuffer.append("\r\n  ");
+                } else {
+                    fileBuffer.append(",\r\n  ");
+                }
+
+                fileBuffer.append(setVirtualList[i]);
+            }
+            if (Count == 0) {
+                fileBuffer.append("\r\n  NULL");
+            }
+            fileBuffer.append("\r\n};\r\n\r\n");
+        }
+
+        if (UefiOrDxeModule) {
+            //
+            // Entry point lib for these module types needs to know the count.
+            //
+            fileBuffer
+                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverExitBootServicesEventCount = ");
+
+            //
+            // If the list is not valid or has no entries set count to zero else
+            // set count to the number of valid entries.
+            //
+            Count = 0;
+            if (exitBootList != null) {
+                if (setVirtualList != null) {
+                    for (i = 0; i < exitBootList.length; i++) {
+                        if (exitBootList[i].equalsIgnoreCase("")) {
+                            break;
+                        }
+                    }
+                    Count = i;
+                }
+            }
+            fileBuffer.append(Integer.toString(Count));
+            fileBuffer.append(";\r\n\r\n");
+        }
+
+        if (exitBootList == null) {
+            if (UefiOrDxeModule) {
+                //
+                // No data so make a NULL list.
+                //
+                fileBuffer
+                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {\r\n");
+                fileBuffer.append("  NULL\r\n");
+                fileBuffer.append("};\r\n\r\n");
+            }
+        } else {
+            //
+            // Write DriverExitBootServices function definition.
+            //
+            for (i = 0; i < exitBootList.length; i++) {
+                if (exitBootList[i].equalsIgnoreCase("")) {
+                    break;
+                }
+
+                fileBuffer.append("VOID\r\n");
+                fileBuffer.append("EFIAPI\n");
+                fileBuffer.append(exitBootList[i]);
+                fileBuffer.append(" (\r\n");
+                fileBuffer.append("  IN EFI_EVENT  Event,\r\n");
+                fileBuffer.append("  IN VOID       *Context\r\n");
+                fileBuffer.append("  );\r\n\r\n");
+            }
+
+            //
+            // Write DriverExitBootServices entry point array.
+            //
+            fileBuffer
+                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {");
+            for (i = 0; i < exitBootList.length; i++) {
+                if (exitBootList[i].equalsIgnoreCase("")) {
+                    break;
+                }
+
+                if (i == 0) {
+                    fileBuffer.append("\r\n  ");
+                } else {
+                    fileBuffer.append(",\r\n  ");
+                }
+                fileBuffer.append(exitBootList[i]);
+            }
+            if (Count == 0) {
+                fileBuffer.append("\r\n  NULL");
+            }
+            fileBuffer.append("\r\n};\r\n\r\n");
+        }
+
+    }
+
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
new file mode 100644
index 0000000000..77404d4007
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -0,0 +1,306 @@
+/**@file
+ AutogenLibOrder class.
+
+ This class is to reorder library instance sequence according to library 
+ dependence.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.build.autogen;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.LibraryClassDocument.LibraryClass;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.SurfaceAreaQuery;
+
+/**
+  This class This class is to reorder library instance sequence according to
+  library dependence.
+**/
+public class AutogenLibOrder {
+    ///
+    /// The map of library class and its library instance.
+    ///
+    private Map<String, String> libClassMap = new HashMap<String, String>();
+
+    ///
+    /// The map of library instance and its implemet instance.
+    ///
+    private Map<String, String[]> libInstanceMap = new HashMap<String, String[]>();
+
+    ///
+    /// List of library instance. It is String[3] list, String[0] is libraryName,
+    /// String[1] is libraryConstructor name, String[2] is libDestructor name.
+    ///
+    private List<String[]> libInstanceList = new ArrayList<String[]>();
+    
+    /**
+      Constructor function
+    
+      This function mainly initialize some member variable.
+     
+      @param  libraryList   List of the library instance.
+      @throws Exception
+    **/
+    AutogenLibOrder(List<String> libraryList) throws Exception {
+        String[]       libInstance = new String[3];
+        LibraryClass[] libClassDeclList = null;
+        LibraryClass[] libClassConsmList = null;
+        
+        for (int i = 0; i < libraryList.size(); i++) {
+            //
+            // Add libraryInstance in to libInstanceList.
+            //
+            libInstance[0] = libraryList.get(i);
+            Map<String, XmlObject> libDoc = GlobalData.getDoc(libInstance[0]);
+            SurfaceAreaQuery.push(libDoc);
+            libInstance[1] = SurfaceAreaQuery.getLibConstructorName();
+            libInstance[2] = SurfaceAreaQuery.getLibDestructorName();
+            libInstanceList.add(libInstance.clone());
+            
+            //
+            // Add library instance and consumed library class list to
+            // libInstanceMap.
+            //
+            libClassConsmList = SurfaceAreaQuery
+                    .getLibraryClassArray(CommonDefinition.AlwaysConsumed);
+            if (libClassConsmList != null) {
+                String[] classStr = new String[libClassConsmList.length];
+                for (int k = 0; k < libClassConsmList.length; k++) {
+                    classStr[k] = libClassConsmList[k].getStringValue();
+                }
+                if (this.libInstanceMap.containsKey(libInstance[0])) {
+                    throw new Exception(
+                            libInstance[0]
+                                    + "this library instance is already exist, please check you library instance list!");
+                } else {
+                    this.libInstanceMap.put(libInstance[0], classStr);
+                }
+            }
+
+            //
+            // Add library class and library instance map.
+            //
+            libClassDeclList = SurfaceAreaQuery
+                    .getLibraryClassArray(CommonDefinition.AlwaysProduced);
+            if (libClassDeclList != null) {
+                for (int j = 0; j < libClassDeclList.length; j++) {
+                    if (this.libClassMap.containsKey(libClassDeclList[j]
+                            .getStringValue())) {
+                        System.out.println(libClassDeclList[j].getStringValue()
+                                + " class is already implement by "
+                                + this.libClassMap.get(libClassDeclList[j]
+                                        .getStringValue()));
+                        throw new Exception(libClassDeclList
+                                + " is already have library instance!");
+                    } else {
+                        this.libClassMap.put(libClassDeclList[j]
+                                .getStringValue(), libInstance[0]);
+                    }
+                }
+            }
+            SurfaceAreaQuery.pop();
+        }
+
+        //
+        // Check is the library instance list meet the require;
+        //
+        for (int s = 0; s < this.libInstanceList.size(); s++) {
+            String[] libClass = this.libInstanceMap.get(this.libInstanceList
+                    .get(s));
+            if (libClass != null) {
+                for (int t = 0; t < libClass.length; t++) {
+                    if (this.libClassMap.get(libClass[t]) == null) {
+                        //
+                        // Note: There exist a kind of module which depend on 
+                        // library class with no instance or whose instance will
+                        // never be linked into the module. 
+                        // For this satuation, the module has the description of 
+                        // library class in MSA file but no description of 
+                        // corresponding library instance in MBD file. There 
+                        // will be a warnig message given here after a standard 
+                        // log way has been decided.
+                        //
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+      orderLibInstance
+      
+      This function reorder the library instance according the library class 
+      dependency.
+      
+      @return     List which content the ordered library instance.
+    **/
+    List orderLibInstance() {
+        List<String> orderList = new ArrayList<String>();
+        //
+        // Stack of node which track the library instance name ant its visiting
+        // flag.
+        //
+        List<Node> stackList = new ArrayList<Node>();
+        int stackSize = 0;
+        String libInstance = null;
+        if (libInstanceList.size() < 0) {
+            return null;
+        }
+
+        //
+        // Reorder the library instance.
+        //
+        for (int i = 0; i < libInstanceList.size(); i++) {
+            //
+            // If library instance is already in the order list skip it.
+            //
+            if (isInLibInstance(orderList, libInstanceList.get(i)[0])) {
+                continue;
+            }
+            
+            Node node = new Node(libInstanceList.get(i)[0], false);
+            //
+            // Use stack to reorder library instance.
+            // Push node to stack.
+            //
+            stackList.add(node);
+            while (stackList.size() > 0) {
+                stackSize = stackList.size() - 1;
+                //
+                // Pop the first node in stack. If the node flag has been visited
+                // add this node to orderlist and remove it from stack.
+                //
+                if (stackList.get(stackSize).isVisit) {
+                    if (!isInLibInstance(orderList,
+                            stackList.get(stackSize).nodeName)) {
+                        orderList.add(stackList.get(stackSize).nodeName);
+                        stackList.remove(stackSize);
+                    }
+                    
+                } else {
+                    //
+                    // Get the node value and set visit flag as true.
+                    //
+                    stackList.get(stackList.size() - 1).isVisit = true;
+                    String[] libClassList = this.libInstanceMap.get(stackList
+                            .get(stackSize).nodeName);
+                    //
+                    // Push the node dependence library instance to the stack.
+                    //
+                    if (libClassList != null) {
+                        for (int j = 0; j < libClassList.length; j++) {
+                            libInstance = this.libClassMap.get(libClassList[j]);
+                            if (libInstance != null
+                                    && !isInLibInstance(orderList, libInstance)) {
+                                //
+                                // If and only if the currently library instance
+                                // is not in stack and it have constructor or 
+                                // destructor function, push this library 
+                                // instacne in stack.
+                                //
+                                if (!isInStackList(stackList, this.libClassMap
+                                        .get(libClassList[j])) && isHaveConsDestructor(libInstance)) {
+                                    stackList.add(new Node(this.libClassMap
+                                            .get(libClassList[j]), false));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return orderList;
+    }
+
+    /**
+      isInLibInstance
+    
+      This function check does the library instance already in the list.
+    
+      @param list             List of the library instance.
+      @param instanceName     Name of library instance.
+      @return                 "true" the library instance in list |
+                              "false" the library instance is not in list.
+    **/
+    private boolean isInLibInstance(List list, String instanceName) {
+        for (int i = 0; i < list.size(); i++) {
+            if (instanceName.equalsIgnoreCase(list.get(i).toString())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+      isInStackList 
+      
+      This function check if the node already in the stack.
+       
+      @param list        Stack.
+      @param nodeName    Name of node.
+      @return            "true" if node have in stack |
+                         "false" if node don't in stack.
+    **/ 
+    private boolean isInStackList(List<Node> list, String nodeName) {
+        for (int i = 0; i < list.size(); i++) {
+            if (nodeName.equalsIgnoreCase(list.get(i).nodeName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+      isHaveConsDestructor
+      
+      This function check if the library have constructor or destructor 
+      function.
+      
+      @param  libName    Name of library
+      @return            "true" if library have constructor or desconstructor |
+                         "false" if library don't have constructor 
+                         and desconstructor.
+    **/
+    private boolean isHaveConsDestructor (String libName){
+        for (int i = 0; i < libInstanceList.size(); i++){
+            if (libInstanceList.get(i)[0].equalsIgnoreCase(libName)){
+                if (libInstanceList.get(i)[1] != null || libInstanceList.get(i)[2] != null){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
+
+/**
+  Node 
+ 
+  This class is used as stack node.
+ 
+ **/
+class Node {
+    String nodeName;
+
+    boolean isVisit;
+
+    Node(String name, boolean isVisit) {
+        this.nodeName = name;
+        this.isVisit = false;
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
new file mode 100644
index 0000000000..2490d97467
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -0,0 +1,257 @@
+/** @file
+ CommonDefinition class.
+
+ This class is to define some common marcos and funcions, which used by AutoGen.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.build.autogen;
+
+/**
+  CommonDefinition
+  
+  This class is to define some common marcos, which used by AutoGen.
+  
+**/
+public class CommonDefinition {
+    public final static String spdSuffix = ".spd";
+    public final static String mbdSuffix = ".mbd";
+    public final static String msaSuffix = ".msa";
+    public final static String LibraryStr = "LIBRARY";
+    public final static String autoGenHbegin = "extern int __make_me_compile_correctly;\r\n";
+    public final static String include = "#include";
+    public final static String autoGenCLine1 = "\r\n";
+    
+    public final static String autoGenCLine2 = "const UINT8  _gDebugPropertyMask "
+                    + "= DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED"
+                    + "  | DEBUG_PROPERTY_DEBUG_PRINT_ENABLED"
+                    + "  | DEBUG_PROPERTY_DEBUG_CODE_ENABLED;\r\n";
+
+    public final static String autoGenCLine3 = "const UINTN  _gModuleDefaultErrorLevel"
+                    + " = EFI_D_ERROR | EFI_D_LOAD;\r\n";
+    
+    public final static String autoGenHLine1          = "#define EFI_SPECIFICATION_VERSION    0x00020000\r\n";
+    public final static String autoGenHVersionDefault = "#define EFI_SPECIFICATION_VERSION    0x00000000\r\n";
+    public final static String autoGenHLine2          = "#define EDK_RELEASE_VERSION        0x00090000\r\n";
+    public final static String autoGenHReleaseDefault = "#define EDK_RELEASE_VERSION        0x00000000\r\n";
+
+    public final static String includeAutogenH        = "#include    <AutoGen.h>\r\n" ;
+
+    public final static String gEfi = "gEfi";
+    public final static String protocolGuid = "ProtocolGuid";
+    public final static String ppiGuid = "PpiGuid";
+    public final static String guidGuid = "Guid";
+    
+    //
+    // AutoGen.h and AutoGen.c file's header
+    //
+    public final static String autogenHNotation = 
+      "/**\r\n" +
+      "  DO NOT EDIT\r\n" +
+      "  FILE auto-generated by GenBuild tasks\r\n" +
+      "  Module name:\r\n" +
+      "       AutoGen.h\r\n" +
+      "  Abstract:" +
+      "       Auto-generated AutoGen.h for building module or library.\r\n" +
+      "**/\r\n\r\n";
+        
+    public final static String autogenCNotation = 
+        "/**\r\n" +
+        "  DO NOT EDIT\r\n" +
+        "  FILE auto-generated by GenBuild tasks\r\n" +
+        "  Module name:\r\n" +
+        "       AutoGen.c\r\n" +
+        "  Abstract:" +
+        "       Auto-generated AutoGen.c for building module or library.\r\n" +
+        "**/\r\n\r\n";
+    
+    //
+    // module type
+    //
+    public final static int ModuleTypeBase = 0;
+    public final static int ModuleTypeSec = 1;
+    public final static int ModuleTypePeiCore = 2;
+    public final static int ModuleTypePeim = 3;
+    public final static int ModuleTypeDxeCore = 4;
+    public final static int ModuleTypeDxeDriver = 5;
+    public final static int ModuleTypeDxeRuntimeDriver = 6;
+    public final static int ModuleTypeDxeSmmDriver = 7;
+    public final static int ModuleTypeDxeSalDriver = 8;
+    public final static int ModuleTypeUefiDriver = 9;
+    public final static int ModuleTypeUefiApplication = 10;
+    public final static int ModuleTypeUnknown = 11;
+    
+   
+    //
+    // component type
+    //                           
+    public final static int  ComponentTypeNull = 0;
+    public final static int  ComponentTypeApriori = 1;
+    public final static int  ComponentTypeSec = 2;
+    public final static int  ComponentTypeLibrary = 3;
+    public final static int  ComponentTypeFvImageFile = 4;
+    public final static int  ComponentTypeBsDriver = 5;
+    public final static int  ComponentTypeRtDriver = 6;
+    public final static int  ComponentTypeSalRtDriver =7;
+    public final static int  ComponentTypePe32Peim = 8;
+    public final static int  ComponentTypePicPeim =9;
+    public final static int  ComponentTypeCombinedPeimDriver =10;
+    public final static int  ComponentTypePeiCore = 11;
+    public final static int  ComponentTypeDxeCore = 12;
+    public final static int  ComponentTypeApplication = 13;
+    public final static int  ComponentTypeBsDriverEfi = 14;
+    public final static int  ComponentTypeShellApp = 15;
+    public final static int  ComponentTypeBinary =16;
+    public final static int  ComponentTypeLogo = 17;
+    public final static int  ComponentTypeCustomBuild = 18;
+    public final static int  ComponentTypeUnknown = 19;
+
+    
+    //
+    // Usaged style
+    //
+    public final static String AlwaysConsumed = "ALWAYS_CONSUMED";
+    public final static String AlwaysProduced = "ALWAYS_PRODUCED";
+  
+
+    public static class MyEnum {
+        String moduleTypeStr;
+        int   type;
+
+        MyEnum (String str, int type) {
+            this.type    = type;
+            this.moduleTypeStr = str;
+        }
+
+        int ForInt(String str) {
+            if (str.equals(this.moduleTypeStr)) {
+                return this.type;
+            } else
+                return -1;
+        }
+    }
+    
+    //
+    // Module type
+    //
+    public static final MyEnum[] moduleEnum = new MyEnum[] {
+                    new MyEnum("BASE", ModuleTypeBase),
+                    new MyEnum("SEC", ModuleTypeSec),
+                    new MyEnum("PEI_CORE", ModuleTypePeiCore),
+                    new MyEnum("PEIM", ModuleTypePeim),
+                    new MyEnum("DXE_CORE", ModuleTypeDxeCore),
+                    new MyEnum("DXE_DRIVER", ModuleTypeDxeRuntimeDriver),
+                    new MyEnum("DXE_RUNTIME_DRIVER", ModuleTypeDxeRuntimeDriver),
+                    new MyEnum("DXE_SAL_DRIVER", ModuleTypeDxeSmmDriver),
+                    new MyEnum("DXE_SMM_DRIVER", ModuleTypeDxeSalDriver),
+                    new MyEnum("UEFI_DRIVER", ModuleTypeUefiDriver),
+                    new MyEnum("UEFI_APPLICATION", ModuleTypeUefiApplication) };
+    
+    //
+    // Component type
+    //
+    public static final MyEnum[] componentEnum = new MyEnum[]{
+                    new MyEnum("APRIORI", ComponentTypeApriori),
+                    new MyEnum("SEC", ComponentTypeSec),
+                    new MyEnum("LIBRARY", ComponentTypeLibrary),
+                    new MyEnum("FV_IMAGE_FILE", ComponentTypeFvImageFile),
+                    new MyEnum("BS_DRIVER", ComponentTypeBsDriver),
+                    new MyEnum("RT_DRIVER", ComponentTypeRtDriver),
+                    new MyEnum("SAL_RT_DRIVER", ComponentTypeSalRtDriver),
+                    new MyEnum("PE32_PEIM", ComponentTypePe32Peim),
+                    new MyEnum("PIC_PEIM", ComponentTypePicPeim),
+                    new MyEnum("COMBINED_PEIM_DRIVER", ComponentTypeCombinedPeimDriver),
+                    new MyEnum("PEI_CORE", ComponentTypePeiCore),
+                    new MyEnum("DXE_CORE", ComponentTypeDxeCore),
+                    new MyEnum("APPLICATION", ComponentTypeApplication),
+                    new MyEnum("BS_DRIVER_EFI", ComponentTypeBsDriverEfi),
+                    new MyEnum("SHELLAPP", ComponentTypeShellApp),
+                    new MyEnum("BINARY", ComponentTypeBinary),
+                    new MyEnum("LOGO", ComponentTypeLogo),
+                    new MyEnum("CUSTOM_BUILD", ComponentTypeCustomBuild)
+                    };
+   
+    /**
+      getModuleType
+      
+      This function get the module type value according module type string.
+      
+      @param  moduleTypeStr     String of modlue type.
+      @return                   
+    **/
+    static public int getModuleType(String moduleTypeStr) {
+        int returnValue = -1;
+        for (int i = 0; i < CommonDefinition.moduleEnum.length; i++) {
+            returnValue = CommonDefinition.moduleEnum[i].ForInt(moduleTypeStr);
+            if (returnValue != -1) {
+                return returnValue;
+            }
+        }
+        return CommonDefinition.ModuleTypeUnknown;
+    }
+
+    /**
+      getComponentType
+      
+      This function get the component type value according commponet type 
+      string.
+      
+      @param    componentTypeStr  String of component type.
+      @return
+    **/
+    static public int getComponentType (String componentTypeStr){
+        int returnValue = -1;
+        for (int i = 0; i < CommonDefinition.componentEnum.length; i++) {
+            returnValue = CommonDefinition.componentEnum[i].ForInt(componentTypeStr);
+            if (returnValue != -1) {
+                return returnValue;
+            }
+        }
+        return CommonDefinition.ComponentTypeUnknown;
+    }
+
+    /**
+    getComponentTypeString
+    
+    This function get the commponet type string according component type value.
+    
+    @param    componentType  Integer value of component type.
+    @return
+  **/
+    static public String getComponentTypeString (int componentType) {
+      if ((componentType > CommonDefinition.ComponentTypeUnknown) || 
+          (componentType < CommonDefinition.ComponentTypeNull)) {
+        return null;
+      }
+      for (int index = 0; index < CommonDefinition.componentEnum.length; index ++) {
+        if (componentType == CommonDefinition.componentEnum[index].type) {
+          return CommonDefinition.componentEnum[index].moduleTypeStr;
+        }
+      }
+      return null;
+    }
+
+    /**
+      isLibraryComponent 
+      
+      This function is to check does componet is library according to commponet
+      type value.
+      
+      @param   componentType     Integer value of component type.
+      @return
+    **/
+    static public boolean isLibraryComponent (int componentType) {
+      if (ComponentTypeLibrary == componentType) {
+        return true;
+      }
+      return false;
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdModuleIdentification.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdModuleIdentification.java
new file mode 100644
index 0000000000..261cf58a35
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdModuleIdentification.java
@@ -0,0 +1,131 @@
+/** @file
+  Java class FpdModuleIdentification is used to present a module identification
+  from BaseName, GUID, Version, PackageName, and ARCH. 
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.fpd;
+
+/**
+  This class is used to identify a module with BaseName, GUID, Version, PackageName
+  and ARCH.
+  
+  @since GenBuild 1.0
+ **/
+public class FpdModuleIdentification {
+    
+    private String arch;
+    
+    private String fvBinding;
+    
+    private String baseName;
+    
+    private String packageName;
+    
+    private String guid;
+    
+    private String version;
+    
+    private String sequence;
+    
+    /**
+      
+      @param baseName the base name of the module
+      @param guid the GUID of the module
+      @param arch the ARCH of the module
+    **/
+    public FpdModuleIdentification(String baseName, String guid, String arch){
+        this.baseName = baseName;
+        this.guid = guid;
+        this.arch = arch;
+    }
+    
+    /**
+      Override java.lang.Object#equals. 
+      
+      <p>Currently, use BaseName and ARCH to identify a module. It will enhance
+      in the next version. </p>
+      
+      @see java.lang.Object#equals(java.lang.Object)
+    **/
+    public boolean equals(Object obj) {
+        if (obj instanceof FpdModuleIdentification) {
+            FpdModuleIdentification moduleIdObj = (FpdModuleIdentification)obj;
+            if ( baseName.equalsIgnoreCase(moduleIdObj.baseName) && arch.equalsIgnoreCase(moduleIdObj.arch)) {
+                return true;
+            }
+            // TBD
+            return false;
+        }
+        else {
+            return super.equals(obj);
+        }
+    }
+    
+    public void setArch(String arch) {
+        this.arch = arch;
+    }
+
+    public void setFvBinding(String fvBinding) {
+        this.fvBinding = fvBinding;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    public String toString(){
+        return arch + ":" + guid + "_" + baseName;
+    }
+
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getArch() {
+        return arch;
+    }
+
+    public String getBaseName() {
+        return baseName;
+    }
+
+    public String getFvBinding() {
+        return fvBinding;
+    }
+
+    public String getGuid() {
+        return guid;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
new file mode 100644
index 0000000000..99b7242ebc
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -0,0 +1,808 @@
+/** @file
+  This file is ANT task FpdParserTask. 
+ 
+  FpdParserTask is used to parse FPD (Framework Platform Description) and generate
+  build.out.xml. It is for Package or Platform build use. 
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.fpd;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Property;
+import org.apache.xmlbeans.XmlObject;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.OutputManager;
+import org.tianocore.build.global.OverrideProcess;
+import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.build.pcd.action.CollectPCDAction;
+import org.tianocore.build.pcd.action.ActionMessage;
+import org.tianocore.BuildOptionsDocument;
+import org.tianocore.FrameworkPlatformDescriptionDocument;
+import org.tianocore.ModuleSADocument;
+
+
+/**
+  <code>FpdParserTask</code> is an ANT task. The main function is parsing FPD
+  XML file and generating its ANT build script for Platform or Package. 
+  
+  <p>The usage is (take NT32 Platform for example):</p>
+  
+  <pre>
+    &lt;FPDParser fpdfilename="Build\Nt32.fpd" /&gt;
+  </pre>
+  
+  <p>The task will initialize all information through parsing Framework Database, 
+  SPD, Tool chain configuration files. </p>
+  
+  @since GenBuild 1.0
+**/
+public class FpdParserTask extends Task {
+
+    ///
+    /// FV dir: ${PLATFORM_DIR}/Build/FV
+    ///
+    public static final String FV_OUTPUT_DIR = "${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "FV";
+
+    private File fpdFilename;
+
+    private File guiddatabase;
+
+    ///
+    /// Keep platform buildoption information
+    ///
+    public static XmlObject platformBuildOptions = null;
+
+    ///
+    /// Mapping from modules identification to out put file name
+    ///
+    private Map<FpdModuleIdentification, String> outfiles = new LinkedHashMap<FpdModuleIdentification, String>();
+
+    ///
+    /// Mapping from FV name to its modules
+    ///
+    private Map<String, Set<FpdModuleIdentification> > fvs = new HashMap<String, Set<FpdModuleIdentification> >();
+
+    ///
+    /// Mapping from sequence number to its modules
+    ///
+    private Map<String, Set<FpdModuleIdentification> > sequences = new HashMap<String, Set<FpdModuleIdentification> >();
+
+    ///
+    /// FpdParserTask can specify some ANT properties. 
+    ///
+    private Vector<Property> properties = new Vector<Property>();
+
+    private String info = "====================================================================\n"
+                    + "DO NOT EDIT \n"
+                    + "File auto-generated by build utility\n"
+                    + "\n"
+                    + "Abstract:\n"
+                    + "Auto-generated ANT build file for building of EFI Modules/Platforms\n"
+                    + "=====================================================================";
+
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public FpdParserTask () {
+    }
+
+    /**
+      ANT task's entry method. The main steps is described as following: 
+      
+      <ul>
+        <li>Initialize global information (Framework DB, SPD files and all MSA files 
+        listed in SPD). This step will execute only once in whole build process;</li>
+        <li>Parse specified FPD file; </li>
+        <li>Generate FV.inf files; </li>
+        <li>Generate build.out.xml file for Flatform or Package build; </li>
+        <li>Collect PCD information. </li>
+      </ul>
+      
+      @throws BuildException
+                  Surface area is not valid. 
+    **/
+    public void execute() throws BuildException {
+        OutputManager.update(getProject());
+        //
+        // Parse DB and SPDs files. Initialize Global Data
+        //
+        GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db", getProject()
+                        .getProperty("WORKSPACE_DIR"));
+        //
+        // Parse FPD file
+        //
+        parseFpdFile();
+        //
+        // Gen Fv.inf files
+        //
+        genFvInfFiles();
+        //
+        // Gen build.xml
+        //
+        genBuildFile();
+        //
+        // Collect PCD information 
+        // 
+        collectPCDInformation (); 
+    }
+    
+    /**
+      Generate Fv.inf files. The Fv.inf file is composed with four 
+      parts: Options, Attributes, Components and Files. The Fv.inf files 
+      will be under ${PLATFOMR_DIR}\Build\Fv.
+      
+      @throws BuildException
+              File write FV.inf files error. 
+    **/
+    private void genFvInfFiles() throws BuildException{
+        String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();
+        for (int i = 0; i < validFv.length; i++) {
+            getProject().setProperty("FV_FILENAME", validFv[i].toUpperCase());
+            //
+            // Get all global variables from FPD and set them to properties
+            //
+            String[][] globalVariables = SurfaceAreaQuery
+                            .getFpdGlobalVariable();
+            for (int j = 0; j < globalVariables.length; j++) {
+                getProject().setProperty(globalVariables[j][0],
+                                globalVariables[j][1]);
+            }
+
+            File fvFile = new File(getProject().replaceProperties(
+                            FV_OUTPUT_DIR + File.separatorChar + validFv[i].toUpperCase()
+                                            + ".inf"));
+            fvFile.getParentFile().mkdirs();
+
+            try {
+                FileWriter fw = new FileWriter(fvFile);
+                BufferedWriter bw = new BufferedWriter(fw);
+                //
+                // Options
+                //
+                String[][] options = SurfaceAreaQuery.getFpdOptions(validFv[i]);
+                if (options.length > 0) {
+                    bw.write("[options]");
+                    bw.newLine();
+                    for (int j = 0; j < options.length; j++) {
+                        StringBuffer str = new StringBuffer(100);
+                        str.append(options[j][0]);
+                        while (str.length() < 40) {
+                            str.append(' ');
+                        }
+                        str.append("=  ");
+                        str.append(options[j][1]);
+                        bw.write(getProject().replaceProperties(str.toString()));
+                        bw.newLine();
+                    }
+                    bw.newLine();
+                }
+                //
+                // Attributes;
+                //
+                String[][] attributes = SurfaceAreaQuery
+                                .getFpdAttributes(validFv[i]);
+                if (attributes.length > 0) {
+                    bw.write("[attributes]");
+                    bw.newLine();
+                    for (int j = 0; j < attributes.length; j++) {
+                        StringBuffer str = new StringBuffer(100);
+                        str.append(attributes[j][0]);
+                        while (str.length() < 40) {
+                            str.append(' ');
+                        }
+                        str.append("=  ");
+                        str.append(attributes[j][1]);
+                        bw
+                                        .write(getProject().replaceProperties(
+                                                        str.toString()));
+                        bw.newLine();
+                    }
+                    bw.newLine();
+                }
+                //
+                // Components
+                //
+                String[][] components = SurfaceAreaQuery
+                                .getFpdComponents(validFv[i]);
+                if (components.length > 0) {
+                    bw.write("[components]");
+                    bw.newLine();
+                    for (int j = 0; j < components.length; j++) {
+                        StringBuffer str = new StringBuffer(100);
+                        str.append(components[j][0]);
+                        while (str.length() < 40) {
+                            str.append(' ');
+                        }
+                        str.append("=  ");
+                        str.append(components[j][1]);
+                        bw
+                                        .write(getProject().replaceProperties(
+                                                        str.toString()));
+                        bw.newLine();
+                    }
+                    bw.newLine();
+                }
+                //
+                // Files
+                //
+                Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i].toUpperCase());
+                if (filesSet != null) {
+                    FpdModuleIdentification[] files = filesSet.toArray(new FpdModuleIdentification[filesSet
+                                    .size()]);
+                    bw.write("[files]");
+                    bw.newLine();
+                    for (int j = 0; j < files.length; j++) {
+                        String str = outfiles.get(files[j]);
+                        bw.write(getProject().replaceProperties(
+                                        "EFI_FILE_NAME = " + str));
+                        bw.newLine();
+                    }
+                }
+                bw.flush();
+                bw.close();
+                fw.close();
+            } catch (Exception e) {
+                throw new BuildException("Generate Fv.inf file failed. \n" + e.getMessage());
+            }
+        }
+    }
+
+    /**
+      Parse FPD file. 
+    
+      @throws BuildException
+              FPD file is not valid. 
+    **/
+    private void parseFpdFile() throws BuildException {
+        try {
+            FrameworkPlatformDescriptionDocument doc = (FrameworkPlatformDescriptionDocument) XmlObject.Factory
+                            .parse(fpdFilename);
+            if ( ! doc.validate() ){
+                throw new BuildException("FPD file is invalid.");
+            }
+            platformBuildOptions = doc.getFrameworkPlatformDescription()
+                            .getBuildOptions();
+            HashMap<String, XmlObject> map = new HashMap<String, XmlObject>();
+            map.put("FrameworkPlatformDescription", doc);
+            SurfaceAreaQuery.setDoc(map);
+            //
+            // Parse all list modules SA
+            //
+            parseModuleSAFiles();
+            SurfaceAreaQuery.setDoc(map);
+        } catch (Exception e) {
+            throw new BuildException("Load FPD file [" + fpdFilename.getPath()
+                            + "] error. \n" + e.getMessage());
+        }
+    }
+
+    /**
+      Parse all modules listed in FPD file. 
+    **/
+    private void parseModuleSAFiles() {
+        ModuleSADocument.ModuleSA[] moduleSAs = SurfaceAreaQuery
+                        .getFpdModules();
+        //
+        // For every Module lists in FPD file.
+        //
+        for (int i = 0; i < moduleSAs.length; i++) {
+            String defaultFv = "NULL";
+            String defaultArch = "IA32";
+            String baseName = moduleSAs[i].getModuleName();
+            if (baseName == null) {
+                System.out.println("Warning: Module Name is not specified.");
+                continue;
+            }
+            String fvBinding = moduleSAs[i].getFvBinding();
+            //
+            // If the module do not specify any FvBinding, use the default value.
+            // Else update the default FvBinding value to this value.
+            //
+            if (fvBinding == null) {
+                fvBinding = defaultFv;
+            }
+            else {
+                defaultFv = fvBinding;
+            }
+            String arch;
+            //
+            // If the module do not specify any Arch, use the default value.
+            // Else update the default Arch value to this value.
+            //
+            if (moduleSAs[i].getArch() == null ){
+                arch = defaultArch;
+            }
+            else {
+                arch = moduleSAs[i].getArch().toString();
+                defaultArch = arch;
+            }
+            Map<String, XmlObject> msaMap = GlobalData.getNativeMsa(baseName);
+            Map<String, XmlObject> mbdMap = GlobalData.getNativeMbd(baseName);
+            Map<String, XmlObject> map = new HashMap<String, XmlObject>();
+            //
+            // Whether the Module SA has parsed before or not
+            //
+            if (!GlobalData.isModuleParsed(baseName)) {
+                OverrideProcess op = new OverrideProcess();
+                //
+                // using overriding rules
+                // Here we can also put platform Build override
+                //
+                map = op.override(mbdMap, msaMap);
+                Map<String, XmlObject> overrideMap = op.override(
+                                getPlatformOverrideInfo(moduleSAs[i]),
+                                OverrideProcess.deal(map));
+                GlobalData.registerModule(baseName, overrideMap);
+            } else {
+                map = GlobalData.getDoc(baseName);
+            }
+            SurfaceAreaQuery.setDoc(map);
+            String guid = SurfaceAreaQuery.getModuleGuid();
+            String componentType = SurfaceAreaQuery.getComponentType();
+            FpdModuleIdentification moduleId = new FpdModuleIdentification(baseName, guid, arch);
+            updateFvs(fvBinding, moduleId);
+            outfiles.put(moduleId, "${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar 
+                            + "${TARGET}" + File.separatorChar + arch
+                            + File.separatorChar + guid + "-" + baseName
+                            + getSuffix(componentType));
+        }
+    }
+
+    /**
+      Add the current module to corresponding FV. 
+    
+      @param fvName current FV name
+      @param moduleName current module identification
+    **/
+    private void updateFvs(String fvName, FpdModuleIdentification moduleName) {
+        String upcaseFvName = fvName.toUpperCase();
+        if (fvs.containsKey(upcaseFvName)) {
+            Set<FpdModuleIdentification> set = fvs.get(upcaseFvName);
+            set.add(moduleName);
+        } else {
+            Set<FpdModuleIdentification> set = new LinkedHashSet<FpdModuleIdentification>();
+            set.add(moduleName);
+            fvs.put(upcaseFvName, set);
+        }
+    }
+
+    /**
+      Get the suffix based on component type. Current relationship are listed:  
+      
+      <pre>
+        <b>ComponentType</b>   <b>Suffix</b>
+           APPLICATION          .APP
+           SEC                  .SEC
+           PEI_CORE             .PEI
+           PE32_PEIM            .PEI
+           RELOCATABLE_PEIM     .PEI
+           PIC_PEIM             .PEI
+           COMBINED_PEIM_DRIVER .PEI
+           TE_PEIM              .PEI
+           LOGO                 .FFS
+           others               .DXE
+      </pre>
+    
+      @param componentType component type
+      @return
+      @throws BuildException
+              If component type is null
+    **/
+    public static String getSuffix(String componentType) throws BuildException{
+        if (componentType == null) {
+            throw new BuildException("Component type is not specified.");
+        }
+        String str = ".DXE";
+        if (componentType.equalsIgnoreCase("APPLICATION")) {
+            str = ".APP";
+        } else if (componentType.equalsIgnoreCase("SEC")) {
+            str = ".SEC";
+        } else if (componentType.equalsIgnoreCase("PEI_CORE")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("PE32_PEIM")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("RELOCATABLE_PEIM")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("PIC_PEIM")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("COMBINED_PEIM_DRIVER")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("TE_PEIM")) {
+            str = ".PEI";
+        } else if (componentType.equalsIgnoreCase("LOGO")) {
+            str = ".FFS";
+        }
+        return str;
+    }
+
+    /**
+      Parse module surface are info described in FPD file and put them into map. 
+      
+      @param sa module surface area info descibed in FPD file
+      @return map list with top level elements
+    **/
+    private Map<String, XmlObject> getPlatformOverrideInfo(
+                    ModuleSADocument.ModuleSA sa) {
+        Map<String, XmlObject> map = new HashMap<String, XmlObject>();
+        map.put("SourceFiles", sa.getSourceFiles());
+        map.put("Includes", sa.getIncludes());
+        map.put("Libraries", sa.getLibraries());
+        map.put("Protocols", sa.getProtocols());
+        map.put("Events", sa.getEvents());
+        map.put("Hobs", sa.getHobs());
+        map.put("PPIs", sa.getPPIs());
+        map.put("Variables", sa.getVariables());
+        map.put("BootModes", sa.getBootModes());
+        map.put("SystemTables", sa.getSystemTables());
+        map.put("DataHubs", sa.getDataHubs());
+        map.put("Formsets", sa.getFormsets());
+        map.put("Guids", sa.getGuids());
+        map.put("Externs", sa.getExterns());
+        map.put("BuildOptions", platformBuildOptions);
+        return map;
+    }
+
+    /**
+      Generate build.out.xml file.
+      
+      @throws BuildException
+              build.out.xml XML document create error
+    **/
+    private void genBuildFile() throws BuildException {
+        DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder dombuilder = domfac.newDocumentBuilder();
+            Document document = dombuilder.newDocument();
+            Comment rootComment = document.createComment(info);
+            //
+            // create root element and its attributes
+            //
+            Element root = document.createElement("project");
+            root.setAttribute("name", getProject().getProperty("PLATFORM"));
+            root.setAttribute("default", "main");
+            root.setAttribute("basedir", ".");
+            //
+            // element for External ANT tasks
+            //
+            root.appendChild(document.createComment("Apply external ANT tasks"));
+            Element ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "GenBuild.tasks");
+            root.appendChild(ele);
+
+            ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "frameworktasks.tasks");
+            root.appendChild(ele);
+
+            ele = document.createElement("property");
+            ele.setAttribute("environment", "env");
+            root.appendChild(ele);
+            //
+            // Default Target
+            //
+            root.appendChild(document.createComment("Default target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "main");
+            ele.setAttribute("depends", "modules, fvs");
+            root.appendChild(ele);
+            //
+            // Modules Target
+            //
+            root.appendChild(document.createComment("Modules target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "modules");
+
+            Set set = outfiles.keySet();
+            Iterator iter = set.iterator();
+            while (iter.hasNext()) {
+                FpdModuleIdentification moduleId = (FpdModuleIdentification) iter.next();
+                String baseName = moduleId.getBaseName();
+                Element moduleEle = document.createElement("ant");
+                moduleEle.setAttribute("antfile", GlobalData
+                                .getModulePath(baseName)
+                                + File.separatorChar + "build.xml");
+                moduleEle.setAttribute("target", baseName);
+                //
+                // ARCH
+                //
+                Element property = document.createElement("property");
+                property.setAttribute("name", "ARCH");
+                property.setAttribute("value", moduleId.getArch());
+                moduleEle.appendChild(property);
+                //
+                // PACKAGE_DIR
+                //
+                property = document.createElement("property");
+                property.setAttribute("name", "PACKAGE_DIR");
+                property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                + GlobalData.getPackagePathForModule(baseName));
+                moduleEle.appendChild(property);
+                //
+                // PACKAGE
+                //
+                property = document.createElement("property");
+                property.setAttribute("name", "PACKAGE");
+                property.setAttribute("value", GlobalData
+                                .getPackageNameForModule(baseName));
+                moduleEle.appendChild(property);
+                ele.appendChild(moduleEle);
+            }
+            root.appendChild(ele);
+            //
+            // FVS Target
+            //
+            root.appendChild(document.createComment("FVs target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "fvs");
+
+            String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();
+            for (int i = 0; i < validFv.length; i++) {
+                String inputFile = FV_OUTPUT_DIR + "" + File.separatorChar
+                                + validFv[i].toUpperCase() + ".inf";
+                Element fvEle = document.createElement("genfvimage");
+                fvEle.setAttribute("infFile", inputFile);
+                ele.appendChild(fvEle);
+                Element moveEle = document.createElement("move");
+                moveEle.setAttribute("file", validFv[i].toUpperCase() + ".fv");
+                moveEle.setAttribute("todir", FV_OUTPUT_DIR);
+                ele.appendChild(moveEle);
+            }
+            root.appendChild(ele);
+            
+            boolean isUnified = false;
+            BuildOptionsDocument.BuildOptions buildOptions = (BuildOptionsDocument.BuildOptions)platformBuildOptions;
+            if (buildOptions.getOutputDirectory() != null){
+                if (buildOptions.getOutputDirectory().getIntermediateDirectories() != null){
+                    if (buildOptions.getOutputDirectory().getIntermediateDirectories().toString().equalsIgnoreCase("UNIFIED")){
+                        isUnified = true;
+                    }
+                }
+            }
+            //
+            // Clean Target
+            //
+            root.appendChild(document.createComment("Clean target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "clean");
+            
+            if (isUnified) {
+                Element cleanEle = document.createElement("delete");
+                cleanEle.setAttribute("includeemptydirs", "true");
+                Element filesetEle = document.createElement("fileset");
+                filesetEle.setAttribute("dir", getProject().getProperty("PLATFORM_DIR") + File.separatorChar + "Build" + File.separatorChar + "${TARGET}");
+                filesetEle.setAttribute("includes", "**/OUTPUT/**");
+                cleanEle.appendChild(filesetEle);
+                ele.appendChild(cleanEle);
+            }
+            else {
+                set = outfiles.keySet();
+                iter = set.iterator();
+                while (iter.hasNext()) {
+                    FpdModuleIdentification moduleId = (FpdModuleIdentification) iter.next();
+                    String baseName = moduleId.getBaseName();
+    
+                    Element ifEle = document.createElement("if");
+                    Element availableEle = document.createElement("available");
+                    availableEle.setAttribute("file", GlobalData
+                                    .getModulePath(baseName)
+                                    + File.separatorChar + "build.xml");
+                    ifEle.appendChild(availableEle);
+                    Element elseEle = document.createElement("then");
+    
+                    Element moduleEle = document.createElement("ant");
+                    moduleEle.setAttribute("antfile", GlobalData
+                                    .getModulePath(baseName)
+                                    + File.separatorChar + "build.xml");
+                    moduleEle.setAttribute("target", baseName + "_clean");
+                    //
+                    // ARCH
+                    //
+                    Element property = document.createElement("property");
+                    property.setAttribute("name", "ARCH");
+                    property.setAttribute("value", moduleId.getArch());
+                    moduleEle.appendChild(property);
+                    //
+                    // PACKAGE_DIR
+                    //
+                    property = document.createElement("property");
+                    property.setAttribute("name", "PACKAGE_DIR");
+                    property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                    + GlobalData.getPackagePathForModule(baseName));
+                    moduleEle.appendChild(property);
+                    //
+                    // PACKAGE
+                    //
+                    property = document.createElement("property");
+                    property.setAttribute("name", "PACKAGE");
+                    property.setAttribute("value", GlobalData
+                                    .getPackageNameForModule(baseName));
+                    moduleEle.appendChild(property);
+                    elseEle.appendChild(moduleEle);
+                    ifEle.appendChild(elseEle);
+                    ele.appendChild(ifEle);
+                }
+            }
+            root.appendChild(ele);
+            //
+            // Deep Clean Target
+            //
+            root.appendChild(document.createComment("Clean All target"));
+            ele = document.createElement("target");
+            ele.setAttribute("name", "cleanall");
+
+            if (isUnified) {
+                Element cleanAllEle = document.createElement("delete");
+                cleanAllEle.setAttribute("dir", getProject().getProperty("PLATFORM_DIR") + File.separatorChar + "Build" + File.separatorChar + "${TARGET}");
+                ele.appendChild(cleanAllEle);
+            }
+            else {
+                set = outfiles.keySet();
+                iter = set.iterator();
+                while (iter.hasNext()) {
+                    FpdModuleIdentification moduleId = (FpdModuleIdentification) iter.next();
+                    String baseName = moduleId.getBaseName();
+    
+                    Element ifEle = document.createElement("if");
+                    Element availableEle = document.createElement("available");
+                    availableEle.setAttribute("file", GlobalData
+                                    .getModulePath(baseName)
+                                    + File.separatorChar + "build.xml");
+                    ifEle.appendChild(availableEle);
+                    Element elseEle = document.createElement("then");
+    
+                    Element moduleEle = document.createElement("ant");
+                    moduleEle.setAttribute("antfile", GlobalData
+                                    .getModulePath(baseName)
+                                    + File.separatorChar + "build.xml");
+                    moduleEle.setAttribute("target", baseName + "_cleanall");
+                    //
+                    // ARCH
+                    //
+                    Element property = document.createElement("property");
+                    property.setAttribute("name", "ARCH");
+                    property.setAttribute("value", moduleId.getArch());
+                    moduleEle.appendChild(property);
+                    //
+                    // PACKAGE_DIR
+                    //
+                    property = document.createElement("property");
+                    property.setAttribute("name", "PACKAGE_DIR");
+                    property.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar
+                                    + GlobalData.getPackagePathForModule(baseName));
+                    moduleEle.appendChild(property);
+                    //
+                    // PACKAGE
+                    //
+                    property = document.createElement("property");
+                    property.setAttribute("name", "PACKAGE");
+                    property.setAttribute("value", GlobalData
+                                    .getPackageNameForModule(baseName));
+                    moduleEle.appendChild(property);
+                    elseEle.appendChild(moduleEle);
+                    ifEle.appendChild(elseEle);
+                    ele.appendChild(ifEle);
+                }
+            }
+            root.appendChild(ele);
+            
+            document.appendChild(rootComment);
+            document.appendChild(root);
+            //
+            // Prepare the DOM document for writing
+            //
+            Source source = new DOMSource(document);
+            //
+            // Prepare the output file
+            //
+            File file = new File(getProject().getProperty("PLATFORM_DIR")
+                            + File.separatorChar + "build.out.xml");
+            //
+            // generate all directory path
+            //
+            (new File(file.getParent())).mkdirs();
+            Result result = new StreamResult(file);
+            //
+            // Write the DOM document to the file
+            //
+            Transformer xformer = TransformerFactory.newInstance()
+                            .newTransformer();
+            xformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            xformer.transform(source, result);
+        } catch (Exception ex) {
+            throw new BuildException("Generate build.out.xml failed. \n" + ex.getMessage());
+        }
+    }
+
+    /**
+      Add a property. 
+      
+      @param p property
+    **/
+    public void addProperty(Property p) {
+        properties.addElement(p);
+    }
+
+    /**
+      Get FPD file name.
+       
+      @return FPD file name.
+    **/
+    public File getFpdFilename() {
+        return fpdFilename;
+    }
+
+    /**
+      Set FPD file name.
+      
+      @param fpdFilename FPD file name
+    **/
+    public void setFpdFilename(File fpdFilename) {
+        this.fpdFilename = fpdFilename;
+    }
+
+    public File getGuiddatabase() {
+        return guiddatabase;
+    }
+
+    public void setGuiddatabase(File guiddatabase) {
+        this.guiddatabase = guiddatabase;
+    }
+
+    public void collectPCDInformation() {
+      CollectPCDAction collectAction = new CollectPCDAction ();
+      //
+      // Set memory database log file path. It should be put into same directory with FPD file. 
+      //
+      GlobalData.getPCDMemoryDBManager().setLogFileName(
+                   fpdFilename.getPath() + ".PCDMemroyDatabaseLog.txt"
+                   );
+      //
+      // Collect all PCD information from FPD to MSA, and get help information from SPD.
+      // These all information will be stored into memory database for future usage such 
+      // as autogen.
+      //
+      try {
+        collectAction.perform (
+          getProject().getProperty("WORKSPACE_DIR"),
+          fpdFilename.getPath(),
+          ActionMessage.NULL_MESSAGE_LEVEL
+          );
+      } catch (Exception exp) {
+        throw new BuildException (exp.getMessage());
+      }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java b/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java
new file mode 100644
index 0000000000..78cde75604
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java
@@ -0,0 +1,129 @@
+/** @file
+This file is used to define class which represents dependency file in ANT task
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.global;
+
+import org.apache.tools.ant.types.DataType;
+import org.apache.tools.ant.types.Path;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ DpFile is a ANT DataType which can be used to specify dependency files from
+ a file list file, from file list string separated by space, comma or semi-comma,
+ or from file name with absolute path
+ **/
+public class DpFile  extends DataType {
+    ///
+    /// keep the list of files path
+    ///
+    private List<String> nameList = new ArrayList<String>();
+
+    /**
+     Empty constructor just in case
+     **/
+    public DpFile() {
+    }
+
+    /**
+     Empty execute method of ANT task, just in case
+     **/
+    public void execute() {
+    }
+
+    /**
+     Standard set method of ANT task/datatype, for ListFile attribute. It simply
+     fetch one file path a line from specified list file, and put them in nameList
+
+     @param     fileListFile    file which contains a file list, one file a line,
+                                with full path
+     **/
+    public void setListFile(String fileListFile) {
+        File file = new File(fileListFile);
+        if (!file.exists()) {
+            return;
+        }
+
+        try {
+            FileReader fileReader = new FileReader(file);
+            LineNumberReader lineReader = new LineNumberReader(fileReader);
+
+            String filePath = null;
+            while ((filePath = lineReader.readLine()) != null) {
+                filePath = filePath.trim();
+                if (filePath.length() == 0) {
+                    continue;
+                }
+                this.nameList.add(filePath);
+            }
+
+            lineReader.close();
+            fileReader.close();
+        } catch (IOException e) {
+            System.out.println (e.getMessage());
+        }
+    }
+
+    /**
+     Standard set method of ANT task/datatype, for List attribute.
+
+     @param     fileList        string with file pathes separated by space, comma,
+                                or semi-comma
+     **/
+    public void setList(String fileList) {
+        //
+        // space, comma or semi-comma separated files list
+        //
+        Pattern pattern = Pattern.compile("([^ ,;\n\r]++)[ ,;\n\r]*+");
+        Matcher matcher = pattern.matcher(fileList);
+
+        while (matcher.find()) {
+            //
+            // keep each file name before " ,;\n\r"
+            //
+            String filePath = fileList.substring(matcher.start(1), matcher.end(1)).trim();
+            if (filePath.length() == 0) {
+                continue;
+            }
+            nameList.add(Path.translateFile(filePath));
+        }
+
+    }
+
+    /**
+     Standard set method of ANT task/datatype, for Name attribute.
+
+     @param     fileName        string of a file full path
+     **/
+    public void setName(String fileName) {
+        this.nameList.add(fileName);
+    }
+
+    /**
+     Fetch the file name list.
+
+     @returns   A string list which contains file names specified to check dependnecy
+     **/
+    public List<String> getList() {
+        return this.nameList;
+    }
+}
+
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/DpFileList.java b/Tools/Source/GenBuild/org/tianocore/build/global/DpFileList.java
new file mode 100644
index 0000000000..8b4b4a0add
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/DpFileList.java
@@ -0,0 +1,50 @@
+/** @file
+This file is used to nest elements corresponding to DpFile
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.global;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ DpFileList is a container of Dpfile at the point of ANT task/datatype
+ **/
+public class DpFileList {
+    ///
+    /// Keep all the file names from all nested DpFile
+    ///
+    List<String> nameList = new ArrayList<String>();
+
+    /**
+     Empty constructor just in case
+     **/
+    public DpFileList() {
+    }
+
+    /**
+     Empty execute method of ANT task. ANT will call it even we don't need it.
+     **/
+    public void execute() {
+    }
+
+    /**
+     Standard add method of ANT task, for nested DpFile type of elements. It just
+     simply fetch the files list from DpFile and put them in its own nameList.
+
+     @param     f   a DpFile object which will be instantiated by ANT
+     **/
+    public void addConfiguredFile(DpFile f) {
+        this.nameList.addAll(f.getList());
+    }
+}
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
new file mode 100644
index 0000000000..611758a4ef
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -0,0 +1,637 @@
+/** @file
+  GlobalData class. 
+  
+  GlobalData provide initializing, instoring, querying and update global data.
+  It is a bridge to intercommunicate between multiple component, such as AutoGen,
+  PCD and so on.   
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.global;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.FrameworkDatabaseDocument;
+import org.tianocore.MsaFilesDocument;
+import org.tianocore.PackageListDocument;
+import org.tianocore.PackageSurfaceAreaDocument;
+import org.tianocore.MsaHeaderDocument.MsaHeader;
+import org.tianocore.MsaLibHeaderDocument.MsaLibHeader;
+import org.tianocore.build.pcd.entity.MemoryDatabaseManager;
+import org.tianocore.build.autogen.CommonDefinition;
+import org.tianocore.build.fpd.FpdParserTask;
+
+/**
+  GlobalData provide initializing, instoring, querying and update global data.
+  It is a bridge to intercommunicate between multiple component, such as AutoGen,
+  PCD and so on. 
+  
+  <p>Note that all global information are initialized incrementally. All data will 
+  parse and record only it is necessary during build time. </p>
+  
+  @since GenBuild 1.0
+**/
+public class GlobalData {
+
+    ///
+    /// means no surface area information for module
+    ///
+    public static final int NO_SA = 0;
+
+    ///
+    /// means only MSA
+    ///
+    public static final int ONLY_MSA = 1;
+
+    ///
+    /// means only Library MSA
+    ///
+    public static final int ONLY_LIBMSA = 2;
+
+    ///
+    /// means both MSA and MBD
+    ///
+    public static final int MSA_AND_MBD = 3;
+
+    ///
+    /// means both Library MSA and Library MBD
+    ///
+    public static final int LIBMSA_AND_LIBMBD = 4;
+
+    ///
+    /// Be used to ensure Global data will be initialized only once.
+    ///
+    public static boolean globalFlag = false;
+
+    ///
+    /// Record current WORKSPACE Directory
+    ///
+    private static String workspaceDir = "";
+
+    ///
+    /// Two columns: Package Name (Key), Package Path(ralative to WORKSPACE)
+    ///
+    private static final Map<String, String> packageInfo = new HashMap<String, String>();
+
+    ///
+    /// spdTable
+    /// Key: Package Name, Value: SPD detail info
+    ///
+    private static final Map<String, Spd> spdTable = new HashMap<String, Spd>();
+
+    ///
+    /// Three columns:
+    /// 1. Module Name | BaseName (Key)
+    /// 2. Module Path + Msa file name (relative to Package)
+    /// 3. Package Name (This module belong to which package)
+    ///
+    private static final Map<String, String[]> moduleInfo = new HashMap<String, String[]>();
+
+    ///
+    /// List all libraries for current build module
+    /// Key: Library BaseName, Value: output library path+name
+    ///
+    private static final Map<String, String> libraries = new HashMap<String, String>();
+
+    ///
+    /// Store every module's relative library instances BaseName
+    /// Key: Module BaseName, Value: All library instances module depends on.
+    ///
+    private static final Map<String, Set<String> > moduleLibraryMap = new HashMap<String, Set<String> >();
+
+    ///
+    /// Key: Module BaseName, Value: original MSA info
+    ///
+    private static final Map<String, Map<String, XmlObject> > nativeMsa = new HashMap<String, Map<String, XmlObject> >();
+
+    ///
+    /// Key: Module BaseName, Value: original MBD info
+    ///
+    private static final Map<String, Map<String, XmlObject> > nativeMbd = new HashMap<String, Map<String, XmlObject> >();
+
+    ///
+    /// Two columns: Module Name or Base Name as Key
+    /// Value is a HashMap with overridden data from MSA/MBD or/and Platform
+    ///
+    private static final Map<String, Map<String, XmlObject> > parsedModules = new HashMap<String, Map<String, XmlObject> >();
+
+    ///
+    /// List all built Module; Value is Module BaseName + Arch. TBD
+    ///
+    private static final Set<String> builtModules = new HashSet<String>();
+
+    ///
+    /// Library instance information table which recored the library and it's
+    /// constructor and distructor function
+    ///
+    private static final Map<String, String[]> libInstanceInfo = new HashMap<String, String[]>();
+
+    ///
+    /// PCD memory database stored all PCD information which collected from FPD,MSA and SPD.
+    ///
+    private static final MemoryDatabaseManager pcdDbManager = new MemoryDatabaseManager();
+
+    /**
+      Query the module's absolute path with module base name. 
+      
+      @param moduleName the base name of the module
+      @return the absolute module path
+    **/
+    public synchronized static String getModulePath(String moduleName) {
+        String[] info = moduleInfo.get(moduleName);
+        String packagePath = (String) packageInfo.get(info[1]);
+        File convertFile = new File(workspaceDir + File.separatorChar + packagePath + File.separatorChar + info[0]);
+        return convertFile.getParent();
+    }
+
+    /**
+      Query the module's absolute MSA file path with module base name. 
+    
+      @param moduleName the base name of the module
+      @return the absolute MSA file name
+      @throws BuildException
+              Base name is not registered in any SPD files
+    **/
+    private synchronized static String getMsaFilename(String moduleName) throws BuildException {
+        String[] info = moduleInfo.get(moduleName);
+        if (info == null) {
+            throw new BuildException("Module base name [" + moduleName + "] can't found in all SPD.");
+        }
+        String packagePath = (String) packageInfo.get(info[1]);
+        File convertFile = new File(workspaceDir + File.separatorChar + packagePath + File.separatorChar + info[0]);
+        return convertFile.getPath();
+    }
+
+    /**
+      Query the module's absolute MBD file path with module base name. 
+    
+      @param moduleName the base name of the module
+      @return the absolute MBD file name
+      @throws BuildException
+              Base name is not registered in any SPD files
+    **/
+    private synchronized static String getMbdFilename(String moduleName) throws BuildException {
+        String[] info = moduleInfo.get(moduleName);
+        if (info == null) {
+            throw new BuildException("Info: Module base name [" + moduleName + "] can't found in all SPD.");
+        }
+        String packagePath = (String) packageInfo.get(info[1]);
+        File convertFile = new File(workspaceDir + File.separatorChar + packagePath + File.separatorChar + info[0]);
+        return convertFile.getPath().substring(0, convertFile.getPath().length() - 4) + ".mbd";
+    }
+
+    /**
+      Get the current WORKSPACE Directory. 
+      @return current workspace directory
+    **/
+    public synchronized static String getWorkspacePath() {
+        return workspaceDir;
+    }
+
+    /**
+      Query package relative path to WORKSPACE_DIR with package name. 
+      
+      @param packageName the name of the package
+      @return the path relative to WORKSPACE_DIR 
+    **/
+    public synchronized static String getPackagePath(String packageName) {
+        return (String) packageInfo.get(packageName);
+    }
+
+    /**
+      Query package (which the module belongs to) relative path to WORSPACE_DIR.  
+    
+      @param moduleName the base name of the module
+      @return the relative path to WORKSPACE_DIR of the package which the module belongs to
+    **/
+    public synchronized static String getPackagePathForModule(String moduleName) {
+        String[] info = moduleInfo.get(moduleName);
+        String packagePath = (String) packageInfo.get(info[1]);
+        return packagePath;
+    }
+
+    /**
+      Query the package name which the module belongs to with the module's base name.
+    
+      @param moduleName the base name of the module
+      @return the package name which the module belongs to
+    **/
+    public synchronized static String getPackageNameForModule(String moduleName) {
+        return moduleInfo.get(moduleName)[1];
+    }
+
+    /**
+      Parse framework database (DB) and all SPD files listed in DB to initialize
+      the environment for next build. This method will only be executed only once
+      in the whole build process.  
+      
+      @param workspaceDatabaseFile the file name of framework database
+      @param workspaceDir current workspace directory path
+      @throws BuildException
+              Framework Dababase or SPD or MSA file is not valid
+    **/
+    public synchronized static void initInfo(String workspaceDatabaseFile, String workspaceDir) throws BuildException {
+        if (globalFlag) {
+            return;
+        }
+        globalFlag = true;
+        GlobalData.workspaceDir = workspaceDir;
+        File dbFile = new File(workspaceDir + File.separatorChar + workspaceDatabaseFile);
+        try {
+            FrameworkDatabaseDocument db = (FrameworkDatabaseDocument) XmlObject.Factory.parse(dbFile);
+            List<PackageListDocument.PackageList.Package> packages = db.getFrameworkDatabase().getPackageList()
+                                                                       .getPackageList();
+            Iterator iter = packages.iterator();
+            while (iter.hasNext()) {
+                PackageListDocument.PackageList.Package packageItem = (PackageListDocument.PackageList.Package) iter
+                                                                                                                    .next();
+                String name = packageItem.getPackageNameArray(0).getStringValue();
+                String path = packageItem.getPathArray(0).getStringValue();
+                packageInfo.put(name, path);
+                File spdFile = new File(workspaceDir + File.separatorChar + path + File.separatorChar + name + ".spd");
+                initPackageInfo(spdFile.getPath(), name);
+                // 
+                // SPD Parse.
+                //
+                PackageSurfaceAreaDocument spdDoc = (PackageSurfaceAreaDocument) XmlObject.Factory.parse(spdFile);
+                Spd spd = new Spd(spdDoc, path);
+                spdTable.put(name, spd);
+
+            }
+        } catch (Exception e) {
+            throw new BuildException("Parse workspace Database [" + dbFile.getPath() + "] Error.\n" + e.getMessage());
+        }
+    }
+
+    /**
+      Parse every MSA files, get base name from MSA Header. And record those
+      values to ModuleInfo.
+      
+      @param packageFilename the file name of the package
+      @param packageName the name of the package
+      @throws BuildException
+              SPD or MSA file is not valid
+    **/
+    private synchronized static void initPackageInfo(String packageFilename, String packageName) throws BuildException {
+        File packageFile = new File(packageFilename);
+        try {
+            PackageSurfaceAreaDocument spd = (PackageSurfaceAreaDocument) XmlObject.Factory.parse(packageFile);
+            List<MsaFilesDocument.MsaFiles.MsaFile> msasList = spd.getPackageSurfaceArea().getMsaFiles()
+                                                                  .getMsaFileList();
+            Iterator msasIter = msasList.iterator();
+            while (msasIter.hasNext()) {
+                MsaFilesDocument.MsaFiles.MsaFile msas = (MsaFilesDocument.MsaFiles.MsaFile) msasIter.next();
+                String msaFilename = msas.getFilename().getStringValue();
+                File msaFile = new File(workspaceDir + File.separatorChar + GlobalData.getPackagePath(packageName)
+                                        + File.separatorChar + msaFilename);
+                SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();
+                Map<String, XmlObject> map = surfaceAreaParser.parseFile(msaFile);
+                String baseName = "";
+                XmlObject header = null;
+                if ((header = map.get("MsaHeader")) != null) {
+                    baseName = ((MsaHeader) header).getBaseName().getStringValue();
+                } else if ((header = map.get("MsaLibHeader")) != null) {
+                    baseName = ((MsaLibHeader) header).getBaseName().getStringValue();
+                } else {
+                    continue;
+                }
+                nativeMsa.put(baseName, map);
+                String[] info = { msaFilename, packageName };
+                moduleInfo.put(baseName, info);
+            }
+        } catch (Exception e) {
+            throw new BuildException("Parse package description file [" + packageFile.getPath() + "] Error.\n"
+                                     + e.getMessage());
+        }
+    }
+
+    /**
+      Query the libraries which the module depends on.
+    
+      @param moduleName the base name of the module
+      @return the libraries which the module depends on
+    **/
+    public synchronized static String[] getModuleLibrary(String moduleName) {
+        Set<String> set = moduleLibraryMap.get(moduleName);
+        return set.toArray(new String[set.size()]);
+    }
+
+    /**
+      Register module's library list which it depends on for later use. 
+      
+      @param moduleName the base name of the module
+      @param libraryList the libraries which the module depends on
+    **/
+    public synchronized static void addModuleLibrary(String moduleName, Set<String> libraryList) {
+        moduleLibraryMap.put(moduleName, libraryList);
+    }
+
+    /**
+      Query the library absolute file name with library name. 
+      
+      @param library the base name of the library
+      @return the library absolute file name
+    **/
+    public synchronized static String getLibrary(String library) {
+        return libraries.get(library);
+    }
+
+    /**
+      Register library absolute file name for later use.
+      
+      @param library the base name of the library
+      @param resultPath the library absolute file name
+    **/
+    public synchronized static void addLibrary(String library, String resultPath) {
+        libraries.put(library, resultPath);
+    }
+
+    /**
+      Whether the module with ARCH has built in the previous build. 
+      
+      @param moduleName the base name of the module
+      @param arch current build ARCH
+      @return true if the module has built in previous, otherwise return false
+    **/
+    public synchronized static boolean isModuleBuilt(String moduleName, String arch) {
+        return builtModules.contains(moduleName + "-" + arch);
+    }
+
+    /**
+      Register the module with ARCH has built. 
+    
+      @param moduleName the base name of the module
+      @param arch current build ARCH
+    **/
+    public synchronized static void registerBuiltModule(String moduleName, String arch) {
+        builtModules.add(moduleName + "-" + arch);
+    }
+
+    /**
+      Whether the module's surface area has parsed in the previous build.
+      
+      @param moduleName the base name of the module
+      @return true if the module's surface area has parsed in previous, otherwise
+      return false
+    **/
+    public synchronized static boolean isModuleParsed(String moduleName) {
+        return parsedModules.containsKey(moduleName);
+    }
+
+    /**
+      Query overrided module surface area information. If current is Package
+      or Platform build, also include the information from FPD file. 
+      
+      <p>Note that surface area parsing is incremental. That means the method will 
+      only to parse the MSA and MBD files when never parsed before. </p>
+    
+      @param moduleName the base name of the module
+      @return the overrided module surface area information
+      @throws BuildException
+              MSA or MBD is not valid
+    **/
+    public synchronized static Map<String, XmlObject> getDoc(String moduleName) throws BuildException {
+        if (parsedModules.containsKey(moduleName)) {
+            return parsedModules.get(moduleName);
+        }
+        Map<String, XmlObject> msaMap = getNativeMsa(moduleName);
+        Map<String, XmlObject> mbdMap = getNativeMbd(moduleName);
+        OverrideProcess op = new OverrideProcess();
+        Map<String, XmlObject> map = op.override(mbdMap, msaMap);
+        //
+        // IF IT IS A PALTFORM BUILD, OVERRIDE FROM PLATFORM
+        //
+        if (FpdParserTask.platformBuildOptions != null) {
+            Map<String, XmlObject> platformMap = new HashMap<String, XmlObject>();
+            platformMap.put("BuildOptions", FpdParserTask.platformBuildOptions);
+            Map<String, XmlObject> overrideMap = op.override(platformMap, OverrideProcess.deal(map));
+            GlobalData.registerModule(moduleName, overrideMap);
+            return overrideMap;
+        } else {
+            parsedModules.put(moduleName, map);
+            return map;
+        }
+    }
+
+    /**
+      Query the native MSA information with module base name. 
+      
+      <p>Note that MSA parsing is incremental. That means the method will 
+      only to parse the MSA files when never parsed before. </p>
+      
+      @param moduleName the base name of the module
+      @return the native MSA information
+      @throws BuildException
+              MSA file is not valid
+    **/
+    public synchronized static Map<String, XmlObject> getNativeMsa(String moduleName) throws BuildException {
+        if (nativeMsa.containsKey(moduleName)) {
+            return nativeMsa.get(moduleName);
+        }
+        String msaFilename = getMsaFilename(moduleName);
+        File msaFile = new File(msaFilename);
+        if (!msaFile.exists()) {
+            throw new BuildException("Info: Surface Area file [" + msaFile.getPath() + "] can't found.");
+        }
+        SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();
+        Map<String, XmlObject> map = surfaceAreaParser.parseFile(msaFile);
+        nativeMsa.put(moduleName, map);
+        return map;
+    }
+    
+    /**
+      Query the native MBD information with module base name. 
+      
+      <p>Note that MBD parsing is incremental. That means the method will 
+      only to parse the MBD files when never parsed before. </p>
+    
+      @param moduleName the base name of the module
+      @return the native MBD information
+      @throws BuildException
+              MBD file is not valid
+    **/
+    public synchronized static Map<String, XmlObject> getNativeMbd(String moduleName) throws BuildException {
+        if (nativeMbd.containsKey(moduleName)) {
+            return nativeMbd.get(moduleName);
+        }
+        String mbdFilename = getMbdFilename(moduleName);
+        File mbdFile = new File(mbdFilename);
+        if (!mbdFile.exists()) {
+            throw new BuildException("Info: Surface Area file [" + mbdFile.getPath() + "] can't found.");
+        }
+        SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();
+        Map<String, XmlObject> map = surfaceAreaParser.parseFile(mbdFile);
+        nativeMbd.put(moduleName, map);
+        return map;
+    }
+
+    /**
+      Register module overrided surface area information. If has existed, then update.
+      
+      @param moduleName the base name of the module
+      @param map the overrided surface area information
+    **/
+    public synchronized static void registerModule(String moduleName, Map<String, XmlObject> map) {
+        parsedModules.put(moduleName, map);
+    }
+
+    /**
+     * 
+     * @param protocolName
+     * @return
+     */
+    public synchronized static String[] getProtocolInfoGuid(String protocolName) {
+        Set set = spdTable.keySet();
+        Iterator iter = set.iterator();
+        String[] cNameGuid = null;
+
+        while (iter.hasNext()) {
+            Spd spd = (Spd) spdTable.get(iter.next());
+            cNameGuid = spd.getProtocolNameGuidArray(protocolName);
+            if (cNameGuid != null) {
+                break;
+            }
+        }
+        return cNameGuid;
+    }
+
+    public synchronized static String[] getPpiInfoGuid(String ppiName) {
+        Set set = spdTable.keySet();
+        Iterator iter = set.iterator();
+        String[] cNameGuid = null;
+
+        while (iter.hasNext()) {
+            Spd spd = (Spd) spdTable.get(iter.next());
+            cNameGuid = spd.getPpiCnameGuidArray(ppiName);
+
+            if (cNameGuid != null) {
+                break;
+            }
+        }
+        return cNameGuid;
+    }
+
+    /**
+     * 
+     * @param guidName
+     * @return
+     */
+    public synchronized static String[] getGuidInfoGuid(String guidName) {
+        String[] cNameGuid = null;
+        Set set = spdTable.keySet();
+        Iterator iter = set.iterator();
+
+        while (iter.hasNext()) {
+            Spd spd = (Spd) spdTable.get(iter.next());
+            cNameGuid = spd.getGuidNameArray(guidName);
+            if (cNameGuid != null) {
+                break;
+            }
+        }
+        return cNameGuid;
+    }
+
+    public synchronized static String getLibClassIncluder(String libName) {
+        String libIncluder = null;
+        Set set = spdTable.keySet();
+        Iterator iter = set.iterator();
+
+        while (iter.hasNext()) {
+            String packageName = (String) iter.next();
+            Spd spd = (Spd) spdTable.get(packageName);
+            libIncluder = spd.getLibClassIncluder(libName);
+            String packagePath = spd.packagePath;
+            if (packagePath != null) {
+                packagePath = packagePath.replace('\\', File.separatorChar);
+                packagePath = packagePath.replace('/', File.separatorChar);
+            } else {
+                packagePath = packageName;
+            }
+            if (libIncluder != null) {
+                libIncluder = libIncluder.replace('\\', File.separatorChar);
+                libIncluder = libIncluder.replace('/', File.separatorChar);
+                libIncluder = packageName + File.separatorChar + libIncluder;
+                break;
+            }
+        }
+        return libIncluder;
+    }
+
+    public synchronized static String getModuleInfoByPackageName(String packageName, String moduleType) {
+        Spd spd;
+        String includeFile = null;
+        String includeStr = "";
+        String cleanPath = "";
+
+        spd = (Spd) spdTable.get(packageName);
+        includeFile = spd.getModuleTypeIncluder(moduleType);
+        if (includeFile != null) {
+            includeFile = includeFile.replace('\\', File.separatorChar);
+            includeFile = includeFile.replace('/', File.separatorChar);
+            includeStr = CommonDefinition.include + " <" + includeStr;
+            cleanPath = spd.packagePath;
+            cleanPath = cleanPath.replace('\\', File.separatorChar);
+            cleanPath = cleanPath.replace('/', File.separatorChar);
+
+            if (cleanPath.charAt(spd.packagePath.length() - 1) != File.separatorChar) {
+                cleanPath = cleanPath + File.separatorChar;
+            }
+            includeStr = includeStr + cleanPath;
+            includeStr = includeStr + includeFile;
+            includeStr = includeStr + ">\r\n";
+        }
+
+        return includeStr;
+    }
+
+    public synchronized static void setLibInstanceInfo(String libName, String libConstructor, String libDesturctor) {
+        String[] libConsDes = new String[2];
+        libConsDes[0] = libConstructor;
+        libConsDes[1] = libDesturctor;
+
+        libInstanceInfo.put(libName, libConsDes);
+    }
+
+    public synchronized static boolean isHaveLibInstance(String libName) {
+        return libInstanceInfo.containsKey(libName);
+    }
+
+    public synchronized static String getLibInstanceConstructor(String libName) {
+        String[] libInstanceValue;
+        libInstanceValue = libInstanceInfo.get(libName);
+        if (libInstanceValue != null) {
+            return libInstanceValue[0];
+        } else {
+            return null;
+        }
+    }
+
+    public synchronized static String getLibInstanceDestructor(String libName) {
+        String[] libInstanceValue;
+        libInstanceValue = libInstanceInfo.get(libName);
+        if (libInstanceValue != null) {
+            return libInstanceValue[1];
+        } else {
+            return null;
+        }
+    }
+
+    public synchronized static MemoryDatabaseManager getPCDMemoryDBManager() {
+        return pcdDbManager;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalShare.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalShare.java
new file mode 100644
index 0000000000..5912127a10
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalShare.java
@@ -0,0 +1,178 @@
+/*++
+
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ Module Name:
+ ShareObject.java
+
+ Abstract:
+
+ --*/
+package org.tianocore.build.global;
+
+import java.util.*;
+
+import org.apache.tools.ant.*;
+import org.apache.tools.ant.types.DataType;
+
+public class GlobalShare extends DataType implements DynamicConfigurator {
+    private static final HashMap<String, Object> objStorage = new HashMap<String, Object>();
+
+    private DataObjectOp op;
+
+    private String objName;
+
+    private Object objInst;
+
+    private String objClassPackage = "org.tianocore";
+
+    public GlobalShare () {
+
+    }
+
+    public GlobalShare (String objName) {
+        this.objName = objName;
+        this.objInst = objStorage.get(this.objName);
+    }
+
+    public GlobalShare (String objName, Object obj) {
+        this.objName = objName;
+        this.objInst = obj;
+        objStorage.put(this.objName, this.objInst);
+    }
+
+    public Object createDynamicElement(String name) throws BuildException {
+        String className = objClassPackage + "." + name;
+        log("GlobalShare.createDynamicElement(" + name + ")",
+                        Project.MSG_VERBOSE);
+        try {
+            objInst = Class.forName(className).newInstance();
+        } catch (ClassNotFoundException e) {
+            throw new BuildException("class name is not found");
+        } catch (InstantiationException e) {
+            throw new BuildException("the class cannnot be instantiated");
+        } catch (IllegalAccessException e) {
+            throw new BuildException("cannot access the class");
+        }
+
+        return objInst;
+    }
+
+    public void setDynamicAttribute(String name, String value)
+                    throws BuildException {
+        log("name = " + name + " value = " + value, Project.MSG_VERBOSE);
+        throw new BuildException();
+    }
+
+    public void setName(String name) {
+        this.objName = name;
+        if (this.op != null) {
+            issueOperation();
+        }
+    }
+
+    public String getName() {
+        return this.objName;
+    }
+
+    public void setPackage(String name) {
+        log("ShareObject.setPackage(" + name + ")", Project.MSG_VERBOSE);
+        this.objClassPackage = name;
+    }
+
+    public String getPackage() {
+        return this.objClassPackage;
+    }
+
+    public void setOperation(String opName) {
+        log("ShareObject.setOperation(" + opName + ")", Project.MSG_VERBOSE);
+        this.op = DataObjectOp.formString(opName);
+
+        if (this.objName != null) {
+            issueOperation();
+        }
+    }
+
+    public String getOperation() {
+        return this.op.toString();
+    }
+
+    public void issueOperation() {
+        if (this.op == DataObjectOp.ADD) {
+
+            log("ShareObject: adding ... " + this.objName, Project.MSG_VERBOSE);
+            objStorage.put(this.objName, this.objInst);
+
+        } else if (this.op == DataObjectOp.GET) {
+
+            log("ShareObject: fetching ... " + this.objName,
+                            Project.MSG_VERBOSE);
+            objInst = objStorage.get(objName);
+
+        } else if (this.op == DataObjectOp.DEL) {
+
+            log("ShareObject: removing ... " + this.objName,
+                            Project.MSG_VERBOSE);
+            objInst = objStorage.remove(objName);
+
+        } else {
+            throw new BuildException("not supported operation");
+        }
+    }
+
+    public Object get() {
+        return this.objInst;
+    }
+
+    public static int getObjectNum() {
+        return objStorage.size();
+    }
+
+    public static Object add(String objName, Object obj) {
+        return objStorage.put(objName, obj);
+    }
+
+    public static Object retrieve(String objName) {
+        return objStorage.get(objName);
+    }
+
+    public static Object remove(String objName) {
+        return objStorage.remove(objName);
+    }
+
+    public static void empty() {
+        objStorage.clear();
+    }
+}
+
+class DataObjectOp {
+    private static final HashMap<String, DataObjectOp> opMap = new HashMap<String, DataObjectOp>();
+
+    private final String opName;
+
+    private DataObjectOp (String name) {
+        this.opName = name;
+        opMap.put(this.opName, this);
+    }
+
+    public String toString() {
+        return opName;
+    }
+
+    public static DataObjectOp formString(String opName) {
+        return opMap.get(opName);
+    }
+
+    public static final DataObjectOp ADD = new DataObjectOp("ADD");
+
+    public static final DataObjectOp GET = new DataObjectOp("GET");
+
+    public static final DataObjectOp DEL = new DataObjectOp("DEL");
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/LibBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/global/LibBuildFileGenerator.java
new file mode 100644
index 0000000000..4d7e870587
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/LibBuildFileGenerator.java
@@ -0,0 +1,412 @@
+/** @file
+  This file is an ANT task.
+  
+  LibBuildFileGenerator task is used to generate module's build.xml file.
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.global;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.MsaHeaderDocument.MsaHeader;
+import org.tianocore.MsaLibHeaderDocument.MsaLibHeader;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+  This class <code>LibBuildFileGenerator</code> is an ANT task to generate 
+  build.xml for each module. Here are two usages. 
+  
+  <ul>
+    <li>
+      For one module (<b>bf</b> is LibBuildFileGenerator task name):
+      <pre>
+        &lt;bf buildFile="Application\HelloWorld\HelloWorld.msa" /&gt;
+      </pre>
+    </li>
+    <li>
+      For one package:
+      <pre>
+        &lt;bf recursive="true" /&gt;
+      </pre>
+    </li>
+  </ul>
+  
+  @since GenBuild 1.0
+**/
+public class LibBuildFileGenerator extends Task {
+
+    private File buildFile;
+
+    private boolean recursive = false;
+    
+    private String license = " Copyright (c) 2006, Intel Corporation \n"
+                    + "All rights reserved. This program and the accompanying materials \n"
+                    + "are licensed and made available under the terms and conditions of the BSD License \n"
+                    + "which accompanies this distribution.  The full text of the license may be found at  \n"
+                    + "http://opensource.org/licenses/bsd-license.php \n"
+                    + "\n"
+                    + "THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN \"AS IS\" BASIS, \n"
+                    + "WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.";
+
+    private String base_name;
+    
+    private String module_relative_path;
+    
+    private File base_file = new File(".");
+    
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public LibBuildFileGenerator () {
+    }
+
+    /**
+      ANT task's entry point, will be called after init(). 
+      
+      @throws BuildException
+              buildFile do not specify while recursive set to false
+    **/
+    public void execute() throws BuildException {
+        if(recursive){
+            searchMsa(new File("."));
+        }
+        else {
+            Map<String,File> map = new HashMap<String,File>();
+            String basename = buildFile.getName();
+            int k = basename.lastIndexOf('.');
+            base_name = basename.substring(0, k);
+            map.put(base_name, buildFile);
+            genBuildFile(map);
+        }
+    }
+    
+    /**
+      Recursivly find all MSA files and record all modules. 
+      
+      @param path Package path
+    **/
+    private void searchMsa(File path){
+        File[] files = path.listFiles();
+        Vector<File> vec = new Vector<File>();
+        for(int i=0; i < files.length; i ++){
+            if (files[i].isFile()){
+                if(files[i].getName().endsWith(".msa")){
+                    System.out.println("#" + files[i].getPath());
+                    vec.add(files[i]);
+                }
+            }
+        }
+        Map<String,File> mapBasename = new HashMap<String,File>();
+        if (vec.size() > 0){
+            base_name = null;
+            for ( int j = 0 ; j < vec.size(); j++){
+                if ( vec.size() > 1){
+                  System.out.println("##" + vec.get(0));
+                }
+                File f = (File)vec.get(j);
+                SurfaceAreaParser surfaceAreaParser = new SurfaceAreaParser();
+                Map<String, XmlObject> map = surfaceAreaParser.parseFile(f);
+                String baseName = "";
+                XmlObject header = null;
+                if ( (header = map.get("MsaHeader")) != null ){
+                    baseName = ((MsaHeader)header).getBaseName().getStringValue();
+                }
+                else if ( (header = map.get("MsaLibHeader")) != null){
+                    baseName = ((MsaLibHeader)header).getBaseName().getStringValue();
+                } else {
+                    continue ;
+                }
+                if ( base_name == null || base_name.length() > baseName.length()){
+                    base_name = baseName;
+                    buildFile = f;
+                    try {
+                    module_relative_path = buildFile.getParent().substring(base_file.getPath().length() + 1);
+                    }
+                    catch(Exception e){
+                        module_relative_path = ".";
+                    }
+                }
+                mapBasename.put(baseName, f);
+            }
+            genBuildFile(mapBasename);
+        }
+
+        for(int i=0; i < files.length; i ++){
+            if (files[i].isDirectory()){
+                searchMsa(files[i]);
+            }
+        }
+    }
+    
+    /**
+      Generate build.xml.
+      
+      @param map All base name under one module directory
+    **/
+    private void genBuildFile(Map map) {
+        DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder dombuilder = domfac.newDocumentBuilder();
+            Document document = dombuilder.newDocument();
+            //
+            // create root element and its attributes
+            //
+            document.appendChild(document.createComment(license));
+            Element root = document.createElement("project");
+            root.setAttribute("default", base_name);
+            root.setAttribute("basedir", ".");
+            //
+            // element for External ANT tasks
+            //
+            root.appendChild(document.createComment("Apply external ANT tasks"));
+            Element ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "GenBuild.tasks");
+            root.appendChild(ele);
+            //
+            // <taskdef resource="net/sf/antcontrib/antlib.xml" />
+            //
+            ele = document.createElement("taskdef");
+            ele.setAttribute("resource", "net/sf/antcontrib/antlib.xml");
+            root.appendChild(ele);
+            
+            ele = document.createElement("property");
+            ele.setAttribute("environment", "env");
+            root.appendChild(ele);
+
+            ele = document.createElement("property");
+            ele.setAttribute("name", "WORKSPACE_DIR");
+            ele.setAttribute("value", "${env.WORKSPACE}");
+            root.appendChild(ele);
+            
+            ele = document.createElement("import");
+            ele.setAttribute("file", "${WORKSPACE_DIR}"+File.separatorChar+"Tools"+File.separatorChar+"Conf"+File.separatorChar+"BuildMacro.xml");
+            root.appendChild(ele);
+            
+            root.appendChild(document.createComment("MODULE_RELATIVE PATH is relative to PACKAGE_DIR"));
+            ele = document.createElement("property");
+            ele.setAttribute("name", "MODULE_RELATIVE_PATH");
+            ele.setAttribute("value", module_relative_path);
+            root.appendChild(ele);
+
+            ele = document.createElement("property");
+            ele.setAttribute("name", "MODULE_DIR");
+            ele.setAttribute("value", "${PACKAGE_DIR}" + File.separatorChar + "${MODULE_RELATIVE_PATH}");
+            root.appendChild(ele);
+
+            ele = document.createElement("property");
+            ele.setAttribute("name", "COMMON_FILE");
+            ele.setAttribute("value", "${WORKSPACE_DIR}" + File.separatorChar + "Tools"
+                            + File.separatorChar + "Conf" + File.separatorChar + "Common.xml");
+            root.appendChild(ele);
+            
+            //
+            // generate the buildfmd target
+            //
+            Set set = map.keySet();
+            Iterator iter = set.iterator();
+            while (iter.hasNext()){
+                String bName = (String)iter.next();
+                File msaFile = (File)map.get(bName);
+                String msaFilename = "${MODULE_DIR}" + File.separatorChar + msaFile.getName();
+                String mbdFilename = msaFilename.substring(0 , msaFilename.length() - 4) + ".mbd";
+                ele = document.createElement("target");
+                ele.setAttribute("name", bName);
+                Element target = document.createElement("GenBuild");
+                target.setAttribute("msaFilename", msaFilename);
+                target.setAttribute("mbdFilename", mbdFilename);
+                target.setAttribute("baseName", bName);
+                ele.appendChild(target);
+                root.appendChild(ele);
+            }
+
+            root.appendChild(ele);
+            //
+            // Default clean
+            //
+            ele = document.createElement("target");
+            ele.setAttribute("name", "clean");
+            ele.setAttribute("depends", base_name + "_clean");
+            root.appendChild(ele);
+            //
+            // Default Clean ALl
+            //
+            ele = document.createElement("target");
+            ele.setAttribute("name", "cleanall");
+            ele.setAttribute("depends", base_name + "_cleanall");
+            root.appendChild(ele);
+            //
+            // Every clean target for each BaseName
+            //
+            set = map.keySet();
+            iter = set.iterator();
+            while (iter.hasNext()){
+                String bName = (String)iter.next();
+                File msaFile = (File)map.get(bName);
+                String msaFilename = "${MODULE_DIR}" + File.separatorChar + msaFile.getName();
+                String mbdFilename = msaFilename.substring(0 , msaFilename.length() - 4) + ".mbd";
+                
+                ele = document.createElement("target");
+                ele.setAttribute("name", bName + "_clean");
+                //
+                // Output Dir
+                //
+                Element target = document.createElement("OutputDirSetup");
+                target.setAttribute("msaFilename", msaFilename);
+                target.setAttribute("mbdFilename", mbdFilename);
+                target.setAttribute("baseName", bName);
+                ele.appendChild(target);
+                //
+                // Call BaseName_build.xml clean
+                //
+                Element ifEle = document.createElement("if");
+                Element availableEle = document.createElement("available");
+                availableEle.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + bName + "_build.xml");
+                ifEle.appendChild(availableEle);
+                Element elseEle = document.createElement("then");
+                
+                Element moduleEle = document.createElement("ant");
+                moduleEle.setAttribute("antfile", "${DEST_DIR_OUTPUT}" + File.separatorChar + bName + "_build.xml");
+                moduleEle.setAttribute("target", "clean");
+                
+                elseEle.appendChild(moduleEle);
+                ifEle.appendChild(elseEle);
+                ele.appendChild(ifEle);
+                //
+                // just delete
+                //
+                Element clean = document.createElement("delete");
+                clean.setAttribute("dir", "${DEST_DIR_OUTPUT}");
+                clean.setAttribute("excludes", "*.xml");
+                ele.appendChild(clean);
+                
+                root.appendChild(ele);
+            }
+            //
+            // Every Clean ALl target for each BaseName
+            //
+            set = map.keySet();
+            iter = set.iterator();
+            while (iter.hasNext()){
+                String bName = (String)iter.next();
+                File msaFile = (File)map.get(bName);
+                String msaFilename = "${MODULE_DIR}" + File.separatorChar + msaFile.getName();
+                String mbdFilename = msaFilename.substring(0 , msaFilename.length() - 4) + ".mbd";
+                
+                ele = document.createElement("target");
+                ele.setAttribute("name", bName + "_cleanall");
+                //
+                // Output Dir
+                //
+                Element target = document.createElement("OutputDirSetup");
+                target.setAttribute("msaFilename", msaFilename);
+                target.setAttribute("mbdFilename", mbdFilename);
+                target.setAttribute("baseName", bName);
+                ele.appendChild(target);
+                //
+                // Call BaseName_build.xml clean
+                //
+                Element ifEle = document.createElement("if");
+                Element availableEle = document.createElement("available");
+                availableEle.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + bName + "_build.xml");
+                ifEle.appendChild(availableEle);
+                Element elseEle = document.createElement("then");
+                
+                Element moduleEle = document.createElement("ant");
+                moduleEle.setAttribute("antfile", "${DEST_DIR_OUTPUT}" + File.separatorChar + bName + "_build.xml");
+                moduleEle.setAttribute("target", "cleanall");
+                
+                elseEle.appendChild(moduleEle);
+                ifEle.appendChild(elseEle);
+                ele.appendChild(ifEle);
+                //
+                // just delete
+                //
+                Element clean = document.createElement("delete");
+                clean.setAttribute("dir", "${DEST_DIR_OUTPUT}");
+                ele.appendChild(clean);
+                
+                clean = document.createElement("delete");
+                clean.setAttribute("dir", "${DEST_DIR_DEBUG}");
+                ele.appendChild(clean);
+                
+                clean = document.createElement("delete");
+                Element fileset = document.createElement("fileset");
+                fileset.setAttribute("dir", "${BIN_DIR}");
+                fileset.setAttribute("includes", "**" + bName + "*");
+                clean.appendChild(fileset);
+                ele.appendChild(clean);
+                
+                root.appendChild(ele);
+            }
+            document.appendChild(root);
+            //
+            // Prepare the DOM document for writing
+            //
+            Source source = new DOMSource(document);
+            //
+            // Prepare the output file
+            //
+            String filename = buildFile.getParent() + File.separatorChar + "build.xml";
+            File file = new File(getProject().replaceProperties(filename));
+            //
+            // generate all directory path
+            //
+            Result result = new StreamResult(file);
+            //
+            // Write the DOM document to the file
+            //
+            Transformer xformer = TransformerFactory.newInstance()
+                            .newTransformer();
+            xformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
+            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            xformer.transform(source, result);
+        } catch (Exception ex) {
+            System.out.println("##" + ex);
+        }
+    }
+    
+    
+    public File getBuildFile() {
+        return buildFile;
+    }
+
+    public void setBuildFile(File buildFile) {
+        this.buildFile = buildFile;
+    }
+
+    public boolean isRecursive() {
+        return recursive;
+    }
+
+    public void setRecursive(boolean recursive) {
+        this.recursive = recursive;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/ModuleIdentification.java b/Tools/Source/GenBuild/org/tianocore/build/global/ModuleIdentification.java
new file mode 100644
index 0000000000..74311d4541
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/ModuleIdentification.java
@@ -0,0 +1,55 @@
+package org.tianocore.build.global;
+
+public class ModuleIdentification {
+
+    private String baseName;
+    
+    private String packageName;
+    
+    private String guid;
+    
+    private String version;
+    
+    public ModuleIdentification(String baseName, String packageName, String guid, String version){
+        this.baseName = baseName;
+        this.packageName = packageName;
+        this.guid = guid;
+        this.version = version;
+    }
+    
+    public boolean equals(Object obj) {
+        if (obj instanceof ModuleIdentification) {
+            ModuleIdentification moduleIdObj = (ModuleIdentification)obj;
+            if ( baseName.equalsIgnoreCase(moduleIdObj.baseName)) {
+                return true;
+            }
+            // TBD
+            return false;
+        }
+        else {
+            return super.equals(obj);
+        }
+    }
+    
+    public String toString(){
+        return packageName + ":" + guid + "_" + baseName + "_" + version;
+    }
+
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    public void setGuid(String guid) {
+        this.guid = guid;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+    
+    
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
new file mode 100644
index 0000000000..936dac8ea3
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
@@ -0,0 +1,121 @@
+/** @file
+This file is to define OnDependency class.
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+--*/
+package org.tianocore.build.global;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Sequential;
+
+import java.io.File;
+import java.util.Iterator;
+
+/**
+ Class OnDepdendency is used to check the timestamp between source files and
+ target files, which can be used to determine if the target files are needed to
+ be re-generated from source files.
+ **/
+public class OnDependency extends Task {
+    ///
+    /// source files list
+    ///
+    private DpFileList sources = null;
+    ///
+    /// target files list
+    ///
+    private DpFileList targets = null;
+    ///
+    /// tasks to be performed to generate target files
+    ///
+    private Sequential  task = null;
+
+    ///
+    /// An empty constructor for an ANT task can avoid some potential issues
+    ///
+    public OnDependency(){
+    }
+
+    /**
+     Standard execute method of ANT task
+     **/
+    public void execute() {
+        if (isOutOfDate() && task != null) {
+            task.perform();
+        }
+    }
+
+    ///
+    /// check if the target files are outofdate
+    ///
+    private boolean isOutOfDate() {
+        ///
+        /// if no source files specified, take it as a fresh start
+        ///
+        if (sources.nameList.size() == 0) {
+            return true;
+        }
+
+        Iterator dstIt = targets.nameList.iterator();
+        while (dstIt.hasNext()) {
+            String dstFileName = (String)dstIt.next();
+            File dstFile = new File(dstFileName);
+            if (!dstFile.exists()) {
+                return true;
+            }
+
+            long dstTimeStamp = dstFile.lastModified();
+            Iterator srcIt = sources.nameList.iterator();
+            while (srcIt.hasNext()) {
+                String srcFileName = (String)srcIt.next();
+                File srcFile = new File(srcFileName);
+                if (!srcFile.exists()) {
+                    throw new BuildException(srcFileName + " doesn't exist !!!");
+                }
+
+                if (dstTimeStamp < srcFile.lastModified()) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     Add method of ANT task for nested element with Sequential type
+
+     @param     task    Sequential object which contains tasks for generating target files
+     **/
+    public void addSequential(Sequential task) {
+        this.task = task;
+    }
+
+    /**
+     Add method of ANT task for nested element with DpFileList type
+
+     @param     sources DpFileList object which contains the list of source files
+     **/
+    public void addSourcefiles(DpFileList sources) {
+        this.sources = sources;
+    }
+
+    /**
+     Add method of ANT task for nested element with DpFileList type
+
+     @param     targets DpFileList object which contains the list of target files
+     **/
+    public void addTargetfiles(DpFileList targets) {
+        this.targets = targets;
+    }
+}
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
new file mode 100644
index 0000000000..01e24e653f
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -0,0 +1,176 @@
+/** @file
+  OutputManager class.
+  
+  OutputManager class set output directories for every module by BUILD_MODE.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.global;
+
+import org.apache.tools.ant.Project;
+import java.io.File;
+
+/**
+  OutputManager class is used to setup output directories (BIN_DIR, DEST_DIR_OUTPUT, 
+  DEST_DIR_DEBUG) according to BUILD_MODE. 
+  
+  @since GenBuild 1.0
+**/
+public class OutputManager {
+    
+    ///
+    /// Single Module build
+    ///
+    public static final String MODULE_BUILD = "MODULE";
+
+    ///
+    /// Package build
+    ///
+    public static final String PACKAGE_BUILD = "PACKAGE";
+
+    ///
+    /// Platform build
+    ///
+    public static final String PLATFORM_BUILD = "PLATFORM";
+    
+    public static String buildMode = MODULE_BUILD;
+    
+    ///
+    /// For Package build, PLATFORM represent PACKAGE
+    ///
+    public static String PLATFORM;
+    
+    ///
+    /// For Platform build, PLATFORM_DIR represent PACKAGE_DIR
+    ///
+    public static String PLATFORM_DIR;
+    
+    ///
+    /// means intermediate files will put under Module's dir
+    ///
+    public static final String MODULE = "MODULE";
+    
+    ///
+    /// mean intermediate files will put under a unify dir
+    ///
+    public static final String UNIFIED = "UNIFIED";
+    
+    ///
+    /// Flag to ensure the function <code>update</code> will be called only one in the whole build.
+    ///
+    private static boolean flag = true;
+    
+    /**
+      If BUILD_MODE is PLATFORM or PACKAGE, record PLATFORM and PLARFORM_DIR.
+      Reminder that for PACKAGE build, here set value PACKAGE to PLATFORM and
+      PACKAGE_DIR to PLARFORM_DIR, and also update the ant properties. 
+      
+      <p>Note that this function will be called only once in the whole build.</p> 
+      
+      @param project current ANT build Project
+    **/
+    public synchronized static void update(Project project) {
+        if (flag){
+            flag = false;
+            String str = project.getProperty("BUILD_MODE");
+            if (str != null){
+                if (str.equals(PLATFORM_BUILD)) {
+                    buildMode = PLATFORM_BUILD;
+                    PLATFORM = project.getProperty("PLATFORM");
+                    PLATFORM_DIR = project.getProperty("PLATFORM_DIR");
+                }
+                else if (str.equals(PACKAGE_BUILD)) {
+                    buildMode = PACKAGE_BUILD;
+                    PLATFORM = project.getProperty("PACKAGE");
+                    PLATFORM_DIR = project.getProperty("PACKAGE_DIR");
+                    project.setProperty("PLATFORM", PLATFORM);
+                    project.setProperty("PLATFORM_DIR", PLATFORM_DIR);
+                }
+            }
+        }
+    }
+    
+    /**
+      Setup BIN_DIR, DEST_DIR_OUTPUT and DEST_DIR_OUTPUT, following are the rules:
+      
+      <pre>
+        Those three variables are defined as following
+        DEST_DIR_OUTPUT (intermediate files)
+        DEST_DIR_DEBUG (intermediate debug files)
+        BIN_DIR (final files)
+        
+        Output Dir (MODULE or UNIFIED):
+        For <b>Module</b> build: 
+        All intermediate files are at ${MODULE_DIR}/Build/${TARGET}/${ARCH}/DEBUG|OUTPUT
+        All final files are at ${MODULE_DIR}/Build/${TARGET}/${ARCH}
+        
+        For <b>Platform</b> build:
+        If specified with MODULE
+        Intermediate files->${MODULE_DIR}/Build/${PLATFORM}/${TARGET}/${ARCH}/DEBUG|OUTPUT
+        Final files -> ${PLARFORM_DIR}/Build/${TARGET}/${ARCH}
+        
+        Else if specified with UNIFIED
+        Intermediate files->${PLARFORM_DIR}/Build/${TARGET}/${ARCH}/${PACKAGE}/${SOURCE_RELATIVE_PATH}/DEBUG|OUTPUT
+        Final files -> ${PLARFORM_DIR}/Build/${TARGET}/${ARCH}
+        
+        For <b>Package</b> build:
+        If specified with MODULE
+        Intermediate files->${MODULE_DIR}/Build/${PACKAGE}/${TARGET}/${ARCH}/DEBUG|OUTPUT
+        Final files -> ${PACKAGE_DIR}/Build/${TARGET}/${ARCH}
+        
+        Else if specified with UNIFIED
+        Intermediate files->${PACKAGE_DIR}/Build/${TARGET}/${ARCH}/${PACKAGE}/${SOURCE_RELATIVE_PATH}/DEBUG|OUTPUT
+        Final files -> ${PACKAGE_DIR}/Build/${TARGET}/${ARCH}
+      </pre>
+      
+      @param project current ANT build Project
+      @param userdir user-defined directory
+      @param type the module build type (MODULE or UNIFIED)
+    **/
+    public synchronized static void update(Project project, String userdir, String type) {
+        //
+        // userdir TBD
+        //
+       if(  type == null || ! type.equals(MODULE)){
+           type = UNIFIED;
+       }
+       if (buildMode.equals(MODULE_BUILD)){
+           project.setProperty("DEST_DIR_OUTPUT", project.replaceProperties("${MODULE_DIR}"
+                        + File.separatorChar + "Build" + File.separatorChar + "${TARGET}"
+                        + File.separatorChar + "${ARCH}" + File.separatorChar + "OUTPUT"));
+           project.setProperty("DEST_DIR_DEBUG", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "DEBUG"));
+           project.setProperty("BIN_DIR", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}"));
+       }
+       else if (buildMode.equals(PLATFORM_BUILD)) {
+           if (type.equals(MODULE)) {
+               project.setProperty("DEST_DIR_OUTPUT", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${PLATFORM}" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "OUTPUT"));
+               project.setProperty("DEST_DIR_DEBUG", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${PLATFORM}" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "DEBUG"));
+               project.setProperty("BIN_DIR", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}"));
+           }
+           else if (type.equals(UNIFIED)){
+               project.setProperty("DEST_DIR_OUTPUT", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "${PACKAGE}" + File.separatorChar + "${MODULE_RELATIVE_PATH}" + File.separatorChar + "OUTPUT"));
+               project.setProperty("DEST_DIR_DEBUG", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "${PACKAGE}" + File.separatorChar + "${MODULE_RELATIVE_PATH}" + File.separatorChar + "DEBUG"));
+               project.setProperty("BIN_DIR", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}"));
+           }
+       }
+       else if (buildMode.equals(PACKAGE_BUILD)) {
+           if (type.equals(MODULE)) {
+               project.setProperty("DEST_DIR_OUTPUT", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${PLATFORM}" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "OUTPUT"));
+               project.setProperty("DEST_DIR_DEBUG", project.replaceProperties("${MODULE_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${PLATFORM}" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "DEBUG"));
+               project.setProperty("BIN_DIR", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}"));
+           }
+           else if (type.equals(UNIFIED)){
+               project.setProperty("DEST_DIR_OUTPUT", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "${PACKAGE}" + File.separatorChar + "${MODULE_RELATIVE_PATH}" + File.separatorChar + "OUTPUT"));
+               project.setProperty("DEST_DIR_DEBUG", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}" + File.separatorChar + "${PACKAGE}" + File.separatorChar + "${MODULE_RELATIVE_PATH}" + File.separatorChar + "DEBUG"));
+               project.setProperty("BIN_DIR", project.replaceProperties("${PLATFORM_DIR}" + File.separatorChar + "Build" + File.separatorChar + "${TARGET}" + File.separatorChar + "${ARCH}"));
+           }
+       }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java b/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java
new file mode 100644
index 0000000000..dae2ca29aa
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OverrideProcess.java
@@ -0,0 +1,354 @@
+/** @file
+  OverrideProcess class.
+  
+  OverrideProcess class is used to override surface area information. 
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.global;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.BootModesDocument;
+import org.tianocore.BuildOptionsDocument;
+import org.tianocore.DataHubsDocument;
+import org.tianocore.EventsDocument;
+import org.tianocore.ExternsDocument;
+import org.tianocore.FormsetsDocument;
+import org.tianocore.GuidsDocument;
+import org.tianocore.HobsDocument;
+import org.tianocore.IncludesDocument;
+import org.tianocore.LibrariesDocument;
+import org.tianocore.LibraryClassDefinitionsDocument;
+import org.tianocore.MsaHeaderDocument;
+import org.tianocore.MsaLibHeaderDocument;
+import org.tianocore.PCDsDocument;
+import org.tianocore.PPIsDocument;
+import org.tianocore.ProtocolsDocument;
+import org.tianocore.SourceFilesDocument;
+import org.tianocore.SystemTablesDocument;
+import org.tianocore.VariablesDocument;
+
+/**
+  This class is used to override surface area information. For example, MBD can
+  overried MSA, Platform can override all information of the module. 
+  
+  <p>Override will take effect if two element satisfy one of following two condition: </p>
+  <ul>
+    <li>Element name and its attribute OverrideID equal each other. </li>
+    <li>Element is defined as exclusive which mean such element can be
+    only appeared in the surface area. </li>
+  </ul>
+  
+  <p>For example, here OutputDirectory element is exclusive: </p>
+  
+  <pre>
+  Low priority Xml Document fragment:
+     &lt;Libraries&gt;
+       &lt;Arch ArchType="IA32"&gt;
+         &lt;Library OverrideID="8888"&gt;EdkPeCoffLoaderLib&lt;/Library&gt;
+         &lt;Library OverrideID="8888"&gt;BasePeCoffLib&lt;/Library&gt;
+       &lt;/Arch&gt;
+     &lt;/Libraries&gt; 
+     &lt;BuildOptions&gt;
+       &lt;OutputDirectory IntermediateDirectories="MODULE"/&gt;
+       &lt;Option&gt;CC_FLAGS = "/NOLOGO", "/C"&lt;/Option&gt;
+     &lt;BuildOptions&gt;
+ 
+  High priority Xml Document fragment:
+     &lt;Libraries&gt;
+       &lt;Arch ArchType="IA32"&gt;
+         &lt;Library OverrideID="8888">Nt32PeCoffLoaderLib&lt;/Library&gt;
+       &lt;/Arch&gt;
+     &lt;/Libraries&gt;
+     &lt;BuildOptions&gt;
+       &lt;OutputDirectory IntermediateDirectories="UNIFIED"/&gt;
+       &lt;Option&gt;LIB_FLAGS = "/NOLOGO"&lt;/Option&gt;
+     &lt;BuildOptions&gt;
+     
+   The result is: 
+     &lt;Libraries&gt;
+       &lt;Arch ArchType="IA32"&gt;
+         &lt;Library OverrideID="8888"&gt;Nt32PeCoffLoaderLib&lt;/Library&gt;
+       &lt;/Arch&gt;
+     &lt;/Libraries&gt;
+     &lt;BuildOptions&gt;
+       &lt;OutputDirectory IntermediateDirectories="UNIFIED"/&gt;
+       &lt;Option&gt;CC_FLAGS = "/NOLOGO", "/C"&lt;/Option&gt;
+       &lt;Option&gt;LIB_FLAGS = "/NOLOGO"&lt;/Option&gt;
+     &lt;BuildOptions&gt;
+   
+  </pre>
+  
+  <p>Note that using XmlBeans to walk through the whole XML document tree.</p> 
+  
+  @since GenBuild 1.0
+  @see org.apache.xmlbeans.XmlBeans
+**/
+public class OverrideProcess {
+
+    ///
+    /// URI, the namespace of current XML schema
+    ///
+    public static String prefix = "http://www.TianoCore.org/2006/Edk2.0";
+
+    ///
+    /// list of top elements of surface area
+    ///
+    public static String[] topElements = { "LibraryClassDefinitions",
+                    "SourceFiles", "Includes", "Libraries", "Protocols",
+                    "Events", "Hobs", "PPIs", "Variables", "BootModes",
+                    "SystemTables", "DataHubs", "Formsets", "Guids", "Externs",
+                    "PCDs", "BuildOptions" };
+
+    ///
+    /// list of exclusive elements
+    ///
+    public static String[] exclusiveElements = {"OutputDirectory"};
+    
+    /**
+      Recursively find out all elements specified with OverrideId attribute
+      and exclusive elements in current XML object. 
+      
+      @param o curent parsing XML object
+      @param map Map to list elements specified OverrideID attribute
+      @param execlusiveMap Map to list exclusive elements appeared in current XMl object
+      @param level the depth in XML document tree
+    **/
+    private void listOverrideID(XmlObject o, Map<String,Object> map, Map<String,Object> execlusiveMap, int level) {
+        XmlCursor cursor = o.newCursor();
+        String name = cursor.getName().getLocalPart();
+        for (int i = 0 ; i < exclusiveElements.length; i++){
+            if (name.equalsIgnoreCase(exclusiveElements[i])){
+                execlusiveMap.put(exclusiveElements[i], cursor.getObject());
+            }
+        }
+        String overrideID = cursor.getAttributeText(new QName("OverrideID"));
+        if (overrideID != null) {
+            map.put(name + ":" + overrideID, cursor.getObject());
+        }
+        if (cursor.toFirstChild()) {
+            do {
+                listOverrideID(cursor.getObject(), map, execlusiveMap, level + 1);
+            } while (cursor.toNextSibling());
+        }
+    }
+
+    /**
+      This function is used to prepare for overriding with changing data. 
+      
+      @param map original surface area information 
+      @return after normalize surface area information
+    **/
+    public synchronized static Map<String, XmlObject> deal(Map<String, XmlObject> map) {
+        Map<String, XmlObject> newMap = new HashMap<String, XmlObject>();
+        if (map.get("MsaHeader") != null) {
+            newMap.put("MsaHeader", ((MsaHeaderDocument) map.get("MsaHeader"))
+                            .getMsaHeader());
+        }
+        if (map.get("MsaLibHeader") != null) {
+            newMap.put("MsaLibHeader", ((MsaLibHeaderDocument) map
+                            .get("MsaLibHeader")).getMsaLibHeader());
+        }
+        if (map.get("LibraryClassDefinitions") != null) {
+            newMap.put("LibraryClassDefinitions",
+                            ((LibraryClassDefinitionsDocument) map
+                                            .get("LibraryClassDefinitions"))
+                                            .getLibraryClassDefinitions());
+        }
+        if (map.get("SourceFiles") != null) {
+            newMap.put("SourceFiles", ((SourceFilesDocument) map
+                            .get("SourceFiles")).getSourceFiles());
+        }
+        if (map.get("Includes") != null) {
+            newMap.put("Includes", ((IncludesDocument) map.get("Includes"))
+                            .getIncludes());
+        }
+        if (map.get("Libraries") != null) {
+            newMap.put("Libraries", ((LibrariesDocument) map.get("Libraries"))
+                            .getLibraries());
+        }
+        if (map.get("Protocols") != null) {
+            newMap.put("Protocols", ((ProtocolsDocument) map.get("Protocols"))
+                            .getProtocols());
+        }
+        if (map.get("Events") != null) {
+            newMap.put("Events", ((EventsDocument) map.get("Events"))
+                            .getEvents());
+        }
+        if (map.get("Hobs") != null) {
+            newMap.put("Hobs", ((HobsDocument) map.get("Hobs")).getHobs());
+        }
+        if (map.get("PPIs") != null) {
+            newMap.put("PPIs", ((PPIsDocument) map.get("PPIs")).getPPIs());
+        }
+        if (map.get("Variables") != null) {
+            newMap.put("Variables", ((VariablesDocument) map.get("Variables"))
+                            .getVariables());
+        }
+        if (map.get("BootModes") != null) {
+            newMap.put("BootModes", ((BootModesDocument) map.get("BootModes"))
+                            .getBootModes());
+        }
+        if (map.get("SystemTables") != null) {
+            newMap.put("SystemTables", ((SystemTablesDocument) map
+                            .get("SystemTables")).getSystemTables());
+        }
+        if (map.get("DataHubs") != null) {
+            newMap.put("DataHubs", ((DataHubsDocument) map.get("DataHubs"))
+                            .getDataHubs());
+        }
+        if (map.get("Formsets") != null) {
+            newMap.put("Formsets", ((FormsetsDocument) map.get("Formsets"))
+                            .getFormsets());
+        }
+        if (map.get("Guids") != null) {
+            newMap.put("Guids", ((GuidsDocument) map.get("Guids")).getGuids());
+        }
+        if (map.get("Externs") != null) {
+            newMap.put("Externs", ((ExternsDocument) map.get("Externs"))
+                            .getExterns());
+        }
+        if (map.get("PCDs") != null) {
+            newMap.put("PCDs", ((PCDsDocument) map.get("PCDs")).getPCDs());
+        }
+        if (map.get("BuildOptions") != null) {
+            newMap.put("BuildOptions", ((BuildOptionsDocument) map
+                            .get("BuildOptions")).getBuildOptions());
+        }
+        return newMap;
+    }
+
+    /**
+      Recursively remove all subelement in Xml Object l (with low priority) 
+      based on OverrideID or exclusive elements. 
+    
+      @param l the XML object to process
+      @param map list of elements with OverrideID in high priority XML object
+      @param execusiveMap  list of exclusive elements in high priority XML object
+    **/
+    private void cut(XmlCursor l, Map map, Map execusiveMap) {
+        String name = l.getName().getLocalPart();
+        if (execusiveMap.containsKey(name)){
+            l.removeXml();
+            return;
+        }
+        String overrideID = l.getAttributeText(new QName("OverrideID"));
+        if (overrideID != null) {
+            if (map.containsKey(name + ":" + overrideID)) {
+                l.removeXml();
+                return;
+            }
+        }
+        if (l.toFirstChild()) {
+            do {
+                cut(l, map, execusiveMap);
+            } while (l.toNextSibling());
+        }
+    }
+
+    private XmlObject cloneXmlObject(XmlObject object, boolean deep) throws BuildException {
+        XmlObject result = null;
+        try {
+            result = XmlObject.Factory.parse(object.getDomNode()
+                            .cloneNode(deep));
+        } catch (Exception ex) {
+            throw new BuildException(ex.getMessage());
+        }
+        return result;
+    }
+
+    /**
+      Process every item list in h and l.
+    
+      @param h surface area info with high priority
+      @param l surface area info with low priority
+      @return surface area after override
+    **/
+    public Map<String, XmlObject> override(Map<String, XmlObject> h,
+                    Map<String, XmlObject> l) {
+        Map<String, XmlObject> result = new HashMap<String, XmlObject>();
+        result.put("MsaHeader", override(l.get("MsaHeader"), null));
+        result.put("MsaLibHeader", override(l.get("MsaLibHeader"), null));
+        for (int i = 0; i < topElements.length; i++) {
+            result.put(topElements[i], override(h.get(topElements[i]), l
+                            .get(topElements[i])));
+        }
+        return result;
+    }
+
+    /**
+      Recursively override two Xml Objects.
+      
+      @param h Xml Object info with high priority
+      @param l Xml Object info with low priority
+      @return Xml Object after area
+    **/
+    public XmlObject override(XmlObject h, XmlObject l) {
+        if (l == null && h == null) {
+            return null;
+        }
+        if (h == null) {
+            return cloneXmlObject(l, true);
+        }
+        if (l == null) {
+            return cloneXmlObject(h, true);
+        }
+        XmlCursor hc = h.newCursor();
+        if (h.getClass() != l.getClass()) {
+            System.out
+                            .println("Error: Two XmlObject does not with compliant format.");
+            return null;
+        }
+        if (!hc.toFirstChild()) {
+            return cloneXmlObject(l, true);
+        }
+
+        XmlCursor result = cloneXmlObject(h, true).newCursor();
+        XmlCursor lcursor = cloneXmlObject(l, true).newCursor();
+        result.push();
+        result.toNextToken();
+        result.insertNamespace("", prefix);
+        result.toFirstChild();
+        //
+        // found out all element specified a OverrideID
+        //
+        Map<String,Object> hmap = new HashMap<String,Object>();
+        Map<String,Object> execlusiveMap = new HashMap<String,Object>();
+        listOverrideID(h, hmap, execlusiveMap, 0);
+        lcursor.toNextToken();
+        lcursor.push();
+        //
+        // for every direct subelement of l, cut all element satisfied with
+        // override rule
+        //
+        if (lcursor.toFirstChild()) {
+            do {
+                cut(lcursor, hmap, execlusiveMap);
+            } while (lcursor.toNextSibling());
+        }
+        lcursor.pop();
+        if (lcursor.toFirstChild()) {
+            do {
+                lcursor.copyXml(result);
+                result.insertChars("\n");
+            } while (lcursor.toNextSibling());
+        }
+        result.pop();
+        return result.getObject();
+    }
+}
+\ No newline at end of file
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
new file mode 100644
index 0000000000..54c1391094
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/Spd.java
@@ -0,0 +1,414 @@
+/** @file
+ Spd class.
+
+ This class is to generate a global table for the content of spd file.
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.build.global;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.tianocore.PackageSurfaceAreaDocument;
+import org.tianocore.GuidDeclarationsDocument.GuidDeclarations;
+import org.tianocore.IncludeHeaderDocument.IncludeHeader;
+import org.tianocore.LibraryClassDeclarationDocument.LibraryClassDeclaration;
+import org.tianocore.LibraryClassDeclarationsDocument.LibraryClassDeclarations;
+import org.tianocore.PackageHeadersDocument.PackageHeaders;
+import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;
+import org.tianocore.PpiDeclarationsDocument.PpiDeclarations;
+import org.tianocore.ProtocolDeclarationsDocument.ProtocolDeclarations;
+
+/**
+ 
+  This class is to generate a global table for the content of spd file.
+  
+**/
+public class Spd {
+    ///
+    /// Map of module name and package it belongs to.
+    /// Key : Module BaseName
+    /// Value: Relative Path to Package
+    ///
+    Map<String, String[]> msaInfo = new HashMap<String, String[]>();
+
+    ///
+    /// Map of module info. 
+    /// Key : moduletype
+    /// Value: moduletype related include file
+    ///
+    Map<String, String> moduleInfo = new HashMap<String, String>();
+
+    ///
+    /// Map of PPI info.
+    /// Key : PPI name
+    /// value: String[] a. PPI C_NAME; b. PPI GUID;
+    ///
+    Map<String, String[]> ppiInfo = new HashMap<String, String[]>();
+
+    ///
+    /// Map of Protocol info.
+    /// Key : Protocol name
+    /// value: String[] a. Protocol C_NAME; b. Protocol GUID;
+    ///
+    Map<String, String[]> protocolInfo = new HashMap<String, String[]>();
+
+    ///
+    /// Map of Guid info.
+    /// Key : Guid name
+    /// value: String[] a. Guid C_NAME; b. Guid's GUID;
+    ///
+    Map<String, String[]> guidInfo = new HashMap<String, String[]>();
+
+
+    ///
+    /// Map of library class and its exposed header file.
+    /// Key : library class name
+    /// value : library class corresponding header file
+    ///
+    Map<String, String> libClassHeaderList = new HashMap<String, String>();
+
+    ///
+    /// Package path.
+    ///
+    String packagePath = null;
+
+    /**
+      Constructor function
+      
+      This function mainly initialize some member variables. 
+   
+      @param spdDoc      Handle of spd document.
+      @param spdPath     Path of spd file.
+     **/
+    Spd (PackageSurfaceAreaDocument spdDoc, String spdPath) {
+
+        PackageSurfaceArea spd = spdDoc.getPackageSurfaceArea();
+        this.packagePath = spdPath;
+
+        GuidDeclarations spdGuidInfo = spd.getGuidDeclarations();
+        genGuidInfoList(spdGuidInfo);
+
+        PpiDeclarations spdPpiInfo = spd.getPpiDeclarations();
+        genPpiInfoList(spdPpiInfo);
+
+        ProtocolDeclarations spdProtocolInfo = spd.getProtocolDeclarations();
+        genProtocolInfoList(spdProtocolInfo);
+
+        LibraryClassDeclarations spdLibClassDeclare = spd
+                        .getLibraryClassDeclarations();
+        genLibClassDeclare(spdLibClassDeclare);
+
+        PackageHeaders spdPackageHeaderInfo = spd.getPackageHeaders();
+        genModuleInfoList(spdPackageHeaderInfo);
+
+    }
+
+    /**
+      genModuleInfoList
+      
+      This function is to generate Module info map.
+      
+      @param packageHeader   The information of packageHeader which descripted
+                             in spd file.    
+    **/
+    public void genModuleInfoList(PackageHeaders packageHeader) {
+
+        if (packageHeader != null) {
+            List<IncludeHeader> headerList = packageHeader.getIncludeHeaderList();
+            for (int i = 0; i < headerList.size(); i++) {
+                try {
+                    this.moduleInfo
+                                    .put(headerList.get(i).getModuleType()
+                                                    .toString(), headerList.get(i)
+                                                    .getStringValue());
+                } catch (Exception e) {
+                    System.out
+                                    .print("can't find ModuleHeaders ModuleType & includeHeader!\n");
+                }
+            }
+        }
+    }
+
+  /**
+    genPpiInfoList
+    
+    This function is to generate Ppi info map.
+    
+    @param  ppiInfo           The information of PpiDeclarations which descripted
+                              in spd file.    
+  **/
+    public void genPpiInfoList(PpiDeclarations ppiInfo) {
+        String[] cNameGuid = new String[2];
+
+        if (ppiInfo != null) {
+            List<PpiDeclarations.Entry> ppiEntryList = ppiInfo.getEntryList();
+            for (int i = 0; i < ppiEntryList.size(); i++) {
+                try {
+                    cNameGuid[0] = ppiEntryList.get(i).getCName();
+                    cNameGuid[1] = formatGuidName(ppiEntryList.get(i)
+                                    .getGuid().getStringValue());
+                    this.ppiInfo.put(ppiEntryList.get(i).getName(), new String[] {
+                                    cNameGuid[0], cNameGuid[1] });
+                } catch (Exception e) {
+                    System.out
+                                    .print("can't find GuidDeclarations C_Name & Guid!\n");
+                }
+            }
+        }
+    }
+
+    /**
+      genProtocolInfoList 
+      
+      This function is to generate Protocol info map.
+      
+      @param   proInfo    The information of ProtocolDeclarations which 
+                          descripted in spd file.
+    **/
+    public void genProtocolInfoList(ProtocolDeclarations proInfo) {
+        String[] cNameGuid = new String[2];
+        if (proInfo != null) {
+            List<ProtocolDeclarations.Entry> protocolEntryList = proInfo.getEntryList();
+            for (int i = 0; i < protocolEntryList.size(); i++) {
+                try {
+                    cNameGuid[0] = protocolEntryList.get(i).getCName();
+                    cNameGuid[1] = formatGuidName(protocolEntryList.get(i)
+                                    .getGuid().getStringValue());
+
+                    String temp = new String(protocolEntryList.get(i).getName());
+                    this.protocolInfo.put(temp, new String[] { cNameGuid[0],
+                                    cNameGuid[1] });
+                } catch (Exception e) {
+                    System.out
+                                    .print("can't find ProtocolDeclarations C_Name & Guid!\n");
+                }
+            }
+        }
+    }
+
+    /**
+      genGuidInfoList
+      
+      This function is to generate GUID inf map.
+      
+      @param guidInfo     The information of GuidDeclarations which descripted
+                          in spd file.
+      
+    **/
+    public void genGuidInfoList(GuidDeclarations guidInfo) {
+        String[] cNameGuid = new String[2];
+        if (guidInfo != null) {
+            
+            List<GuidDeclarations.Entry> guidEntryList = guidInfo.getEntryList();
+            for (int i = 0; i < guidEntryList.size(); i++) {
+                cNameGuid[0] = guidEntryList.get(i).getCName();
+                cNameGuid[1] = formatGuidName(guidEntryList.get(i)
+                                .getGuid().getStringValue());
+                this.guidInfo.put(guidEntryList.get(i).getName(), new String[] {
+                                cNameGuid[0], cNameGuid[1] });
+            }
+        }
+    }
+
+    /**
+      genLibClassDeclare
+      
+      This function is to generate the libClassHeader list.
+      
+      @param libClassDeclares  The information of LibraryClassDeclarations which
+                               descripted in spd file.
+    **/
+    public void genLibClassDeclare(LibraryClassDeclarations libClassDeclares) {
+        if (libClassDeclares != null && libClassDeclares.getLibraryClassDeclarationList() != null) {
+            if (libClassDeclares.getLibraryClassDeclarationList().size() > 0) {
+                List<LibraryClassDeclaration> libDeclareList = libClassDeclares.getLibraryClassDeclarationList();
+                for (int i = 0; i < libDeclareList.size(); i++) {
+                    libClassHeaderList.put(libDeclareList.get(i).getLibraryClass()
+                                    .getStringValue(), libDeclareList.get(i)
+                                    .getIncludeHeader().getStringValue());
+                }
+            }
+        }
+    }
+
+    /**
+      getPpiGuid
+      
+      This function is to get ppi GUID according ppi name.
+    
+      @param   ppiStr    Name of ppi.
+      @return            PPi's GUID.
+    **/
+    public String getPpiGuid(String ppiStr) {
+        if (ppiInfo.get(ppiStr) != null) {
+            return ppiInfo.get(ppiStr)[1];
+        } else {
+            return null;
+        }
+
+    }
+
+    /**
+      getPpiCnameGuidArray
+      
+      This function is to get the ppi CName and it's GUID according to ppi name.
+      
+      @param   ppiName      Name of ppi.
+      @return               Ppi CName and it's GUID.
+    **/
+    public String[] getPpiCnameGuidArray(String ppiName) {
+        return this.ppiInfo.get(ppiName);
+    }
+
+    /**
+      getProtocolGuid
+      
+      This function is to get the protocol GUID according to protocol's name.
+      
+      @param   protocolStr    Name of protocol.
+      @return                 Protocol's GUID.
+    **/
+    public String getProtocolGuid(String protocolStr) {
+        if (protocolInfo.get(protocolStr) != null) {
+            return this.protocolInfo.get(protocolStr)[0];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+      getProtocolNameGuidArray
+      
+      This function is to get the protocol's CName ant it's GUID according to
+      protocol's namej.
+      
+      @param  protocolName   Name of protocl.
+      @return                Protocol's CName and it's GUID.
+    **/
+    public String[] getProtocolNameGuidArray(String protocolName) {
+        return this.protocolInfo.get(protocolName);
+    }
+
+    /**
+      getGUIDGuid
+      
+      This function is to get the GUID according to GUID's name
+      
+      @param  guidStr        Name of GUID
+      @return                GUID.
+    **/
+    public String getGUIDGuid(String guidStr) {
+        if (guidInfo.get(guidStr) != null) {
+            return guidInfo.get(guidStr)[1];
+        } else {
+            return null;
+        }
+
+    }
+
+    /**
+      getGuidNameArray
+      
+      This function is to get the GUID's CName and it's GUID according to 
+      GUID's name
+      
+      @param   guidName     Name of GUID
+      @return               CName and GUID.
+    **/
+    public String[] getGuidNameArray(String guidName) {
+        return this.guidInfo.get(guidName);
+    }
+
+    /**
+      getLibClassInclude 
+      
+      This function is to get the library exposed header file name according 
+      library class name.
+      
+      @param     libName    Name of library class   
+      @return               Name of header file
+    **/
+    String getLibClassIncluder(String libName) {
+        return libClassHeaderList.get(libName);
+    }
+
+    /**
+      getModuleTypeIncluder
+      
+      This function is to get the header file name from module info map 
+      according to module type.
+     
+      @param   moduleType    Module type.
+      @return                Name of header file.
+    **/
+    String getModuleTypeIncluder(String moduleType) {
+        return moduleInfo.get(moduleType);
+    }
+
+    /**
+      formateGuidName
+      
+      This function is to formate GUID to ANSI c form.
+     
+      @param  guidNameCon      String of GUID.
+      @return                  Formated GUID.
+    **/
+    public static String formatGuidName (String guidNameConv) {
+        String[] strList;
+        String guid = "";
+        int index = 0;
+        if (guidNameConv
+                        .matches("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}")) {
+            strList = guidNameConv.split("-");
+            guid = "0x" + strList[0] + ", ";
+            guid = guid + "0x" + strList[1] + ", ";
+            guid = guid + "0x" + strList[2] + ", ";
+            guid = guid + "{";
+            guid = guid + "0x" + strList[3].substring(0, 2) + ", ";
+            guid = guid + "0x" + strList[3].substring(2, 4);
+
+            while (index < strList[4].length()) {
+                guid = guid + ", ";
+                guid = guid + "0x" + strList[4].substring(index, index + 2);
+                index = index + 2;
+            }
+            guid = guid + "}";
+            return guid;
+        } else if (guidNameConv
+                        .matches("0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\\})?")) {
+            strList = guidNameConv.split(",");
+            
+            //
+            // chang Microsoft specific form to ANSI c form
+            //
+            for (int i = 0; i < 3; i++){
+                guid = guid + strList[i] + ",";
+            }
+            guid = guid + "{";
+            
+            for (int i = 3; i < strList.length; i++){
+                if (i == strList.length - 1){
+                    guid = guid + strList[i];
+                } else {
+                    guid = guid + strList[i] + ",";
+                }
+            }
+            guid = guid + "}";            
+            return guid;
+        } else {
+            System.out.println("Check GUID Value, it don't conform to the schema!!!");
+            return "0";
+
+        }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaParser.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaParser.java
new file mode 100644
index 0000000000..96003c2e71
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaParser.java
@@ -0,0 +1,218 @@
+/** @file
+  SurfaceAreaParser class.
+  
+  SurfaceAreaParser class is used to parse module surface area include both 
+  driver and library. 
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.global;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.LibraryModuleBuildDescriptionDocument;
+import org.tianocore.LibraryModuleSurfaceAreaDocument;
+import org.tianocore.ModuleBuildDescriptionDocument;
+import org.tianocore.ModuleSurfaceAreaDocument;
+
+/**
+  This class is used to parse module surface area (MSA & MBD) include both 
+  driver and library. 
+
+  @since GenBuild 1.0
+**/
+public class SurfaceAreaParser {
+
+    /**
+      Using XmlBeans to parse and valid surface area file. 
+    
+      @param surfaceAreaFile the surface area file to parse
+      @return top level elements and its value mapping information
+      @throws BuildException
+              If surface area is not well-formed or invalid
+    **/
+    public Map<String, XmlObject> parseFile(File surfaceAreaFile) throws BuildException {
+        Map<String, XmlObject> map = new HashMap<String, XmlObject>();
+        try {
+            XmlObject sadoc = XmlObject.Factory.parse(surfaceAreaFile);
+            // Validate File if they obey XML Schema
+            
+            if ( ! sadoc.validate()){
+                throw new BuildException("Surface Area file [" + surfaceAreaFile.getPath() + "] is invalid.");
+            }
+            if (sadoc instanceof ModuleSurfaceAreaDocument){
+                parseFile((ModuleSurfaceAreaDocument) sadoc, map);
+            }
+            else if(sadoc instanceof ModuleBuildDescriptionDocument){
+                parseFile((ModuleBuildDescriptionDocument) sadoc, map);
+            }
+            else if(sadoc instanceof LibraryModuleSurfaceAreaDocument){
+                parseFile((LibraryModuleSurfaceAreaDocument) sadoc, map);
+            }
+            else if(sadoc instanceof LibraryModuleBuildDescriptionDocument){
+                parseFile((LibraryModuleBuildDescriptionDocument) sadoc, map);
+            }
+        }
+        catch (Exception ex){
+            throw new BuildException(ex.getMessage());
+        }
+        return map;
+    }
+    
+    
+    /**
+      Parse MSA.
+    
+      @param doc top level surface area XML document
+      @param msaMap the map to store the result
+    **/
+    private void parseFile(ModuleSurfaceAreaDocument doc, Map<String, XmlObject> msaMap) {
+        msaMap.put("MsaHeader", doc.getModuleSurfaceArea().getMsaHeader());
+        msaMap.put("LibraryClassDefinitions", doc.getModuleSurfaceArea()
+                        .getLibraryClassDefinitions());
+        msaMap.put("SourceFiles", doc.getModuleSurfaceArea().getSourceFiles());
+        msaMap.put("Includes", doc.getModuleSurfaceArea().getIncludes());
+        msaMap.put("Protocols", doc.getModuleSurfaceArea().getProtocols());
+
+        msaMap.put("Events", doc.getModuleSurfaceArea().getEvents());
+        msaMap.put("Hobs", doc.getModuleSurfaceArea().getHobs());
+        msaMap.put("PPIs", doc.getModuleSurfaceArea().getPPIs());
+        msaMap.put("Variables", doc.getModuleSurfaceArea().getVariables());
+        msaMap.put("BootModes", doc.getModuleSurfaceArea().getBootModes());
+
+        msaMap
+                        .put("SystemTables", doc.getModuleSurfaceArea()
+                                        .getSystemTables());
+        msaMap.put("DataHubs", doc.getModuleSurfaceArea().getDataHubs());
+        msaMap.put("Formsets", doc.getModuleSurfaceArea().getFormsets());
+        msaMap.put("Guids", doc.getModuleSurfaceArea().getGuids());
+        msaMap.put("Externs", doc.getModuleSurfaceArea().getExterns());
+
+        msaMap.put("PCDs", doc.getModuleSurfaceArea().getPCDs());
+        msaMap
+                        .put("BuildOptions", doc.getModuleSurfaceArea()
+                                        .getBuildOptions());
+    }
+
+    /**
+      Parse MBD.
+  
+      @param doc top level surface area XML document
+      @param msaMap the map to store the result
+    **/
+    private void parseFile(ModuleBuildDescriptionDocument doc, Map<String, XmlObject> mbdMap) {
+        mbdMap.put("MbdHeader", doc.getModuleBuildDescription().getMbdHeader());
+        mbdMap.put("Libraries", doc.getModuleBuildDescription().getLibraries());
+        mbdMap.put("SourceFiles", doc.getModuleBuildDescription()
+                        .getSourceFiles());
+        mbdMap.put("Includes", doc.getModuleBuildDescription().getIncludes());
+        mbdMap.put("Protocols", doc.getModuleBuildDescription().getProtocols());
+
+        mbdMap.put("Events", doc.getModuleBuildDescription().getEvents());
+        mbdMap.put("Hobs", doc.getModuleBuildDescription().getHobs());
+        mbdMap.put("PPIs", doc.getModuleBuildDescription().getPPIs());
+        mbdMap.put("Variables", doc.getModuleBuildDescription().getVariables());
+        mbdMap.put("BootModes", doc.getModuleBuildDescription().getBootModes());
+
+        mbdMap.put("SystemTables", doc.getModuleBuildDescription()
+                        .getSystemTables());
+        mbdMap.put("DataHubs", doc.getModuleBuildDescription().getDataHubs());
+        mbdMap.put("Formsets", doc.getModuleBuildDescription().getFormsets());
+        mbdMap.put("Guids", doc.getModuleBuildDescription().getGuids());
+        mbdMap.put("Externs", doc.getModuleBuildDescription().getExterns());
+
+        mbdMap.put("PCDs", doc.getModuleBuildDescription().getPCDs());
+        mbdMap.put("BuildOptions", doc.getModuleBuildDescription()
+                        .getBuildOptions());
+    }
+    /**
+      Parse Library MSA.
+
+      @param doc top level surface area XML document
+      @param msaMap the map to store the result
+    **/
+    private void parseFile(LibraryModuleSurfaceAreaDocument doc, Map<String, XmlObject> msaMap) {
+        msaMap.put("MsaLibHeader", doc.getLibraryModuleSurfaceArea()
+                        .getMsaLibHeader());
+        msaMap.put("LibraryClassDefinitions", doc.getLibraryModuleSurfaceArea()
+                        .getLibraryClassDefinitions());
+        msaMap.put("SourceFiles", doc.getLibraryModuleSurfaceArea()
+                        .getSourceFiles());
+        msaMap.put("Includes", doc.getLibraryModuleSurfaceArea().getIncludes());
+        msaMap.put("Protocols", doc.getLibraryModuleSurfaceArea()
+                        .getProtocols());
+
+        msaMap.put("Events", doc.getLibraryModuleSurfaceArea().getEvents());
+        msaMap.put("Hobs", doc.getLibraryModuleSurfaceArea().getHobs());
+        msaMap.put("PPIs", doc.getLibraryModuleSurfaceArea().getPPIs());
+        msaMap.put("Variables", doc.getLibraryModuleSurfaceArea()
+                        .getVariables());
+        msaMap.put("BootModes", doc.getLibraryModuleSurfaceArea()
+                        .getBootModes());
+
+        msaMap.put("SystemTables", doc.getLibraryModuleSurfaceArea()
+                        .getSystemTables());
+        msaMap.put("DataHubs", doc.getLibraryModuleSurfaceArea().getDataHubs());
+        msaMap.put("Formsets", doc.getLibraryModuleSurfaceArea().getFormsets());
+        msaMap.put("Guids", doc.getLibraryModuleSurfaceArea().getGuids());
+        msaMap.put("Externs", doc.getLibraryModuleSurfaceArea().getExterns());
+
+        msaMap.put("PCDs", doc.getLibraryModuleSurfaceArea().getPCDs());
+        msaMap.put("BuildOptions", doc.getLibraryModuleSurfaceArea()
+                        .getBuildOptions());
+    }
+
+    /**
+      Parse Library MBD.
+
+      @param doc top level surface area XML document
+      @param msaMap the map to store the result
+    **/
+    private void parseFile(LibraryModuleBuildDescriptionDocument doc, Map<String, XmlObject> mbdMap) {
+        mbdMap.put("MbdLibHeader", doc.getLibraryModuleBuildDescription()
+                        .getMbdLibHeader());
+        mbdMap.put("Libraries", doc.getLibraryModuleBuildDescription()
+                        .getLibraries());
+        mbdMap.put("SourceFiles", doc.getLibraryModuleBuildDescription()
+                        .getSourceFiles());
+        mbdMap.put("Includes", doc.getLibraryModuleBuildDescription()
+                        .getIncludes());
+        mbdMap.put("Protocols", doc.getLibraryModuleBuildDescription()
+                        .getProtocols());
+
+        mbdMap
+                        .put("Events", doc.getLibraryModuleBuildDescription()
+                                        .getEvents());
+        mbdMap.put("Hobs", doc.getLibraryModuleBuildDescription().getHobs());
+        mbdMap.put("PPIs", doc.getLibraryModuleBuildDescription().getPPIs());
+        mbdMap.put("Variables", doc.getLibraryModuleBuildDescription()
+                        .getVariables());
+        mbdMap.put("BootModes", doc.getLibraryModuleBuildDescription()
+                        .getBootModes());
+
+        mbdMap.put("SystemTables", doc.getLibraryModuleBuildDescription()
+                        .getSystemTables());
+        mbdMap.put("DataHubs", doc.getLibraryModuleBuildDescription()
+                        .getDataHubs());
+        mbdMap.put("Formsets", doc.getLibraryModuleBuildDescription()
+                        .getFormsets());
+        mbdMap.put("Guids", doc.getLibraryModuleBuildDescription().getGuids());
+        mbdMap.put("Externs", doc.getLibraryModuleBuildDescription()
+                        .getExterns());
+
+        mbdMap.put("PCDs", doc.getLibraryModuleBuildDescription().getPCDs());
+        mbdMap.put("BuildOptions", doc.getLibraryModuleBuildDescription()
+                        .getBuildOptions());
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
new file mode 100644
index 0000000000..03c8d4328d
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -0,0 +1,1109 @@
+/** @file
+ This file is for surface area information retrieval.
+
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.build.global;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.xmlbeans.XmlNormalizedString;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlString;
+import org.tianocore.BuildOptionsDocument;
+import org.tianocore.CName;
+import org.tianocore.ExternsDocument;
+import org.tianocore.FfsDocument;
+import org.tianocore.FileNameConvention;
+import org.tianocore.FrameworkComponentTypes;
+import org.tianocore.FvImageOptionsDocument;
+import org.tianocore.GuidDocument;
+import org.tianocore.GuidsDocument;
+import org.tianocore.LibrariesDocument;
+import org.tianocore.LibraryClassDocument;
+import org.tianocore.LibraryUsage;
+import org.tianocore.ModuleSADocument;
+import org.tianocore.ModuleTypeDef;
+import org.tianocore.NameValueDocument;
+import org.tianocore.OutputDirectoryDocument;
+import org.tianocore.PPIsDocument;
+import org.tianocore.PackageNameDocument;
+import org.tianocore.ProtocolsDocument;
+import org.tianocore.PCDsDocument.PCDs;
+
+/**
+  SurfaceAreaQuery class is used to query Surface Area information from msa, mbd,
+  spd and fpd files. 
+  
+  This class should not instantiated. All the public interfaces is static.
+  
+  @since GenBuild 1.0
+ **/
+public class SurfaceAreaQuery {
+    /// 
+    /// Contains name/value pairs of Surface Area document object. The name is
+    /// always the top level element name.
+    ///  
+    private static Map<String, XmlObject> map = null;
+    
+    ///
+    /// mapStack is used to do nested query
+    ///
+    private static Stack< Map<String, XmlObject> > mapStack = new Stack< Map<String, XmlObject> >();
+    
+    /// 
+    /// prefix of name space
+    /// 
+    private static String nsPrefix = "sans";
+    
+    ///
+    /// xmlbeans needs a name space for each Xpath element 
+    ///
+    private static String ns = null;
+    
+    ///
+    /// keep the namep declaration for xmlbeans Xpath query
+    ///
+    private static String queryDeclaration = null;
+
+    /**
+     Set a Surface Area document for query later
+     
+     @param     map     A Surface Area document in TopLevelElementName/XmlObject format.
+     **/
+    public static void setDoc(Map<String, XmlObject> map) {
+        ns = OverrideProcess.prefix;
+        queryDeclaration = "declare namespace " + nsPrefix + "='" + ns + "'; ";
+        SurfaceAreaQuery.map = map;
+    }
+
+    /**
+     Push current used Surface Area document into query stack. The given new 
+     document  will be used for any immediately followed getXXX() callings, 
+     untill pop() is called.
+     
+     @param     newMap  The TopLevelElementName/XmlObject format of a Surface Area document.
+     **/
+    public static void push(Map<String, XmlObject> newMap) {
+        mapStack.push(SurfaceAreaQuery.map);
+        SurfaceAreaQuery.map = newMap;
+    }
+    
+    /**
+     Discard current used Surface Area document and use the top document in stack
+     instead.
+     **/
+    public static void pop() {
+        SurfaceAreaQuery.map = mapStack.pop();
+    }
+    
+    ///
+    /// Convert xPath to be namespace qualified, which is necessary for XmlBeans
+    /// selectPath(). For example, converting /MsaHeader/ModuleType to
+    /// /ns:MsaHeader/ns:ModuleType
+    ///     
+    private static String normalizeQueryString(String[] exp, String from) {
+        StringBuffer normQueryString = new StringBuffer(4096);
+
+        int i = 0;
+        while (i < exp.length) {
+            String newExp = from + exp[i];
+            Pattern pattern = Pattern.compile("([^/]*)(/|//)([^/]+)");
+            Matcher matcher = pattern.matcher(newExp);
+
+            while (matcher.find()) {
+                String starter = newExp.substring(matcher.start(1), matcher.end(1));
+                String seperator = newExp.substring(matcher.start(2), matcher.end(2));
+                String token = newExp.substring(matcher.start(3), matcher.end(3));
+                
+                normQueryString.append(starter);
+                normQueryString.append(seperator);
+                normQueryString.append(nsPrefix);
+                normQueryString.append(":");
+                normQueryString.append(token);
+            }
+
+            ++i;
+            if (i < exp.length) {
+                normQueryString.append(" | ");
+            }
+        }
+
+        return normQueryString.toString();
+    }
+
+    /**
+      Search all XML documents stored in "map" for the specified xPath, using
+      relative path (starting with '$this')
+     
+     @param     xPath   xpath query string array
+     @returns   An array of XmlObject   if elements are found at the specified xpath
+     @returns   NULL                    if nothing is at the specified xpath
+     **/
+    public static XmlObject[] get(String[] xPath) {
+        if (map == null) {
+            return null;
+        }
+        
+        String[] keys = (String[]) map.keySet().toArray(new String[map.size()]);
+        List<XmlObject> result = new ArrayList<XmlObject>();
+        for (int i = 0; i < keys.length; ++i) {
+            XmlObject rootNode = (XmlObject) map.get(keys[i]);
+            if (rootNode == null) {
+                continue;
+            }
+            
+            String query = queryDeclaration + normalizeQueryString(xPath, "$this/" + keys[i]);
+            XmlObject[] tmp = rootNode.selectPath(query);
+            for (int j = 0; j < tmp.length; ++j) {
+                result.add(tmp[j]);
+            }
+        }
+        
+        int size = result.size();
+        if (size <= 0) {
+            return null;
+        }
+        
+        return (XmlObject[]) result.toArray(new XmlObject[size]);
+    }
+
+    /**
+     Search XML documents named by "rootName" for the given xPath, using
+     relative path (starting with '$this')
+     
+     @param     rootName    The top level element name 
+     @param     xPath       The xpath query string array
+     @returns   An array of XmlObject   if elements are found at the given xpath
+     @returns   NULL                    if nothing is found at the given xpath
+     **/
+    public static XmlObject[] get(String rootName, String[] xPath) {
+        if (map == null) {
+            return null;
+        }
+        
+        XmlObject root = (XmlObject) map.get(rootName);
+        if (root == null) {
+            return null;
+        }
+
+        String query = queryDeclaration + normalizeQueryString(xPath, "$this/" + rootName);
+        XmlObject[] result = root.selectPath(query);
+        if (result.length > 0) {
+            return result;
+        }
+
+        query = queryDeclaration + normalizeQueryString(xPath, "/" + rootName);
+        result = root.selectPath(query);
+        if (result.length > 0) {
+            return result;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve SourceFiles/Filename for specified ARCH type
+      
+     @param     arch        architecture name
+     @returns   An array of XmlObject   if elements are found at the known xpath
+     @returns   NULL                    if nothing is found at the known xpath
+     **/
+    public static XmlObject[] getSourceFiles(String arch) {
+        String[] xPath;
+
+        if (arch == null || arch.equals("")) {
+            xPath = new String[] {
+                "/Filename",
+                "/Arch/Filename"
+                };
+        } else {
+            xPath = new String[] {
+                "/Filename[not(@ArchType) or @ArchType='ALL' or @ArchType='" + arch + "']",
+                "/Arch[@ArchType='ALL' or @ArchType='" + arch + "']/Filename"
+                };
+        }
+
+        return get("SourceFiles", xPath);
+    }
+
+    /**
+     Retrieve BuildOptions/Ffs
+
+     @returns   FfsDocument.Ffs object  if elements are found at the known xpath
+     @returns   NULL                    if nothing is found at the known xpath
+     **/
+    public static FfsDocument.Ffs getFfs() {
+        String[] xPath = new String[] { "/Ffs" };
+
+        XmlObject[] returns = get("BuildOptions", xPath);
+        if (returns != null && returns.length > 0) {
+            return (FfsDocument.Ffs) returns[0];
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve BuildOptions/OutputDirectory
+
+     @returns   Directory names array   if elements are found at the known xpath
+     @returns   Empty                   if nothing is found at the known xpath
+     **/
+    public static String[] getOutputDirectory() {
+        String[] xPath = new String[] { "/OutputDirectory" };
+
+        XmlObject[] returns = get("BuildOptions", xPath);
+        if (returns != null && returns.length > 0) {
+            String[] dirString = new String[2];
+
+            OutputDirectoryDocument.OutputDirectory[] dir = (OutputDirectoryDocument.OutputDirectory[]) returns;
+            dirString[0] = dir[0].getIntermediateDirectories().toString();
+            dirString[1] = dir[0].getStringValue();
+
+            return dirString;
+        }
+
+        return new String[] { "UNIFIED", null };
+    }
+
+    /**
+     Retrieve BuildOptions/Option or Arch/Option
+
+     @param     arch    architecture name
+
+     @returns   name/value pairs of options if elements are found at the known xpath
+     @returns   Empty array                 if nothing is there
+     **/
+    public static String[][] getOptions(String arch){
+        String[] xPath;
+
+        if (arch == null || arch.equals("")) {
+            xPath = new String[] {
+                "/Option",
+                "/Arch/Option"
+                };
+        } else {
+            xPath = new String[] {
+                "/Option",
+                "/Arch[@ArchType='ALL' or @ArchType='" + arch + "']/Option"
+                };
+        }
+
+        XmlObject[] returns = get("BuildOptions", xPath);
+        if (returns == null){
+            return new String[0][2];
+        }
+        
+        String[][] result = new String[returns.length][2];
+        for (int i = 0; i < returns.length; i ++){
+            String str;
+            String name = null;
+            String value = null;
+
+            if (returns[i] instanceof BuildOptionsDocument.BuildOptions.Option) {
+                BuildOptionsDocument.BuildOptions.Option option = (BuildOptionsDocument.BuildOptions.Option)returns[i];
+                str = option.getStringValue();
+            } else if (returns[i] instanceof BuildOptionsDocument.BuildOptions.Arch.Option) {
+                BuildOptionsDocument.BuildOptions.Arch.Option archOption = (BuildOptionsDocument.BuildOptions.Arch.Option)returns[i];
+                str = archOption.getStringValue();
+            } else {
+                continue;
+            }
+            
+            int equalIndex = str.indexOf('=');
+            if ( equalIndex > 0) {
+                name = str.substring(0, equalIndex).trim();
+                value = str.substring(equalIndex + 1).trim();
+                // TBD remove some forbidden name: BASE_NAME, ARCH and so on
+                if (name.length() == 0){
+                    name = null;
+                }
+            }
+            result[i][0] = name;
+            result[i][1] = value;
+        }
+
+        return result;
+    }
+    
+    /**
+     Retrieve <xxxHeader>/ModuleType
+
+     @returns   The module type name    if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getModuleType() {
+        String[] xPath = new String[] { "/ModuleType" };
+
+        XmlObject[] returns = get(xPath);
+        if (returns != null && returns.length > 0) {
+            ModuleTypeDef type = (ModuleTypeDef) returns[0];
+            return type.enumValue().toString();
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve <xxxHeader>/ComponentType
+     
+     @returns   The component type name if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getComponentType() {
+        String[] xPath = new String[] { "/ComponentType" };
+
+        XmlObject[] returns = get(xPath);
+        if (returns != null && returns.length > 0) {
+            FrameworkComponentTypes type = (FrameworkComponentTypes) returns[0];
+            return type.enumValue().toString();
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve Includes/PackageName
+
+     @param     arch    Architecture name
+
+     @returns   package name list       if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static List<String> getIncludePackageName(String arch) {
+        String[] xPath;
+
+        if (arch == null || arch.equals("")) {
+            xPath = new String[] {
+                "/PackageName",
+                "/Arch/PackageName"
+                };
+        } else {
+            xPath = new String[] {
+                "/PackageName",
+                "/Arch[@ArchType='ALL' or @ArchType='" + arch + "']/PackageName"
+                };
+        }
+        
+        XmlObject[] returns = get("Includes", xPath);
+        if (returns == null || returns.length == 0) {
+            return null;
+        }
+
+        List<String> packageNames = new ArrayList<String>();
+        PackageNameDocument.PackageName[] nameObj = (PackageNameDocument.PackageName[])returns;
+        for (int i = 0; i < returns.length; ++i) {
+            packageNames.add(nameObj[i].getStringValue());
+        }
+        
+        return packageNames;
+    }
+
+    /**
+     Retrieve LibraryClassDefinitions/LibraryClass for specified usage
+
+     @param     usage   Library class usage
+
+     @returns   LibraryClass objects list   if elements are found at the known xpath
+     @returns   null                        if nothing is there
+     **/
+    public static LibraryClassDocument.LibraryClass[] getLibraryClassArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] {"/LibraryClass"};
+        } else {
+            xPath = new String[] {"/LibraryClass[@Usage='" + usage + "']"};
+        }
+
+        XmlObject[] returns = get("LibraryClassDefinitions", xPath);
+        if (returns != null && returns.length > 0) {
+            return (LibraryClassDocument.LibraryClass[]) returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve ModuleEntryPoint names
+
+     @returns   ModuleEntryPoint name list  if elements are found at the known xpath
+     @returns   null                        if nothing is there
+     **/
+    public static String[] getModuleEntryPointArray() {
+        String[] xPath = new String[] { "/Extern/ModuleEntryPoint" };
+
+        XmlObject[] returns = get("Externs", xPath);
+
+        if (returns != null && returns.length > 0) {
+            String[] entryPoints = new String[returns.length];
+
+            for (int i = 0; i < returns.length; ++i) {
+                entryPoints[i] = ((XmlNormalizedString) returns[i])
+                                .getStringValue();
+            }
+
+            return entryPoints;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve module Guid string
+ 
+     @returns   GUILD string            if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getModuleGuid() {
+        String[] xPath = new String[] { "/Guid" };
+
+        XmlObject[] returns = get(xPath);
+        if (returns != null && returns.length > 0) {
+            GuidDocument.Guid guid = (GuidDocument.Guid) returns[0];
+            return guid.getStringValue();
+        }
+
+        return null;
+    }
+
+    /**
+     retrieve Protocol for specified usage
+
+     @param     usage   Protocol usage
+
+     @returns   Protocol objects list   if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static ProtocolsDocument.Protocols.Protocol[] getProtocolArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] {"/Protocol"};
+        } else {
+            xPath = new String[] {"/Protocol[@Usage='" + usage + "']"};
+        }
+
+        XmlObject[] returns = get("Protocols", xPath);
+        if (returns != null && returns.length > 0) {
+            return (ProtocolsDocument.Protocols.Protocol[]) returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve ProtocolNotify for specified usage
+    
+     @param     usage   ProtocolNotify usage
+
+     @returns   ProtocolNotify objects list     if elements are found at the known xpath
+     @returns   null                            if nothing is there
+     **/
+    public static ProtocolsDocument.Protocols.ProtocolNotify[] getProtocolNotifyArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] {"/ProtocolNotify"};
+        } else {
+            xPath = new String[] {"/ProtocolNotify[@Usage='" + usage + "']"};
+        }
+
+        XmlObject[] returns = get("Protocols", xPath);
+        if (returns != null && returns.length > 0) {
+            return (ProtocolsDocument.Protocols.ProtocolNotify[]) returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve ModuleUnloadImage names
+
+     @returns   ModuleUnloadImage name list     if elements are found at the known xpath
+     @returns   null                            if nothing is there
+     **/
+    public static String[] getModuleUnloadImageArray() {
+        String[] xPath = new String[] { "/Extern/ModuleUnloadImage" };
+
+        XmlObject[] returns = get("Externs", xPath);
+        if (returns != null && returns.length > 0) {
+            String[] stringArray = new String[returns.length];
+            XmlNormalizedString[] doc = (XmlNormalizedString[])returns;
+
+            for (int i = 0; i < returns.length; ++i) {
+                stringArray[i] = doc[i].getStringValue();
+            }
+
+            return stringArray;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve Extern
+
+     @returns   Extern objects list     if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static ExternsDocument.Externs.Extern[] getExternArray() {
+        String[] xPath = new String[] { "/Extern" };
+
+        XmlObject[] returns = get("Externs", xPath);
+        if (returns != null && returns.length > 0) {
+            return (ExternsDocument.Externs.Extern[]) returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve Ppi information
+
+     @param     usage   Ppi usage
+
+     @returns   Ppi objects list        if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static PPIsDocument.PPIs.Ppi[] getPpiArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] { "/Ppi" };
+        } else {
+            xPath = new String[] { "/Ppi[@Usage='" + usage + "']" };
+        }
+
+        XmlObject[] returns = get("PPIs", xPath);
+        if (returns != null && returns.length > 0) {
+            return (PPIsDocument.PPIs.Ppi[])returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrive PpiNotify information
+    
+     @param usage
+
+     @returns   PpiNotify objects list  if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static PPIsDocument.PPIs.PpiNotify[] getPpiNotifyArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] { "/PpiNotify" };
+        } else {
+            xPath = new String[] { "/PpiNotify[@Usage='" + usage + "']" };
+        }
+
+        XmlObject[] returns = get("PPIs", xPath);
+        if (returns != null && returns.length > 0) {
+            return (PPIsDocument.PPIs.PpiNotify[])returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve GuidEntry information for specified usage
+
+     @param     usage   GuidEntry usage
+
+     @returns   GuidEntry objects list  if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static GuidsDocument.Guids.GuidEntry[] getGuidEntryArray(String usage) {
+        String[] xPath;
+
+        if (usage == null || usage.equals("")) {
+            xPath = new String[] { "/GuidEntry" };
+        } else {
+            xPath = new String[] { "/GuidEntry[@Usage='" + usage + "']" };
+        }
+
+        XmlObject[] returns = get("Guids", xPath);
+        if (returns != null && returns.length > 0) {
+            return (GuidsDocument.Guids.GuidEntry[])returns;
+        }
+
+        return null;
+    }
+
+    /**
+     Retrieve Library instance information
+
+     @param     arch    Architecture name
+     @param     usage   Library instance usage
+
+     @returns   library instance name list  if elements are found at the known xpath
+     @returns   null                        if nothing is there
+     **/
+    public static List<String> getLibraryInstance(String arch, String usage) {
+        String[] xPath;
+        String   archAttribute = "";
+        String   usageAttribute = "";
+
+        if ((arch != null) || (!arch.equals(""))) {
+            archAttribute = "[@ArchType='ALL' or @ArchType='" + arch + "']";
+        }
+        
+        if ((usage != null) || (!usage.equals(""))) {
+            // if no Usage attribute specified, default to ALWAYS_CONSUMED
+            if (usage.equals(LibraryUsage.ALWAYS_CONSUMED.toString())) {
+                usageAttribute = "[not(@Usage) or @Usage='" + usage + "']";
+            } else {
+                usageAttribute = "[@Usage='" + usage + "']";
+            }
+        }
+        
+        xPath = new String[] {
+                "/Library" + usageAttribute,
+                "/Arch" + archAttribute + "/Library" + usageAttribute
+                };
+
+        XmlObject[] returns = get("Libraries", xPath);
+        if (returns == null || returns.length == 0) {
+            return null;
+        }
+        
+        List<String> instances = new ArrayList<String>();
+        for (int i = 0; i < returns.length; ++i) {
+            if (returns[i] instanceof LibrariesDocument.Libraries.Library) {
+                LibrariesDocument.Libraries.Library lib = (LibrariesDocument.Libraries.Library)returns[i];
+                instances.add(lib.getStringValue());
+            } else if (returns[i] instanceof LibrariesDocument.Libraries.Arch.Library) {
+                LibrariesDocument.Libraries.Arch.Library lib = (LibrariesDocument.Libraries.Arch.Library)returns[i];
+                instances.add(lib.getStringValue());
+            }
+        }
+
+        return instances;
+    }
+
+    ///
+    /// This method is used for retrieving the elements information which has 
+    /// CName sub-element
+    ///
+    private static String[] getCNames(String from, String xPath[]) {
+        XmlObject[] returns = get(from, xPath);
+        if (returns == null || returns.length == 0) {
+            return null;
+        }
+        
+        String[] strings = new String[returns.length];
+        for (int i = 0; i < returns.length; ++i) {
+            strings[i] = ((CName)returns[i]).getStringValue(); 
+        }
+        
+        return strings;            
+    }
+    
+    /**
+     Retrive library's constructor name
+
+     @returns   constructor name list   if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getLibConstructorName() {
+        String[] xPath = new String[] {"/Extern/Constructor"};
+
+        XmlObject[] returns = get("Externs", xPath);
+        if (returns != null && returns.length > 0) {
+            CName constructor = (CName)returns[0]; 
+            return constructor.getStringValue();            
+        }
+
+        return null;
+    }
+
+    /**
+     Retrive library's destructor name
+
+     @returns   destructor name list    if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getLibDestructorName() {
+        String[] xPath = new String[] {"/Extern/Destructor"};
+
+        XmlObject[] returns = get("Externs", xPath);
+        if (returns != null && returns.length > 0) {
+            CName destructor = (CName)returns[0]; 
+            return destructor.getStringValue();            
+        }
+
+        return null;
+    }
+    
+    /**
+     Retrive DriverBinding names
+
+     @returns   DriverBinding name list if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getDriverBindingArray() {
+        String[] xPath = new String[] {"/Extern/DriverBinding"};
+        return getCNames("Externs", xPath);
+    }
+    
+    /**
+     Retrive ComponentName names
+
+     @returns   ComponentName name list if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getComponentNameArray() {
+        String[] xPath = new String[] {"/Extern/ComponentName"};
+        return getCNames("Externs", xPath);
+    }
+    
+    /**
+     Retrive DriverConfig names
+
+     @returns   DriverConfig name list  if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getDriverConfigArray() {
+        String[] xPath = new String[] {"/Extern/DriverConfig"};
+        return getCNames("Externs", xPath);
+    }
+    
+    /**
+     Retrive DriverDiag names
+
+     @returns   DriverDiag name list    if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getDriverDiagArray() {
+        String[] xPath = new String[] {"/Extern/DriverDiag"};
+        return getCNames("Externs", xPath);
+    }
+
+    /**
+     Retrive SetVirtualAddressMapCallBack names
+
+     @returns   SetVirtualAddressMapCallBack name list  
+                                        if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getSetVirtualAddressMapCallBackArray() {
+        String[] xPath = new String[] {"/Extern/SetVirtualAddressMapCallBack"};
+        return getCNames("Externs", xPath);
+    }
+    
+    /**
+     Retrive ExitBootServicesCallBack names
+
+     @returns   ExitBootServicesCallBack name list  
+                                        if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String[] getExitBootServicesCallBackArray() {
+        String[] xPath = new String[] {"/Extern/ExitBootServicesCallBack"};
+        return getCNames("Externs", xPath);
+    }
+
+    /**
+     Retrieve module surface area file information
+
+     @returns   ModuleSA objects list   if elements are found at the known xpath
+     @returns   Empty ModuleSA list     if nothing is there
+     **/
+    public static ModuleSADocument.ModuleSA[] getFpdModules() {
+        String[] xPath = new String[] { "/TianoImage/*/ModuleSA" };
+
+        XmlObject[] result = get("FrameworkPlatformDescription", xPath);
+        if (result == null) {
+            return new ModuleSADocument.ModuleSA[0];
+        }
+
+        return (ModuleSADocument.ModuleSA[]) result;
+    }
+
+    /**
+     Retrieve variables for FV images
+
+     @returns   name/value list        if elements are found at the known xpath
+     @returns   empty list             if nothing is there
+     **/
+    public static String[][] getFpdGlobalVariable() {
+        String[] xPath = new String[] { "/Flash/FvImages/NameValue" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null) {
+            return new String[0][];
+        }
+
+        String[][] result = new String[queryResult.length][2];
+        for (int i = 0; i < queryResult.length; i++){
+            result[i][0] = ((NameValueDocument.NameValue)queryResult[i]).getName();
+            result[i][1] = ((NameValueDocument.NameValue)queryResult[i]).getValue();
+        }
+
+        return result;
+    }
+    
+    /**
+     Retrieve valid image names
+
+     @returns   valid iamges name list  if elements are found at the known xpath
+     @returns   empty list              if nothing is there
+     **/
+    public static String[] getFpdValidImageNames(){
+        String[] xPath = new String[] { "/Flash/FvImages/FvImage[@Type='ValidImageNames']/FvImageNames" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null) {
+            return new String[0];
+        }
+
+        String[] result = new String[queryResult.length];
+        for (int i = 0; i < queryResult.length; i++){
+            result[i] = ((XmlString)queryResult[i]).getStringValue();
+        }
+
+        return result;
+    }
+
+    /**
+     Retrieve FV image option information
+
+     @param fvName  FV image name
+
+     @returns   option name/value list if elements are found at the known xpath
+     @returns   empty list             if nothing is there
+     **/
+    public static String[][] getFpdOptions(String fvName){
+        String[] xPath = new String[] {"/Flash/FvImages/FvImageName[@Name='" + fvName.toUpperCase() + "']/FvImageOptions/NameValue" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null) {
+            return new String[0][];
+        }
+
+        String[][] result = new String[queryResult.length][2];
+        for (int i = 0; i < queryResult.length; i++){
+            result[i][0] = ((NameValueDocument.NameValue)queryResult[i]).getName();
+            result[i][1] = ((NameValueDocument.NameValue)queryResult[i]).getValue();
+        }
+
+        return result;
+    }
+    
+    /**
+     Retrieve FV image attributes information
+
+     @param     fvName  FV image name
+
+     @returns   attribute name/value list   if elements are found at the known xpath
+     @returns   empty list                  if nothing is there
+     **/
+    public static String[][] getFpdAttributes(String fvName){
+        String[] xPath = new String[] {"/Flash/FvImages/FvImage[@Type='Attributes' and ./FvImageNames='" + fvName.toUpperCase() + "']/FvImageOptions" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null) {
+            return new String[0][];
+        }
+
+        ArrayList<String[]> list = new ArrayList<String[]>();
+        for (int i = 0 ; i < queryResult.length; i++){
+            FvImageOptionsDocument.FvImageOptions item = (FvImageOptionsDocument.FvImageOptions)queryResult[i];
+
+            List<NameValueDocument.NameValue> namevalues = item.getNameValueList();
+            Iterator iter = namevalues.iterator();
+            while (iter.hasNext()) {
+                NameValueDocument.NameValue nvItem = (NameValueDocument.NameValue)iter.next();
+                list.add(new String[]{nvItem.getName(), nvItem.getValue()});
+            }
+
+            List<String> enables = item.getEnableList();
+            iter = enables.iterator();
+            while (iter.hasNext()) {
+                String enableItem = (String)iter.next();
+                list.add(new String[]{enableItem, "TRUE"});
+            }
+
+            List<String> disables = item.getDisableList();
+            iter = disables.iterator();
+            while (iter.hasNext()) {
+                String disableItem = (String)iter.next();
+                list.add(new String[]{disableItem, "FALSE"});
+            }
+        }
+
+        String[][] result = new String[list.size()][2];
+        for (int i = 0; i < list.size(); i++){
+            result[i][0] = list.get(i)[0];
+            result[i][1] = list.get(i)[1];
+        }
+
+        return result;
+    }
+    
+    /**
+     Retrieve flash definition file name
+
+     @returns   file name               if elements are found at the known xpath
+     @returns   null                    if nothing is there
+     **/
+    public static String getFlashDefinitionFile(){
+        String[] xPath = new String[] {"/Flash/FlashDefinitionFile" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null || queryResult.length == 0) {
+            return null;
+        }
+
+        FileNameConvention filename = (FileNameConvention)queryResult[queryResult.length - 1];
+        return filename.getStringValue();
+    }
+    
+    /**
+     Retrieve FV image component options
+
+     @param     fvName  FV image name
+
+     @returns   name/value pairs list   if elements are found at the known xpath
+     @returns   empty list              if nothing is there
+     **/
+    public static String[][] getFpdComponents(String fvName){
+        String[] xPath = new String[] {"/Flash/FvImages/FvImage[@Type='Components' and ./FvImageNames='" + fvName.toUpperCase() + "']/FvImageOptions" };
+
+        XmlObject[] queryResult = get("FrameworkPlatformDescription", xPath);
+        if (queryResult == null) {
+            return new String[0][];
+        }
+
+        ArrayList<String[]> list = new ArrayList<String[]>();
+        for (int i = 0 ; i < queryResult.length; i++){
+            FvImageOptionsDocument.FvImageOptions item = (FvImageOptionsDocument.FvImageOptions)queryResult[i];
+
+            List<NameValueDocument.NameValue> namevalues = item.getNameValueList();
+            Iterator iter = namevalues.iterator();
+            while (iter.hasNext()) {
+                NameValueDocument.NameValue nvItem = (NameValueDocument.NameValue)iter.next();
+                list.add(new String[]{nvItem.getName(), nvItem.getValue()});
+            }
+
+            List<String> enables = item.getEnableList();
+            iter = enables.iterator();
+            while (iter.hasNext()) {
+                String enableItem = (String)iter.next();
+                list.add(new String[]{enableItem, "TRUE"});
+            }
+
+            List<String> disables = item.getDisableList();
+            iter = disables.iterator();
+            while (iter.hasNext()) {
+                String disableItem = (String)iter.next();
+                list.add(new String[]{disableItem, "FALSE"});
+            }
+        }
+
+        String[][] result = new String[list.size()][2];
+        for (int i = 0; i < list.size(); i++){
+            result[i][0] = list.get(i)[0];
+            result[i][1] = list.get(i)[1];
+        }
+
+        return result;
+    }
+    
+    /**
+     Retrieve PCD tokens
+
+     @returns   CName/ItemType pairs list   if elements are found at the known xpath
+     @returns   null                        if nothing is there
+     **/
+    public static String[][] getPcdTokenArray() {
+        String[] xPath = new String[] {"/PcdData"};
+        
+        XmlObject[] returns = get("PCDs", xPath);
+        if (returns == null || returns.length == 0) {
+            return null;
+        }
+        
+        PCDs.PcdData[] pcds = (PCDs.PcdData[]) returns;
+        String[][] result = new String[pcds.length][2];
+        for (int i = 0; i < returns.length; ++i) {
+            if (pcds[i].getItemType() != null) {
+                result[i][1] = pcds[i].getItemType().toString();
+            } else {
+                result[i][1] = null;
+            }
+            result[i][0] = pcds[i].getCName();
+        }
+            
+        return result;
+    }
+
+    /**
+     Get the PcdToken array from module's surface area document.
+     The array should contains following data:
+     <p>-------------------------------------------------------------------</p>
+     <p>CName | ItemType | TokenspaceName | DefaultValue | Usage | HelpText</p>
+     <p>-------------------------------------------------------------------</p>
+     <p>Note: Until new schema applying, now we can only get CName, ItemType,</p>
+     
+     @return  2-array table contains all information of PCD token retrieved from MSA.
+     **/
+    public static Object[][] getModulePCDTokenArray () {
+      int             index;
+      Object[][]      result;
+      PCDs.PcdData[]  pcds;
+      String[]        xPath   = new String[] {"/PcdData"};
+      XmlObject[]     returns = get ("PCDs", xPath);
+
+      if ((returns == null) || (returns.length == 0)) {
+        return null;
+      }
+
+      pcds     = (PCDs.PcdData[]) returns;
+      result   = new Object[pcds.length][6];
+      for (index = 0; index < pcds.length; index ++) {
+        //
+        // Get CName
+        //
+        result [index][0] = pcds[index].getCName();
+        //
+        // Get ItemType: FEATURE_FLAG, FIXED_AT_BUILD, PATCHABLE_IN_MODLE, DYNAMIC, DYNAMIC_EX
+        //
+        if (pcds[index].getItemType() != null) {
+          result [index][1] = pcds[index].getItemType().toString();
+        } else {
+          result [index][1] = null;
+        }
+        
+        //
+        // BUGBUG: following field can *not* be got from current MSA until schema changed.
+        //
+        //result [index][2] = pcds[index].getTokenSpaceName();
+        result [index][2] = null;
+        result [index][3] = pcds[index].getDefaultValue();
+        //result [index][4] = pcds[index].getUsage ();
+        result [index][4] = null;
+        //result [index][5] = pcds[index].getHelpText ();
+        result [index][5] = null;
+      }
+      return result;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java b/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
new file mode 100644
index 0000000000..f830e0ac76
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/VariableTask.java
@@ -0,0 +1,71 @@
+/** @file
+ * This file is ANT task VariableTask. 
+ *
+ * VariableTask task implements part of ANT property task. The difference is
+ * this task will override variable with same name, but ANT property task do not.
+ *
+ * Copyright (c) 2006, Intel Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are licensed and made available under the terms and conditions of the BSD License
+ * which accompanies this distribution.  The full text of the license may be found at
+ * http://opensource.org/licenses/bsd-license.php
+ *
+ * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ */
+package org.tianocore.build.global;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * VariableTask task implements part of ANT property task. The difference is
+ * this task will override variable with same name, but ANT property task do not.
+ * 
+ * @since GenBuild 1.0
+ */
+public class VariableTask extends Task {
+
+   /**
+    * property value
+    */
+   private String value;
+   
+   /**
+    * property name
+    */
+   private String name;
+
+   /**
+    * Set property name.
+    *
+    * @param name property name
+    */
+   public void setName( String name ) {
+      this.name = name;
+   }
+
+
+   /**
+    * Set property value.
+    *
+    * @param value  property value
+    */
+   public void setValue( String value ) {
+      this.value = value;
+   }
+
+   /**
+    * ANT task's entry point, will be called after init(). 
+    *
+    * @exception BuildException
+    *            If name or value is null
+    */
+   public void execute() throws BuildException {
+       if (name == null || value == null) {
+           throw new BuildException("Name or value must not null.");
+       }
+       getProject().setProperty(name, value);
+   }
+}
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ActionMessage.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ActionMessage.java
new file mode 100644
index 0000000000..a67d2f9e4d
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ActionMessage.java
@@ -0,0 +1,129 @@
+/** @file
+  ActionMessage class.
+
+  ActionMessage class take over all message for loging and waning. This class should
+  dispatch message into different class according to instance class type.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.action;
+
+import org.apache.tools.ant.Task;
+import org.tianocore.build.pcd.action.BuildAction;
+import org.tianocore.build.pcd.action.UIAction;
+
+/** ActionMessage class take over all message for loging and waning. This class 
+    should dispatch message into different Action class according to instance 
+    class type.
+**/
+public class ActionMessage {
+    ///
+    /// Macro definition for NULL messge level. 
+    /// In this meessage level, all message will be hidden.
+    ///
+    public final static int NULL_MESSAGE_LEVEL    = 0; 
+    ///
+    /// Macro definition for Log messge level.
+    /// In this message level, Only log information will be shown.
+    ///
+    public final static int LOG_MESSAGE_LEVEL     = 1;
+    ///
+    /// Macro definition for Warning message level.  
+    /// In this message level, log and waning message will be shown.
+    ///
+    public final static int WARNING_MESSAGE_LEVEL = 2;
+    ///
+    /// Macro definition for Debug mesage level.
+    /// In this message level, log, warning, debug message will be shown.
+    ///
+    public final static int DEBUG_MESSAGE_LEVEL   = 3;
+    ///
+    /// Macor definition for MAX message level.
+    /// In this message level, all message will be shown.
+    ///
+    public final static int MAX_MESSAGE_LEVEL     = 4;
+    ///
+    /// Current message level. It will control all message output for PCD tool.
+    ///
+    public       static int messageLevel          = NULL_MESSAGE_LEVEL;
+
+    /**
+      Log() function provide common log information functionality for all 
+      PCD tool includes all function
+
+      This function will dispatch message to special class such as BuildAction
+      Class, Entity Class etc.
+     
+      @param thisClass   The class object who want log information.
+      @param logStr      The string contains log information.
+    **/
+    public static void log(Object thisClass, String logStr) {
+        if(messageLevel < LOG_MESSAGE_LEVEL) {
+            return;
+        }
+
+        if(thisClass instanceof Task) {
+            BuildAction.logMsg(thisClass, "$$LOG$$:" + logStr);
+        } else if(thisClass instanceof UIAction) {
+            UIAction.logMsg(thisClass, "$$LOG$$:" + logStr);
+        } else {
+            System.out.println("$$LOG$$:" + logStr);
+        }
+    }
+
+    /**
+      Warning() function provide common warning information functionality for all 
+      PCD tool.
+
+      This function will dispatch message to special class such as BuildAction
+      Class, Entity Class etc.
+     
+      @param thisClass   The class object who want warn information.
+      @param warningStr  The string contains warning information.
+    **/  
+    public static void warning(Object thisClass, String warningStr) {
+        if(messageLevel < WARNING_MESSAGE_LEVEL) {
+            return;
+        }
+
+        if(thisClass instanceof Task) {
+            BuildAction.warningMsg(thisClass, "**WARNING**:" + warningStr);
+        } else if(thisClass instanceof UIAction) {
+            UIAction.warningMsg(thisClass, "**WARNING**:" + warningStr);
+        } else {
+            System.out.println("**WARNING**:" + warningStr);
+        }
+    }
+
+    /**
+      Debug() function provide common Debug information functionality for all 
+      PCD tool.
+
+      This function will dispatch message to special class such as BuildAction
+      Class, Entity Class etc.
+     
+      @param thisClass   The class object who want Debug information.
+      @param debugStr    The string contains Debug information.
+    **/  
+    public static void debug(Object thisClass, String debugStr) {
+        if(messageLevel < DEBUG_MESSAGE_LEVEL) {
+            return;
+        }
+
+        if(thisClass instanceof Task) {
+            BuildAction.logMsg(thisClass, "%%DEBUG%%:" + debugStr);
+        } else if(thisClass instanceof UIAction) {
+            UIAction.logMsg(thisClass, "%%DEBUG%%:" + debugStr);
+        } else {
+            System.out.println("%%DEBUG%%:" + debugStr);
+        }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/BuildAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/BuildAction.java
new file mode 100644
index 0000000000..c8b0d9dba1
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/BuildAction.java
@@ -0,0 +1,114 @@
+/** @file
+  BuildAction class.
+
+  BuildAction is the parent class for all action related to ant Task. This class will
+  define some common utility functionality, such as logMsg, warningMsg..etc.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.action;
+
+import org.apache.tools.ant.Task;
+import org.tianocore.build.pcd.exception.BuildActionException;
+
+/** BuildAction is the parent class for all action related to ant Task. This class will
+    define some common utility functionality, such as logMsg, warningMsg..etc.
+**/
+abstract class BuildAction extends Task {
+    ///
+    /// Original message level before this action. This value will 
+    /// be restored when quit this action.
+    ///
+    private int originalMessageLevel;
+
+    /**
+      checkParameter function check all parameter valid.
+
+      This function will be overrided by child class.
+    **/
+    abstract void checkParameter() throws BuildActionException;
+
+    /**
+     performAction is to execute the detail action.
+      
+     This function will be overrided by child class.
+    **/
+    abstract void performAction() throws BuildActionException;
+
+    /**
+      setMessageLevel function set current message for task instance object.
+
+      The message should be restored when this action exit.
+
+      @param messageLevel The message level for this action.
+    **/
+    public void setMessageLevel(int messageLevel) {
+        originalMessageLevel        = ActionMessage.messageLevel;
+        ActionMessage.messageLevel  = messageLevel;
+    }
+
+    /**
+      logMsg function provide common log information functionality for all 
+      PCD tool extends from ANT task class.
+
+      This function will use the log function in Ant task class.
+     
+      @param action     The class object who want log information.
+      @param logStr     The string contains log information.
+    **/
+    public static void logMsg(Object action, String logStr) {
+        //
+        // Comment following code because in console debug environment, we can't 
+        // get Project instance.
+        //((Task) action).log(errorText, Project.MSG_INFO);
+        //
+        System.out.println(logStr);
+    }
+
+    /**
+      warningMsg function provide common warning information functionality for all 
+      PCD tool.
+
+      This function will dispatch message to special class such as BuildAction
+      Class, Entity Class etc.
+     
+      @param action      The class object who want warn information.
+      @param warningStr  The string contains warning information.
+    **/  
+    public static void warningMsg(Object action, String warningStr) {
+        //
+        // Comment following code because in console debug environment, we can't 
+        // get Project instance.
+        //((Task) action).log(warningText, Project.MSG_WARN);
+        //
+        System.out.println(warningStr);
+    }
+
+    /**
+      execute function is the main flow for all build action class.
+
+      This workflow will be:
+      1) Check paramet of this action.
+      2) Perform the child class action function.
+      3) Restore the message level.
+     
+      @throws BuildActionException
+    **/  
+    public void execute() throws BuildActionException {
+        checkParameter();
+        performAction();
+
+        //
+        // Restore orignal message level when exist the action.
+        //
+        ActionMessage.messageLevel = originalMessageLevel;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
new file mode 100644
index 0000000000..055563df1b
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -0,0 +1,669 @@
+/** @file
+  CollectPCDAction class.
+
+  This action class is to collect PCD information from MSA, SPD, FPD xml file.
+  This class will be used for wizard and build tools, So it can *not* inherit
+  from buildAction or wizardAction.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.action;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.FrameworkPlatformDescriptionDocument;
+import org.tianocore.ModuleSADocument;
+import org.tianocore.PackageSurfaceAreaDocument;
+import org.tianocore.PcdBuildDeclarationsDocument.PcdBuildDeclarations.PcdBuildData;
+import org.tianocore.PcdDefinitionsDocument.PcdDefinitions;
+import org.tianocore.build.autogen.CommonDefinition;
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.build.pcd.action.ActionMessage;
+import org.tianocore.build.pcd.entity.MemoryDatabaseManager;
+import org.tianocore.build.pcd.entity.SkuInstance;
+import org.tianocore.build.pcd.entity.Token;
+import org.tianocore.build.pcd.entity.UsageInstance;
+import org.tianocore.build.pcd.exception.EntityException;
+
+/** This action class is to collect PCD information from MSA, SPD, FPD xml file.
+    This class will be used for wizard and build tools, So it can *not* inherit
+    from buildAction or UIAction.
+**/
+public class CollectPCDAction {
+    /// memoryDatabase hold all PCD information collected from SPD, MSA, FPD.
+    private MemoryDatabaseManager dbManager;
+
+    /// Workspacepath hold the workspace information.
+    private String                workspacePath;
+
+    /// FPD file is the root file. 
+    private String                fpdFilePath;
+
+    /// Message level for CollectPCDAction.
+    private int                   originalMessageLevel;
+
+    /**
+      Set WorkspacePath parameter for this action class.
+
+      @param workspacePath parameter for this action
+    **/
+    public void setWorkspacePath(String workspacePath) {
+        this.workspacePath = workspacePath;
+    }
+
+    /**
+      Set action message level for CollectPcdAction tool.
+
+      The message should be restored when this action exit.
+
+      @param actionMessageLevel parameter for this action
+    **/
+    public void setActionMessageLevel(int actionMessageLevel) {
+        originalMessageLevel       = ActionMessage.messageLevel;
+        ActionMessage.messageLevel = actionMessageLevel;
+    }
+
+    /**
+      Set FPDFileName parameter for this action class.
+
+      @param fpdFilePath    fpd file path
+    **/
+    public void setFPDFilePath(String fpdFilePath) {
+        this.fpdFilePath = fpdFilePath;
+    }
+
+    /**
+      Common function interface for outer.
+      
+      @param workspacePath The path of workspace of current build or analysis.
+      @param fpdFilePath   The fpd file path of current build or analysis.
+      @param messageLevel  The message level for this Action.
+      
+      @throws  Exception The exception of this function. Because it can *not* be predict
+                         where the action class will be used. So only Exception can be throw.
+      
+    **/
+    public void perform(String workspacePath, String fpdFilePath, 
+                        int messageLevel) throws Exception {
+        setWorkspacePath(workspacePath);
+        setFPDFilePath(fpdFilePath);
+        setActionMessageLevel(messageLevel);
+        checkParameter();
+        execute();
+        ActionMessage.messageLevel = originalMessageLevel;
+    }
+
+    /**
+      Core execution function for this action class.
+     
+      This function work flows will be:
+      1) Get all token's platform information from FPD, and create token object into memory database.
+      2) Get all token's module information from MSA, and create usage instance for every module's PCD entry.
+      3) Get all token's inherited information from MSA's library, and create usage instance 
+         for module who consume this library and create usage instance for library for building.
+      4) Collect token's package information from SPD, update these information for token in memory
+         database.
+      
+      @throws  EntityException Exception indicate failed to execute this action.
+      
+    **/
+    private void execute() throws EntityException {
+        FrameworkPlatformDescriptionDocument fpdDoc               = null;
+        Object[][]                           modulePCDArray       = null;
+        Map<String, XmlObject>               docMap               = null;
+        ModuleSADocument.ModuleSA[]          moduleSAs            = null;
+        UsageInstance                        usageInstance        = null;
+        String                               packageName          = null;
+        String                               packageFullPath      = null;
+        int                                  index                = 0;
+        int                                  libraryIndex         = 0;
+        int                                  pcdArrayIndex        = 0;
+        List<String>                         listLibraryInstance  = null;
+        String                               componentTypeStr     = null;
+
+        //
+        // Collect all PCD information defined in FPD file.
+        // Evenry token defind in FPD will be created as an token into 
+        // memory database.
+        //
+        fpdDoc = createTokenInDBFromFPD();
+
+        //
+        // Searching MSA and SPD document. 
+        // The information of MSA will be used to create usage instance into database.
+        // The information of SPD will be used to update the token information in database.
+        //
+
+        HashMap<String, XmlObject> map = new HashMap<String, XmlObject>();
+        map.put("FrameworkPlatformDescription", fpdDoc);
+        SurfaceAreaQuery.setDoc(map);    
+
+        moduleSAs = SurfaceAreaQuery.getFpdModules();
+        for(index = 0; index < moduleSAs.length; index ++) {
+            //
+            // Get module document and use SurfaceAreaQuery to get PCD information
+            //
+            docMap = GlobalData.getDoc(moduleSAs[index].getModuleName());
+            SurfaceAreaQuery.setDoc(docMap);
+            modulePCDArray    = SurfaceAreaQuery.getModulePCDTokenArray();
+            componentTypeStr  = SurfaceAreaQuery.getComponentType();
+            packageName       = 
+                GlobalData.getPackageNameForModule(moduleSAs[index].getModuleName());
+            packageFullPath   = this.workspacePath + File.separator    +
+                                GlobalData.getPackagePath(packageName) +
+                                packageName + ".spd";
+
+            if(modulePCDArray != null) {
+                //
+                // If current MSA contains <PCDs> information, then create usage
+                // instance for PCD information from MSA
+                //
+                for(pcdArrayIndex = 0; pcdArrayIndex < modulePCDArray.length; 
+                     pcdArrayIndex ++) {
+                    usageInstance = 
+                        createUsageInstanceFromMSA(moduleSAs[index].getModuleName(),
+                                                   modulePCDArray[pcdArrayIndex]);
+
+                    if(usageInstance == null) {
+                        continue;
+                    }
+                    //
+                    // Get remaining PCD information from the package which this module belongs to
+                    //
+                    updateTokenBySPD(usageInstance, packageFullPath);
+                }
+            }
+
+            //
+            // Get inherit PCD information which inherit from library instance of this module.
+            //
+            listLibraryInstance = 
+                SurfaceAreaQuery.getLibraryInstance(moduleSAs[index].getArch().toString(),
+                                                    CommonDefinition.AlwaysConsumed);
+            if(listLibraryInstance != null) {
+                for(libraryIndex = 0; libraryIndex < listLibraryInstance.size(); 
+                     libraryIndex ++) {
+                    inheritPCDFromLibraryInstance(listLibraryInstance.get(libraryIndex),
+                                                  moduleSAs[index].getModuleName(),
+                                                  packageName,
+                                                  componentTypeStr);
+                }
+            }
+        }
+    }
+
+    /**
+      This function will collect inherit PCD information from library for a module.
+     
+      This function will create two usage instance for inherited PCD token, one is 
+      for module and another is for library.
+      For module, if it inherited a PCD token from library, this PCD token's value 
+      should be instanced in module level, and belongs to module.
+      For library, it also need a usage instance for build.
+      
+      @param libraryName         The name of library instance.
+      @param moduleName          The name of module.
+      @param packageName         The name of package while module belongs to.
+      @param parentcomponentType The component type of module.
+      
+      @throws EntityException  If the token does *not* exist in memory database.
+      
+    **/
+    private void inheritPCDFromLibraryInstance(String libraryName,
+                                               String moduleName,
+                                               String packageName,
+                                               String parentcomponentType) 
+        throws EntityException {
+        Map<String, XmlObject>  docMap            = null;
+        String                  primaryKeyString  = null;
+        Object[][]              libPcdDataArray   = null;
+        UUID                    nullUUID          = new UUID(0,0);
+        UUID                    platformUUID      = nullUUID;
+        UUID                    tokenSpaceGuid    = null;
+        int                     tokenIndex        = 0;
+        Token                   token             = null;
+        Token.PCD_TYPE          pcdType           = Token.PCD_TYPE.UNKNOWN;
+        UsageInstance           usageInstance     = null;
+        String                  packageFullPath   = null;
+
+        //
+        // Query PCD information from library's document.
+        //
+        docMap          = GlobalData.getDoc(libraryName);
+        SurfaceAreaQuery.setDoc(docMap);
+        libPcdDataArray = SurfaceAreaQuery.getModulePCDTokenArray();
+
+        if(libPcdDataArray == null) {
+            return;
+        }
+
+        for(tokenIndex = 0; tokenIndex < libPcdDataArray.length; tokenIndex ++) {
+            tokenSpaceGuid =((UUID)libPcdDataArray[tokenIndex][2] == null) ? 
+                             nullUUID :(UUID)libPcdDataArray[tokenIndex][2];
+
+            //
+            // Get token from memory database. The token must be created from FPD already.
+            //
+            primaryKeyString = Token.getPrimaryKeyString((String)libPcdDataArray[tokenIndex][0],
+                                                         tokenSpaceGuid,
+                                                         platformUUID
+                                                         );
+
+            if(dbManager.isTokenInDatabase(primaryKeyString)) {
+                token = dbManager.getTokenByKey(primaryKeyString);
+            } else {
+                throw new EntityException("The PCD token " + primaryKeyString + 
+                                          " defined in module " + moduleName + 
+                                          " does not exist in FPD file!");
+            }      
+
+            //
+            // Create usage instance for module.
+            //
+            pcdType = Token.getpcdTypeFromString((String)libPcdDataArray[tokenIndex][1]);
+            usageInstance = new UsageInstance(token,
+                                              Token.PCD_USAGE.ALWAYS_CONSUMED,
+                                              pcdType,
+                                              CommonDefinition.getComponentType(parentcomponentType),
+                                              libPcdDataArray[tokenIndex][3],
+                                              null,
+                                             (String) libPcdDataArray[tokenIndex][5],
+                                              "",
+                                              moduleName,
+                                              packageName,
+                                              true);
+            if(Token.PCD_USAGE.UNKNOWN == token.isUsageInstanceExist(moduleName)) {
+                token.addUsageInstance(usageInstance);
+
+                packageFullPath = this.workspacePath + File.separator    +
+                                  GlobalData.getPackagePath(packageName) +
+                                  packageName + ".spd";
+                updateTokenBySPD(usageInstance, packageFullPath);
+            }
+
+            //
+            // We need create second usage instance for inherited case, which
+            // add library as an usage instance, because when build a module, and 
+            // if module inherited from base library, then build process will build
+            // library at first. 
+            //
+            if(Token.PCD_USAGE.UNKNOWN == token.isUsageInstanceExist(libraryName)) {
+                packageName   = GlobalData.getPackageNameForModule(libraryName);
+                usageInstance = new UsageInstance(token,
+                                                  Token.PCD_USAGE.ALWAYS_CONSUMED,
+                                                  pcdType,
+                                                  CommonDefinition.ComponentTypeLibrary,
+                                                  libPcdDataArray[tokenIndex][3],
+                                                  null,
+                                                 (String)libPcdDataArray[tokenIndex][5],
+                                                  "",
+                                                  libraryName,
+                                                  packageName,
+                                                  false);
+                token.addUsageInstance(usageInstance);
+            }
+        }
+    }
+
+    /**
+      Create usage instance for PCD token defined in MSA document
+
+      A PCD token maybe used by many modules, and every module is one of usage
+      instance of this token. For ALWAY_CONSUMED, SOMETIMES_CONSUMED, it is 
+      consumer type usage instance of this token, and for ALWAYS_PRODUCED, 
+      SOMETIMES_PRODUCED, it is produce type usage instance.
+     
+      @param moduleName      The name of module 
+      @param tokenInfoInMsa  The PCD token information array retrieved from MSA.
+      
+      @return UsageInstance  The usage instance created in memroy database.
+      
+      @throws EntityException  If token did not exist in database yet.
+      
+    **/
+    private UsageInstance createUsageInstanceFromMSA(String   moduleName,
+                                                     Object[] tokenInfoInMsa) 
+        throws EntityException {
+        String          packageName         = null;
+        UsageInstance   usageInstance       = null;
+        UUID            tokenSpaceGuid      = null;
+        UUID            nullUUID            = new UUID(0,0);
+        String          primaryKeyString    = null;
+        UUID            platformTokenSpace  = nullUUID;
+        Token           token               = null;
+        Token.PCD_TYPE  pcdType             = Token.PCD_TYPE.UNKNOWN;
+        Token.PCD_USAGE pcdUsage            = Token.PCD_USAGE.UNKNOWN;
+
+        tokenSpaceGuid =((UUID)tokenInfoInMsa[2] == null) ? nullUUID :(UUID)tokenInfoInMsa[2];
+
+        primaryKeyString = Token.getPrimaryKeyString((String)tokenInfoInMsa[0],
+                                                     tokenSpaceGuid,
+                                                     platformTokenSpace);
+
+        //
+        // Get token object from memory database firstly.
+        //
+        if(dbManager.isTokenInDatabase(primaryKeyString)) {
+            token = dbManager.getTokenByKey(primaryKeyString);
+        } else {
+            throw new EntityException("The PCD token " + primaryKeyString + " defined in module " + 
+                                      moduleName + " does not exist in FPD file!" );
+        }
+        pcdType     = Token.getpcdTypeFromString((String)tokenInfoInMsa[1]);
+        pcdUsage    = Token.getUsageFromString((String)tokenInfoInMsa[4]);
+
+        packageName = GlobalData.getPackageNameForModule(moduleName);
+
+        if(Token.PCD_USAGE.UNKNOWN != token.isUsageInstanceExist(moduleName)) {
+            //
+            // BUGBUG: It should *not* throw exception here. Becaues in MdePkg.fpd, 
+            // more than on BaseLib exist. But why? need confirmation.
+            //
+            //throw new EntityException(
+            //  "In module " + moduleName + " exist more than one PCD token " + token.cName
+            //  );
+            ActionMessage.warning(this,
+                                  "In module " + moduleName + " exist more than one PCD token " + token.cName
+                                  );
+            return null;
+        }
+
+        //
+        // BUGBUG: following code could be enabled at current schema. Because 
+        //         current schema does not provide usage information.
+        // 
+        // For FEATRURE_FLAG, FIXED_AT_BUILD, PATCH_IN_MODULE type PCD token, his 
+        // usage is always ALWAYS_CONSUMED
+        //
+        //if((pcdType != Token.PCD_TYPE.DYNAMIC) &&
+        //   (pcdType != Token.PCD_TYPE.DYNAMIC_EX)) {
+        pcdUsage = Token.PCD_USAGE.ALWAYS_CONSUMED;
+        //}
+
+        usageInstance = new UsageInstance(token,
+                                          pcdUsage,
+                                          pcdType,
+                                          CommonDefinition.getComponentType(SurfaceAreaQuery.getComponentType()),
+                                          tokenInfoInMsa[3],
+                                          null,
+                                         (String) tokenInfoInMsa[5],
+                                          "",
+                                          moduleName,
+                                          packageName,
+                                          false);
+
+        //
+        // Use default value defined in MSA to update datum of token,
+        // if datum of token does not defined in FPD file.
+        //
+        if((token.datum == null) &&(tokenInfoInMsa[3] != null)) {
+            token.datum = tokenInfoInMsa[3];
+        }
+
+        token.addUsageInstance(usageInstance);
+
+        return usageInstance;
+    }
+
+    /**
+      Create token instance object into memory database, the token information
+      comes for FPD file. Normally, FPD file will contain all token platform 
+      informations.
+     
+      This fucntion should be executed at firsly before others collection work
+      such as searching token information from MSA, SPD.
+      
+      @return FrameworkPlatformDescriptionDocument   The FPD document instance for furture usage.
+      
+      @throws EntityException                        Failed to parse FPD xml file.
+      
+    **/
+    private FrameworkPlatformDescriptionDocument createTokenInDBFromFPD() 
+        throws EntityException {
+        XmlObject                            doc               = null;
+        FrameworkPlatformDescriptionDocument fpdDoc            = null;
+        int                                  index             = 0;
+        List<PcdBuildData>                   pcdBuildDataArray = new ArrayList<PcdBuildData>();
+        PcdBuildData                         pcdBuildData      = null;
+        Token                                token             = null;
+        UUID                                 nullUUID          = new UUID(0,0);
+        UUID                                 platformTokenSpace= nullUUID;
+        List                                 skuDataArray      = new ArrayList();
+        SkuInstance                          skuInstance       = null;
+        int                                  skuIndex          = 0;
+
+        //
+        // Get all tokens from FPD file and create token into database.
+        // 
+
+        try {
+            doc = XmlObject.Factory.parse(new File(fpdFilePath));
+        } catch(IOException ioE) {
+            throw new EntityException("Can't find the FPD xml fle:" + fpdFilePath);
+        } catch(XmlException xmlE) {
+            throw new EntityException("Can't parse the FPD xml fle:" + fpdFilePath);
+        }
+
+        //
+        // Get memoryDatabaseManager instance from GlobalData.
+        //
+        if((dbManager = GlobalData.getPCDMemoryDBManager()) == null) {
+            throw new EntityException("The instance of PCD memory database manager is null");
+        }
+
+        dbManager = new MemoryDatabaseManager();
+
+        if(!(doc instanceof FrameworkPlatformDescriptionDocument)) {
+            throw new EntityException("File " + fpdFilePath + 
+                                       " is not a FrameworkPlatformDescriptionDocument");
+        }
+
+        fpdDoc =(FrameworkPlatformDescriptionDocument)doc;
+
+        //
+        // Add all tokens in FPD into Memory Database.
+        //
+        pcdBuildDataArray = 
+            fpdDoc.getFrameworkPlatformDescription().getPcdBuildDeclarations().getPcdBuildDataList();
+        for(index = 0; 
+             index < fpdDoc.getFrameworkPlatformDescription().getPcdBuildDeclarations().sizeOfPcdBuildDataArray(); 
+             index ++) {
+            pcdBuildData = pcdBuildDataArray.get(index);
+            token        = new Token(pcdBuildData.getCName(), new UUID(0, 0), new UUID(0, 0));
+            //
+            // BUGBUG: in FPD, <defaultValue> should be defined as <Value>
+            //
+            token.datum        = pcdBuildData.getDefaultValue();
+            token.hiiEnabled   = pcdBuildData.getHiiEnable();
+            token.variableGuid = Token.getGUIDFromSchemaObject(pcdBuildData.getVariableGuid());
+            token.variableName = pcdBuildData.getVariableName();
+            token.variableOffset = Integer.decode(pcdBuildData.getDataOffset());
+            token.skuEnabled   = pcdBuildData.getSkuEnable();
+            token.maxSkuCount  = Integer.decode(pcdBuildData.getMaxSku());
+            token.skuId        = Integer.decode(pcdBuildData.getSkuId());
+            token.skuDataArrayEnabled  = pcdBuildData.getSkuDataArrayEnable();
+            token.assignedtokenNumber  = Integer.decode(pcdBuildData.getToken().getStringValue());
+            skuDataArray               = pcdBuildData.getSkuDataArray1();
+           
+            if(skuDataArray != null) {
+                for(skuIndex = 0; skuIndex < skuDataArray.size(); skuIndex ++) {
+                    //
+                    // BUGBUG: Now in current schema, The value is defined as String type, 
+                    // it is not correct, the type should be same as the datumType
+                    //
+                    skuInstance = new SkuInstance(((PcdBuildData.SkuData)skuDataArray.get(skuIndex)).getId(),
+                                                  ((PcdBuildData.SkuData)skuDataArray.get(skuIndex)).getValue());
+                    token.skuData.add(skuInstance);
+                }
+            }
+
+            if(dbManager.isTokenInDatabase(Token.getPrimaryKeyString(token.cName, 
+                                                                      token.tokenSpaceName, 
+                                                                      platformTokenSpace))) {
+                //
+                // If found duplicate token, Should tool be hold?
+                //
+                ActionMessage.warning(this, 
+                                       "Token " + token.cName + " exists in token database");
+                continue;
+            }
+            token.pcdType = Token.getpcdTypeFromString(pcdBuildData.getItemType().toString());
+            dbManager.addTokenToDatabase(Token.getPrimaryKeyString(token.cName, 
+                                                                   token.tokenSpaceName, 
+                                                                   platformTokenSpace), 
+                                         token);
+        }
+
+        return fpdDoc;
+    }
+
+    /**
+      Update PCD token in memory database by help information in SPD.
+
+      After create token from FPD and create usage instance from MSA, we should collect
+      PCD package level information from SPD and update token information in memory 
+      database.
+      
+      @param usageInstance   The usage instance defined in MSA and want to search in SPD.
+      @param packageFullPath The SPD file path.
+      
+      @throws EntityException Failed to parse SPD xml file.
+      
+    **/
+    private void updateTokenBySPD(UsageInstance  usageInstance,
+                                  String         packageFullPath) 
+        throws EntityException {
+        PackageSurfaceAreaDocument  pkgDoc          = null;
+        List<PcdDefinitions.PcdEntry> pcdEntryArray = new ArrayList<PcdDefinitions.PcdEntry>();
+        int                         index;
+        boolean                     isFoundInSpd  = false;
+        Token.DATUM_TYPE            datumType     = Token.DATUM_TYPE.UNKNOWN;
+
+        try {
+            pkgDoc =(PackageSurfaceAreaDocument)XmlObject.Factory.parse(new File(packageFullPath));
+        } catch(IOException ioE) {
+            throw new EntityException("Can't find the FPD xml fle:" + packageFullPath);
+        } catch(XmlException xmlE) {
+            throw new EntityException("Can't parse the FPD xml fle:" + packageFullPath);
+        }
+
+        pcdEntryArray = pkgDoc.getPackageSurfaceArea().getPcdDefinitions().getPcdEntryList();
+        for(index = 0; index < pcdEntryArray.size(); index ++) {
+            if(pcdEntryArray.get(index).getCName().equalsIgnoreCase(
+                usageInstance.parentToken.cName)) {
+                isFoundInSpd = true;
+                //
+                // From SPD file , we can get following information.
+                //  Token:        Token number defined in package level.
+                //  PcdItemType:  This item does not single one. It means all supported item type.
+                //  datumType:    UINT8, UNIT16, UNIT32, UINT64, VOID*, BOOLEAN 
+                //  datumSize:    The size of default value or maxmine size.
+                //  defaultValue: This value is defined in package level.
+                //  HelpText:     The help text is provided in package level.
+                //
+
+                usageInstance.parentToken.tokenNumber = Integer.decode(pcdEntryArray.get(index).getToken());
+
+                if(pcdEntryArray.get(index).getDatumType() != null) {
+                    datumType = Token.getdatumTypeFromString(
+                        pcdEntryArray.get(index).getDatumType().toString());
+                    if(usageInstance.parentToken.datumType == Token.DATUM_TYPE.UNKNOWN) {
+                        usageInstance.parentToken.datumType = datumType;
+                    } else {
+                        if(datumType != usageInstance.parentToken.datumType) {
+                            throw new EntityException("Different datum types are defined for Token :" + 
+                                                      usageInstance.parentToken.cName);
+                        }
+                    }
+
+                } else {
+                    throw new EntityException("The datum type for token " + usageInstance.parentToken.cName + 
+                                              " is not defind in SPD file " + packageFullPath);
+                }
+
+                usageInstance.defaultValueInSPD = pcdEntryArray.get(index).getDefaultValue();
+                usageInstance.helpTextInSPD     = "Help Text in SPD";
+
+                //
+                // If token's datum is not valid, it indicate that datum is not provided
+                // in FPD and defaultValue is not provided in MSA, then use defaultValue
+                // in SPD as the datum of token.
+                //
+                if(usageInstance.parentToken.datum == null) {
+                    if(pcdEntryArray.get(index).getDefaultValue() != null) {
+                        usageInstance.parentToken.datum = pcdEntryArray.get(index).getDefaultValue();
+                    } else {
+                        throw new EntityException("FPD does not provide datum for token " + usageInstance.parentToken.cName +
+                                                  ", MSA and SPD also does not provide <defaultValue> for this token!");
+                    }
+                }
+            }
+        }
+
+        if(!isFoundInSpd ) {
+            ActionMessage.warning(this, 
+                                  "Can *not* find the PCD token " + usageInstance.parentToken.cName + 
+                                  " in SPD file!");
+        }
+    }
+
+    /**
+      check parameter for this action.
+      
+      @throws EntityException  Bad parameter.
+    **/
+    private void checkParameter() throws EntityException {
+        File file = null;
+
+        if((fpdFilePath    == null) ||(workspacePath  == null)) {
+            throw new EntityException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");
+        }
+
+        if(fpdFilePath.length() == 0 || workspacePath.length() == 0) {
+            throw new EntityException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");
+        }
+
+        file = new File(workspacePath);
+        if(!file.exists()) {
+            throw new EntityException("WorkpacePath " + workspacePath + " does not exist!");
+        }
+
+        file = new File(fpdFilePath);
+
+        if(!file.exists()) {
+            throw new EntityException("FPD File " + fpdFilePath + " does not exist!");
+        }
+    }
+
+    /**
+      Test case function
+
+      @param argv  parameter from command line
+    **/
+    public static void main(String argv[]) throws EntityException {
+        CollectPCDAction ca = new CollectPCDAction();
+        ca.setWorkspacePath("G:/mdk");
+        ca.setFPDFilePath("G:/mdk/EdkNt32Pkg/build/Nt32.fpd");
+        ca.setActionMessageLevel(ActionMessage.MAX_MESSAGE_LEVEL);
+        GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
+                            "G:/mdk");
+        ca.execute();
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
new file mode 100644
index 0000000000..ca65c7546c
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -0,0 +1,452 @@
+/** @file
+  PCDAutoGenAction class.
+
+  This class is to manage how to generate the PCD information into Autogen.c and
+  Autogen.h.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.action;
+
+import java.io.File;
+import java.util.List;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.pcd.entity.MemoryDatabaseManager;
+import org.tianocore.build.pcd.entity.Token;
+import org.tianocore.build.pcd.entity.UsageInstance;
+import org.tianocore.build.pcd.exception.BuildActionException;
+import org.tianocore.build.pcd.exception.EntityException;
+
+/** This class is to manage how to generate the PCD information into Autogen.c and
+    Autogen.h.
+**/
+public class PCDAutoGenAction extends BuildAction {
+    ///
+    /// The reference of DBManager in GlobalData class.
+    ///
+    private MemoryDatabaseManager dbManager;
+    ///
+    /// The name of module which is analysised currently.
+    ///
+    private String                moduleName;
+    ///
+    /// Wheter current module is PCD emulated driver. It is only for 
+    /// emulated PCD driver and will be kept until PCD IMAGE tool ready.
+    ///
+    private boolean               isEmulatedPCDDriver;
+    ///
+    /// The generated string for header file.
+    ///
+    private String                hAutoGenString;
+    ///
+    /// The generated string for C code file.
+    ///
+    private String                cAutoGenString;       
+
+    /**
+      Set parameter ModuleName
+  
+      @param moduleName   the module name parameter.
+    **/
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    /**
+      Set parameter isEmulatedPCDDriver
+  
+      @param isEmulatedPCDDriver  whether this module is PeiEmulatedPCD driver
+    **/
+    public void setIsEmulatedPCDDriver(boolean isEmulatedPCDDriver) {
+        this.isEmulatedPCDDriver = isEmulatedPCDDriver;
+    }
+
+    /**
+      Get the output of generated string for header file.
+  
+      @return the string of header file for PCD
+    **/
+    public String OutputH() {
+        return hAutoGenString;
+    }
+
+    /**
+      Get the output of generated string for C Code file.
+  
+      @return the string of C code file for PCD
+    **/
+    public String OutputC() {
+        return cAutoGenString;
+    }
+
+    /**
+      Construct function
+  
+      This function mainly initialize some member variable.
+     
+      @param moduleName            Parameter of this action class.
+      @param isEmulatedPCDDriver   Parameter of this action class.
+    **/
+    public PCDAutoGenAction(String moduleName, boolean isEmulatedPCDDriver) {
+        dbManager = null;
+        setIsEmulatedPCDDriver(isEmulatedPCDDriver);
+        setModuleName(moduleName);
+    }
+
+    /**
+      check the parameter for action class.
+      
+      @throws BuildActionException Bad parameter.
+    **/
+    void checkParameter() throws BuildActionException {
+        if(!isEmulatedPCDDriver &&(moduleName == null)) {
+            throw new BuildActionException("Wrong module name parameter for PCDAutoGenAction tool!");
+        }
+
+        if(!isEmulatedPCDDriver && moduleName.length() == 0) {
+            throw new BuildActionException("Wrong module name parameter for PCDAutoGenAction tool!");
+        }
+
+        //
+        // Check the PCD memory database manager is valid.
+        //
+        if(GlobalData.getPCDMemoryDBManager() == null) {
+            throw new BuildActionException("Memory database has not been initlizated!");
+        }
+
+        dbManager = GlobalData.getPCDMemoryDBManager();
+
+        if(dbManager.getDBSize() == 0) {
+            throw new BuildActionException("Memory database does not contain any record!");
+        }
+
+        ActionMessage.debug(this,
+                            "PCD memory database contains " + dbManager.getDBSize() + " PCD tokens");
+    }
+
+    /**
+      Core execution function for this action class.
+     
+      All PCD information of this module comes from memory dabase. The collection
+      work should be done before this action execution.
+      Currently, we should generated all PCD information(maybe all dynamic) as array 
+      in Pei emulated driver for simulating PCD runtime database. 
+      
+      @throws BuildActionException Failed to execute this aciton class.
+    **/
+    void performAction() throws BuildActionException {
+        ActionMessage.debug(this, 
+                            "Starting PCDAutoGenAction to generate autogen.h and autogen.c!...");
+
+        hAutoGenString = "";
+        cAutoGenString = "";
+
+        if(isEmulatedPCDDriver) {
+            generateAutogenForPCDEmulatedDriver();
+        } else {
+            generateAutogenForModule();
+        }
+    }
+
+    /**
+      Generate the autogen string for a common module.
+     
+      All PCD information of this module comes from memory dabase. The collection
+      work should be done before this action execution.
+    **/
+    private void generateAutogenForModule()
+    {
+        int                   index;
+        List<UsageInstance>   usageInstanceArray;
+
+        usageInstanceArray  = dbManager.getUsageInstanceArrayByModuleName(moduleName);
+
+        if(usageInstanceArray.size() != 0) {
+            //
+            // Add "#include 'PcdLib.h'" for Header file
+            //
+            hAutoGenString = "#include <MdePkg/Include/Library/PcdLib.h>\r\n";
+        }
+
+        for(index = 0; index < usageInstanceArray.size(); index ++) {
+            ActionMessage.debug(this,
+                                "Module " + moduleName + "'s PCD [" + Integer.toHexString(index) + 
+                                "]: " + usageInstanceArray.get(index).parentToken.cName);
+            try {
+                usageInstanceArray.get(index).generateAutoGen();
+                hAutoGenString += usageInstanceArray.get(index).getHAutogenStr() + "\r\n";
+                cAutoGenString += usageInstanceArray.get(index).getCAutogenStr() + "\r\n";
+            } catch(EntityException exp) {
+                throw new BuildActionException(exp.getMessage());
+            }
+        }
+
+        ActionMessage.debug(this,
+                            "Module " + moduleName + "'s PCD header file:\r\n" + hAutoGenString + "\r\n"
+                           );
+        ActionMessage.debug(this,
+                             "Module " + moduleName + "'s PCD C file:\r\n" + cAutoGenString + "\r\n"
+                            );
+    }
+
+    /**
+      Generate all PCD autogen string and the emulated PCD IMAGE array for emulated driver.
+      
+      Currently, we should generated all PCD information(maybe all dynamic) as array 
+      in Pei emulated driver for simulating PCD runtime database. 
+      
+    **/
+    private void generateAutogenForPCDEmulatedDriver() {
+        int           index;
+        Token[]       tokenArray;
+        UsageInstance usageInstance;
+
+        //
+        // Add "#include 'PcdLib.h'" for Header file
+        //
+        hAutoGenString = "#include <MdePkg/Include/Library/PcdLib.h>\r\n";
+
+        tokenArray = dbManager.getRecordArray();
+        for(index = 0; index < tokenArray.length; index ++) {
+            //
+            // Get one consumer instance and generate autogen for this token.
+            //
+            if(tokenArray[index].consumers != null ) {
+                if(tokenArray[index].consumers.size() == 0) {
+                    continue;
+                }
+
+                usageInstance = tokenArray[index].consumers.get(0);
+                try {
+                    usageInstance.generateAutoGen();
+                } catch(EntityException exp) {
+                    throw new BuildActionException(exp.getMessage());
+                }
+
+                hAutoGenString += usageInstance.getHAutogenStr();
+                cAutoGenString += usageInstance.getCAutogenStr();
+
+                hAutoGenString += "\r\n";
+                cAutoGenString += "\r\n";
+            }
+        }
+
+        generatePCDEmulatedArray(tokenArray);
+
+        ActionMessage.debug(this,
+                             "PCD emulated driver's header: \r\n" + hAutoGenString + "\r\n"
+                            );
+        ActionMessage.debug(this,
+                             "PCD emulated driver's C code: \r\n" + cAutoGenString + "\r\n"
+                            );
+
+    }
+
+    /**
+      Generate PCDEmulated array in PCDEmulated driver for emulated runtime database.
+      
+      @param tokenArray  All PCD token in memory database.
+      
+      @throws BuildActionException  Unknown PCD_TYPE
+    **/
+    private void generatePCDEmulatedArray(Token[] tokenArray)
+        throws BuildActionException {
+        int       index;
+        Token     token;
+        String[]  guidStrArray;
+        String    value;
+
+        //
+        // The value of String type of PCD entry maybe use byte array but not string direcly
+        // such as {0x1, 0x2, 0x3}, and define PCD1_STRING_Value as L"string define here"
+        // For this case, we should generate a string array to C output and use the address
+        // of generated string array.
+        //
+        for(index = 0; index < tokenArray.length; index ++) {
+            token = tokenArray[index];
+
+            if((token.producers.size() == 0) &&(token.consumers.size() == 0)) {
+                //
+                // If no one use this PCD token, it will not generated in emulated array.
+                //
+                continue;
+            }
+            value = token.datum.toString();
+            if(token.datumType == Token.DATUM_TYPE.POINTER) {
+                if(!((value.charAt(0) == 'L' && value.charAt(1) == '"') ||(value.charAt(0) == '"'))) {
+                    cAutoGenString += String.format("UINT8 _mPcdArray%08x[] = %s;\r\n", 
+                                                     index, 
+                                                     value
+                                                     );
+                }
+            }
+        }
+
+        //
+        // Output emulated PCD entry array
+        //
+        cAutoGenString += "\r\nEMULATED_PCD_ENTRY gEmulatedPcdEntry[] = {\r\n";
+
+        for(index = 0; index < tokenArray.length; index ++) {
+            token = tokenArray[index];
+
+            if((token.producers.size() == 0) &&(token.consumers.size() == 0)) {
+                //
+                // If no one use this PCD token, it will not generated in emulated array.
+                //
+                continue;
+            }
+
+            if(index != 0) {
+                cAutoGenString += ",\r\n";
+            }
+
+            //
+            // Print Start "{" for a Token item in array
+            //
+            cAutoGenString += "  {\r\n";
+
+            //
+            // Print Token Name
+            //
+            cAutoGenString += String.format("    _PCD_TOKEN_%s,\r\n", token.cName);
+
+            //
+            // Print Hii information
+            //
+            if(token.hiiEnabled) {
+                cAutoGenString += String.format("    TRUE,\r\n");
+            } else {
+                cAutoGenString += String.format("    FALSE,\r\n");
+            }
+
+            //
+            // Print sku information
+            //
+            if(token.skuEnabled) {
+                cAutoGenString += String.format("    TRUE,\r\n");
+            } else {
+                cAutoGenString += String.format("    FALSE,\r\n");
+            }
+
+            //
+            // Print maxSkuCount
+            //
+            cAutoGenString += String.format("    %d,\r\n", token.maxSkuCount);
+
+            cAutoGenString += String.format("    %d,\r\n", token.skuId);
+
+            if(token.variableGuid == null) {
+                cAutoGenString += "    { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },\r\n";
+            } else {
+                guidStrArray =(token.variableGuid.toString()).split("-");
+
+                cAutoGenString += String.format("    { 0x%s, 0x%s, 0x%s, { 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s, 0x%s } },\r\n",
+                                                 guidStrArray[0],
+                                                 guidStrArray[1],
+                                                 guidStrArray[2],
+                                                (guidStrArray[3].substring(0, 2)),
+                                                (guidStrArray[3].substring(2, 4)),
+                                                (guidStrArray[4].substring(0, 2)),
+                                                (guidStrArray[4].substring(2, 4)),
+                                                (guidStrArray[4].substring(4, 6)),
+                                                (guidStrArray[4].substring(6, 8)),
+                                                (guidStrArray[4].substring(8, 10)),
+                                                (guidStrArray[4].substring(10, 12))
+                                                );
+
+            }
+
+            value = token.datum.toString();
+            if(token.datumType == Token.DATUM_TYPE.POINTER) {
+                if((value.charAt(0) == 'L' && value.charAt(1) == '"') || value.charAt(0) == '"') {
+                    cAutoGenString += String.format("    sizeof(_PCD_VALUE_%s),\r\n", token.cName);
+                    cAutoGenString += String.format("    0, %s, %s,\r\n", token.variableName, value);
+                } else {
+                    cAutoGenString += String.format("    sizeof(_mPcdArray%08x),\r\n", index);
+                    cAutoGenString += String.format("    0, &_mPcdArray%08x, %s,\r\n", index, token.variableName);
+                }
+            } else {
+                switch(token.datumType) {
+                case UINT8:
+                    cAutoGenString += "    1,\r\n";
+                    break;
+                case UINT16:
+                    cAutoGenString += "    2,\r\n";
+                    break;
+                case UINT32:
+                    cAutoGenString += "    4,\r\n";
+                    break;
+                case UINT64:
+                    cAutoGenString += "    8,\r\n";
+                    break;
+                case BOOLEAN:
+                    cAutoGenString += "    1,\r\n";
+                    break;
+                default:
+                    throw new BuildActionException("Unknown datum size");
+                }
+                cAutoGenString += String.format("    %s, %s, NULL,\r\n", value, token.variableName);
+            }
+
+            //
+            // Print end "}" for a token item in array
+            //
+            cAutoGenString += "  }";
+        }
+
+        cAutoGenString += "\r\n};\r\n";
+        cAutoGenString += "\r\n";
+        cAutoGenString += "UINTN\r\n";
+        cAutoGenString += "GetPcdDataBaseSize(\r\n";
+        cAutoGenString += "  VOID\r\n";
+        cAutoGenString += "  )\r\n";
+        cAutoGenString += "{\r\n";
+        cAutoGenString += "  return sizeof(gEmulatedPcdEntry);\r\n";
+        cAutoGenString += "}\r\n";
+    }
+
+    /**
+      Test case function
+
+      @param argv  paramter from command line
+    **/
+    public static void main(String argv[]) {
+        String logFilePath = "G:/mdk/EdkNt32Pkg/build/Nt32.fpd";
+
+        //
+        // At first, CollectPCDAction should be invoked to collect
+        // all PCD information from SPD, MSA, FPD.
+        //
+        CollectPCDAction collectionAction = new CollectPCDAction();
+        GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
+                            "G:/mdk");
+
+        GlobalData.getPCDMemoryDBManager().setLogFileName(logFilePath + ".PCDMemroyDatabaseLog.txt");
+
+        try {
+            collectionAction.perform("G:/mdk", 
+                                     logFilePath,
+                                     ActionMessage.MAX_MESSAGE_LEVEL);
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+
+        //
+        // Then execute the PCDAuotoGenAction to get generated Autogen.h and Autogen.c
+        //
+        PCDAutoGenAction autogenAction = new PCDAutoGenAction("HelloWorld",
+                                                              true
+                                                              );
+        autogenAction.execute();
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
new file mode 100644
index 0000000000..cd67dd46c9
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java
@@ -0,0 +1,130 @@
+/** @file
+  ShowPCDDatabase class.
+
+  This class is the action to diplay the PCD database.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.action;
+
+import java.io.File;
+
+import org.tianocore.build.global.GlobalData;
+import org.tianocore.build.pcd.exception.UIException;
+import org.tianocore.build.pcd.ui.PCDDatabaseFrame;
+
+/** This class is the action to show PCD database.
+**/
+public class ShowPCDDatabaseAction extends UIAction {
+    ///
+    /// The workspace path parameter.
+    ///
+    private String workspacePath;
+    ///
+    /// The FpdfileName parameter.
+    ///
+    private String fpdFilePath;
+
+    /**
+     set workspace path parameter for this action.
+      
+     @param workspacePath the string of workspace path.
+    **/
+    public void setWorkspacePath(String workspacePath) {
+        this.workspacePath = workspacePath;
+    }
+
+    /**
+      set fpd file path parameter for this action.
+
+      @param fpdFilePath file path string
+    **/
+    public void setFPDFilePath(String fpdFilePath) {
+        this.fpdFilePath = "./" + fpdFilePath;
+    }
+
+    /**
+      check paramter for this action.
+      
+      @throw UIException wrong paramter.
+    **/
+    void checkParamter() throws UIException {
+        File file = null;
+
+        if((fpdFilePath    == null) ||(workspacePath  == null)) {
+            throw new UIException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");
+        }
+
+        if(fpdFilePath.length() == 0 || workspacePath.length() == 0) {
+            throw new UIException("WorkspacePath and FPDFileName should be blank for CollectPCDAtion!");
+        }
+
+        file = new File(workspacePath);
+        if(!file.exists()) {
+            throw new UIException("WorkpacePath " + workspacePath + " does not exist!");
+        }
+
+        file = new File(fpdFilePath);
+
+        if(!file.exists()) {
+            throw new UIException("FPD File " + fpdFilePath + " does not exist!");
+        }
+    }
+
+    /**
+      Core workflow function.
+      
+      @throw UIException Fail to show PCD database.
+    **/
+    void performAction() throws UIException {
+        CollectPCDAction  collectAction = null;
+        PCDDatabaseFrame  dbFrame       = null;
+
+        //
+        // Initialize global data.
+        //
+        GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db",
+                            workspacePath);
+        GlobalData.getPCDMemoryDBManager().setLogFileName(fpdFilePath + ".PCDMemroyDatabaseLog.txt");
+
+        //
+        // Collect PCD information.
+        //
+        collectAction = new CollectPCDAction();
+
+        try {
+            collectAction.perform(workspacePath,
+                                  fpdFilePath,
+                                  ActionMessage.LOG_MESSAGE_LEVEL);
+        } catch(Exception exp) {
+            throw new UIException(exp.getMessage());
+        }
+
+        //
+        // Start tree windows.
+        //
+        dbFrame = new PCDDatabaseFrame(GlobalData.getPCDMemoryDBManager());
+    }
+
+    /**
+      Entry function.
+      
+      The action is run from command line.
+     
+      @param argv command line parameter.
+    **/
+    public static void main(String[] argv) throws UIException {
+        ShowPCDDatabaseAction showAction = new ShowPCDDatabaseAction();
+        showAction.setWorkspacePath(argv[0]);
+        showAction.setFPDFilePath(argv[1]);
+        showAction.execute();
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/UIAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/UIAction.java
new file mode 100644
index 0000000000..2cde9b24ec
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/UIAction.java
@@ -0,0 +1,83 @@
+/** @file
+  UIAction class.
+
+  This class is the parent action class of UI wizard.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+package org.tianocore.build.pcd.action;
+
+import org.tianocore.build.pcd.exception.UIException;
+
+/** This class is the parent class for all UI wizard action.
+**/
+public abstract class UIAction {
+    ///
+    /// original message level. when finish this action, original 
+    /// message level will be restored.
+    ///
+    private int originalMessageLevel;
+
+    /**
+      Check the parameter for this aciton.
+      
+      This function will be overrided by child class.
+    **/
+    abstract void checkParamter() throws UIException;
+
+    /**
+      Perform action.
+      
+      This function will be overrided by child class.
+    **/
+    abstract void performAction() throws UIException;
+
+    /**
+     set the message level for this action.
+
+     @param messageLevel  message level wanted.
+    **/
+    public void setMessageLevel(int messageLevel) {
+        originalMessageLevel        = ActionMessage.messageLevel;
+        ActionMessage.messageLevel  = messageLevel;
+    }
+
+    /**
+     log message for UI wizard aciton.
+
+     @param actionObj  aciton instance object.
+     @param logStr     log message string
+    **/
+    public static void logMsg(Object actionObj, String logStr) {
+        System.out.println(logStr);
+    }
+
+    /**
+     Warning message for UI wizard action.
+
+     @param warningObj action instance object.
+     @param warningStr warning message string.
+    **/
+    public static void warningMsg(Object warningObj, String warningStr) {
+        System.out.println(warningStr);
+    }
+
+    /**
+      Entry function for all UI wizard actions.
+    **/
+    public void execute() throws UIException {
+        checkParamter();
+        performAction();
+
+        ActionMessage.messageLevel = originalMessageLevel;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
new file mode 100644
index 0000000000..6f4f8949ef
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/MemoryDatabaseManager.java
@@ -0,0 +1,306 @@
+/** @file
+  MemoryDatabaseManager class.
+
+  Database hold all PCD information comes from SPD, MSA, FPD file in memory.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.pcd.entity;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.tianocore.build.autogen.CommonDefinition;
+import org.tianocore.build.pcd.action.ActionMessage;
+
+/** Database hold all PCD information comes from SPD, MSA, FPD file in memory.
+**/
+public class MemoryDatabaseManager {
+    ///
+    ///  Memory database. The string "cName + SpaceNameGuid" is primary key.
+    ///  memory database is in global scope, and it will be used for others PCD tools.
+    ///
+    private static Map<String, Token>  memoryDatabase = null;
+    ///
+    /// The log file name for dumping memory database.
+    ///
+    private static String              logFileName    = null;
+
+    /**
+      Constructure function
+    **/
+    public MemoryDatabaseManager() {
+        //
+        // Allocate memory for new database in global scope.
+        //
+        if (memoryDatabase == null) {
+            memoryDatabase = new HashMap<String, Token>();
+        }
+    }
+
+    /**
+      Get the log file name.
+    **/
+    public String getLogFileName() {
+        return logFileName;
+    }
+
+    /**
+      Set parameter log file name.
+  
+      @param fileName log file name parameter.
+    **/
+    public void setLogFileName(String fileName) {
+        logFileName = fileName;
+    }
+
+    /**
+      Judege whether token exists in memory database
+      
+      @param primaryKey    the primaryKey for searching token
+      
+      @retval  TRUE  - token already exist in database.
+      @retval  FALSE - token does not exist in database.
+    **/
+    public boolean isTokenInDatabase(String primaryKey) {
+        return (memoryDatabase.get(primaryKey) != null);
+    }
+
+    /**
+      Add a pcd token into memory database.
+      
+      @param primaryKey   the primary key for searching token
+      @param token        token instance
+    **/
+    public void addTokenToDatabase(String primaryKey, Token token) {
+        memoryDatabase.put(primaryKey, token);
+    }
+
+    /**
+      Get a token instance from memory database with primary key.
+  
+      @param primaryKey   the primary key for searching token
+    
+      @return token instance.
+    **/
+    public Token getTokenByKey(String primaryKey) {
+        return memoryDatabase.get(primaryKey);
+    }
+
+    /**
+      Get the number of PCD token record in memory database.
+      
+      @return the number of PCD token record in memory database.
+    **/
+    public int getDBSize() {
+        return memoryDatabase.size();
+    }
+
+    /**
+      Get the token record array contained all PCD token in memory database.
+      
+      @return the token record array contained all PCD token in memory database.
+    **/
+    public Token[] getRecordArray() {
+        Token[]     tokenArray  = null;
+        Object[]    dataArray   = null;
+        Map.Entry   entry       = null;
+        int         index       = 0;
+
+        if (memoryDatabase == null) {
+            return null;
+        }
+
+        dataArray  = memoryDatabase.entrySet().toArray();
+        tokenArray = new Token[memoryDatabase.size()];
+        for (index = 0; index < memoryDatabase.size(); index ++) {
+            entry =(Map.Entry) dataArray [index];
+            tokenArray[index] =(Token) entry.getValue();
+        }
+
+        return tokenArray;
+    }
+
+    /**
+      Get all PCD record for a module according to module's name.
+     
+      @param moduleName  the name of module.
+      
+      @return  all usage instance for this module in memory database.
+    **/
+    public List<UsageInstance> getUsageInstanceArrayByModuleName(String moduleName) {
+        Token[]               tokenArray          = null;
+        int                   recordIndex         = 0; 
+        int                   usageInstanceIndex  = 0;
+        List<UsageInstance>   usageInstanceArray  = null;
+        UsageInstance         usageInstance       = null;
+        List<UsageInstance>   returnArray         = new ArrayList<UsageInstance>();
+
+        tokenArray = getRecordArray();
+
+        //
+        // Loop to find all PCD record related to current module
+        //
+        for (recordIndex = 0; recordIndex < getDBSize(); recordIndex ++) {
+            if (tokenArray[recordIndex].producers != null) {
+                usageInstanceArray = tokenArray[recordIndex].producers;
+                for (usageInstanceIndex = 0; usageInstanceIndex < usageInstanceArray.size(); usageInstanceIndex ++) {
+                    usageInstance =(UsageInstance) usageInstanceArray.get(usageInstanceIndex);
+                    if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                        returnArray.add(usageInstance);
+                    }
+                }
+            }
+
+            if (tokenArray[recordIndex].consumers != null) {
+                usageInstanceArray = tokenArray[recordIndex].consumers;
+                for (usageInstanceIndex = 0; usageInstanceIndex < usageInstanceArray.size(); usageInstanceIndex ++) {
+                    usageInstance =(UsageInstance) usageInstanceArray.get(usageInstanceIndex);
+                    if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                        returnArray.add(usageInstance);
+                    }
+                }
+            }
+        }
+
+        if (returnArray.size() == 0) {
+            ActionMessage.warning(this, "Can *not* find any usage instance for " + moduleName + " !");
+        }
+
+        return returnArray;
+    }
+
+    /**
+      Get all modules name who contains PCD information
+     
+      @return Array for module name
+    **/
+    public List<String> getAllModuleArray()
+    {
+        int                       indexToken    = 0;
+        int                       usageIndex    = 0;
+        int                       moduleIndex   = 0;
+        Token[]                   tokenArray    = null;
+        List<String>              moduleNames   = new ArrayList<String>();
+        UsageInstance             usageInstance = null;
+        boolean                   bFound        = false;
+
+        tokenArray = this.getRecordArray();
+        //
+        // Find all producer usage instance for retrieving module's name
+        //
+        for (indexToken = 0; indexToken < getDBSize(); indexToken ++) {
+            for (usageIndex = 0; usageIndex < tokenArray[indexToken].producers.size(); usageIndex ++) {
+                usageInstance = tokenArray[indexToken].producers.get(usageIndex);
+                bFound        = false;
+                for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex ++) {
+                    if (moduleNames.get(moduleIndex).equalsIgnoreCase(usageInstance.moduleName)) {
+                        bFound = true;
+                        break;
+                    }
+                }
+                if (!bFound) {
+                    moduleNames.add(usageInstance.moduleName);
+                }
+            }
+        }
+
+        //
+        // Find all consumer usage instance for retrieving module's name
+        //
+        for (indexToken = 0; indexToken < getDBSize(); indexToken ++) {
+            for (usageIndex = 0; usageIndex < tokenArray[indexToken].consumers.size(); usageIndex ++) {
+                usageInstance = tokenArray[indexToken].consumers.get(usageIndex);
+                bFound        = false;
+                for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex ++) {
+                    if (moduleNames.get(moduleIndex).equalsIgnoreCase(usageInstance.moduleName)) {
+                        bFound = true;
+                        break;
+                    }
+                }
+                if (!bFound) {
+                    moduleNames.add(usageInstance.moduleName);
+                }
+            }
+        }
+        return moduleNames;
+    }
+
+    /**
+      Dump all PCD record into file for reviewing.
+    **/
+    public void DumpAllRecords() {
+        BufferedWriter    bWriter           = null;
+        Object[]          tokenArray        = null;
+        Map.Entry         entry             = null;
+        Token             token             = null;
+        int               index             = 0;
+        int               usageIndex        = 0;
+        UsageInstance     usageInstance     = null;
+        String            inheritString     = null;
+        String            componentTypeName = null;
+
+        try {
+            bWriter = new BufferedWriter(new FileWriter(new File(logFileName)));
+            tokenArray = memoryDatabase.entrySet().toArray();
+            for (index = 0; index < memoryDatabase.size(); index ++) {
+                entry =(Map.Entry) tokenArray [index];
+                token =(Token) entry.getValue();
+                bWriter.write("****** token [" + Integer.toString(index) + "] ******\r\n");
+                bWriter.write(" cName:" + token.cName + "\r\n");
+                for (usageIndex = 0; usageIndex < token.producers.size(); usageIndex ++) {
+                    usageInstance     =(UsageInstance)token.producers.get(usageIndex);
+                    componentTypeName = CommonDefinition.getComponentTypeString(usageInstance.componentType);
+
+                    if (usageInstance.isInherit) {
+                        inheritString = "Inherit";
+                    } else {
+                        inheritString = "";
+                    }
+                    bWriter.write(String.format("   (Producer)#%d: %s:%s  Package:%s  %s\r\n",
+                                                usageIndex,
+                                                componentTypeName,
+                                                usageInstance.moduleName,
+                                                usageInstance.packageName,
+                                                inheritString
+                                               )
+                                 );
+                }
+                for (usageIndex = 0; usageIndex < token.consumers.size(); usageIndex ++) {
+                    usageInstance     =(UsageInstance)token.consumers.get(usageIndex);
+                    componentTypeName = CommonDefinition.getComponentTypeString(usageInstance.componentType);
+                    if (usageInstance.isInherit) {
+                        inheritString = "Inherit";
+                    } else {
+                        inheritString = "";
+                    }
+                    bWriter.write(String.format("   (Consumer)#%d: %s:%s  Package:%s  %s\r\n",
+                                                usageIndex,
+                                                componentTypeName,
+                                                usageInstance.moduleName,
+                                                usageInstance.packageName,
+                                                inheritString
+                                               )
+                                 );
+                }
+            }
+            bWriter.close();
+        } catch (IOException exp) {
+            ActionMessage.warning(this, "Failed to open database log file: " + logFileName);
+        }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
new file mode 100644
index 0000000000..2886506411
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/SkuInstance.java
@@ -0,0 +1,40 @@
+/** @file
+  SkuInstance class.
+
+  Sku instance contains ID and value, A pcd token maybe contains more than one Sku instance.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/ 
+package org.tianocore.build.pcd.entity;
+
+/** Sku instance contains ID and value, A pcd token maybe contains more than one Sku instance.
+**/
+public class SkuInstance {
+    ///
+    /// The id number of this SKU instance
+    ///
+    public int    id;
+    ///
+    /// The value of this SKU instance
+    ///
+    public Object value;
+
+    /**
+      Constructure function
+
+      @param id     sku id 
+      @param value  sku value for this id.
+    **/
+    public SkuInstance(int id, Object value) {
+        this.id    = id;
+        this.value = value;
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
new file mode 100644
index 0000000000..e4ecfc034c
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/Token.java
@@ -0,0 +1,641 @@
+/** @file
+  Token class.
+
+  This module contains all classes releted to PCD token.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/  
+package org.tianocore.build.pcd.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.tianocore.build.pcd.action.ActionMessage;
+
+/** This class is to descript a PCD token object. The information of a token mainly 
+    comes from MSA, SPD and setting produced by platform developer. 
+**/
+public class Token {
+    ///
+    /// Enumeration macro defintion for PCD type.
+    /// BUGBUG: Not use upcase charater is to facility for reading. It may be changed
+    ///         in coding review.
+    public enum             PCD_TYPE {FEATURE_FLAG, FIXED_AT_BUILD, PATCHABLE_IN_MODULE, DYNAMIC, 
+                                      DYNAMIC_EX, UNKNOWN}
+
+    ///
+    /// Enumeration macro definition for datum type. All type mainly comes from ProcessBind.h.
+    /// Wizard maybe expand this type as "int, unsigned int, short, unsigned short etc" in 
+    /// prompt dialog.
+    ///
+    public enum             DATUM_TYPE {UINT8, UINT16, UINT32, UINT64, BOOLEAN, POINTER, UNKNOWN}
+
+    ///
+    /// Enumeration macor defintion for usage of PCD
+    ///
+    public enum             PCD_USAGE {ALWAYS_PRODUCED, ALWAYS_CONSUMED, SOMETIMES_PRODUCED,
+                                       SOMETIMES_CONSUMED, UNKNOWN}
+
+    ///
+    /// cName is to identify a PCD entry and will be used for generating autogen.h/autogen.c.
+    /// cName will be defined in MSA, SPD and FPD, can be regarded as primary key with token space guid.
+    ///
+    public String           cName;
+
+    ///
+    /// Token space name is the guid defined by token itself in package or module level. This
+    /// name mainly for DynamicEx type. For other PCD type token, his token space name is the 
+    /// assignedtokenSpaceName as follows.
+    /// tokenSpaceName is defined in MSA, SPD, FPD, can be regarded as primary key with cName.
+    ///
+    public UUID             tokenSpaceName;
+
+    ///
+    /// tokenNumber is allocated by platform. tokenNumber indicate an index for this token in
+    /// platform token space.
+    /// tokenNumber is defined in SPD, FPD.
+    ///
+    public int              tokenNumber;
+
+    ///
+    /// The token space name assigned by platform. For Non-DynamicEx driver this value is same.
+    /// assignedtokenSpaceName is defined in FPD.
+    ///
+    public UUID             assignedtokenSpaceName;
+
+    ///
+    /// The token number assigned by platform. The number indiect the offset of this token in platform
+    /// token space.
+    /// AssgiendtokenNumber is defined in FPD.
+    ///
+    public int              assignedtokenNumber;
+
+    ///
+    /// pcdType is the PCD item type defined by platform developer.
+    ///
+    public PCD_TYPE         pcdType;
+
+    ///
+    /// PCDtype is set by platform developer. It is final PCD type of this token.
+    /// SupportedPcdType is defined in SPD.
+    ///
+    public PCD_TYPE[]       supportedpcdType;
+
+    ///
+    /// datumSize is to descript the fix size or max size for this token. 
+    /// datumSize is defined in SPD.
+    ///
+    public int              datumSize;
+
+    ///
+    /// datum type is to descript what type can be expressed by a PCD token.
+    /// datumType is defined in SPD.
+    ///
+    public DATUM_TYPE       datumType;
+
+    ///
+    /// Isplatform is to descript whether this token is defined in platform level.
+    /// If token is belong to platform level. The value can be different for every
+    /// module. All are determined by platform developer.
+    ///
+    public boolean          isPlatform;
+
+    ///
+    /// hiiEnabled is to indicate whether the token support Hii functionality.
+    /// hiiEnabled is defined in FPD.
+    ///
+    public boolean          hiiEnabled;
+
+    ///
+    /// variableName is valid only when this token support Hii functionality. variableName
+    /// indicates the value of token is associated with what variable.
+    /// variableName is defined in FPD.
+    ///
+    public String           variableName;
+
+    ///
+    /// variableGuid is the GUID this token associated with.
+    /// variableGuid is defined in FPD.
+    ///
+    public UUID             variableGuid;
+
+    ///
+    /// Variable offset indicate the associated variable's offset in NV storage.
+    /// variableOffset is defined in FPD.
+    ///
+    public int              variableOffset;
+
+    ///
+    /// skuEnabled is to indicate whether the token support Sku functionality.
+    /// skuEnabled is defined in FPD.
+    ///
+    public boolean          skuEnabled;
+
+    ///
+    /// skuDataArrayEnabled is to indicate wheter use the skuData array or default value.
+    ///
+    public boolean          skuDataArrayEnabled;
+
+    ///
+    /// skuData contains all value for SkuNumber of token.
+    /// skuData is defined in FPD.
+    ///
+    public List<SkuInstance> skuData;
+
+    ///
+    /// maxSkuCount indicate the max count of sku data.
+    /// maxSkuCount is defined in FPD.
+    ///
+    public int              maxSkuCount;
+
+    ///
+    /// SkuId is the id of current selected SKU.
+    /// SkuId is defined in FPD.
+    ///
+    public int              skuId;
+
+    ///
+    /// datum is the value set by platform developer.
+    /// datum is defined in FPD.
+    ///
+    public Object           datum;
+
+    ///
+    /// Default value of this token.
+    /// This default value is defined in SPD level.
+    ///
+    public Object           defaultValue;
+
+    ///
+    /// BUGBUG: fix comment
+    /// vpdEnabled is defined in FPD.
+    ///
+    public boolean          vpdEnabled;
+
+    ///
+    /// BUGBUG: fix comment
+    /// vpdOffset is defined in FPD.
+    ///
+    public long             vpdOffset;
+
+    ///
+    /// producers array record all module private information who produce this PCD token.
+    ///
+    public List<UsageInstance>  producers;
+
+    ///
+    /// consumers array record all module private information who consume this PCD token.
+    ///
+    public List<UsageInstance>  consumers;
+
+    /**
+      Constructure function.
+     
+      Initialize the value of token.
+     
+      @param cName                   The cName of this token
+      @param tokenSpaceName          The tokenSpaceName of this token, it is a GUID.
+      @param assignedtokenSpaceName  The assignedtokenSpaceName of this token, it is a GUID.
+      
+    **/ 
+    public Token(String cName, UUID tokenSpaceName, UUID assignedtokenSpaceName) {
+        UUID    nullUUID = new UUID(0, 0);
+
+        this.cName                  = cName;
+        this.tokenSpaceName         =(tokenSpaceName == null) ? nullUUID : tokenSpaceName;
+        this.assignedtokenSpaceName =(assignedtokenSpaceName == null) ? nullUUID : assignedtokenSpaceName;
+        this.tokenNumber            = 0;
+        this.assignedtokenNumber    = 0;
+        this.pcdType                = PCD_TYPE.UNKNOWN;
+        this.supportedpcdType       = null;
+        this.isPlatform             = false;
+        this.datumType              = DATUM_TYPE.UNKNOWN;
+        this.datumSize              = -1;
+        this.defaultValue           = null;
+        this.datum                  = null;
+        this.hiiEnabled             = false;
+        this.variableGuid           = null;
+        this.variableName           = "";
+        this.variableOffset         = -1;
+        this.skuEnabled             = false;
+        this.skuDataArrayEnabled    = false;
+        this.skuId                  = -1;
+        this.maxSkuCount            = -1;
+        this.skuData                = new ArrayList<SkuInstance>();
+        this.vpdEnabled             = false;
+        this.vpdOffset              = -1;
+
+        this.producers              = new ArrayList<UsageInstance>();
+        this.consumers              = new ArrayList<UsageInstance>();
+    }
+
+    /**
+      Use "TokencName + "-" + SpaceTokenName" as primary key when adding token into database
+      
+      @param   cName                     Token name.
+      @param   tokenSpaceName            The token space guid defined in MSA or SPD
+      @param   platformtokenSpaceName    The token space guid for current platform token space,
+      
+      @return  primary key for this token in token database.
+    **/
+    public static String getPrimaryKeyString(String cName, UUID tokenSpaceName, 
+                                             UUID platformtokenSpaceName) {
+        UUID  nullUUID = new UUID(0, 0);
+
+        if (platformtokenSpaceName == nullUUID) {
+            return cName + "-" + tokenSpaceName.toString();
+        } else {
+            return cName + "-" + platformtokenSpaceName.toString();
+        }
+    }
+
+    /**
+      Judge datumType is valid
+      
+      @param type  The datumType want to be judged.
+      
+      @retval TRUE  - The type is valid.
+      @retval FALSE - The type is invalid.
+    **/
+    public static boolean isValiddatumType(DATUM_TYPE type) {
+        if ((type.ordinal() < DATUM_TYPE.UINT8.ordinal() ) || 
+            (type.ordinal() > DATUM_TYPE.POINTER.ordinal())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+      Judge pcdType is valid
+      
+      @param  type The PCdType want to be judged.
+      
+      @retval TRUE  - The type is valid.
+      @retval FALSE - The type is invalid.
+    **/
+    public static boolean isValidpcdType(PCD_TYPE  type) {
+        if ((type.ordinal() < PCD_TYPE.FEATURE_FLAG.ordinal() ) || 
+            (type.ordinal() > PCD_TYPE.DYNAMIC_EX.ordinal())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+      Add an usage instance for token
+      
+      @param usageInstance   The usage instance
+     
+      @retval TRUE  - Success to add usage instance.
+      @retval FALSE - Fail to add usage instance
+    **/
+    public boolean addUsageInstance(UsageInstance usageInstance) {
+        if (usageInstance.usage == PCD_USAGE.UNKNOWN) {
+            return false;
+        }
+
+        if ((usageInstance.usage == PCD_USAGE.ALWAYS_PRODUCED) ||
+            (usageInstance.usage == PCD_USAGE.SOMETIMES_PRODUCED)) {
+            producers.add(usageInstance);
+        } else {
+            consumers.add(usageInstance);
+        }
+        return true;
+    }
+
+    /**
+      Judge whether exist an usage instance for this token
+      
+      @param moduleName   Use xmlFilePath as keyword to search the usage instance
+      
+      @retval PCD_USAGE - if UsageInstance exists.
+      @retval UNKNOWN   - if UsageInstance does not exist, return UNKONW.
+    **/
+    public PCD_USAGE isUsageInstanceExist(String moduleName) {
+        int           index;
+        UsageInstance usageInstance;
+
+        if (moduleName == null) {
+            ActionMessage.warning(this, "Error parameter for isUsageInstanceExist() function!");
+            return PCD_USAGE.UNKNOWN;
+        }
+
+        if (moduleName.length() == 0) {
+            return PCD_USAGE.UNKNOWN;
+        }
+
+        //
+        // Searching the usage instance in module's producer and consumer according to 
+        // module's name.
+        //
+        for (index = 0; index < producers.size(); index ++) {
+            usageInstance =(UsageInstance)producers.get(index);
+            if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                return usageInstance.usage;
+            }
+        }
+
+        for (index = 0; index < consumers.size(); index ++) {
+            usageInstance =(UsageInstance)consumers.get(index);
+            if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                return usageInstance.usage;
+            }
+        }
+        return PCD_USAGE.UNKNOWN;
+    }
+
+    /**
+      Get usage instance according to a MSA file name
+      
+      @param moduleName   The file path string of MSA file.
+
+      @return usage instance object.
+    **/
+    public UsageInstance getUsageInstance(String moduleName) {
+        int           usageIndex;
+        UsageInstance usageInstance;
+
+        if (moduleName == null) {
+            ActionMessage.warning(this, "Error parameter for isUsageInstanceExist() function!");
+            return null;
+        }
+
+        if (moduleName.length() == 0) {
+            return null;
+        }
+
+        if (producers.size() != 0) {
+            for (usageIndex = 0; usageIndex < producers.size(); usageIndex ++) {
+                usageInstance =(UsageInstance)producers.get(usageIndex);
+                if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                    return usageInstance;
+                }
+            }
+        }
+
+        if (consumers.size() != 0) {
+            for (usageIndex = 0; usageIndex < consumers.size(); usageIndex ++) {
+                usageInstance =(UsageInstance)consumers.get(usageIndex);
+                if (usageInstance.moduleName.equalsIgnoreCase(moduleName)) {
+                    return usageInstance;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+      Get the PCD_TYPE according to the string of PCD_TYPE
+      
+      @param pcdTypeStr    The string of PCD_TYPE
+      
+      @return PCD_TYPE
+    **/
+    public static PCD_TYPE getpcdTypeFromString(String pcdTypeStr) {
+        if (pcdTypeStr == null) {
+            return PCD_TYPE.UNKNOWN;
+        }
+
+        if (pcdTypeStr.equalsIgnoreCase("FEATURE_FLAG")) {
+            return PCD_TYPE.FEATURE_FLAG;
+        } else if (pcdTypeStr.equalsIgnoreCase("FIXED_AT_BUILD")) {
+            return PCD_TYPE.FIXED_AT_BUILD;
+        } else if (pcdTypeStr.equalsIgnoreCase("PATCHABLE_IN_MODULE")) {
+            return PCD_TYPE.PATCHABLE_IN_MODULE;
+        } else if (pcdTypeStr.equalsIgnoreCase("DYNAMIC")) {
+            return PCD_TYPE.DYNAMIC;
+        } else if (pcdTypeStr.equalsIgnoreCase("DYNAMIC_EX")) {
+            return PCD_TYPE.DYNAMIC_EX;
+        } else {
+            return PCD_TYPE.UNKNOWN;
+        }
+    }
+
+    /**
+      Get the string of given datumType. This string will be used for generating autogen files
+     
+      @param datumType   Given datumType
+     
+      @return The string of datum type.
+    **/
+    public static String getStringOfdatumType(DATUM_TYPE  datumType) {
+        switch (datumType) {
+        case UINT8:
+            return "UINT8";
+        case UINT16:
+            return "UINT16";
+        case UINT32:
+            return "UINT32";
+        case UINT64:
+            return "UINT64";
+        case POINTER:
+            return "POINTER";
+        case BOOLEAN:
+            return "BOOLEAN";
+        }
+        return "UNKNOWN";
+    }
+
+    /**
+      Get the datumType according to a string.
+      
+      @param datumTypeStr    The string of datumType
+     
+      @return DATUM_TYPE
+    **/
+    public static DATUM_TYPE getdatumTypeFromString(String datumTypeStr) {
+        if (datumTypeStr.equalsIgnoreCase("UINT8")) {
+            return DATUM_TYPE.UINT8;
+        } else if (datumTypeStr.equalsIgnoreCase("UINT16")) {
+            return DATUM_TYPE.UINT16;
+        } else if (datumTypeStr.equalsIgnoreCase("UINT32")) {
+            return DATUM_TYPE.UINT32;
+        } else if (datumTypeStr.equalsIgnoreCase("UINT64")) {
+            return DATUM_TYPE.UINT64;
+        } else if (datumTypeStr.equalsIgnoreCase("VOID*")) {
+            return DATUM_TYPE.POINTER;
+        } else if (datumTypeStr.equalsIgnoreCase("BOOLEAN")) {
+            return DATUM_TYPE.BOOLEAN;
+        }
+        return DATUM_TYPE.UNKNOWN;
+    }
+
+    /**
+      Get string of given pcdType
+      
+      @param pcdType  The given PcdType
+      
+      @return The string of PCD_TYPE.
+    **/
+    public static String getStringOfpcdType(PCD_TYPE pcdType) {
+        switch (pcdType) {
+        case FEATURE_FLAG:
+            return "FEATURE_FLAG";
+        case FIXED_AT_BUILD:
+            return "FIXED_AT_BUILD";
+        case PATCHABLE_IN_MODULE:
+            return "PATCHABLE_IN_MODULE";
+        case DYNAMIC:
+            return "DYNAMIC";
+        case DYNAMIC_EX:
+            return "DYNAMIC_EX";
+        }
+        return "UNKNOWN";
+    }
+
+    /**
+      Get the PCD_USAGE according to a string
+      
+      @param usageStr  The string of PCD_USAGE
+      
+      @return The PCD_USAGE
+    **/
+    public static PCD_USAGE getUsageFromString(String usageStr) {
+        if (usageStr == null) {
+            return PCD_USAGE.UNKNOWN;
+        }
+
+        if (usageStr.equalsIgnoreCase("ALWAYS_PRODUCED")) {
+            return PCD_USAGE.ALWAYS_PRODUCED;
+        } else if (usageStr.equalsIgnoreCase("SOMETIMES_PRODUCED")) {
+            return PCD_USAGE.SOMETIMES_PRODUCED;
+        } else if (usageStr.equalsIgnoreCase("ALWAYS_CONSUMED")) {
+            return PCD_USAGE.ALWAYS_CONSUMED;
+        } else if (usageStr.equalsIgnoreCase("SOMETIMES_CONSUMED")) {
+            return PCD_USAGE.SOMETIMES_CONSUMED;
+        }
+
+        return PCD_USAGE.UNKNOWN;
+    }
+
+    /**
+      Get the string of given PCD_USAGE
+      
+      @param   usage   The given PCD_USAGE
+      
+      @return The string of PDC_USAGE.
+    **/
+    public static String getStringOfUsage(PCD_USAGE usage) {
+        switch (usage) {
+        case ALWAYS_PRODUCED:
+            return "ALWAYS_PRODUCED";
+        case ALWAYS_CONSUMED:
+            return "ALWAYS_CONSUMED";
+        case SOMETIMES_PRODUCED:
+            return "SOMETIMES_PRODUCED";
+        case SOMETIMES_CONSUMED:
+            return "SOMETIMES_CONSUMED";
+        }
+        return "UNKNOWN";
+    }
+
+    /**
+      Get the Defined datumType string for autogen. The string is for generating some MACROs in Autogen.h
+      
+      @param datumType The given datumType
+
+      @return string of datum type for autogen.
+    **/
+    public static String GetAutogenDefinedatumTypeString(DATUM_TYPE datumType) {
+        switch (datumType) {
+        
+        case UINT8:
+            return "8";
+        case UINT16:
+            return "16";
+        case BOOLEAN:
+            return "BOOL";
+        case POINTER:
+            return "PTR";
+        case UINT32:
+            return "32";
+        case UINT64:
+            return "64";
+        default:
+            return null;
+        }
+    }
+
+    /**
+      Get the datumType String for Autogen. This string will be used for generating defintions of PCD token in autogen
+      
+      @param datumType   The given datumType
+
+      @return string of datum type.
+    **/
+    public static String getAutogendatumTypeString(DATUM_TYPE datumType) {
+        switch (datumType) {
+        case UINT8:
+            return "UINT8";
+        case UINT16:
+            return "UINT16";
+        case UINT32:
+            return "UINT32";
+        case UINT64:
+            return "UINT64";
+        case POINTER:
+            return "VOID*";
+        case BOOLEAN:
+            return "BOOLEAN";
+        }
+        return null;
+    }
+
+    /**
+      Get the datumType string for generating some MACROs in autogen file of Library
+      
+      @param   datumType  The given datumType
+
+      @return String of datum for genrating bit charater.
+    **/
+    public static String getAutogenLibrarydatumTypeString(DATUM_TYPE datumType) {
+        switch (datumType) {
+        case UINT8:
+            return "8";
+        case UINT16:
+            return "16";
+        case BOOLEAN:
+            return "Bool";
+        case POINTER:
+            return "Ptr";
+        case UINT32:
+            return "32";
+        case UINT64:
+            return "64";
+        default:
+            return null;
+        }
+    }
+
+    /**
+      UUID defined in Schems is object, this function is to tranlate this object 
+      to UUID data.
+      
+      @param uuidObj The object comes from schema.
+      
+      @return The traslated UUID instance.
+    **/
+    public static UUID getGUIDFromSchemaObject(Object uuidObj) {
+        UUID uuid;
+        if (uuidObj.toString().equalsIgnoreCase("0")) {
+            uuid = new UUID(0,0);
+        } else {
+            uuid = UUID.fromString(uuidObj.toString());
+        }
+
+        return uuid;
+    }
+}
+
+
+
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
new file mode 100644
index 0000000000..a11633d91b
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/entity/UsageInstance.java
@@ -0,0 +1,471 @@
+/** @file
+  UsageInstance class.
+
+  This class indicate an usage instance for a PCD token. This instance maybe a module
+  or platform setting. When a module produce or cosume a PCD token, then this module
+  is an usage instance for this PCD token.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/  
+package org.tianocore.build.pcd.entity;
+
+
+import org.tianocore.build.pcd.exception.EntityException;
+import org.tianocore.build.pcd.action.ActionMessage;
+
+import org.tianocore.build.autogen.CommonDefinition;
+
+/**
+  This class indicate an usage instance for a PCD token. This instance maybe a module
+  or platform setting. When a module produce or cosume a PCD token, then this module
+  is an usage instance for this PCD token.
+**/
+public class UsageInstance {
+  ///
+  /// This parent that this usage instance belongs to.
+  ///
+  public Token            parentToken;
+  ///
+  /// The usage of this token for platform or module.
+  ///
+  public Token.PCD_USAGE  usage;
+  ///
+  /// Whether this usage instance inherit from library
+  ///
+  public boolean          isInherit;
+  ///
+  /// The pcd type of this token for module.
+  ///
+  public Token.PCD_TYPE   modulePcdType;
+  ///
+  /// The name of the module who contains this PCD.
+  ///
+  public String           moduleName;
+  ///
+  /// The name of the package whose module contains this PCD.
+  ///
+  public String           packageName;
+  ///
+  /// The component type for this usage instance.
+  ///
+  public int              componentType;
+  ///
+  /// The default value defined in MSA has high prior than defined in SPD.
+  ///
+  public Object           defaultValueInMSA;
+  ///
+  /// The default value defined in SPD.
+  ///
+  public Object           defaultValueInSPD;
+  ///
+  /// Help text in MSA
+  ///
+  public String           helpTextInMSA;
+  ///
+  /// Help text in SPD
+  ///
+  public String           helpTextInSPD;
+  ///
+  /// Autogen string for header file.
+  ///
+  public String           hAutogenStr;
+  /**
+   * Auotgen string for C code file.
+   */
+  public String           cAutogenStr;
+
+  /**
+    Constructure function
+    
+    @param parentToken         Member variable.
+    @param usage               Member variable.
+    @param pcdType             Member variable.
+    @param componentType       Member variable.
+    @param defaultValueInMSA   Member variable.
+    @param defaultValueInSPD   Member variable.
+    @param helpTextInMSA       Member variable.
+    @param helpTextInSPD       Member variable.
+    @param moduleName          Member variable.
+    @param packageName         Member variable.
+    @param isInherit           Member variable.
+  **/
+  public UsageInstance(
+    Token           parentToken,
+    Token.PCD_USAGE usage,
+    Token.PCD_TYPE  pcdType,
+    int             componentType,
+    Object          defaultValueInMSA,
+    Object          defaultValueInSPD,
+    String          helpTextInMSA,
+    String          helpTextInSPD,
+    String          moduleName,
+    String          packageName,
+    boolean         isInherit
+    )
+  {
+    this.parentToken       = parentToken;
+    this.usage             = usage;
+    this.modulePcdType     = pcdType;
+    this.componentType     = componentType;
+    this.defaultValueInMSA = defaultValueInMSA;
+    this.defaultValueInSPD = defaultValueInSPD;
+    this.helpTextInMSA     = helpTextInMSA;
+    this.helpTextInSPD     = helpTextInSPD;
+    this.moduleName        = moduleName;
+    this.packageName       = packageName;
+    this.isInherit         = isInherit;
+  }
+
+  /**
+    Generate autogen string for header file and C code file.
+    
+    @throws EntityException Fail to generate.
+  **/
+  public void generateAutoGen() throws EntityException {
+    Object value        = null;
+    int    tokenNumber  = 0;
+
+    hAutogenStr = "";
+    cAutogenStr = "";
+
+    value = this.parentToken.datum;
+
+    //
+    // If this pcd token's PCD_TYPE is DYNAMIC_EX, use itself token space name 
+    // otherwices use assgined token space name from tool automatically.
+    //
+    if(parentToken.pcdType == Token.PCD_TYPE.DYNAMIC_EX) {
+      tokenNumber = parentToken.tokenNumber;
+    } else {
+      tokenNumber = parentToken.assignedtokenNumber;
+    }
+
+    hAutogenStr += String.format("#define _PCD_TOKEN_%s   0x%016x\r\n", 
+                                 parentToken.cName, tokenNumber);
+
+    switch(modulePcdType) {
+    case FEATURE_FLAG:
+      //
+      // BUGBUG: The judegement of module PCD type and platform PCD type should not be 
+      //         done here, but in wizard tools, But here is just following something 
+      //         PcdEmulation driver. 
+      //
+      if(parentToken.pcdType.ordinal() > Token.PCD_TYPE.FEATURE_FLAG.ordinal()) {
+        throw new EntityException(
+          String.format(
+            "%s:Platform PCD Type %d is not compatible with Module PCD Type %d\r\n",
+            parentToken.cName,
+            parentToken.pcdType.name(),
+            modulePcdType.name()
+            )
+          );
+      }
+
+      if(CommonDefinition.isLibraryComponent(componentType)) {
+          hAutogenStr += String.format(
+                           "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
+                           parentToken.cName
+                           );
+          hAutogenStr += String.format(
+                             "#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
+                             parentToken.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+      } else {
+          hAutogenStr += String.format(
+                           "#define _PCD_VALUE_%s   %s\r\n", 
+                           parentToken.cName, 
+                           value.toString()
+                           );
+          hAutogenStr += String.format(
+                           "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
+                           parentToken.cName
+                           );
+          cAutogenStr += String.format(
+                           "GLOBAL_REMOVE_IF_UNREFERENCED const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
+                           parentToken.cName,
+                           parentToken.cName
+                           );
+          hAutogenStr += String.format(
+                           "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
+                           Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                           parentToken.cName,
+                           parentToken.cName
+                           );
+      }
+      break;
+    case FIXED_AT_BUILD:
+      //
+      // BUGBUG: The judegement of module PCD type and platform PCD type should not be 
+      //         done here, but in wizard tools, But here is just following something 
+      //         PcdEmulation driver. 
+      //
+      if(parentToken.pcdType.ordinal() > Token.PCD_TYPE.FIXED_AT_BUILD.ordinal()) {
+        throw new EntityException(
+          String.format(
+            "%s:Platform PCD Type %d is not compatible with Module PCD Type %d\r\n",
+            parentToken.cName,
+            parentToken.pcdType.name(),
+            modulePcdType.name()
+            )
+          );
+      }
+
+      if(CommonDefinition.isLibraryComponent(componentType)) {
+        hAutogenStr += String.format(
+                         "extern const %s _gPcd_FixedAtBuild_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName
+                         );
+        hAutogenStr += String.format(
+                         "#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
+                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+      } else {
+        hAutogenStr += String.format(
+                         "#define _PCD_VALUE_%s   %s\r\n", 
+                         parentToken.cName, 
+                         value.toString()
+                         );
+        hAutogenStr += String.format(
+                         "extern const %s _gPcd_FixedAtBuild_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName
+                         );
+        cAutogenStr += String.format(
+                         "GLOBAL_REMOVE_IF_UNREFERENCED const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+        hAutogenStr += String.format(
+                         "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
+                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+      }
+      break;
+    case PATCHABLE_IN_MODULE:
+      //
+      // BUGBUG: The judegement of module PCD type and platform PCD type should not be 
+      //         done here, but in wizard tools, But here is just following something 
+      //         PcdEmulation driver. 
+      //
+      if(parentToken.pcdType.ordinal() > Token.PCD_TYPE.PATCHABLE_IN_MODULE.ordinal()) {
+        throw new EntityException(
+          String.format(
+            "%s:Platform PCD Type %d is not compatible with Module PCD Type %d\r\n",
+            parentToken.cName,
+            parentToken.pcdType.name(),
+            modulePcdType.name()
+            )
+          );
+      }
+
+      if(CommonDefinition.isLibraryComponent(componentType)) {
+        hAutogenStr += String.format(
+                         "extern %s _gPcd_BinaryPatch_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName
+                         );
+        hAutogenStr += String.format(
+                         "#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",
+                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+      } else {
+        hAutogenStr += String.format(
+                         "#define _PCD_VALUE_%s   %s\r\n", 
+                         parentToken.cName, 
+                         value
+                         );
+        hAutogenStr += String.format(
+                         "extern %s _gPcd_BinaryPatch_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName
+                         );
+        cAutogenStr += String.format(
+                         "GLOBAL_REMOVE_IF_UNREFERENCED %s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;\r\n",
+                         Token.getAutogendatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+        hAutogenStr += String.format(
+                         "#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",
+                         Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                         parentToken.cName,
+                         parentToken.cName
+                         );
+      }
+
+      break;
+    case DYNAMIC:
+      //
+      // BUGBUG: The judegement of module PCD type and platform PCD type should not be 
+      //         done here, but in wizard tools, But here is just following something 
+      //         PcdEmulation driver. 
+      //
+      if(parentToken.pcdType.ordinal() > Token.PCD_TYPE.DYNAMIC.ordinal()) {
+        throw new EntityException(
+          String.format(
+            "%s:Platform PCD Type %d is not compatible with Module PCD Type %d\r\n",
+            parentToken.cName,
+            parentToken.pcdType.name(),
+            modulePcdType.name()
+            )
+          );
+      }
+ 
+      switch(parentToken.pcdType) {
+        case FEATURE_FLAG:
+          if(CommonDefinition.isLibraryComponent(componentType)) {
+            hAutogenStr += String.format(
+                             "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
+                             parentToken.cName
+                             );
+            hAutogenStr += String.format(
+                             "#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
+                             Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+          } else {
+            hAutogenStr += String.format(
+                             "#define _PCD_VALUE_%s   %s\r\n", 
+                             parentToken.cName, 
+                             value
+                             );
+            hAutogenStr += String.format(
+                             "extern const BOOLEAN _gPcd_FixedAtBuild_%s;\r\n", 
+                             parentToken.cName
+                             );
+            cAutogenStr += String.format(
+                             "const BOOLEAN _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+            hAutogenStr += String.format(
+                             "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
+                             Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+          }
+          break;
+        case FIXED_AT_BUILD:
+          if(CommonDefinition.isLibraryComponent(componentType)) {
+            hAutogenStr += String.format(
+                             "extern const %s _gPcd_FixedAtBuild_%s;\r\n",
+                             Token.getAutogendatumTypeString(parentToken.datumType),
+                             parentToken.cName
+                             );
+            hAutogenStr += String.format(
+                             "#define _PCD_MODE_%s_%s  _gPcd_FixedAtBuild_%s\r\n",
+                             Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+
+          } else {
+            hAutogenStr += String.format(
+                             "#define _PCD_VALUE_%s   %s\r\n", 
+                             parentToken.cName, 
+                             value
+                             );
+            hAutogenStr += String.format(
+                             "extern const %s _gPcd_FixedAtBuild_%s\r\n",
+                             Token.getAutogendatumTypeString(parentToken.datumType),
+                             parentToken.cName
+                             );
+            cAutogenStr += String.format(
+                             "const %s _gPcd_FixedAtBuild_%s = _PCD_VALUE_%s;\r\n",
+                             Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+            hAutogenStr += String.format(
+                             "#define _PCD_MODE_%s_%s  _PCD_VALUE_%s\r\n",
+                             Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                             parentToken.cName,
+                             parentToken.cName
+                             );
+          }
+          break;
+        case PATCHABLE_IN_MODULE:
+          hAutogenStr += String.format(
+                           "#define _PCD_VALUE_%s   %s\r\n", 
+                           parentToken.cName, 
+                           value
+                           );
+          hAutogenStr += String.format(
+                           "extern %s _gPcd_BinaryPatch_%s;\r\n",
+                           Token.getAutogendatumTypeString(parentToken.datumType),
+                           parentToken.cName,
+                           parentToken.cName
+                           );
+          cAutogenStr += String.format(
+                           "%s _gPcd_BinaryPatch_%s = _PCD_VALUE_%s;",
+                           Token.getAutogendatumTypeString(parentToken.datumType),
+                           parentToken.cName,
+                           parentToken.cName
+                           );
+          hAutogenStr += String.format(
+                           "#define _PCD_MODE_%s_%s  _gPcd_BinaryPatch_%s\r\n",
+                           Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                           parentToken.cName,
+                           parentToken.cName
+                           );
+          break;
+        case DYNAMIC:
+          hAutogenStr += String.format(
+                           "#define _PCD_MODE_%s_%s  LibPcdGet%s(_PCD_TOKEN_%s)\r\n",
+                           Token.GetAutogenDefinedatumTypeString(parentToken.datumType),
+                           parentToken.cName,
+                           Token.getAutogenLibrarydatumTypeString(parentToken.datumType),
+                           parentToken.cName
+                           );
+          break;
+        default:
+         ActionMessage.log(
+           this, 
+           "The PCD_TYPE setted by platform is unknown"
+           );
+      }
+      break;
+    case DYNAMIC_EX:
+      break;
+    }
+  }
+
+  /**
+    Get the autogen string for header file.
+    
+    @return The string of header file.
+  **/
+  public String getHAutogenStr() {
+    return hAutogenStr;
+  }
+
+  /**
+    Get the autogen string for C code file.
+    
+    @return The string of C Code file.
+  **/
+  public String getCAutogenStr() {
+    return cAutogenStr;
+  }
+}
+
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/BuildActionException.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/BuildActionException.java
new file mode 100644
index 0000000000..357ebf017a
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/BuildActionException.java
@@ -0,0 +1,33 @@
+/** @file
+  BuildActionException class.
+
+  BuildAction Exception deals with all build action exceptions.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/   
+package org.tianocore.build.pcd.exception;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+  BuildAction Exception deals with all build action exceptions.
+**/
+public class BuildActionException extends BuildException {
+    static final long serialVersionUID = -7034897190740066939L;
+    /**
+      Constructure function
+      
+      @param reason exception message string.
+    **/
+    public BuildActionException(String reason) {
+        super(reason);
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/EntityException.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/EntityException.java
new file mode 100644
index 0000000000..1e7ebfcbe1
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/EntityException.java
@@ -0,0 +1,31 @@
+/** @file
+  EntityException class.
+
+  The class handle the exception throwed by entity class.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/   
+package org.tianocore.build.pcd.exception;
+
+/**
+  The class handle the exception throwed by entity class.
+**/
+public class EntityException extends Exception {
+    static final long serialVersionUID = -8034897190740066939L;
+    /**
+      Constructure function
+        
+      @param expStr exception message string.
+    **/
+    public EntityException(String expStr) {
+        super("[EntityException]:" + expStr);
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/UIException.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/UIException.java
new file mode 100644
index 0000000000..96575a1450
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/exception/UIException.java
@@ -0,0 +1,31 @@
+/** @file
+  UIException class.
+
+  The class handle the exception throwed by UI action class.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/   
+package org.tianocore.build.pcd.exception;
+
+/**
+  The class handle the exception throwed by UI action class.
+**/
+public class UIException extends Exception {
+    static final long serialVersionUID = -7034897190740066930L;
+    /**
+      Constructure function
+        
+      @param reason exception message string.
+    **/
+    public UIException(String reason) {
+        super(reason);
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java
new file mode 100644
index 0000000000..81eb63025b
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/ui/PCDDatabaseFrame.java
@@ -0,0 +1,184 @@
+/** @file
+  PCDDatabaseFrame class.
+
+  The class is the frame class for displaying PCD database in tree method.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+ 
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/   
+package org.tianocore.build.pcd.ui;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.tianocore.build.pcd.action.ActionMessage;
+import org.tianocore.build.pcd.entity.MemoryDatabaseManager;
+import org.tianocore.build.pcd.entity.Token;
+import org.tianocore.build.pcd.entity.UsageInstance;
+
+/**
+  The class is the frame class for displaying PCD database in tree method.
+**/
+public class PCDDatabaseFrame extends JFrame {
+    static final long serialVersionUID = -7034897190740068939L;
+    ///
+    /// Database instance 
+    ///
+    private MemoryDatabaseManager dbManager;
+    ///
+    /// The token and module tree
+    ///
+    private JTree                 databaseTree;
+
+    /**
+      Constructure function. 
+     
+      Create the UI component and display frame.
+
+      @param dbManager databaase manager instance.
+    **/
+    public PCDDatabaseFrame(MemoryDatabaseManager dbManager) {
+        if (dbManager != null) {
+            this.dbManager = dbManager;
+        }
+        //
+        // Put the frame into center of desktop.
+        //
+        setLocation(100, 100);
+        initializeComponent();
+
+        setTitle("PCD View Tool");
+        pack();
+        setVisible(true);
+    }
+
+    /**
+       Initliaze the UI component in Display frame.
+    **/
+    public void initializeComponent() {
+        JScrollPane scrollPane = new JScrollPane();
+        Container contentPane  = getContentPane();
+
+        contentPane.setLayout(new BorderLayout());
+        scrollPane.setViewportView(initializeTree());
+        contentPane.add(scrollPane);
+
+        addWindowListener(new PCDDatabaseFrameAdapter());
+    }
+
+    /**
+      Initiliaze the TREE control.
+    **/
+    public JTree initializeTree() {
+        Token[]                tokenArray     = null;
+        Token                  token          = null;
+        DefaultMutableTreeNode root           = new DefaultMutableTreeNode(dbManager.getLogFileName());
+        DefaultMutableTreeNode rootByPCD      = new DefaultMutableTreeNode("By PCD");
+        DefaultMutableTreeNode rootByModule   = new DefaultMutableTreeNode("By Module");
+        DefaultMutableTreeNode tokenNode      = null;
+        DefaultMutableTreeNode usageNode      = null;
+        DefaultMutableTreeNode moduleNode     = null;
+        java.util.List<String> moduleNames    = null;
+        int                    index          = 0; 
+        int                    usageIndex     = 0;
+        int                    moduleIndex    = 0;
+        java.util.List<UsageInstance>    usageArray     = null;
+        UsageInstance          usageInstance  = null;
+
+        root.add(rootByPCD);
+        //
+        // By PCD Node
+        //
+
+        tokenArray = dbManager.getRecordArray();
+        for (index = 0; index < tokenArray.length; index ++) {
+            token = tokenArray[index];
+            ActionMessage.debug(this, token.cName);
+            tokenNode = new DefaultMutableTreeNode(token.cName);
+            tokenNode.add(new DefaultMutableTreeNode(String.format("TOKEN NUMBER: 0x%08x", token.tokenNumber)));
+            tokenNode.add(new DefaultMutableTreeNode(String.format("ASSIGNED TOKEN NUMBER: 0x%08x", token.assignedtokenNumber)));
+            tokenNode.add(new DefaultMutableTreeNode("TOKEN SPACE NAME: " + token.tokenSpaceName.toString()));
+            tokenNode.add(new DefaultMutableTreeNode("ASSIGNED TOKEN SPACE NAME: " + token.assignedtokenSpaceName.toString()));
+            tokenNode.add(new DefaultMutableTreeNode("PCD TYPE: " + Token.getStringOfpcdType(token.pcdType)));
+            tokenNode.add(new DefaultMutableTreeNode("DATUM TYPE: " +Token.getStringOfdatumType(token.datumType)));
+            tokenNode.add(new DefaultMutableTreeNode("DATUM: " + token.datum.toString()));
+            tokenNode.add(new DefaultMutableTreeNode("HIIENABLE: " +(token.hiiEnabled?"true":"false")));
+            tokenNode.add(new DefaultMutableTreeNode("VARIABLE NAME: " + token.variableName));
+            tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));
+            tokenNode.add(new DefaultMutableTreeNode("SKUENABLE: " +(token.skuEnabled?"true":"false")));
+            tokenNode.add(new DefaultMutableTreeNode("SKUDATA ARRAY ENABLE: " +(token.skuDataArrayEnabled?"true":"false")));
+            tokenNode.add(new DefaultMutableTreeNode(String.format("SKUID: %d", token.skuId)));
+            tokenNode.add(new DefaultMutableTreeNode(String.format("MAX SKU COUNT: %d", token.maxSkuCount)));
+            tokenNode.add(new DefaultMutableTreeNode("VPDENABLE: " +(token.vpdEnabled?"true":"false")));
+
+            usageNode = new DefaultMutableTreeNode("PRODUCER");
+            tokenNode.add(usageNode);
+
+            //
+            // Prepare producer's leaf node
+            //
+
+            for (usageIndex = 0; usageIndex < token.producers.size(); usageIndex ++) {
+                usageNode.add(new DefaultMutableTreeNode(token.producers.get(usageIndex).moduleName));
+            }
+
+            //
+            // Prepare consumer's leaf node
+            //
+            usageNode = new DefaultMutableTreeNode("CONSUMER");
+            tokenNode.add(usageNode);
+
+            for (usageIndex = 0; usageIndex < token.consumers.size(); usageIndex ++) {
+                usageNode.add(new DefaultMutableTreeNode(token.consumers.get(usageIndex).moduleName));
+            }
+
+            rootByPCD.add(tokenNode);
+        }
+
+        //
+        // BY MODULE Node
+        //
+        root.add(rootByModule);
+        moduleNames = dbManager.getAllModuleArray();
+        for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex ++) {
+            ActionMessage.debug(this, "ModuleName:" + moduleNames.get(moduleIndex));
+        }
+        for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex ++) {
+            moduleNode = new DefaultMutableTreeNode(moduleNames.get(moduleIndex));
+            usageArray = dbManager.getUsageInstanceArrayByModuleName(moduleNames.get(moduleIndex));
+            for (usageIndex = 0; usageIndex < usageArray.size(); usageIndex ++) {
+                usageInstance = usageArray.get(usageIndex);
+                usageNode = new DefaultMutableTreeNode(usageInstance.parentToken.cName);
+                usageNode.add(new DefaultMutableTreeNode("MODULE PCD TYPE: " + Token.getStringOfpcdType(usageInstance.modulePcdType)));
+                usageNode.add(new DefaultMutableTreeNode("HELP TEXT: " + usageInstance.helpTextInMSA));
+                usageNode.add(new DefaultMutableTreeNode("IS INHERIT: " +(usageInstance.isInherit?"true":"false")));
+                usageNode.add(new DefaultMutableTreeNode("USAGE: " + Token.getStringOfUsage(usageInstance.usage)));
+                moduleNode.add(usageNode);
+            }
+            rootByModule.add(moduleNode);
+        }
+
+        databaseTree = new JTree(root);
+        return databaseTree;
+    }
+}
+
+/**
+  The adatper class for PCDDatabaseFrame. This class instance many windows message 
+  callback function.
+**/
+class PCDDatabaseFrameAdapter  extends WindowAdapter {
+    public void windowClosing(WindowEvent e) {
+        System.exit(0);
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
new file mode 100644
index 0000000000..f48735966e
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java
@@ -0,0 +1,218 @@
+/** @file
+  ConfigReader class.
+  
+  ConfigReader is used to read tool chain config file with flat format. 
+  
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.build.toolchain;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import org.apache.tools.ant.BuildException;
+
+/**
+  
+  ConfigReader is used to read tool chain config file with flat format. Comments
+  is line starting with character '#'.
+  
+  @since GenBuild 1.0
+**/
+public class ConfigReader {
+
+    private static String confPath = ".";
+
+    /**
+      Public construct method. 
+    **/
+    public ConfigReader () {
+    }
+
+    /**
+      Default filepath is ".".
+    
+      @param filename the config file name like "target.txt"
+      @return the variables defined in file
+    **/
+    public static synchronized String[][] parse(String filename) {
+        return parse(confPath, filename);
+    }
+
+    /**
+      Get all variables defined in config file. the config file format is flat
+      with "A=B". If line started with '#' looks as comments. 
+    
+      @param confPath the path of config file
+      @param filename the file name of the config file
+      @return the variables defined in the config file
+      @throws BuildException
+              Config file's format is not valid
+    **/
+    public static synchronized String[][] parse(String confPath, String filename) throws BuildException {
+        try {
+            Map<String, String> map = new HashMap<String, String>(20);
+            File file = new File(confPath + File.separatorChar + filename);
+            FileReader reader = new FileReader(file);
+            BufferedReader in = new BufferedReader(reader);
+            String str;
+            while ((str = in.readLine()) != null) {
+                str = str.trim();
+                //
+                // if str is empty line or comments (start with '#')
+                //
+                if (str.equalsIgnoreCase("") || str.startsWith("#")) {
+                    continue;
+                }
+                //
+                // if str without '=' or start with '='
+                //
+                if (str.indexOf('=') <= 0) {
+                    continue;
+                }
+                //
+                // look as line "A = B"
+                //
+                int index = str.indexOf('=');
+                String key = str.substring(0, index).trim();
+                String value = str.substring(index + 1).trim();
+                //
+                // if key is existed, then update
+                //
+                if (map.containsKey(key)) {
+                    map.remove(key);
+                }
+                map.put(key, value);
+            }
+            Set keyset = map.keySet();
+            Iterator iter = keyset.iterator();
+            String[][] result = new String[map.size()][2];
+            int i = 0;
+            while (iter.hasNext()) {
+                String key = (String) iter.next();
+                result[i][0] = key;
+                result[i++][1] = (String) map.get(key);
+            }
+            return result;
+        } catch (Exception e) {
+            throw new BuildException("Processor file [" + filename + "] error. \n" + e.getMessage());
+        }
+    }
+
+    /**
+      Parse global flags table. The format is like such(global flag name, value, 
+      vendor_arch_cmd, [add flags], [sub flags]): 
+      
+      <pre>
+        # EFI_DEBUG
+        EFI_DEBUG YES MSFT_IA32_ASM    ADD.["/Zi", "/DEBUG"]
+        EFI_DEBUG YES MSFT_IA32_CC     ADD.["/Zi", "/Gm", "/D EFI_DEBUG"] SUB.["/nologo", "/WX"]
+        EFI_DEBUG YES MSFT_IA32_LINK   ADD.["/DEBUG"]
+        EFI_DEBUG YES MSFT_NT32_CC     ADD.["/DEBUG"]
+      </pre>
+     
+      @param confPath the file path of config file
+      @param filename the file name of config file
+      @return the value list
+      @throws BuildException
+              Config file is not valid
+    **/
+    public static synchronized String[][] parseTable(String confPath,
+                    String filename) throws BuildException {
+        try {
+            Vector<String[]> vector = new Vector<String[]>(20);
+            File file = new File(confPath + File.separatorChar + filename);
+            FileReader reader = new FileReader(file);
+            BufferedReader in = new BufferedReader(reader);
+            String str;
+            while ((str = in.readLine()) != null) {
+                str = str.trim();
+                //
+                // if str is empty line or comments (start with '#')
+                //
+                if (str.equalsIgnoreCase("") || str.startsWith("#")) {
+                    continue;
+                }
+                String[] item = new String[5];
+                for(int i=0; i < item.length; i++){
+                    item[i] = "";
+                }
+                //
+                // EFI_DEBUG YES MSFT_IA32_ASM    ADD.["/Zi", "/DEBUG"]
+                // FLAGS: EFI_DEBUG
+                //
+                int index = str.indexOf(" ");
+                item[0] = str.substring(0, index);
+                str = str.substring(index + 1).trim();
+                //
+                // Setting: YES
+                //
+                index = str.indexOf(" ");
+                item[1] = str.substring(0, index);
+                str = str.substring(index + 1).trim();
+                //
+                // Vendor_Arch_Commandtype: MSFT_IA32_ASM
+                //
+                index = str.indexOf(" ");
+                item[2] = str.substring(0, index);
+                str = str.substring(index + 1).trim();
+                //
+                // Add or/and Sub
+                //
+                if (str.startsWith("ADD.")) {
+                    index = str.indexOf("]");
+                    if ( index > 0){
+                        item[3] = str.substring(5, index);
+                        str = str.substring(index + 1).trim();
+                    }
+                }
+                else if(str.startsWith("SUB.")){
+                    index = str.indexOf("]");
+                    if ( index > 0){
+                        item[4] = str.substring(5, index);
+                        str = str.substring(index + 1).trim();
+                    }
+                }
+                else {
+                    throw new BuildException("File [" + filename + "] never conform to Global Flags Table format.");
+                }
+                
+                if (str.startsWith("ADD.")) {
+                    index = str.indexOf("]");
+                    if ( index > 0){
+                        item[3] = str.substring(5, index);
+                        str = str.substring(index + 1).trim();
+                    }
+                }
+                else if(str.startsWith("SUB.")){
+                    index = str.indexOf("]");
+                    if ( index > 0){
+                        item[4] = str.substring(5, index);
+                        str = str.substring(index + 1).trim();
+                    }
+                }
+                vector.addElement(item);
+            }
+            String[][] result = new String[vector.size()][5];
+            for(int i=0; i < vector.size(); i++){
+                result[i] = (String[])vector.get(i);
+            }
+            return result;
+        } catch (Exception e) {
+            throw new BuildException("Processor file [" + filename + "] error. \n" + e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainFactory.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainFactory.java
new file mode 100644
index 0000000000..e3010fccf4
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainFactory.java
@@ -0,0 +1,529 @@
+/** @file
+  ToolChainFactory class.
+  
+  ToolChainFactory class parse all config files and get STD_FLAGS, GLOBAL_FLAGS,
+  and also command path + name.
+  
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+package org.tianocore.build.toolchain;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.io.File;
+
+import org.apache.tools.ant.Project;
+
+
+/**
+  This class parse all config files and get STD_FLAGS, GLOBAL_FLAGS, and also 
+  command path + name.
+  
+  @since GenBuild 1.0
+**/
+public class ToolChainFactory {
+    ///
+    /// list of Arch: EBC, ARM, IA32, X64, IPF, PPC
+    ///
+    public final static String[] arch = { "EBC", "ARM", "IA32", "X64", "IPF",
+                    "PPC"};
+
+    ///
+    /// list of OS: Linux, Windows
+    ///
+    public final static String[] os = { "WINDOWS", "LINUX" };
+
+    ///
+    /// list of Command Type: CC, LIB, LINK, ASL, ASM, ASMLINK, PP
+    ///
+    public final static String[] commandType = { "CC", "LIB", "LINK", "ASL",
+                    "ASM", "ASMLINK", "PP" };
+
+    ///
+    /// default command name for every command
+    ///
+    public final static String[][] defaultCmdName = { { "CC", "cl" },
+                    { "LIB", "lib" }, { "LINK", "link" }, { "ASL", "iasl" },
+                    { "ASM", "ml" }, { "ASMLINK", "link" }, { "PP", "cl" } };
+
+    private String confPath = ".";
+    
+    private String toolChainName = "MSFT";
+
+    private String sTargetFilename = "target.txt";
+
+    private String sToolsdefFilename = "tools_def.txt";
+
+    private String sWorkspaceTarget = "WORKSPACE_TARGET";
+
+    private String sTargetArch = "TARGET_ARCH";
+
+    private HashMap<String,String[][]> filesMap = new HashMap<String,String[][]>();
+    
+    private HashMap<String,String> globalFlagsMap = new HashMap<String,String>();
+    
+    private String[][] globalFlagTable;
+    
+    private String currentTarget = "RELEASE";
+
+    ///
+    /// toolchain array list all results by parsing config files
+    ///
+    public static String[][] toolchain = null;
+    
+    /**
+      Public construct method.
+    **/
+    public ToolChainFactory () {
+    }
+
+    /**
+      Public construct method.
+      
+      @param project current ANT Project.
+    **/
+    public ToolChainFactory (Project project) {
+        this.confPath = project.replaceProperties("${WORKSPACE_DIR}" + File.separatorChar + "Tools" + File.separatorChar + "Conf");
+    }
+    
+    /**
+      Public construct method.
+      
+      @param confPath the path of config files
+      @param toolChainName TOOL_CHAIN name
+    **/
+    public ToolChainFactory (String confPath, String toolChainName) {
+        this.confPath = confPath;
+        //
+        // If set tool used the set one, otherwise use default one.
+        // toolChain used to define open tools define txt file.
+        //
+        if (toolChainName != null && toolChainName.length() > 0){
+            this.toolChainName = toolChainName;
+        }
+    }
+
+    /**
+      Parse all config files, following are the detail steps:
+      
+      <ul>
+        <li>Parse target.txt file. This file define the current build TARGET 
+        and supported ARCH list. </li>
+        <li>Parse tools_def.txt file. This file define every command name, path
+        and vendor. </li>
+        <li>For every supported ARCH and Command Type, find out STD_FLAGS, 
+        GLOBAL_ADD_FLAGS, GLOBAL_SUB_FLAGS. </li>
+      </ul>
+      
+      <p>Note that this method will be called only once during the whole build
+      process. </p>
+    **/
+    public void setupToolChain() {
+        if (toolchain != null) {
+            return ;
+        }
+        Map<String, String> map = new HashMap<String, String>(40);
+        //
+        // parse target.txt
+        //
+        String[][] target = ConfigReader.parse(confPath, sTargetFilename);
+        //
+        // get workspace_target and initialize global flags setting
+        //
+        currentTarget = getValue(sWorkspaceTarget, target);
+        parseGlobalSetting(currentTarget);
+        String[] archList = getArchs(getValue(sTargetArch, target));
+        
+        //
+        // If user write the ${toolChain}_Tools_Def.txt use this one,
+        // otherwise used "tools_def.txt" file.
+        //
+        File tempFile = new File (confPath + File.separator + toolChainName.toLowerCase() + "_tools_def.txt");
+        if (tempFile.exists()){
+            sToolsdefFilename = toolChainName.toLowerCase() + "_tools_def.txt";
+        }
+        
+        System.out.println("Tools definition file is: " + sToolsdefFilename);
+        //
+        // parse tools_def.txt
+        //
+        String[][] tools_def = ConfigReader.parse(confPath, sToolsdefFilename);
+        //
+        // for each arch find all command's path&name and flags
+        //
+        for (int i = 0; i < archList.length; i++) {
+            for (int j = 0; j < commandType.length; j++) {
+                //
+                // Path & Name
+                //
+                map.put(archList[i] + "_" + commandType[j], getAbsoluteCmdPath(
+                                archList[i], commandType[j], tools_def));
+                //
+                // Flags: CMD_STD_FLAGS + CMD_GLOBAL_FLAGS + CMD_PROJ_FLAGS
+                // ARCH_CMD_STD_FLAGS
+                //
+                map.put(archList[i] + "_" + commandType[j] + "_STD_FLAGS",
+                                getStdFlags(archList[i], commandType[j],
+                                                tools_def));
+                //
+                // Flags:ARCH_CMD_VENDOR or ARCH_VENDOR
+                //
+                map.put(archList[i]+ "_"+commandType[j]+"_VENDOR", getVendorFlag(archList[i],
+                        commandType[j], tools_def));
+                //
+                // ARCH_CMD_GLOBAL_FLAGS
+                //
+                String[] globalFlags = getGlobalFlags(archList[i], commandType[j],
+                                tools_def);
+                map.put(archList[i] + "_" + commandType[j] + "_GLOBAL_ADD_FLAGS",
+                                globalFlags[0]);
+                map.put(archList[i] + "_" + commandType[j] + "_GLOBAL_SUB_FLAGS",
+                                globalFlags[1]);
+                //
+                // ARCH_CMD_GLOBAL_FLAGS, default is "".
+                //
+                map.put(archList[i] + "_" + commandType[j] + "_PROJ_FLAGS", "");
+            }
+            map.put(archList[i]+"_VENDOR", getVendorFlag(archList[i], null, tools_def));
+        }
+        Set keyset = map.keySet();
+        Iterator iter = keyset.iterator();
+        String[][] result = new String[map.size()][2];
+        int i = 0;
+        while (iter.hasNext()) {
+            String key = (String) iter.next();
+            result[i][0] = key;
+            result[i++][1] = (String) map.get(key);
+        }
+        toolchain = result;
+    }
+
+    /**
+      Get the standard flags (STD_FLAGS) for specified arch and command type. 
+      
+      <ul>
+        <li>Find out Vendor that cmd Command Type with arch ARCH used. The 
+        search sequence is ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT". Here
+        we suppose default Vendor is MSFT.</li>
+        <li>Search ${Vendor}_tools.txt file, and get the corrsponding flags. 
+        </li>
+      </ul>
+      
+      @param arch the ARCH
+      @param cmd the command type
+      @param map detail flags information of tools_def.txt
+      @return the standard flags of arch ARCH and cmd Command Type 
+    **/
+    private String getStdFlags(String arch, String cmd, String[][] map) {
+        //
+        // first is to find out its Vendor in map
+        // ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT"
+        // Here we suppose default Vendor is MSFT.
+        //
+        String vendor = "MSFT";
+        String str;
+        if ((str = getValue(arch + "_" + cmd + "_VENDOR", map)) != null) {
+            vendor = str;
+        } else if ((str = getValue(arch + "_VENDOR", map)) != null) {
+            vendor = str;
+        }
+        //
+        // change to low letter
+        //
+        vendor = vendor.toLowerCase();
+        //
+        // parse the corresponding file and get arch_cmd value
+        //
+        String filename = vendor + "_tools.txt";
+        String[][] flagsMap;
+        if (filesMap.containsKey(filename)) {
+            flagsMap = (String[][]) filesMap.get(filename);
+        } else {
+            //
+            // read file and store in filesMap
+            //
+            flagsMap = ConfigReader.parse(confPath, vendor + "_tools.txt");
+            filesMap.put(filename, flagsMap);
+        }
+        if ((str = getValue(arch + "_" + cmd, flagsMap)) != null) {
+            return str;
+        }
+        return "";
+    }
+
+    /**
+      Get the global flags (GLOBAL_ADD_FLAGS & GLOBAL_SUB_FLAGS) for specified 
+      arch and command type. 
+      
+      <ul>
+        <li>Find out Vendor that cmd Command Type with arch ARCH used. The 
+        search sequence is ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT". Here
+        we suppose default Vendor is MSFT.</li>
+        <li>Search efi_flags_table.txt file, and get the corrsponding flags. 
+        </li>
+      </ul>
+      
+      @param arch the ARCH
+      @param cmd the command type
+      @param map detail flags information of tools_def.txt
+      @return two values, first is GLOBAL_ADD_FLAGS and another value is 
+      GLOBAL_SUB_FLAGS
+    **/
+    private String[] getGlobalFlags(String arch, String cmd, String[][] map) {
+        String addStr = "";
+        String subStr = "";
+        //
+        // first is to find out its Vendor in map
+        // ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT"
+        // Here we suppose default Vendor is MSFT.
+        //
+        String vendor = "MSFT";
+        String str;
+        if ((str = getValue(arch + "_" + cmd + "_VENDOR", map)) != null) {
+            vendor = str;
+        } else if ((str = getValue(arch + "_VENDOR", map)) != null) {
+            vendor = str;
+        }
+        //
+        // parse global flags table
+        //
+        if (globalFlagTable == null) {
+            globalFlagTable =  ConfigReader.parseTable(confPath, "efi_flags_table.txt");
+        }
+        for (int i=0; i < globalFlagTable.length; i++){
+            String[] item = globalFlagTable[i];
+            if (item[2].equalsIgnoreCase(vendor + "_" + arch + "_" + cmd)){
+                //
+                // if item[0] == item[1] is existed in globalFlagsMap
+                //
+                if (globalFlagsMap.containsKey(item[0])){
+                    if( item[1].equalsIgnoreCase((String)globalFlagsMap.get(item[0]))){
+                        addStr += item[3] + " ";
+                        subStr += item[4] + " ";
+                    }
+                }
+            }
+        }
+        
+        return new String[]{addStr, subStr};
+    }
+
+    /**
+      Find out command path and command name. 
+      
+      <pre>
+        Command path searching sequence in tools_def.txt file:
+        Path: ARCH_CMD_PATH -> ARCH_PATH -> Set to "".
+        
+        Command name searching sequence in tools_def.txt file:
+        Name: ARCH_CMD_NAME -> CMD_NAME -> Default Value.
+      </pre>
+      
+      @param arch the ARCH
+      @param cmd the Command Type
+      @param map detail flags information of tools_def.txt
+      @return the absolute command path and name
+    **/
+    private String getAbsoluteCmdPath(String arch, String cmd, String[][] map) {
+        String path = "";
+        String name = "";
+        String str;
+        //
+        // find Path
+        //
+        if ((str = getValue(arch + "_" + cmd + "_PATH", map)) != null) {
+            path = str;
+        } else if ((str = getValue(arch + "_PATH", map)) != null) {
+            path = str;
+        }
+        //
+        // find Name
+        //
+        if ((str = getValue(arch + "_" + cmd + "_NAME", map)) != null) {
+            name = str;
+        } else if ((str = getValue(cmd + "_NAME", map)) != null) {
+            name = str;
+        } else {
+            name = getValue(cmd, defaultCmdName);
+        }
+        if (path.equalsIgnoreCase("")) {
+            return name;
+        }
+        return path + File.separatorChar + name;
+    }
+
+    /**
+      Find out all global flags value, such as EFI_DEBUG equal YES or NO. Here 
+      are three type files: global_efi_flags.txt, ${TARGET}_efi_flags.txt, 
+      my_efi_flags.txt. global_efi_flags.txt with the highest priority while 
+      my_efi_flags.txt with the lowest priority. 
+      
+      <p>All global flags value will store in <code>globalFlagsMap</code> for 
+      getGlobalFlags using. </p> 
+      
+      @param target current build TARGET value
+    **/
+    private void parseGlobalSetting(String target){
+        //
+        // parse global_efi_flags -> ${TARGET}_efi_flags -> my_efi_flags
+        // parse global_efi_flags
+        //
+        String[][] map = ConfigReader.parse(confPath, "global_efi_flags.txt");
+        for (int i = 0; i < map.length; i++){
+            if(globalFlagsMap.containsKey(map[i][0])){
+                globalFlagsMap.remove(map[i][0]);
+            }
+            globalFlagsMap.put(map[i][0], map[i][1]);
+        }
+        //
+        // parse ${TARGET}_efi_flags
+        //
+        map = ConfigReader.parse(confPath, target + "_efi_flags.txt");
+        for (int i = 0; i < map.length; i++){
+            if(globalFlagsMap.containsKey(map[i][0])){
+                globalFlagsMap.remove(map[i][0]);
+            }
+            globalFlagsMap.put(map[i][0], map[i][1]);
+        }
+        //
+        // parse my_efi_flags.txt
+        //
+        map = ConfigReader.parse(confPath, "my_efi_flags.txt");
+        for (int i = 0; i < map.length; i++){
+            if(globalFlagsMap.containsKey(map[i][0])){
+                globalFlagsMap.remove(map[i][0]);
+            }
+            globalFlagsMap.put(map[i][0], map[i][1]);
+        }
+    }
+    
+    /**
+      Find value with key from map. If not found, return null. 
+      
+      <p>Note that default is case-insensitive</p>
+      
+      @param key key value
+      @param map mapping information
+      @return the related value of key
+    **/
+    private String getValue(String key, String[][] map) {
+        return getValue(key, map, false);
+    }
+
+    /**
+      Find value with key from map. If not found, return null. 
+      
+      @param key key value
+      @param map mapping information
+      @param caseSensitive whether case sesitive or not
+      @return the related value of key
+    **/
+    private String getValue(String key, String[][] map, boolean caseSensitive) {
+        for (int i = 0; i < map.length; i++) {
+            if (caseSensitive) {
+                if (key.compareTo(map[i][0]) == 0) {
+                    return map[i][1];
+                }
+            } else {
+                if (key.compareToIgnoreCase(map[i][0]) == 0) {
+                    return map[i][1];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+      Find value with key from <code>toolchain</code>. If not found, return null. 
+    
+      @param key key value
+      @return the related value of key
+    **/
+    public static String getValue(String key){
+        for (int i = 0; i < toolchain.length; i++) {
+            if (key.compareToIgnoreCase(toolchain[i][0]) == 0) {
+                return toolchain[i][1];
+            }
+        }
+        return null;
+    }
+    
+    /**
+      Get Arch list from a string separated with comma. 
+      
+      <pre>
+        For example:
+          If the arch string is "IA32, X64, EBC".
+          Then the result is {"IA32", "X64", "EBC"}. 
+      </pre>
+    
+      @param arch string separated with comma
+      @return Arch list
+    **/
+    public String[] getArchs(String arch) {
+        if (arch == null) {
+            return new String[0];
+        }
+        StringTokenizer st = new StringTokenizer(arch, " \t,");
+        String[] archs = new String[st.countTokens()];
+        int i = 0;
+        while (st.hasMoreTokens()) {
+            archs[i++] = st.nextToken().toUpperCase();
+        }
+        return archs;
+    }
+
+    /**
+      Get current target value.
+    
+      @return current target value
+    **/
+    public String getCurrentTarget() {
+        return currentTarget;
+    }
+
+    /**
+      Find out Vendor that cmd Command Type with arch ARCH used. The 
+      search sequence is ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT". Here
+      we suppose default Vendor is MSFT.
+      
+      @param arch the ARCH
+      @param cmd the Command Type
+      @param map detail flags information of tools_def.txt
+      @return the related vendor name
+    **/
+    public String getVendorFlag (String arch, String cmdType, String[][] map){
+        //
+        // ARCH_CMD_VENDOR -> ARCH_VENDOR -> "MSFT"
+        // Here we suppose default Vendor is MSFT.
+        //
+        String str;
+        String vendor = "";
+        if (cmdType != null){
+            if ((str = getValue(arch + "_" + cmdType + "_VENDOR", map)) != null) {
+                vendor = str; 
+            }else {
+                vendor = "";
+            }
+        }else if (arch != null){
+            if ((str = getValue(arch + "_VENDOR", map)) != null) {
+                vendor = str; 
+            }else {
+                vendor = "";
+            }
+        }
+        return vendor;
+    }
+    
+}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java
new file mode 100644
index 0000000000..04dab1c3e3
--- /dev/null
+++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java
@@ -0,0 +1,60 @@
+/** @file
+  ToolChainTask class.
+  
+  ToolChainTask class's main fucntion is read all tool chain related config files. 
+
+Copyright (c) 2006, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.  
+
+**/
+package org.tianocore.build.toolchain;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+  This class is an ANT task. The main function is to read all tool chain related
+  config files. 
+  
+  @since GenBuild 1.0
+**/
+public class ToolChainTask extends Task{
+
+    private String confPath = ".";
+    
+    /**
+      Public construct method. It is necessary for ANT task.
+    **/
+    public ToolChainTask(){
+    }
+    
+    /**
+      ANT task's entry point, will be called after init(). Using
+      <code>ToolChainFactory</code> to parse all config files, and
+      set TARGET property. 
+    
+      @throws BuildException
+              Config files are invalid.
+    **/
+    public void execute() throws BuildException {
+        String toolChain = getProject().getProperty("env.TOOL_CHAIN");
+        ToolChainFactory toolchain = new ToolChainFactory(confPath, toolChain);
+        toolchain.setupToolChain();
+        getProject().setProperty("TARGET", toolchain.getCurrentTarget());
+    }
+
+    /**
+      Set the path of config files.
+      
+      @param confPath the path of config files
+    **/
+    public void setConfPath(String confPath) {
+        this.confPath = confPath;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/MANIFEST.MF b/Tools/Source/ModuleEditor/MANIFEST.MF
new file mode 100644
index 0000000000..dffa2192fa
--- /dev/null
+++ b/Tools/Source/ModuleEditor/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.tianocore.packaging.module.ui.ModuleMain
+Class-Path: ../Jars/SurfaceArea.jar ../bin/xmlbeans/lib/jsr173_1.0_api.jar ../bin/xmlbeans/lib/xbean.jar ../bin/xmlbeans/lib/xbean_xpath.jar ../bin/xmlbeans/lib/xmlpublic.jar ../bin/xmlbeans/lib/saxon8.jar ../bin/xmlbeans/lib/saxon8-jdom.jar ../bin/xmlbeans/lib/saxon8-sql.jar ../bin/xmlbeans/lib/resolver.jar
diff --git a/Tools/Source/ModuleEditor/build.xml b/Tools/Source/ModuleEditor/build.xml
new file mode 100644
index 0000000000..f78750e819
--- /dev/null
+++ b/Tools/Source/ModuleEditor/build.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="ModuleEditor" default="all" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>
+  </path>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>
+  <target name="all" depends="install"/>
+  <target name="source">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="src" destdir="${buildDir}">
+      <classpath refid="classpath"/>
+      <!-- <compilerarg value="-Xlint"/> -->
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <delete file="${installLocation}/ModuleEditor.jar"/>
+  </target>
+  <target name="install" depends="source">
+    <jar destfile="${installLocation}/ModuleEditor.jar"
+      basedir="${buildDir}"
+      includes="**"
+      manifest="MANIFEST.MF"
+    />
+  </target>
+</project>
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/common/DataType.java b/Tools/Source/ModuleEditor/src/org/tianocore/common/DataType.java
new file mode 100644
index 0000000000..ea0731b70f
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/common/DataType.java
@@ -0,0 +1,44 @@
+/** @file
+ 
+ The file is used to define all used final variables
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+package org.tianocore.common;
+
+/**
+ The class is used to define all used final variables
+ 
+ @since ModuleEditor 1.0
+
+**/
+public class DataType {
+
+    /**
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+    
+    //
+    // Define all used final variables
+    //
+    public static final String DOS_LINE_SEPARATOR = "\r\n";
+
+    public static final String UNXI_LINE_SEPARATOR = "\n";
+    
+    public static final String EMPTY_SELECT_ITEM = "----";
+
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/common/DataValidation.java b/Tools/Source/ModuleEditor/src/org/tianocore/common/DataValidation.java
new file mode 100644
index 0000000000..4747343725
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/common/DataValidation.java
@@ -0,0 +1,905 @@
+/** @file
+ 
+ The file is used to provides all kinds of Data Validation interface 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+ **/
+
+package org.tianocore.common;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ The class is used to provides all kinds of data validation interface
+
+ <p>All provided interfaces are in static mode</p>
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class DataValidation {
+
+    /**
+     Reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    //
+    // The below is used to check common data types
+    //
+
+    /**
+     Check if the imput data is int
+     
+     @param strInt The input string which needs validation
+     
+     @retval true - The input is Int
+     @retval false - The input is not Int
+     
+     **/
+    public static boolean isInt(String strInt) {
+        return isMatch("^-?[0-9]\\d*$", strInt);
+    }
+
+    /**
+     Check if the input data is int and it is in the valid scope
+     The scope is provided by String
+     
+     @param strNumber The input string which needs validation
+     @param BeginNumber The left boundary of the scope
+     @param EndNumber The right boundary of the scope
+     
+     @retval true - The input is Int and in the scope;
+     @retval false - The input is not Int or not in the scope
+     
+     **/
+    public static boolean isInt(String strNumber, int BeginNumber, int EndNumber) {
+        //
+        //Check if the input data is int first
+        //
+        if (!isInt(strNumber)) {
+            return false;
+        }
+        //
+        //And then check if the data is between the scope
+        //
+        Integer intTemp = new Integer(strNumber);
+        if ((intTemp.intValue() < BeginNumber) || (intTemp.intValue() > EndNumber)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Check if the input data is int and it is in the valid scope
+     The scope is provided by String
+     
+     @param strNumber The input string which needs validation
+     @param strBeginNumber The left boundary of the scope
+     @param strEndNumber The right boundary of the scope
+     
+     @retval true - The input is Int and in the scope;
+     @retval false - The input is not Int or not in the scope
+     
+     **/
+    public static boolean isInt(String strNumber, String strBeginNumber, String strEndNumber) {
+        //
+        //Check if all input data are int
+        //
+        if (!isInt(strNumber)) {
+            return false;
+        }
+        if (!isInt(strBeginNumber)) {
+            return false;
+        }
+        if (!isInt(strEndNumber)) {
+            return false;
+        }
+        //
+        //And then check if the data is between the scope
+        //
+        Integer intI = new Integer(strNumber);
+        Integer intJ = new Integer(strBeginNumber);
+        Integer intK = new Integer(strEndNumber);
+        if ((intI.intValue() < intJ.intValue()) || (intI.intValue() > intK.intValue())) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Use regex to check if the input data is in valid format
+     
+     @param strPattern The input regex
+     @param strMatcher The input data need be checked
+     
+     @retval true - The data matches the regex
+     @retval false - The data doesn't match the regex
+     
+     **/
+    public static boolean isMatch(String strPattern, String strMatcher) {
+        Pattern pattern = Pattern.compile(strPattern);
+        Matcher matcher = pattern.matcher(strMatcher);
+
+        return matcher.find();
+    }
+
+    //
+    // The below is used to check common customized data types
+    //
+
+    /**
+     Check if the input data is BaseNameConvention
+     
+     @param strBaseNameConvention The input string need be checked
+     
+     @retval true - The input is BaseNameConvention
+     @retval false - The input is not BaseNameConvention
+     
+     **/
+    public static boolean isBaseNameConvention(String strBaseNameConvention) {
+        return isMatch("[A-Z]([a-zA-Z0-9])*(_)?([a-zA-Z0-9])*", strBaseNameConvention);
+    }
+
+    /**
+     Check if the input data is GuidArrayType
+     
+     @param strGuidArrayType The input string need be checked
+     
+     @retval true - The input is GuidArrayType
+     @retval false - The input is not GuidArrayType
+     
+     **/
+    public static boolean isGuidArrayType(String strGuidArrayType) {
+        return isMatch(
+                       "0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\\})?",
+                       strGuidArrayType);
+    }
+
+    /**
+     Check if the input data is GuidNamingConvention
+     
+     @param strGuidNamingConvention The input string need be checked
+     
+     @retval true - The input is GuidNamingConvention
+     @retval false - The input is not GuidNamingConvention
+     
+     **/
+    public static boolean isGuidNamingConvention(String strGuidNamingConvention) {
+        return isMatch("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}",
+                       strGuidNamingConvention);
+    }
+
+    /**
+     Check if the input data is GuidType 
+     
+     @param strGuidType The input string need be checked
+     
+     @retval true - The input is GuidType
+     @reture false is not GuidType
+     
+     **/
+    public static boolean isGuidType(String strGuidType) {
+        return (isGuidArrayType(strGuidType) || isGuidNamingConvention(strGuidType));
+    }
+
+    /**
+     Check if the input data is Guid 
+     
+     @param strGuid The input string need be checked
+     
+     @retval true - The input is Guid
+     @retval false - The input is not Guid
+     
+     **/
+    public static boolean isGuid(String strGuid) {
+        return isGuidType(strGuid);
+    }
+
+    /**
+     Check if the input data is Sentence
+     
+     @param strSentence The input string need be checked
+     
+     @retval true - The input is Sentence
+     @retval false - The input is not Sentence
+     
+     **/
+    public static boolean isSentence(String strSentence) {
+        return isMatch("(\\w+\\W*)+( )+(\\W*\\w*\\W*\\s*)*", strSentence);
+    }
+
+    /**
+     Check if the input data is DateType
+     
+     @param strDateType The input string need be checked
+     
+     @retval true - The input is DateType
+     @retval false - The input is not DateType
+     
+     **/
+    public static boolean isDateType(String strDateType) {
+        return isMatch("[1-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]", strDateType);
+    }
+
+    /**
+     Check if the input data is DosPath
+     
+     @param strDosPath The input string need be checked
+     
+     @retval true - The input is DosPath
+     @retval false - The input is not DosPath
+     
+     **/
+    public static boolean isDosPath(String strDosPath) {
+        return isMatch("([a-zA-Z]:\\\\)?(((\\\\?_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\\\)?)*", strDosPath);
+    }
+
+    /**
+     Check if the input data is UnixPath
+     
+     @param strUnixPath The input string need be checked
+     
+     @retval true - The input is UnixPath
+     @retval false - The input is not UnixPath
+     
+     **/
+    public static boolean isUnixPath(String strUnixPath) {
+        return isMatch("(\\/)?(((_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\/)?)*", strUnixPath);
+    }
+
+    /**
+     Check if the input data is DirectoryNamingConvention
+     
+     @param strDirectoryNamingConvention The input string need be checked
+     
+     @retval true - The input is DirectoryNamingConvention
+     @retval false - The input is not DirectoryNamingConvention
+     
+     **/
+    public static boolean isDirectoryNamingConvention(String strDirectoryNamingConvention) {
+        return (isDosPath(strDirectoryNamingConvention) || isUnixPath(strDirectoryNamingConvention));
+    }
+
+    /**
+     Check if the input data is HexDoubleWordDataType
+     
+     @param strHexDoubleWordDataType  The input string need be checked
+     
+     @retval true - The input is HexDoubleWordDataType
+     @retval false - The input is not HexDoubleWordDataType
+     
+     **/
+    public static boolean isHexDoubleWordDataType(String strHexDoubleWordDataType) {
+        return isMatch("0x[a-fA-F0-9]{1,8}", strHexDoubleWordDataType);
+    }
+
+    /**
+     Check if the input data is V1
+     
+     @param strV1 The input string need be checked
+     
+     @retval true - The input is V1
+     @retval false - The input is not V1
+     
+     **/
+    public static boolean isV1(String strV1) {
+        return isMatch("((%[A-Z](_*[A-Z0-9]*)*%)+((((\\\\)?_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\\\)?)*)", strV1);
+    }
+
+    /**
+     Check if the input data is V2
+     
+     @param strV2 The input string need be checked
+     
+     @retval true - The input is V2
+     @retval false - The input is not V2
+     
+     **/
+    public static boolean isV2(String strV2) {
+        return isMatch(
+                       "(($[A-Z](_*[A-Z0-9]*)*)+||($\\([A-Z](_*[A-Z0-9]*)*\\))+||($\\{[A-Z](_*[A-Z0-9]*)*\\})+)+(\\/)?(((((_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\/)?)*)*)",
+                       strV2);
+    }
+
+    /**
+     Check if the input data is VariableConvention
+     
+     @param strVariableConvention The input string need be checked
+     
+     @retval true - The input is VariableConvention
+     @retval false - The input is not VariableConvention
+     
+     **/
+    public static boolean isVariableConvention(String strVariableConvention) {
+        return (isV1(strVariableConvention) || isV2(strVariableConvention));
+    }
+
+    /**
+     Check if the input data is UCName
+     
+     @param strUCName The input string need be checked
+     
+     @retval true - The input is UCName
+     @retval false - The input is not UCName
+     
+     **/
+    public static boolean isUCName(String strUCName) {
+        return isMatch("[A-Z]+(_*[A-Z0-9]*( )*)*", strUCName);
+    }
+
+    /**
+     Check if the input data is HexByteDataType
+     
+     @param strHex64BitDataType The input string need be checked 
+     
+     @retval true - The input is HexByteDataType
+     @retval false - The input is not HexByteDataType
+     
+     **/
+    public static boolean isHexByteDataType(String strHex64BitDataType) {
+        return isMatch("(0x)?[a-fA-F0-9]{1,2}", strHex64BitDataType);
+    }
+
+    /**
+     Check if the input data is Hex64BitDataType
+     
+     @param strHex64BitDataType The input string need be checked
+     
+     @retval true - The input is Hex64BitDataType
+     @retval false - The input is not Hex64BitDataType
+     
+     **/
+    public static boolean isHex64BitDataType(String strHex64BitDataType) {
+        return isMatch("(0x)?[a-fA-F0-9]{1,16}", strHex64BitDataType);
+    }
+
+    /**
+     Check if the input data is HexWordDataType
+     
+     @param strHexWordDataType The input string need be checked
+     
+     @retval true - The input is HexWordDataType
+     @retval false - The input is not HexWordDataType
+     
+     **/
+    public static boolean isHexWordDataType(String strHexWordDataType) {
+        return isMatch("0x[a-fA-F0-9]{1,4}", strHexWordDataType);
+    }
+
+    /**
+     Check if the input data is CName
+     
+     @param strCName The input string need be checked
+     
+     @retval true - The input is CName
+     @retval false - The input is not CName
+     
+     **/
+    public static boolean isCName(String strCName) {
+        return isMatch("((_)*([a-zA-Z])+((_)*[a-zA-Z0-9]*))*", strCName);
+    }
+
+    /**
+     Check if the input data is OverrideID
+     
+     @param strOverrideID The input string need be checked
+     
+     @retval true - The input is OverrideID
+     @retval false - The input is not OverrideID
+     
+     **/
+    public static boolean isOverrideID(String strOverrideID) {
+        return isInt(strOverrideID);
+    }
+
+    //
+    //The below is used to check msaheader data type
+    //
+
+    /**
+     Check if the input data is BaseName
+     
+     @param strBaseName The input string need be checked
+     
+     @retval true - The input is BaseName
+     @retval false - The input is not BaseName
+     
+     **/
+    public static boolean isBaseName(String strBaseName) {
+        return isBaseNameConvention(strBaseName);
+    }
+
+    /**
+     Check if the input data is Abstract
+     
+     @param strAbstract The input string need be checked
+     
+     @retval true - The input is Abstract
+     @retval false - The input is not Abstract
+     
+     **/
+    public static boolean isAbstract(String strAbstract) {
+        return isSentence(strAbstract);
+    }
+
+    /**
+     Check if the input data is Copyright
+     
+     @param strCopyright The input string need be checked
+     
+     @retval true - The input is Copyright
+     @retval false - The input is not Copyright
+     
+     **/
+    public static boolean isCopyright(String strCopyright) {
+        return isSentence(strCopyright);
+    }
+
+    /**
+     Check if the input data is Created
+     
+     @param strCreated The input string need be checked
+     
+     @retval true - The input is Created
+     @retval false - The input is not Created
+     
+     **/
+    public static boolean isCreated(String strCreated) {
+        return isDateType(strCreated);
+    }
+
+    /**
+     Check if the input data is Updated
+     
+     @param strUpdated The input string need be checked
+     
+     @retval true - The input is Updated
+     @retval false - The input is not Updated
+     
+     **/
+    public static boolean isUpdated(String strUpdated) {
+        return isDateType(strUpdated);
+    }
+
+    //
+    // The below is used to check LibraryClass data types
+    //
+
+    /**
+     Check if the input data is LibraryClass
+     
+     @param strLibraryClass The input string need be checked
+     
+     @retval true - The input is LibraryClass
+     @retval false - The input is not LibraryClass
+     
+     **/
+    public static boolean isLibraryClass(String strLibraryClass) {
+        return isBaseNameConvention(strLibraryClass);
+    }
+
+    //
+    // The below is used to check sourcefiles data types
+    //
+
+    /**
+     Check if the input data is Path
+     
+     @param strPath The input string need be checked
+     
+     @retval true - The input is Path
+     @retval false - The input is not Path
+     
+     **/
+    public static boolean isPath(String strPath) {
+        return isDirectoryNamingConvention(strPath);
+    }
+
+    /**
+     Check if the input data is FileName
+     
+     @param strFileName The input string need be checked
+     
+     @retval true - The input is FileName
+     @retval false - The input is not FileName
+     
+     **/
+    public static boolean isFileName(String strFileName) {
+        return isVariableConvention(strFileName);
+    }
+
+    //
+    // The below is used to check includes data types
+    //
+
+    /**
+     Check if the input data is UpdatedDate
+     
+     @param strUpdatedDate The input string need be checked
+     
+     @retval true - The input is UpdatedDate
+     @retval false - The input is not UpdatedDate
+     
+     **/
+    public static boolean isUpdatedDate(String strUpdatedDate) {
+        return isDateType(strUpdatedDate);
+    }
+
+    /**
+     Check if the input data is PackageName
+     
+     @param strPackageName The input string need be checked
+     
+     @retval true - The input is PackageName
+     @retval false - The input is not PackageName
+     
+     **/
+    public static boolean isPackageName(String strPackageName) {
+        return isBaseNameConvention(strPackageName);
+    }
+
+    //
+    // The below is used to check protocols data types
+    //
+
+    /**
+     Check if the input data is ProtocolName
+     
+     @param strProtocolName The input string need be checked
+     
+     @retval true - The input is ProtocolName
+     @retval false - The input is not ProtocolName
+     
+     **/
+    public static boolean isProtocolName(String strProtocolName) {
+        return isCName(strProtocolName);
+    }
+
+    /**
+     Check if the input data is ProtocolNotifyName
+     
+     @param strProtocolNotifyName The input string need be checked
+     
+     @retval true - The input is ProtocolNotifyName
+     @retval false - The input is not ProtocolNotifyName
+     
+     **/
+    public static boolean isProtocolNotifyName(String strProtocolNotifyName) {
+        return isCName(strProtocolNotifyName);
+    }
+
+    //
+    // The below is used to check ppis data types
+    //
+
+    /**
+     Check if the input data is PpiName
+     
+     @param strPpiName The input string need be checked
+     
+     @retval true - The input is PpiName
+     @retval false - The input is not PpiName
+     
+     **/
+    public static boolean isPpiName(String strPpiName) {
+        return isCName(strPpiName);
+    }
+
+    /**
+     Check if the input data is PpiNotifyName
+     
+     @param strPpiNotifyName The input string need be checked
+     
+     @retval true - The input is PpiNotifyName
+     @retval false - The input is not PpiNotifyName
+     
+     **/
+    public static boolean isPpiNotifyName(String strPpiNotifyName) {
+        return isCName(strPpiNotifyName);
+    }
+
+    /**
+     Check if the input data is FeatureFlag
+     
+     @param strFeatureFlag The input string need be checked
+     
+     @retval true - The input is FeatureFlag
+     @retval false - The input is not FeatureFlag
+     
+     **/
+    public static boolean isFeatureFlag(String strFeatureFlag) {
+        return isCName(strFeatureFlag);
+    }
+
+    //
+    // The below is used to check variable data types
+    //
+
+    /**
+     Check if the input data is ByteOffset
+     
+     @param strByteOffset The input string need be checked
+     
+     @retval true - The input is ByteOffset
+     @retval false - The input is not ByteOffset
+     
+     **/
+    public static boolean isByteOffset(String strByteOffset) {
+        return isByteOffset(strByteOffset);
+    }
+
+    /**
+     Check if the input data is BitOffset
+     
+     @param strBitOffset The input string need be checked
+     
+     @retval true - The input is BitOffset
+     @retval false - The input is not BitOffset
+     
+     **/
+    public static boolean isBitOffset(String strBitOffset) {
+        return isInt(strBitOffset, 0, 8);
+    }
+
+    /**
+     Check if the input data is OffsetBitSize
+     
+     @param strOffsetBitSize The input string need be checked
+     
+     @retval true - The input is OffsetBitSize
+     @retval false - The input is not OffsetBitSize
+     
+     **/
+    public static boolean isOffsetBitSize(String strOffsetBitSize) {
+        return isInt(strOffsetBitSize, 0, 7);
+    }
+
+    //
+    // The below is used to check formsets data types
+    //
+
+    /**
+     Check if the input data is Formsets
+     
+     @param strFormsets The input string need be checked
+     
+     @retval true - The input is Formsets
+     @retval false - The input is not Formsets
+     
+     **/
+    public static boolean isFormsets(String strFormsets) {
+        return isCName(strFormsets);
+    }
+
+    //
+    // The below is used to check externs data types
+    //
+
+    /**
+     Check if the input data is Constructor
+     
+     @param strConstructor The input string need be checked
+     
+     @retval true - The input is Constructor
+     @retval false - The input is not Constructor
+     
+     **/
+    public static boolean isConstructor(String strConstructor) {
+        return isCName(strConstructor);
+    }
+
+    /**
+     Check if the input data is Destructor
+     
+     @param strDestructor The input string need be checked
+     
+     @retval true - The input is Destructor
+     @retval false - The input is not Destructor
+     
+     **/
+    public static boolean isDestructor(String strDestructor) {
+        return isCName(strDestructor);
+    }
+
+    /**
+     Check if the input data is DriverBinding
+     
+     @param strDriverBinding The input string need be checked
+     
+     @retval true - The input is DriverBinding
+     @retval false - The input is not DriverBinding
+     
+     **/
+    public static boolean isDriverBinding(String strDriverBinding) {
+        return isCName(strDriverBinding);
+    }
+
+    /**
+     Check if the input data is ComponentName
+     
+     @param strComponentName The input string need be checked
+     
+     @retval true - The input is ComponentName
+     @retval false - The input is not ComponentName
+     
+     **/
+    public static boolean isComponentName(String strComponentName) {
+        return isCName(strComponentName);
+    }
+
+    /**
+     Check if the input data is DriverConfig
+     
+     @param strDriverConfig The input string need be checked
+     
+     @retval true - The input is DriverConfig
+     @retval false - The input is not DriverConfig
+     
+     **/
+    public static boolean isDriverConfig(String strDriverConfig) {
+        return isCName(strDriverConfig);
+    }
+
+    /**
+     Check if the input data is DriverDiag
+     
+     @param strDriverDiag The input string need be checked
+     
+     @retval true - The input is DriverDiag
+     @retval false - The input is not DriverDiag
+     
+     **/
+    public static boolean isDriverDiag(String strDriverDiag) {
+        return isCName(strDriverDiag);
+    }
+
+    /**
+     Check if the input data is SetVirtualAddressMapCallBack
+     
+     @param strSetVirtualAddressMapCallBack The input string need be checked
+     
+     @retval true - The input is SetVirtualAddressMapCallBack
+     @retval false - The input is not SetVirtualAddressMapCallBack
+     
+     **/
+    public static boolean isSetVirtualAddressMapCallBack(String strSetVirtualAddressMapCallBack) {
+        return isCName(strSetVirtualAddressMapCallBack);
+    }
+
+    /**
+     Check if the input data is ExitBootServicesCallBack
+     
+     @param strExitBootServicesCallBack The input string need be checked
+     
+     @retval true - The input is ExitBootServicesCallBack
+     @retval false - The input is not ExitBootServicesCallBack
+     
+     **/
+    public static boolean isExitBootServicesCallBack(String strExitBootServicesCallBack) {
+        return isCName(strExitBootServicesCallBack);
+    }
+
+    /**
+     Check if the input data is UserDefined
+     
+     @param strUserDefined The input string need be checked
+     
+     @retval true - The input is UserDefined
+     @retval false - The input is not UserDefined
+     
+     **/
+    public static boolean isUserDefined(String strUserDefined) {
+        return isCName(strUserDefined);
+    }
+
+    //
+    // The below is used to check PCDs data types
+    //
+
+    /**
+     Check if the input data is Token
+     
+     @param strToken The input string need be checked
+     
+     @retval true - The input is Token
+     @retval false - The input is not Token
+     
+     **/
+    public static boolean isToken(String strToken) {
+        return isHexDoubleWordDataType(strToken);
+    }
+
+    /**
+     Check if the input data is MaxSku
+     
+     @param strMaxSku The input string need be checked
+     
+     @retval true - The input is MaxSku
+     @retval false - The input is not MaxSku
+     
+     **/
+    public static boolean isMaxSku(String strMaxSku) {
+        return isHexByteDataType(strMaxSku);
+    }
+
+    /**
+     Check if the input data is SkuId
+     
+     @param strSkuId The input string need be checked
+     
+     @retval true - The input is SkuId
+     @retval false - The input is not SkuId
+     
+     **/
+    public static boolean isSkuId(String strSkuId) {
+        return isHexByteDataType(strSkuId);
+    }
+
+    /**
+     Check if the input data is DatumSize
+     
+     @param strDatumSize The input string need be checked
+     
+     @retval true - The input is DatumSize
+     @retval false - The input is not DatumSize
+     
+     **/
+    public static boolean isDatumSize(String strDatumSize) {
+        return isInt(strDatumSize, 1, 16777215);
+    }
+
+    /**
+     Check if the input data is VariableGuid
+     
+     @param strVariableGuid The input string need be checked
+     
+     @retval true - The input is VariableGuid
+     @retval false - The input is not VariableGuid
+     
+     **/
+    public static boolean isVariableGuid(String strVariableGuid) {
+        return (isGuid(strVariableGuid) || strVariableGuid.equals("0"));
+    }
+
+    /**
+     Check if the input data is DataOffset
+     
+     @param strDataOffset The input string need be checked
+     
+     @retval true - The input is DataOffset
+     @retval false - The input is not DataOffset
+     
+     **/
+    public static boolean isDataOffset(String strDataOffset) {
+        return isHex64BitDataType(strDataOffset);
+    }
+
+    /**
+     Check if the input data is GuidOffset
+     
+     @param strGuidOffset The input string need be checked
+     
+     @retval true - The input is GuidOffset
+     @retval false - The input is not GuidOffset
+     
+     **/
+    public static boolean isGuidOffset(String strGuidOffset) {
+        return isHex64BitDataType(strGuidOffset);
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/common/IFileFilter.java b/Tools/Source/ModuleEditor/src/org/tianocore/common/IFileFilter.java
new file mode 100644
index 0000000000..1daf7fa867
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/common/IFileFilter.java
@@ -0,0 +1,87 @@
+/** @file
+ 
+ The file is used to override FileFilter to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.common;
+
+import java.io.File;
+
+import javax.swing.filechooser.FileFilter;
+
+/**
+ The class is used to override FileFilter to provides customized interfaces
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IFileFilter extends FileFilter {
+
+    private String strExt;
+
+    /**
+     Reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     @param ext
+     
+     **/
+    public IFileFilter(String ext) {
+        this.strExt = ext;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
+     * 
+     * Override method "accept"
+     * 
+     */
+    public boolean accept(File file) {
+        if (file.isDirectory()) {
+            return true;
+        }
+        String strFileName = file.getName();
+        int intIndex = strFileName.lastIndexOf('.');
+        if (intIndex > 0 && intIndex < strFileName.length() - 1) {
+            String strExtension = strFileName.substring(intIndex + 1).toLowerCase();
+            if (strExtension.equals(strExt))
+                return true;
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.filechooser.FileFilter#getDescription()
+     * 
+     * Override method "getDescription" to config description via different file type 
+     * 
+     */
+    public String getDescription() {
+        if (strExt.equals("msa"))
+            return "Module Surface Area File(*.msa)";
+        if (strExt.equals("mbd"))
+            return "Module Build Description File(*.mbd)";
+        return "";
+    }
+
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/common/Log.java b/Tools/Source/ModuleEditor/src/org/tianocore/common/Log.java
new file mode 100644
index 0000000000..0759fc619c
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/common/Log.java
@@ -0,0 +1,211 @@
+/** @file
+ 
+ The file is used to provides static interfaces to save log and error information 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.common;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import javax.swing.JOptionPane;
+
+/**
+ The class is used to provides static interfaces to save log and error information
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class Log {
+
+    //
+    //Log file
+    //
+    private static File fleLogFile = null;
+
+    //
+    //Err file
+    //
+    private static File fleErrFile = null;
+
+    //
+    //Log file name
+    //
+    static String strLogFileName = "Log.log";
+
+    //
+    //Err file name
+    //
+    static String strErrFileName = "Err.log";
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        try {
+            Log.log("Test", "test");
+            Log.err("Test1", "test1");
+            Log.err("sdfsdfsd fsdfsdfsdfsdfj dsfksdjflsdjf sdkfjsdklfjsdkf dskfsjdkfjks dskfjsdklfjsdkf sdkfjsdlf sdkfjsdk kdfjskdf sdkfjsdkf ksdjfksdfjskdf sdkfsjdfksd fskdfjsdf", "dfsdf sdfksdf sd sdfksd fsdf");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     This is the default constructor
+     Do nothing
+     
+     **/
+    public Log() {
+    }
+
+    /**
+     Call writeToLogFile to save log item and log information to log file
+     
+     @param strItem The log item
+     @param strLog The log information
+     
+     **/
+    public static void log(String strItem, String strLog) {
+        try {
+            writeToLogFile(strItem + ":" + strLog);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToLogFile to save log information to log file
+     
+     @param strLog The log information
+     
+     **/
+    public static void log(String strLog) {
+        try {
+            writeToLogFile(strLog);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToErrFile to save err item and err information to err file
+     
+     @param strItem The err item
+     @param strLog The err information
+     
+     **/
+    public static void err(String strItem, String strErr) {
+        try {
+            writeToErrFile("Error when " + strItem + "::" + strErr);
+            showErrMessage("Error when " + strItem + "::" + strErr);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Call writeToErrFile to save err information to err file
+     
+     @param strLog The err information
+     
+     **/
+    public static void err(String strErr) {
+        try {
+            writeToErrFile("Error::" + strErr);
+            showErrMessage("Error::" + strErr);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Brings up a dialog to show err message
+     When the message's length > defined max length, wrap the text to the next line.
+     
+     @param strErr The input data of err message
+     
+     **/
+    private static void showErrMessage(String strErr) {
+        int intMaxLength = 40;
+        String strReturn = "";
+        String strTemp = "";
+        while (strErr.length() > 0) {
+            if (strErr.length() > intMaxLength) {
+                strTemp = strErr.substring(0, intMaxLength);
+                strErr = strErr.substring(strTemp.length());
+                strReturn = strReturn + strTemp + DataType.UNXI_LINE_SEPARATOR;
+                
+            } else if (strErr.length() <= intMaxLength) {
+                strReturn = strReturn + strErr;
+                strErr = "";
+            }
+        }
+        JOptionPane.showConfirmDialog(null, strReturn, "Error", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
+    }
+
+    /**
+     Open log file and write log information
+     
+     @param strLog The log information
+     @throws IOException
+     
+     **/
+    private static void writeToLogFile(String strLog) throws IOException {
+        try {
+            if (fleLogFile == null) {
+                fleLogFile = new File(strLogFileName);
+                fleLogFile.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(fleLogFile, true);
+            fos.write((Tools.getCurrentDateTime() + DataType.DOS_LINE_SEPARATOR).getBytes());
+            fos.write((strLog + DataType.DOS_LINE_SEPARATOR).getBytes());
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     Open err file and write err information
+     
+     @param strLog The log information
+     @throws IOException
+     
+     **/
+    private static void writeToErrFile(String strLog) throws IOException {
+        try {
+            if (fleErrFile == null) {
+                fleErrFile = new File(strErrFileName);
+                fleErrFile.createNewFile();
+            }
+            FileOutputStream fos = new FileOutputStream(fleErrFile, true);
+            fos.write((Tools.getCurrentDateTime() + DataType.DOS_LINE_SEPARATOR).getBytes());
+            fos.write((strLog + DataType.DOS_LINE_SEPARATOR).getBytes());
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/common/Tools.java b/Tools/Source/ModuleEditor/src/org/tianocore/common/Tools.java
new file mode 100644
index 0000000000..a11df00377
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/common/Tools.java
@@ -0,0 +1,120 @@
+/** @file
+ 
+ The file is used to provides some useful interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.common;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ The class is used to provides some useful interfaces 
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class Tools {
+
+    /**
+     Used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        System.out.println(getCurrentDateTime());
+    }
+
+    /**
+     Get current date and time and format it as "yyyy-MM-dd HH:mm"
+     
+     @return formatted current date and time
+     
+     **/
+    public static String getCurrentDateTime() {
+        Date now = new Date(System.currentTimeMillis());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return sdf.format(now);
+    }
+
+    /**
+     Delete a folder and all its files
+     
+     @param fleFolderName The name of the folder which need be deleted
+     
+     @retval true - Delete successfully
+     @retval false - Delete successfully
+     
+     **/
+    public static boolean deleteFolder(File fleFolderName) {
+        boolean blnIsDeleted = true;
+        File[] aryAllFiles = fleFolderName.listFiles();
+
+        for (int indexI = 0; indexI < aryAllFiles.length; indexI++) {
+            if (blnIsDeleted) {
+                if (aryAllFiles[indexI].isDirectory()) {
+                    //
+                    //If is a directory, recursively call this function to delete sub folders
+                    //
+                    blnIsDeleted = deleteFolder(aryAllFiles[indexI]);
+                } else if (aryAllFiles[indexI].isFile()) {
+                    //
+                    //If is a file, delete it
+                    //
+                    if (!aryAllFiles[indexI].delete()) {
+                        blnIsDeleted = false;
+                    }
+                }
+            }
+        }
+        if (blnIsDeleted) {
+            fleFolderName.delete();
+        }
+        return blnIsDeleted;
+    }
+
+    /**
+     Generate a UUID
+     
+     @return the created UUID
+     
+     **/
+    public static String generateUuidString() {
+        return UUID.randomUUID().toString();
+    }
+
+    /**
+     Get all system properties and output to the console
+     
+     **/
+    public static void getSystemProperties() {
+        System.out.println(System.getProperty("java.class.version"));
+        System.out.println(System.getProperty("java.class.path"));
+        System.out.println(System.getProperty("java.ext.dirs"));
+        System.out.println(System.getProperty("os.name"));
+        System.out.println(System.getProperty("os.arch"));
+        System.out.println(System.getProperty("os.version"));
+        System.out.println(System.getProperty("file.separator"));
+        System.out.println(System.getProperty("path.separator"));
+        System.out.println(System.getProperty("line.separator"));
+        System.out.println(System.getProperty("user.name"));
+        System.out.println(System.getProperty("user.home"));
+        System.out.println(System.getProperty("user.dir"));
+        System.out.println(System.getProperty("PATH"));
+
+        System.out.println(System.getenv("PROCESSOR_REVISION"));
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ExitConfirm.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ExitConfirm.java
new file mode 100644
index 0000000000..2ff84b669b
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ExitConfirm.java
@@ -0,0 +1,265 @@
+/** @file
+ 
+ The file is used to popup a exit confirmation window when program exists
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ The class is used to popup a exit confirmation window when program exists
+ It extends JDialog and implements ActionListener and WindowListener
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class ExitConfirm extends JDialog implements ActionListener, WindowListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -5875921789385911029L;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelMessage = null;
+
+    private JLabel jLabelResume = null;
+
+    private JLabel jLabelExit = null;
+
+    private JButton jButtonResume = null;
+
+    private JButton jButtonExit = null;
+
+    public boolean isCancel = false;
+
+    /**
+     This method initializes jButtonResume
+     
+     @return javax.swing.JButton jButtonResume
+     
+     **/
+    private JButton getJButtonResume() {
+        if (jButtonResume == null) {
+            jButtonResume = new JButton();
+            jButtonResume.setText("Resume");
+            jButtonResume.setSize(new java.awt.Dimension(90, 20));
+            jButtonResume.setLocation(new java.awt.Point(150, 105));
+            jButtonResume.setMnemonic('R');
+            jButtonResume.addActionListener(this);
+        }
+        return jButtonResume;
+    }
+
+    /**
+     This method initializes jButtonExit
+     
+     @return javax.swing.JButton jButtonExit
+     
+     **/
+    private JButton getJButtonExit() {
+        if (jButtonExit == null) {
+            jButtonExit = new JButton();
+            jButtonExit.setText("Exit");
+            jButtonExit.setSize(new java.awt.Dimension(90, 20));
+            jButtonExit.setLocation(new java.awt.Point(260, 105));
+            jButtonExit.setMnemonic('x');
+            jButtonExit.addActionListener(this);
+        }
+        return jButtonExit;
+    }
+
+    /**
+     Main clasee, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ExitConfirm(IFrame parentFrame, boolean modal) {
+        super(parentFrame, modal);
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     
+     **/
+    private void initialize() {
+        this.setSize(500, 170);
+        this.setTitle("Exit");
+        this.setResizable(false);
+        this.setContentPane(getJContentPane());
+        this.addWindowListener(this);
+        //
+        //Set DO_NOTHING_ON_CLOSE when click Close button on title bar
+        //
+        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        centerWindow();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelExit = new JLabel();
+            jLabelExit.setSize(new java.awt.Dimension(450, 20));
+            jLabelExit.setLocation(new java.awt.Point(25, 70));
+            jLabelResume = new JLabel();
+            jLabelResume.setSize(new java.awt.Dimension(450, 20));
+            jLabelResume.setLocation(new java.awt.Point(25, 40));
+            jLabelMessage = new JLabel();
+            jLabelMessage.setSize(new java.awt.Dimension(450, 20));
+            jLabelMessage.setLocation(new java.awt.Point(25, 10));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelMessage, null);
+            jContentPane.add(jLabelResume, null);
+            jContentPane.add(jLabelExit, null);
+            jContentPane.add(getJButtonResume(), null);
+            jContentPane.add(getJButtonExit(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     Call setWarningMessage to set messages of frame when it is used for Setup
+     
+     **/
+    public void setSetupMessage() {
+        String strTitle = "Exit Setup";
+        String strMessage = "Setup is not complete. If you quit now, the program will not be installed.";
+        String strResume = "You may run the setup program at a later time to complete the installation.";
+        String strExit = "To continue installing, click Resume. To quit the Setup program, click Exit.";
+        setWarningMessage(strTitle, strMessage, strResume, strExit);
+    }
+
+    /**
+     Call setWarningMessage to set messages of frame when it is used for Module Main GUI
+     
+     **/
+    public void setModuleMessage() {
+        String strTitle = "Exit";
+        String strMessage = "Do you really want to quit now?";
+        String strResume = "All unsaved module information will be lost.";
+        String strExit = "To continue editing module, click Resume. To quit the program, click Exit.";
+        setWarningMessage(strTitle, strMessage, strResume, strExit);
+    }
+
+    /**
+     Set message information via input data
+     
+     @param strTitle The title value
+     @param strMessage The main message value
+     @param strResume The resume message value
+     @param strExit The exit message value
+     
+     **/
+    private void setWarningMessage(String strTitle, String strMessage, String strResume, String strExit) {
+        this.setTitle(strTitle);
+        jLabelMessage.setText(strMessage);
+        jLabelResume.setText(strResume);
+        jLabelExit.setText(strExit);
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listern all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        //
+        //Set isCancel true when click button "Exit"
+        //
+        Object obj = arg0.getSource();
+        if (obj == jButtonResume) {
+            isCancel = false;
+        }
+        if (obj == jButtonExit) {
+            isCancel = true;
+        }
+        this.setVisible(false);
+    }
+
+    /**
+     Make the window in the center of the screen
+     
+     **/
+    private void centerWindow() {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - this.getSize().width) / 2, (d.height - this.getSize().height) / 2);
+    }
+
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosed(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosing(WindowEvent arg0) {
+        isCancel = false;
+        this.setVisible(false);
+    }
+
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IComboBox.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IComboBox.java
new file mode 100644
index 0000000000..f60ebcfe33
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IComboBox.java
@@ -0,0 +1,196 @@
+/** @file
+ 
+ The file is used to override JComboBox to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.common.ui;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+
+/**
+ The class is used to override JComboBox to provides customized interfaces
+ It extends JComboBox implements KeyListener, MouseListener and FocusListener
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IComboBox extends JComboBox implements KeyListener, MouseListener, FocusListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -1940262568168458911L;
+
+    public void focusGained(FocusEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent)
+     * 
+     * Override focusLost to exit edit mode
+     * 
+     */
+    public void focusLost(FocusEvent arg0) {
+        this.closeEdit();
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        JFrame jf = new JFrame();
+        jf.setSize(500, 200);
+        JPanel jp = new JPanel();
+        jp.setLayout(null);
+        IComboBox icb = new IComboBox();
+        jp.add(icb, null);
+        jf.setContentPane(jp);
+        jf.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public IComboBox() {
+        super();
+        init();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(320, 20);
+        this.setEditable(false);
+        this.editor.addActionListener(this);
+        this.addMouseListener(this);
+        this.addKeyListener(this);
+        this.getEditor().getEditorComponent().addKeyListener(this);
+        this.getEditor().getEditorComponent().addFocusListener(this);
+    }
+
+    public void keyPressed(KeyEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent)
+     * 
+     * Override keyReleased to listen key action
+     * 
+     */
+    public void keyReleased(KeyEvent arg0) {
+        //
+        //Add new item to list when press ENTER
+        //
+        if (arg0.getSource() == this.getEditor().getEditorComponent()) {
+            if (arg0.getKeyCode() == KeyEvent.VK_ENTER) {
+                String strCurrentText = this.getEditor().getItem().toString().trim();
+                if (strCurrentText.length() == 0) {
+                    if (this.getItemCount() > 0) {
+                        this.setSelectedIndex(0);
+                    }
+                } else {
+                    this.addItem(strCurrentText);
+                    this.setSelectedItem(strCurrentText);
+                }
+                this.setEditable(false);
+            }
+            if (arg0.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                closeEdit();
+            }
+        }
+
+        if (arg0.getSource() == this) {
+            //
+            //Remove item from the list when press DEL
+            //
+            if (arg0.getKeyCode() == KeyEvent.VK_DELETE) {
+                int intSelected = this.getSelectedIndex();
+                if (intSelected > -1) {
+                    this.removeItemAt(this.getSelectedIndex());
+                    if (this.getItemCount() > 0) {
+                        this.setSelectedIndex(0);
+                    } else {
+                        this.removeAllItems();
+                    }
+                }
+            }
+        }
+    }
+
+    public void keyTyped(KeyEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
+     * 
+     * Override mouseClicked to enter edit mode when double click mouse
+     * 
+     */
+    public void mouseClicked(MouseEvent arg0) {
+        if (arg0.getClickCount() == 2) {
+            this.setEditable(true);
+            this.getEditor().setItem("");
+        }
+
+    }
+
+    public void mouseEntered(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseExited(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mousePressed(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseReleased(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     Exit edit mode
+     
+     **/
+    private void closeEdit() {
+        this.setEditable(false);
+        this.getEditor().setItem("");
+        if (this.getItemCount() > 0) {
+            this.setSelectedIndex(0);
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDefaultMutableTreeNode.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDefaultMutableTreeNode.java
new file mode 100644
index 0000000000..ae51c5fa45
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDefaultMutableTreeNode.java
@@ -0,0 +1,307 @@
+/** @file
+ 
+ 
+ The file is used to override DefaultMutableTreeNode to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+/**
+ The class is used to override DefaultMutableTreeNode to provides customized interfaces
+ It extends DefaultMutableTreeNode
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IDefaultMutableTreeNode extends DefaultMutableTreeNode {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -1947340717458069548L;
+
+    //
+    //Static final definitions for all kinds of node
+    //
+    public static final int MSA_HEADER = 0;
+
+    public static final int LIBRARYCLASSDEFINITIONS = 1;
+
+    public static final int SOURCEFILES = 2;
+
+    public static final int INCLUDES = 3;
+
+    public static final int PROTOCOLS = 4;
+
+    public static final int EVENTS = 5;
+
+    public static final int HOBS = 6;
+
+    public static final int PPIS = 7;
+
+    public static final int VARIABLES = 8;
+
+    public static final int BOOTMODES = 9;
+
+    public static final int SYSTEMTABLES = 10;
+
+    public static final int DATAHUBS = 11;
+
+    public static final int FORMSETS = 12;
+
+    public static final int GUIDS = 13;
+
+    public static final int EXTERNS = 14;
+
+    public static final int PCDS = 15;
+
+    public static final int MBD_HEADER = 20;
+
+    public static final int MLSA_HEADER = 21;
+
+    public static final int MLBD_HEADER = 22;
+
+    public static final int LIBRARIES = 23;
+
+    public static final int LIBRARY_CLASS_DEFINITION = 101;
+
+    public static final int SOURCEFILES_FILENAME = 210;
+
+    public static final int SOURCEFILES_FILENAME_ITEM = 211;
+
+    public static final int SOURCEFILES_ARCH = 220;
+
+    public static final int SOURCEFILES_ARCH_ITEM = 221;
+
+    public static final int INCLUDES_PACKAGENAME = 310;
+
+    public static final int INCLUDES_PACKAGENAME_ITEM = 311;
+
+    public static final int INCLUDES_ARCH = 320;
+
+    public static final int INCLUDES_ARCH_ITEM = 321;
+
+    public static final int PROTOCOLS_PROTOCOL = 410;
+
+    public static final int PROTOCOLS_PROTOCOL_ITEM = 411;
+
+    public static final int PROTOCOLS_PROTOCOLNOTIFY = 420;
+
+    public static final int PROTOCOLS_PROTOCOLNOTIFY_ITEM = 421;
+
+    public static final int EVENTS_CREATEEVENTS = 510;
+
+    public static final int EVENTS_CREATEEVENTS_ITEM = 511;
+
+    public static final int EVENTS_SIGNALEVENTS = 520;
+
+    public static final int EVENTS_SIGNALEVENTS_ITEM = 521;
+
+    public static final int HOBS_HOB_ITEM = 611;
+
+    public static final int PPIS_PPI = 710;
+
+    public static final int PPIS_PPI_ITEM = 711;
+
+    public static final int PPIS_PPINOTIFY = 720;
+
+    public static final int PPIS_PPINOTIFY_ITEM = 721;
+
+    public static final int VARIABLES_VARIABLE_ITEM = 811;
+
+    public static final int BOOTMODES_BOOTMODE_ITEM = 911;
+
+    public static final int SYSTEMTABLES_SYSTEMTABLE_ITEM = 1011;
+
+    public static final int DATAHUBS_DATAHUB_ITEM = 1111;
+
+    public static final int FORMSETS_FORMSET_ITEM = 1211;
+
+    public static final int GUIDS_GUIDENTRY_ITEM = 1311;
+
+    public static final int EXTERNS_EXTERN_ITEM = 1411;
+
+    public static final int PCDS_PCDDATA_ITEM = 1511;
+
+    public static final int LIBRARIES_LIBRARY = 2310;
+
+    public static final int LIBRARIES_LIBRARY_ITEM = 2311;
+
+    public static final int LIBRARIES_ARCH = 2320;
+
+    public static final int LIBRARIES_ARCH_ITEM = 2321;
+
+    //
+    //Static final definitions for operation
+    //
+    public static final int OPERATION_NULL = 0;
+
+    public static final int OPERATION_ADD = 1;
+
+    public static final int OPERATION_UPDATE = 2;
+
+    public static final int OPERATION_DELETE = 4;
+
+    public static final int OPERATION_ADD_UPDATE = 3;
+
+    public static final int OPERATION_ADD_DELETE = 5;
+
+    public static final int OPERATION_UPDATE_DELETE = 6;
+
+    public static final int OPERATION_ADD_UPDATE_DELETE = 7;
+
+    //
+    //Define 4 node attributes
+    //
+    private int category = 0;
+
+    private int operation = 0;
+
+    private int location = 0;
+
+    private String nodeName = "";
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public IDefaultMutableTreeNode() {
+        super();
+    }
+
+    /**
+     This is the overrided constructor
+     Init clase members with input data
+     
+     @param strNodeName The name of node
+     @param intCategory The category of node
+     @param intOperation The operation of node
+     
+     **/
+    public IDefaultMutableTreeNode(String strNodeName, int intCategory, int intOperation) {
+        super(strNodeName);
+        this.nodeName = strNodeName;
+        this.category = intCategory;
+        this.operation = intOperation;
+    }
+
+    /**
+     This is the overrided constructor
+     Init clase members with input data
+     
+     @param strNodeName The name of node
+     @param intCategory The category of node
+     @param intOperation The operation of node
+     @param intLocation The location of node
+     
+     **/
+    public IDefaultMutableTreeNode(String strNodeName, int intCategory, int intOperation, int intLocation) {
+        super(strNodeName);
+        this.nodeName = strNodeName;
+        this.category = intCategory;
+        this.operation = intOperation;
+        this.location = intLocation;
+    }
+
+    /**
+     Get category of node 
+     
+     @return The category of node
+     
+     **/
+    public int getCategory() {
+        return category;
+    }
+
+    /**
+     Set category of node
+     
+     @param category The input data of node category
+     
+     **/
+    public void setCategory(int category) {
+        this.category = category;
+    }
+
+    /**
+     Get name of node
+     
+     @return The name of node
+     
+     **/
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    /**
+     Set name of node
+     
+     @param nodeName The input data of node name
+     
+     **/
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    /**
+     Get operation of node
+     
+     @return The operation of node
+     
+     **/
+    public int getOperation() {
+        return operation;
+    }
+
+    /**
+     Set operation of node
+     
+     @param operation The input data of node operation
+     
+     **/
+    public void setOperation(int operation) {
+        this.operation = operation;
+    }
+
+    /**
+     Get location of node
+     
+     @return The location of node
+     
+     **/
+    public int getLocation() {
+        return location;
+    }
+
+    /**
+     Set location of node
+     
+     @param location The input data of node location
+     
+     **/
+    public void setLocation(int location) {
+        this.location = location;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDesktopManager.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDesktopManager.java
new file mode 100644
index 0000000000..b86aa6b484
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDesktopManager.java
@@ -0,0 +1,76 @@
+/** @file
+ 
+ The file is used to override DefaultDesktopManager to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import javax.swing.DefaultDesktopManager;
+import javax.swing.JComponent;
+
+/**
+ The class is used to override DefaultDesktopManager to provides customized interfaces
+ It extends DefaultDesktopManager
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IDesktopManager extends DefaultDesktopManager {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -4596986878722011062L;
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.DesktopManager#dragFrame(javax.swing.JComponent, int, int)
+     * 
+     * Override dragFrame to do nothing to forbid internalframe to be draged 
+     * 
+     */
+    public void dragFrame(JComponent f, int newX, int newY) {
+
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.DesktopManager#endDraggingFrame(javax.swing.JComponent)
+     * 
+     * Override endDraggingFrame to do nothing to forbid internalframe to be draged
+     * 
+     */
+    public void endDraggingFrame(JComponent f) {
+
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.DesktopManager#beginResizingFrame(javax.swing.JComponent, int)
+     * 
+     * Override beginResizingFrame to do nothing to forbid internalframe to be draged
+     * 
+     */
+    public void beginResizingFrame(JComponent f, int direction) {
+
+    }
+
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDialog.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDialog.java
new file mode 100644
index 0000000000..622b54bcca
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IDialog.java
@@ -0,0 +1,144 @@
+/** @file
+ 
+ The file is used to override Dialog to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JDialog;
+
+/**
+ The class is used to override Dialog to provides customized interfaces
+ It extends JDialog implements ActionListener
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IDialog extends JDialog implements ActionListener {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -7692623863358631984L;
+    //
+    //Define class members
+    //
+    private boolean isEdited = false;
+
+    public void actionPerformed(ActionEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        IDialog id = new IDialog();
+        id.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public IDialog() {
+        super();
+        initialize();
+    }
+
+    /**
+     * This is the override constructor
+     */
+    /**
+     This is the override constructor
+     
+     @param parentFrame The parent frame which open the dialog
+     @param modal true means the dialog is modal dialog; false means the dialog is not modal dialog
+     **/
+    public IDialog(IFrame parentFrame, boolean modal) {
+        super(parentFrame, modal);
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setResizable(false);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     @param intWidth The width of the dialog
+     @param intHeight The height of the dialog
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     Get if the dialog has been edited
+     
+     @retval true - The dialog has been edited
+     @retval false - The dialog hasn't been edited
+     
+     **/
+    public boolean isEdited() {
+        return isEdited;
+    }
+
+    /**
+     Set if the dialog has been edited
+     
+     @param isEdited The input data which identify if the dialog has been edited
+     
+     **/
+    public void setEdited(boolean isEdited) {
+        this.isEdited = isEdited;
+    }
+
+    /**
+     Check the input data is empty or not
+     
+     @param strValue The input data which need be checked
+     
+     @retval true - The input data is empty
+     @retval fals - The input data is not empty
+     
+     **/
+    public boolean isEmpty(String strValue) {
+        if (strValue.length() > 0) {
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IFrame.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IFrame.java
new file mode 100644
index 0000000000..4e36bd430a
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IFrame.java
@@ -0,0 +1,204 @@
+/** @file
+ 
+ The file is used to override Frame to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import javax.swing.JFrame;
+
+/**
+ The class is used to override Frame to provides customized interfaces 
+ It extends JFrame implements ActionListener and WindowListener
+ 
+ @since ModuleEditor 1.0
+ 
+ **/
+public class IFrame extends JFrame implements ActionListener, WindowListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -3324138961029300427L;
+
+    //
+    //Define class members
+    //
+    private ExitConfirm ec = null;
+
+    //
+    // To indicate the status while quit
+    // 0 - When setup (Default)
+    // 1 - Whne editing module
+    //
+    private int intExitType = 0;
+
+    /**
+     Main class, used for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        IFrame i = new IFrame();
+        i.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public IFrame() {
+        super();
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    public void initialize() {
+        this.setResizable(false);
+        this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        this.addWindowListener(this);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     @param intWidth The width of the dialog
+     @param intHeight The height of the dialog
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the dialog at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     Set the exit window type
+     
+     @param ExitType The input data of ExitType
+     
+     **/
+    protected void setExitType(int ExitType) {
+        this.intExitType = ExitType;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     *
+     * Override windowClosing to call this.onDisvisible()
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onDisvisible();
+    }
+
+    public void windowOpened(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowClosed(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowIconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeiconified(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowActivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void windowDeactivated(WindowEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     Define the actions when exit
+     
+     **/
+    public void onExit() {
+        ec = new ExitConfirm(this, true);
+        //
+        //Show different warning message via different ExitType
+        //
+        switch (intExitType) {
+        case 0:
+            ec.setSetupMessage();
+            break;
+        case 1:
+            ec.setModuleMessage();
+            break;
+        }
+        ec.setVisible(true);
+        if (ec.isCancel) {
+            this.dispose();
+            System.exit(0);
+        }
+    }
+
+    /**
+     Define the actions when disvisible
+     
+     **/
+    public void onDisvisible() {
+        ec = new ExitConfirm(this, true);
+        //
+        //Show different warning message via different ExitType
+        //
+        switch (intExitType) {
+        case 0:
+            ec.setSetupMessage();
+            break;
+        case 1:
+            ec.setModuleMessage();
+            break;
+        }
+        ec.setVisible(true);
+        if (ec.isCancel) {
+            this.dispose();
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IInternalFrame.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IInternalFrame.java
new file mode 100644
index 0000000000..8fc9d9b489
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/IInternalFrame.java
@@ -0,0 +1,109 @@
+/** @file
+ 
+ The file is used to override JInternalFrame to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JInternalFrame;
+
+/**
+ The class is used to override JInternalFrame to provides customized interfaces
+ It extends JInternalFrame implements ActionListener
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class IInternalFrame extends JInternalFrame implements ActionListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -609841772384875886L;
+    //
+    //Define class members
+    //
+    private boolean isEdited = false;
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public IInternalFrame() {
+        super();
+        initialize();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 500));
+    }
+
+    /**
+     Get if the InternalFrame has been edited
+     
+     @retval true - The InternalFrame has been edited
+     @retval false - The InternalFrame hasn't been edited
+     
+     **/
+    public boolean isEdited() {
+        return isEdited;
+    }
+
+    /**
+     Set if the InternalFrame has been edited
+     
+     @param isEdited The input data which identify if the InternalFrame has been edited
+     
+     **/
+    public void setEdited(boolean isEdited) {
+        this.isEdited = isEdited;
+    }
+
+    /**
+     Check the input data is empty or not
+     
+     @param strValue The input data which need be checked
+     
+     @retval true - The input data is empty
+     @retval fals - The input data is not empty
+     
+     **/
+    public boolean isEmpty(String strValue) {
+        if (strValue.length() > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ITree.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ITree.java
new file mode 100644
index 0000000000..eeb51fce83
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/ITree.java
@@ -0,0 +1,204 @@
+/** @file
+ 
+ The file is used to override JTree to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+
+/**
+ The class is used to override JTree to provides customized interfaces 
+ It extends JTree
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ITree extends JTree {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -7907086164518295327L;
+    
+    //
+    // Define class members
+    //
+    DefaultTreeModel treeModel = null;
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ITree() {
+        super();
+    }
+
+    /**
+     This is the overrided constructor
+     Init class members with input data
+     
+     @param iDmtRoot The root node of the tree
+     
+     **/
+    public ITree(IDefaultMutableTreeNode iDmtRoot) {
+        super(iDmtRoot);
+    }
+
+    /**
+     Get category of selected node
+     
+     @return The category of selected node
+     
+     **/
+    public int getSelectCategory() {
+        int intCategory = 0;
+        TreePath path = this.getSelectionPath();
+        IDefaultMutableTreeNode node = (IDefaultMutableTreeNode) path.getLastPathComponent();
+        intCategory = node.getCategory();
+        return intCategory;
+    }
+
+    /**
+     Get operation of selected node
+     
+     @return The operation of selected node
+     
+     **/
+    public int getSelectOperation() {
+        int intOperation = 0;
+        TreePath path = this.getSelectionPath();
+        IDefaultMutableTreeNode node = (IDefaultMutableTreeNode) path.getLastPathComponent();
+        intOperation = node.getOperation();
+        return intOperation;
+    }
+
+    /**
+     Get selectLoaction of selected node
+     
+     @return The selectLoaction of selected node
+     
+     **/
+    public int getSelectLoaction() {
+        int intLocation = 0;
+        TreePath path = this.getSelectionPath();
+        IDefaultMutableTreeNode node = (IDefaultMutableTreeNode) path.getLastPathComponent();
+        intLocation = node.getLocation();
+        return intLocation;
+    }
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     Add input node as child node for current selected node
+     
+     @param strNewNode The name of the node which need be added
+     
+     **/
+    public void addNode(String strNewNode) {
+        DefaultMutableTreeNode parentNode = null;
+        DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(strNewNode);
+        newNode.setAllowsChildren(true);
+        TreePath parentPath = this.getSelectionPath();
+
+        /**
+         * Get parent node of new node
+         */
+        parentNode = (DefaultMutableTreeNode) (parentPath.getLastPathComponent());
+
+        /**
+         * Insert new node
+         */
+        treeModel.insertNodeInto(newNode, parentNode, parentNode.getChildCount());
+        this.scrollPathToVisible(new TreePath(newNode.getPath()));
+    }
+
+    /**
+     Add input node as child node for current selected node
+     
+     @param newNode The node need be added
+     
+     **/
+    public void addNode(IDefaultMutableTreeNode newNode) {
+        IDefaultMutableTreeNode parentNode = null;
+        newNode.setAllowsChildren(true);
+        TreePath parentPath = this.getSelectionPath();
+        parentNode = (IDefaultMutableTreeNode) (parentPath.getLastPathComponent());
+        treeModel.insertNodeInto(newNode, parentNode, parentNode.getChildCount());
+        this.scrollPathToVisible(new TreePath(newNode.getPath()));
+    }
+
+    /**
+     Remove current selectd node
+     
+     **/
+    public void removeNode() {
+        TreePath treepath = this.getSelectionPath();
+        if (treepath != null) {
+            DefaultMutableTreeNode selectionNode = (DefaultMutableTreeNode) treepath.getLastPathComponent();
+            TreeNode parent = (TreeNode) selectionNode.getParent();
+            if (parent != null) {
+                treeModel.removeNodeFromParent(selectionNode);
+            }
+        }
+    }
+
+    /**
+     Remove all node on a same level
+     
+     **/
+    public void removeNodeOnSameLevel() {
+        TreePath treepath = this.getSelectionPath();
+        IDefaultMutableTreeNode parentNode = (IDefaultMutableTreeNode) treepath.getLastPathComponent();
+        parentNode.removeAllChildren();
+        treeModel.reload();
+    }
+
+    /**
+     Remove the input node by name
+     
+     @param strRemovedNode
+     
+     **/
+    public void removeNode(String strRemovedNode) {
+        TreePath treepath = this.getSelectionPath();
+        if (treepath != null) {
+            DefaultMutableTreeNode selectionNode = (DefaultMutableTreeNode) treepath.getLastPathComponent();
+            TreeNode parent = (TreeNode) selectionNode.getParent();
+            if (parent != null) {
+                treeModel.removeNodeFromParent(selectionNode);
+            }
+        }
+    }
+
+    /**
+     Remove all nodes of the tree
+     
+     **/
+    public void removeAllNode() {
+        DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) treeModel.getRoot();
+        rootNode.removeAllChildren();
+        treeModel.reload();
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/StarLabel.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/StarLabel.java
new file mode 100644
index 0000000000..c451ac53b9
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/common/ui/StarLabel.java
@@ -0,0 +1,64 @@
+/** @file
+ 
+ The file is used to override JLabel to provides customized interfaces 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.common.ui;
+
+import javax.swing.JLabel;
+
+/**
+ The class is used to override JLabel to provides customized interfaces 
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class StarLabel extends JLabel {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -6702981027831543919L;
+
+    /**
+     Main class, reserved for test
+     
+     @param args
+     
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public StarLabel() {
+        super();
+        init();
+    }
+
+    /**
+     To create a RED, BOLD and 14 size "*"
+     
+     **/
+    private void init() {
+        this.setText("*");
+        this.setSize(new java.awt.Dimension(10, 20));
+        this.setForeground(java.awt.Color.red);
+        this.setFont(new java.awt.Font("DialogInput", java.awt.Font.BOLD, 14));
+        this.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java
new file mode 100644
index 0000000000..9176407277
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java
@@ -0,0 +1,602 @@
+/** @file
+ 
+ This file is used to create, update MbdHeader of a MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.tianocore.BaseNameDocument;
+import org.tianocore.GuidDocument;
+import org.tianocore.LicenseDocument;
+import org.tianocore.MbdHeaderDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ This class is used to create, update MbdHeader of a MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class MbdHeader extends IInternalFrame {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -2015726615436197378L;
+
+    //
+    // Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneCopyright = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private MbdHeaderDocument.MbdHeader mbdHeader = null;
+
+    /**
+     This method initializes jTextFieldBaseName
+     
+     @return javax.swing.JTextField jTextFieldBaseName
+     
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion 
+     
+     @return javax.swing.JTextField jTextFieldVersion
+     
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense 
+     
+     @return javax.swing.JTextArea jTextAreaLicense
+     
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright 
+     
+     @return javax.swing.JTextArea jTextAreaCopyright
+     
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription 
+     
+     @return javax.swing.JTextArea jTextAreaDescription
+     
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 345, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 345, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPaneLicense 
+     
+     @return javax.swing.JScrollPane jScrollPaneLicense
+     
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPaneCopyright 
+     
+     @return javax.swing.JScrollPane jScrollPaneCopyright
+     
+     **/
+    private JScrollPane getJScrollPaneCopyright() {
+        if (jScrollPaneCopyright == null) {
+            jScrollPaneCopyright = new JScrollPane();
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
+            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
+        }
+        return jScrollPaneCopyright;
+    }
+
+    /**
+     This method initializes jScrollPaneDescription 
+     
+     @return javax.swing.JScrollPane jScrollPaneDescription
+     
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+        }
+        return jScrollPaneDescription;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public MbdHeader() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     **/
+    public MbdHeader(MbdHeaderDocument.MbdHeader inMbdHeader) {
+        super();
+        init(inMbdHeader);
+        this.setVisible(true);
+        this.setViewMode(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Module Build Description Header");
+        initFrame();
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inMbdHeader The input MbdHeaderDocument.MbdHeader
+     
+     **/
+    private void init(MbdHeaderDocument.MbdHeader inMbdHeader) {
+        init();
+        setMbdHeader(inMbdHeader);
+        if (inMbdHeader != null) {
+            if (this.mbdHeader.getBaseName() != null) {
+                this.jTextFieldBaseName.setText(this.mbdHeader.getBaseName().getStringValue());
+            }
+            if (this.mbdHeader.getGuid() != null) {
+                this.jTextFieldGuid.setText(this.mbdHeader.getGuid().getStringValue());
+            }
+            if (this.mbdHeader.getVersion() != null) {
+                this.jTextFieldVersion.setText(this.mbdHeader.getVersion());
+            }
+            if (this.mbdHeader.getLicense() != null) {
+                this.jTextAreaLicense.setText(this.mbdHeader.getLicense().getStringValue());
+            }
+            if (this.mbdHeader.getCopyright() != null) {
+                this.jTextAreaCopyright.setText(this.mbdHeader.getCopyright());
+            }
+            if (this.mbdHeader.getDescription() != null) {
+                this.jTextAreaDescription.setText(this.mbdHeader.getDescription());
+            }
+        }
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldBaseName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jTextFieldVersion.setEnabled(!isView);
+            this.jTextAreaLicense.setEnabled(!isView);
+            this.jTextAreaCopyright.setEnabled(!isView);
+            this.jTextAreaDescription.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Base Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneCopyright(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 170));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(0, 255));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.dispose();
+            this.save();
+            this.setEdited(true);
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+            this.setEdited(false);
+        }
+        //
+        // Generate GUID
+        //
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldBaseName.getText())) {
+            Log.err("Base Name couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldGuid.getText())) {
+            Log.err("Guid couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldVersion.getText())) {
+            Log.err("Version couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaLicense.getText())) {
+            Log.err("License couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaCopyright.getText())) {
+            Log.err("Copyright couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaDescription.getText())) {
+            Log.err("Description couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {
+            Log.err("Incorrect data type for Base Name");
+            return false;
+        }
+        if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+            Log.err("Incorrect data type for Copyright");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Save all components of Mbd Header
+     if exists mbdHeader, set the value directly
+     if not exists mbdHeader, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.mbdHeader == null) {
+                mbdHeader = MbdHeaderDocument.MbdHeader.Factory.newInstance();
+            }
+            if (this.mbdHeader.getBaseName() != null) {
+                this.mbdHeader.getBaseName().setStringValue(this.jTextFieldBaseName.getText());
+            } else {
+                BaseNameDocument.BaseName mBaseName = BaseNameDocument.BaseName.Factory.newInstance();
+                mBaseName.setStringValue(this.jTextFieldBaseName.getText());
+                this.mbdHeader.setBaseName(mBaseName);
+            }
+
+            if (this.mbdHeader.getGuid() != null) {
+                this.mbdHeader.getGuid().setStringValue(this.jTextFieldGuid.getText());
+            } else {
+                GuidDocument.Guid mGuid = GuidDocument.Guid.Factory.newInstance();
+                mGuid.setStringValue(this.jTextFieldGuid.getText());
+                this.mbdHeader.setGuid(mGuid);
+            }
+
+            this.mbdHeader.setVersion(this.jTextFieldVersion.getText());
+
+            if (this.mbdHeader.getLicense() != null) {
+                this.mbdHeader.getLicense().setStringValue(this.jTextAreaLicense.getText());
+            } else {
+                LicenseDocument.License mLicense = LicenseDocument.License.Factory.newInstance();
+                mLicense.setStringValue(this.jTextAreaLicense.getText());
+                this.mbdHeader.setLicense(mLicense);
+            }
+
+            this.mbdHeader.setCopyright(this.jTextAreaCopyright.getText());
+            this.mbdHeader.setDescription(this.jTextAreaDescription.getText());
+
+            if (this.mbdHeader.getCreated() == null) {
+                this.mbdHeader.setCreated(Tools.getCurrentDateTime());
+            } else {
+                this.mbdHeader.setModified(Tools.getCurrentDateTime());
+            }
+
+        } catch (Exception e) {
+            Log.err("Save Module Buid Description", e.getMessage());
+        }
+    }
+
+    /**
+     This method initializes module type and compontent type
+     
+     **/
+    private void initFrame() {
+
+    }
+
+    /**
+     Get MbdHeaderDocument.MbdHeader
+     
+     @return MbdHeaderDocument.MbdHeader mbdHeader
+     
+     **/
+    public MbdHeaderDocument.MbdHeader getMbdHeader() {
+        return mbdHeader;
+    }
+
+    /**
+     Set MbdHeaderDocument.MbdHeader
+     
+     @param mbdHeader The input MbdHeaderDocument.MbdHeader
+     
+     **/
+    public void setMbdHeader(MbdHeaderDocument.MbdHeader mbdHeader) {
+        this.mbdHeader = mbdHeader;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
new file mode 100644
index 0000000000..7f355c1e4d
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
@@ -0,0 +1,599 @@
+/** @file
+ 
+ The file is used to create, update MbdLibHeader of a MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.tianocore.BaseNameDocument;
+import org.tianocore.GuidDocument;
+import org.tianocore.LicenseDocument;
+import org.tianocore.MbdLibHeaderDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update MbdLibHeader of a MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class MbdLibHeader extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -4881447351274201866L;
+
+    //
+    //Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneCopyright = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private MbdLibHeaderDocument.MbdLibHeader mbdLibHeader = null;
+
+    /**
+     This method initializes jTextFieldBaseName 
+     
+     @return javax.swing.JTextField jTextFieldBaseName
+     
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion 
+     
+     @return javax.swing.JTextField jTextFieldVersion
+     
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense 
+     
+     @return javax.swing.JTextArea jTextAreaLicense
+     
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright 
+     
+     @return javax.swing.JTextArea jTextAreaCopyright
+     
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription 
+     
+     @return javax.swing.JTextArea jTextAreaDescription
+     
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 345, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 345, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPaneLicense 
+     
+     @return javax.swing.JScrollPane jScrollPaneLicense 
+     
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPaneCopyright 
+     
+     @return javax.swing.JScrollPane jScrollPaneCopyright
+     
+     **/
+    private JScrollPane getJScrollPaneCopyright() {
+        if (jScrollPaneCopyright == null) {
+            jScrollPaneCopyright = new JScrollPane();
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
+            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
+        }
+        return jScrollPaneCopyright;
+    }
+
+    /**
+     This method initializes jScrollPaneDescription 
+     
+     @return javax.swing.JScrollPane jScrollPaneDescription
+     
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+        }
+        return jScrollPaneDescription;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public MbdLibHeader() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inMbdLibHeader The input MbdLibHeaderDocument.MbdLibHeader
+     
+     **/
+    public MbdLibHeader(MbdLibHeaderDocument.MbdLibHeader inMbdLibHeader) {
+        super();
+        init(inMbdLibHeader);
+        this.setVisible(true);
+        this.setViewMode(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Module Build Description Header");
+        initFrame();
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inMbdLibHeader The input MbdLibHeaderDocument.MbdLibHeader
+     
+     **/
+    private void init(MbdLibHeaderDocument.MbdLibHeader inMbdLibHeader) {
+        init();
+        setMbdLibHeader(inMbdLibHeader);
+        if (inMbdLibHeader != null) {
+            if (this.mbdLibHeader.getBaseName() != null) {
+                this.jTextFieldBaseName.setText(this.mbdLibHeader.getBaseName().getStringValue());
+            }
+            if (this.mbdLibHeader.getGuid() != null) {
+                this.jTextFieldGuid.setText(this.mbdLibHeader.getGuid().getStringValue());
+            }
+            if (this.mbdLibHeader.getVersion() != null) {
+                this.jTextFieldVersion.setText(this.mbdLibHeader.getVersion());
+            }
+            if (this.mbdLibHeader.getLicense() != null) {
+                this.jTextAreaLicense.setText(this.mbdLibHeader.getLicense().getStringValue());
+            }
+            if (this.mbdLibHeader.getCopyright() != null) {
+                this.jTextAreaCopyright.setText(this.mbdLibHeader.getCopyright());
+            }
+            if (this.mbdLibHeader.getDescription() != null) {
+                this.jTextAreaDescription.setText(this.mbdLibHeader.getDescription());
+            }
+        }
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldBaseName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jTextFieldVersion.setEnabled(!isView);
+            this.jTextAreaLicense.setEnabled(!isView);
+            this.jTextAreaCopyright.setEnabled(!isView);
+            this.jTextAreaDescription.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Base Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneCopyright(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 170));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(0, 255));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.dispose();
+            this.save();
+            this.setEdited(true);
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+            this.setEdited(false);
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldBaseName.getText())) {
+            Log.err("Base Name couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldGuid.getText())) {
+            Log.err("Guid couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldVersion.getText())) {
+            Log.err("Version couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaLicense.getText())) {
+            Log.err("License couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaCopyright.getText())) {
+            Log.err("Copyright couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaDescription.getText())) {
+            Log.err("Description couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {
+            Log.err("Incorrect data type for Base Name");
+            return false;
+        }
+        if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+            Log.err("Incorrect data type for Copyright");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Save all components of Mbd Lib Header
+     if exists mbdLibHeader, set the value directly
+     if not exists mbdLibHeader, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.mbdLibHeader == null) {
+                mbdLibHeader = MbdLibHeaderDocument.MbdLibHeader.Factory.newInstance();
+            }
+            if (this.mbdLibHeader.getBaseName() != null) {
+                this.mbdLibHeader.getBaseName().setStringValue(this.jTextFieldBaseName.getText());
+            } else {
+                BaseNameDocument.BaseName mBaseName = BaseNameDocument.BaseName.Factory.newInstance();
+                mBaseName.setStringValue(this.jTextFieldBaseName.getText());
+                this.mbdLibHeader.setBaseName(mBaseName);
+            }
+
+            if (this.mbdLibHeader.getGuid() != null) {
+                this.mbdLibHeader.getGuid().setStringValue(this.jTextFieldGuid.getText());
+            } else {
+                GuidDocument.Guid mGuid = GuidDocument.Guid.Factory.newInstance();
+                mGuid.setStringValue(this.jTextFieldGuid.getText());
+                this.mbdLibHeader.setGuid(mGuid);
+            }
+
+            this.mbdLibHeader.setVersion(this.jTextFieldVersion.getText());
+
+            if (this.mbdLibHeader.getLicense() != null) {
+                this.mbdLibHeader.getLicense().setStringValue(this.jTextAreaLicense.getText());
+            } else {
+                LicenseDocument.License mLicense = LicenseDocument.License.Factory.newInstance();
+                mLicense.setStringValue(this.jTextAreaLicense.getText());
+                this.mbdLibHeader.setLicense(mLicense);
+            }
+
+            this.mbdLibHeader.setCopyright(this.jTextAreaCopyright.getText());
+            this.mbdLibHeader.setDescription(this.jTextAreaDescription.getText());
+
+            if (this.mbdLibHeader.getCreated() == null) {
+                this.mbdLibHeader.setCreated(Tools.getCurrentDateTime());
+            } else {
+                this.mbdLibHeader.setModified(Tools.getCurrentDateTime());
+            }
+        } catch (Exception e) {
+            Log.err("Save Module Buid Description", e.getMessage());
+        }
+    }
+
+    /**
+     This method initializes module type and compontent type
+     
+     **/
+    private void initFrame() {
+    }
+
+    /**
+     Get MbdLibHeaderDocument.MbdLibHeader
+     
+     @return MbdLibHeaderDocument.MbdLibHeader
+     
+     **/
+    public MbdLibHeaderDocument.MbdLibHeader getMbdLibHeader() {
+        return mbdLibHeader;
+    }
+
+    /**
+     Set MbdLibHeaderDocument.MbdLibHeader
+     
+     @param mbdLibHeader The input MbdLibHeaderDocument.MbdLibHeader
+     
+     **/
+    public void setMbdLibHeader(MbdLibHeaderDocument.MbdLibHeader mbdLibHeader) {
+        this.mbdLibHeader = mbdLibHeader;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibraries.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibraries.java
new file mode 100644
index 0000000000..ffbb3eb4ab
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibraries.java
@@ -0,0 +1,1048 @@
+/** @file
+ 
+ The file is used to create, update MbdLibraries of a MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.LibrariesDocument;
+import org.tianocore.LibraryUsage;
+import org.tianocore.SupportedArchitectures;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update MbdLibraries of a MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class MbdLibraries extends IInternalFrame implements ItemListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 8042998899875417568L;
+
+    //
+    //Define class members
+    //
+    private LibrariesDocument.Libraries libraries = null;
+
+    private int location = -1;
+    
+    private int intSelectedItemId = 0;
+
+    //
+    //1 - Add; 2 - Update
+    //
+    private int operation = -1;
+
+    private Vector<String> vName = new Vector<String>();
+
+    private Vector<String> vGuid = new Vector<String>();
+
+    private Vector<String> vLibraryClass = new Vector<String>();
+
+    private Vector<String> vClassGuid = new Vector<String>();
+
+    private Vector<String> vVersion = new Vector<String>();
+
+    private Vector<String> vUsage = new Vector<String>();
+
+    private Vector<String> vOverrideID = new Vector<String>();
+
+    private JPanel jContentPane = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelName = null;
+
+    private JTextField jTextFieldFileName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JComboBox jComboBoxArch = null;
+
+    private JLabel jLabelLibraryClass = null;
+
+    private JTextField jTextFieldLibraryClass = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JLabel jLabelClassGuid = null;
+
+    private JTextField jTextFieldClassGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private JComboBox jComboBoxFileList = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonUpdate = null;
+
+    private JCheckBox jCheckBoxArch = null;
+
+    private JButton jButtonGenerateGuid2 = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk 
+     
+     **/
+    private JButton getJButton() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 240, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     *This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 240, 90, 20));
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldFileName 
+     
+     @return javax.swing.JTextField jTextFieldFileName
+     
+     **/
+    private JTextField getJTextFieldSourceFilesDirectory() {
+        if (jTextFieldFileName == null) {
+            jTextFieldFileName = new JTextField();
+            jTextFieldFileName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldFileName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jComboBoxArch 
+     
+     @return javax.swing.JComboBox jComboBoxArch
+     
+     **/
+    private JComboBox getJComboBoxArch() {
+        if (jComboBoxArch == null) {
+            jComboBoxArch = new JComboBox();
+            jComboBoxArch.setBounds(new java.awt.Rectangle(140, 210, 340, 20));
+            jComboBoxArch.setEnabled(false);
+        }
+        return jComboBoxArch;
+    }
+
+    /**
+     This method initializes jTextFieldLibraryClass 
+     
+     @return javax.swing.JTextField jTextFieldLibraryClass
+     
+     **/
+    private JTextField getJTextFieldLibraryClass() {
+        if (jTextFieldLibraryClass == null) {
+            jTextFieldLibraryClass = new JTextField();
+            jTextFieldLibraryClass.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldLibraryClass;
+    }
+
+    /**
+     This method initializes jTextFieldClassGuid 
+     
+     @return javax.swing.JTextField jTextFieldClassGuid
+     
+     **/
+    private JTextField getJTextFieldClassGuid() {
+        if (jTextFieldClassGuid == null) {
+            jTextFieldClassGuid = new JTextField();
+            jTextFieldClassGuid.setBounds(new java.awt.Rectangle(160, 85, 250, 20));
+        }
+        return jTextFieldClassGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 50, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jComboBoxFileList 
+     
+     @return javax.swing.JComboBox jComboBoxFileList
+     
+     **/
+    private JComboBox getJComboBoxFileList() {
+        if (jComboBoxFileList == null) {
+            jComboBoxFileList = new JComboBox();
+            jComboBoxFileList.setBounds(new java.awt.Rectangle(15, 185, 210, 20));
+            jComboBoxFileList.addItemListener(this);
+            jComboBoxFileList.addActionListener(this);
+        }
+        return jComboBoxFileList;
+    }
+
+    /**
+     This method initializes jButtonAdd 
+     
+     @return javax.swing.JButton jButtonAdd 
+     
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 185, 80, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+     This method initializes jButtonRemove 
+     
+     @return javax.swing.JButton jButtonRemove
+     
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 185, 80, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+     This method initializes jButtonUpdate 
+     
+     @return javax.swing.JButton jButtonUpdate
+     
+     **/
+    private JButton getJButtonUpdate() {
+        if (jButtonUpdate == null) {
+            jButtonUpdate = new JButton();
+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 185, 80, 20));
+            jButtonUpdate.setText("Update");
+            jButtonUpdate.addActionListener(this);
+        }
+        return jButtonUpdate;
+    }
+
+    /**
+     This method initializes jCheckBoxArch 
+     
+     @return javax.swing.JCheckBox jCheckBoxArch
+     
+     **/
+    private JCheckBox getJCheckBoxArch() {
+        if (jCheckBoxArch == null) {
+            jCheckBoxArch = new JCheckBox();
+            jCheckBoxArch.setBounds(new java.awt.Rectangle(10, 210, 119, 20));
+            jCheckBoxArch.setText("Specific Arch");
+            jCheckBoxArch.addActionListener(this);
+        }
+        return jCheckBoxArch;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid2 
+     
+     @return javax.swing.JButton jButtonGenerateGuid2
+     
+     **/
+    private JButton getJButtonGenerateGuid2() {
+        if (jButtonGenerateGuid2 == null) {
+            jButtonGenerateGuid2 = new JButton();
+            jButtonGenerateGuid2.setBounds(new java.awt.Rectangle(415, 85, 65, 20));
+            jButtonGenerateGuid2.setText("GEN");
+            jButtonGenerateGuid2.addActionListener(this);
+        }
+        return jButtonGenerateGuid2;
+    }
+
+    /**
+     This method initializes jTextFieldVersion 
+     
+     @return javax.swing.JTextField jTextFieldVersion
+     
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public MbdLibraries() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inLibraries The input LibrariesDocument.Libraries
+     
+     **/
+    public MbdLibraries(LibrariesDocument.Libraries inLibraries) {
+        super();
+        init(inLibraries);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inLibraries The input LibrariesDocument.Libraries
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public MbdLibraries(LibrariesDocument.Libraries inLibraries, int type, int index) {
+        super();
+        init(inLibraries);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inLibraries The input LibrariesDocument.Libraries
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of operation type
+     
+     **/
+    public MbdLibraries(LibrariesDocument.Libraries inLibraries, int type, int index, int inOperation) {
+        super();
+        init(inLibraries, type, index, inOperation);
+        this.operation = inOperation;
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inLibraries LibrariesDocument.Libraries
+     
+     **/
+    private void init(LibrariesDocument.Libraries inLibraries) {
+        init();
+        this.setLibraries(inLibraries);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inLibraries LibrariesDocument.Libraries
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of operation type
+     
+     **/
+    private void init(LibrariesDocument.Libraries inLibraries, int type, int index, int inOperation) {
+        init(inLibraries);
+        this.location = index;
+        this.operation = inOperation;
+
+        if (operation == 2) {
+            this.jCheckBoxArch.setEnabled(false);
+            this.jComboBoxArch.setEnabled(false);
+
+            if (type == IDefaultMutableTreeNode.LIBRARIES_LIBRARY) {
+                if (this.libraries.getLibraryList().size() > 0) {
+                    for (int indexI = 0; indexI < this.libraries.getLibraryList().size(); indexI++) {
+                        if (this.libraries.getLibraryArray(indexI).getStringValue() != null) {
+                            vName.addElement(this.libraries.getLibraryArray(indexI).getStringValue());
+                        } else {
+                            vName.addElement("");
+                        }
+                        if (this.libraries.getLibraryArray(indexI).getGuid() != null) {
+                            vGuid.addElement(this.libraries.getLibraryArray(indexI).getGuid());
+                        } else {
+                            vGuid.addElement("");
+                        }
+                        if (this.libraries.getLibraryArray(indexI).getLibraryClass() != null) {
+                            vLibraryClass.addElement(this.libraries.getLibraryArray(indexI).getLibraryClass());
+                        } else {
+                            vLibraryClass.addElement("");
+                        }
+                        if (this.libraries.getLibraryArray(indexI).getClassGuid() != null) {
+                            vClassGuid.addElement(this.libraries.getLibraryArray(indexI).getClassGuid());
+                        } else {
+                            vClassGuid.addElement("");
+                        }
+                        if (this.libraries.getLibraryArray(indexI).getVersion() != null) {
+                            vVersion.addElement(this.libraries.getLibraryArray(indexI).getVersion());
+                        } else {
+                            vVersion.addElement("");
+                        }
+                        if (this.libraries.getLibraryArray(indexI).getUsage() != null) {
+                            vUsage.addElement(this.libraries.getLibraryArray(indexI).getUsage().toString());
+                        } else {
+                            vUsage.addElement("ALWAYS_CONSUMED");
+                        }
+                        vOverrideID.addElement(String.valueOf(this.libraries.getLibraryArray(indexI).getOverrideID()));
+                        jComboBoxFileList.addItem(this.libraries.getLibraryArray(indexI).getStringValue());
+                    }
+                }
+            }
+            if (type == IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM) {
+                this.jCheckBoxArch.setSelected(true);
+                this.jComboBoxArch.setSelectedItem(this.libraries.getArchArray(index).getArchType().toString());
+                for (int indexI = 0; indexI < this.libraries.getArchArray(index).getLibraryList().size(); indexI++) {
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getStringValue() != null) {
+                        vName.addElement(this.libraries.getArchArray(index).getLibraryArray(indexI).getStringValue());
+                    } else {
+                        vName.addElement("");
+                    }
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getGuid() != null) {
+                        vGuid.addElement(this.libraries.getArchArray(index).getLibraryArray(indexI).getGuid());
+                    } else {
+                        vGuid.addElement("");
+                    }
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getLibraryClass() != null) {
+                        vLibraryClass.addElement(this.libraries.getArchArray(index).getLibraryArray(indexI)
+                                                               .getLibraryClass());
+                    } else {
+                        vLibraryClass.addElement("");
+                    }
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getClassGuid() != null) {
+                        vClassGuid
+                                  .addElement(this.libraries.getArchArray(index).getLibraryArray(indexI).getClassGuid());
+                    } else {
+                        vClassGuid.addElement("");
+                    }
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getVersion() != null) {
+                        vVersion.addElement(this.libraries.getArchArray(index).getLibraryArray(indexI).getVersion());
+                    } else {
+                        vVersion.addElement("");
+                    }
+                    if (this.libraries.getArchArray(index).getLibraryArray(indexI).getUsage() != null) {
+                        vUsage.addElement(this.libraries.getArchArray(index).getLibraryArray(indexI).getUsage()
+                                                        .toString());
+                    } else {
+                        vUsage.addElement("");
+                    }
+                    vOverrideID.addElement(String.valueOf(this.libraries.getArchArray(index).getLibraryArray(indexI).getOverrideID()));
+                    jComboBoxFileList.addItem(this.libraries.getArchArray(index).getLibraryArray(indexI)
+                                                            .getStringValue());
+                }
+            }
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setName("JFrame");
+        this.setContentPane(getJContentPane());
+        this.setTitle("Source Files");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldFileName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jComboBoxArch.setEnabled(!isView);
+            this.jTextFieldLibraryClass.setEnabled(!isView);
+            this.jTextFieldClassGuid.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jButtonAdd.setEnabled(!isView);
+            this.jButtonRemove.setEnabled(!isView);
+            this.jButtonUpdate.setEnabled(!isView);
+            this.jCheckBoxArch.setEnabled(!isView);
+            this.jTextFieldVersion.setEnabled(!isView);
+
+            this.jButtonOk.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonGenerateGuid2.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelVersion = new JLabel();
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelVersion.setText("Version");
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelClassGuid = new JLabel();
+            jLabelClassGuid.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelClassGuid.setText("Class Guid");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelUsage.setText("Usage");
+            jLabelLibraryClass = new JLabel();
+            jLabelLibraryClass.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelLibraryClass.setText("Library Class");
+            jLabelGuid = new JLabel();
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelName = new JLabel();
+            jLabelName.setText("Name");
+            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelName, null);
+            jContentPane.add(getJTextFieldSourceFilesDirectory(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(getJComboBoxArch(), null);
+            jContentPane.add(jLabelLibraryClass, null);
+            jContentPane.add(getJTextFieldLibraryClass(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(jLabelClassGuid, null);
+            jContentPane.add(getJTextFieldClassGuid(), null);
+            jContentPane.add(getJButtonGenerateGuid2(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+            jContentPane.add(getJComboBoxUsage(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(getJComboBoxFileList(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonUpdate(), null);
+            jContentPane.add(getJCheckBoxArch(), null);
+
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+        if (arg0.getSource() == jButtonGenerateGuid2) {
+            jTextFieldClassGuid.setText(Tools.generateUuidString());
+        }
+        if (arg0.getSource() == jButtonAdd) {
+            if (!checkAdd()) {
+                return;
+            }
+            addToList();
+        }
+        if (arg0.getSource() == jButtonRemove) {
+            removeFromList();
+        }
+        if (arg0.getSource() == jButtonUpdate) {
+            if (!checkAdd()) {
+                return;
+            }
+            updateForList();
+        }
+        if (arg0.getSource() == jCheckBoxArch) {
+            if (this.jCheckBoxArch.isSelected()) {
+                this.jComboBoxArch.setEnabled(true);
+            } else {
+                this.jComboBoxArch.setEnabled(false);
+            }
+        }
+    }
+
+    /**
+     Init the items of Usage and Arch
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+        jComboBoxUsage.addItem("PRIVATE");
+
+        jComboBoxArch.addItem("ALL");
+        jComboBoxArch.addItem("EBC");
+        jComboBoxArch.addItem("ARM");
+        jComboBoxArch.addItem("IA32");
+        jComboBoxArch.addItem("X64");
+        jComboBoxArch.addItem("IPF");
+        jComboBoxArch.addItem("PPC");
+    }
+
+    /**
+     Add current item to Vector
+     
+     **/
+    private void addToList() {
+        intSelectedItemId = vName.size();
+        vName.addElement(this.jTextFieldFileName.getText());
+        vGuid.addElement(this.jTextFieldGuid.getText());
+        vLibraryClass.addElement(this.jTextFieldLibraryClass.getText());
+        vClassGuid.addElement(this.jTextFieldClassGuid.getText());
+        vVersion.addElement(this.jTextFieldVersion.getText());
+        vUsage.addElement(this.jComboBoxUsage.getSelectedItem().toString());
+        vOverrideID.addElement(this.jTextFieldOverrideID.getText());
+        jComboBoxFileList.addItem(this.jTextFieldFileName.getText());
+        jComboBoxFileList.setSelectedItem(this.jTextFieldFileName.getText());
+        
+        //
+        // Reset select item index
+        //
+        intSelectedItemId = vName.size();
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Remove current item from Vector
+     
+     **/
+    private void removeFromList() {
+        int intTempIndex = intSelectedItemId;
+        if (vName.size() < 1) {
+            return;
+        }
+        
+        jComboBoxFileList.removeItemAt(intSelectedItemId);
+        
+        vName.removeElementAt(intTempIndex);
+        vGuid.removeElementAt(intTempIndex);
+        vLibraryClass.removeElementAt(intTempIndex);
+        vClassGuid.removeElementAt(intTempIndex);
+        vVersion.removeElementAt(intTempIndex);
+        vUsage.removeElementAt(intTempIndex);
+        vOverrideID.removeElementAt(intTempIndex);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Update current item of Vector
+     
+     **/
+    private void updateForList() {
+        //
+        // Backup selected item index
+        //
+        int intTempIndex = intSelectedItemId;
+        vName.setElementAt(this.jTextFieldFileName.getText(), intSelectedItemId);
+        vGuid.setElementAt(this.jTextFieldGuid.getText(), intSelectedItemId);
+        vLibraryClass.setElementAt(this.jTextFieldLibraryClass.getText(), intSelectedItemId);
+        vClassGuid.setElementAt(this.jTextFieldClassGuid.getText(), intSelectedItemId);
+        vVersion.setElementAt(this.jTextFieldVersion.getText(), intSelectedItemId);
+        vUsage.setElementAt(this.jComboBoxUsage.getSelectedItem().toString(), intSelectedItemId);
+        vOverrideID.setElementAt(this.jTextFieldOverrideID.getText(), intSelectedItemId);
+        
+        jComboBoxFileList.removeAllItems();
+        for (int index = 0; index < vName.size(); index++) {
+            jComboBoxFileList.addItem(vName.elementAt(index));
+        }
+        
+        //
+        // Restore selected item index
+        //
+        intSelectedItemId = intTempIndex;
+        
+        //
+        // Reset select item index
+        //
+        jComboBoxFileList.setSelectedIndex(intSelectedItemId);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Refresh all fields' values of selected item of Vector
+     
+     **/
+    private void reloadFromList() {
+        if (vName.size() > 0) {
+            //
+            // Get selected item index
+            //
+            intSelectedItemId = jComboBoxFileList.getSelectedIndex();
+            
+            this.jTextFieldFileName.setText(vName.elementAt(intSelectedItemId).toString());
+            this.jComboBoxUsage.setSelectedItem(vUsage.elementAt(intSelectedItemId).toString());
+            this.jTextFieldGuid.setText(vGuid.elementAt(intSelectedItemId).toString());
+            this.jTextFieldLibraryClass.setText(vLibraryClass.elementAt(intSelectedItemId).toString());
+            this.jTextFieldClassGuid.setText(vClassGuid.elementAt(intSelectedItemId).toString());
+            this.jTextFieldVersion.setText(vVersion.elementAt(intSelectedItemId).toString());
+            this.jTextFieldOverrideID.setText(vOverrideID.elementAt(intSelectedItemId).toString());
+        } else {
+            this.jTextFieldFileName.setText("");
+            this.jComboBoxUsage.setSelectedIndex(0);
+            this.jTextFieldGuid.setText("");
+            this.jTextFieldLibraryClass.setText("");
+            this.jTextFieldClassGuid.setText("");
+            this.jTextFieldVersion.setText("");
+            this.jTextFieldOverrideID.setText("");
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
+     *
+     * Reflesh the frame when selected item changed 
+     */
+    public void itemStateChanged(ItemEvent arg0) {
+        if (arg0.getStateChange() == ItemEvent.SELECTED) {
+            reloadFromList();
+        }
+    }
+
+    /**
+     Data validation for all fields before save
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        if (this.jComboBoxFileList.getItemCount() < 1) {
+            Log.err("Must have one Library at least!");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Data validation for all fields before add current item to Vector
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean checkAdd() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldFileName.getText())) {
+            Log.err("File Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isBaseName(this.jTextFieldFileName.getText())) {
+            Log.err("Incorrect data type for Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldLibraryClass.getText())
+            && !DataValidation.isPath(this.jTextFieldLibraryClass.getText())) {
+            Log.err("Incorrect data type for Path");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldClassGuid.getText()) && !DataValidation.isGuid(this.jTextFieldClassGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Mbd Libraries
+     if exists libraries, set the value directly
+     if not exists libraries, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.libraries == null) {
+                libraries = LibrariesDocument.Libraries.Factory.newInstance();
+            }
+            //
+            //Save as file name
+            //
+            if (!this.jCheckBoxArch.isSelected()) {
+                if (this.operation == 2) { //Add new filename
+                    //
+                    //First remove all existed filename
+                    //
+                    if (libraries.getLibraryList().size() > 0) {
+                        for (int index = libraries.getLibraryList().size() - 1; index >= 0; index--) {
+                            libraries.removeLibrary(index);
+                        }
+                    }
+                }
+                LibrariesDocument.Libraries.Library library = LibrariesDocument.Libraries.Library.Factory.newInstance();
+                for (int index = 0; index < vName.size(); index++) {
+                    if (!isEmpty(vName.elementAt(index).toString())) {
+                        library.setStringValue(vName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vGuid.elementAt(index).toString())) {
+                        library.setGuid(vGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vLibraryClass.elementAt(index).toString())) {
+                        library.setLibraryClass(vLibraryClass.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vClassGuid.elementAt(index).toString())) {
+                        library.setClassGuid(vClassGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vVersion.elementAt(index).toString())) {
+                        library.setVersion(vVersion.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vUsage.elementAt(index).toString())) {
+                        library.setUsage(LibraryUsage.Enum.forString(vUsage.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vOverrideID.elementAt(index).toString())) {
+                        library.setOverrideID(Integer.parseInt(vOverrideID.elementAt(index).toString()));
+                    }
+                    libraries.addNewLibrary();
+                    libraries.setLibraryArray(libraries.getLibraryList().size() - 1, library);
+                }
+            }
+            //
+            //Save as Arch
+            //
+            if (this.jCheckBoxArch.isSelected()) {
+                LibrariesDocument.Libraries.Arch arch = LibrariesDocument.Libraries.Arch.Factory.newInstance();
+                if (this.operation == 2) {
+                    //First remove all existed filename
+                    for (int index = libraries.getArchArray(location).getLibraryList().size() - 1; index >= 0; index--) {
+                        libraries.getArchArray(location).removeLibrary(index);
+                    }
+                }
+                for (int index = 0; index < vName.size(); index++) {
+                    LibrariesDocument.Libraries.Arch.Library library = LibrariesDocument.Libraries.Arch.Library.Factory.newInstance();
+                    if (!isEmpty(vName.elementAt(index).toString())) {
+                        library.setStringValue(vName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vGuid.elementAt(index).toString())) {
+                        library.setGuid(vGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vLibraryClass.elementAt(index).toString())) {
+                        library.setLibraryClass(vLibraryClass.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vClassGuid.elementAt(index).toString())) {
+                        library.setClassGuid(vClassGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vVersion.elementAt(index).toString())) {
+                        library.setVersion(vVersion.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vUsage.elementAt(index).toString())) {
+                        library.setUsage(LibraryUsage.Enum.forString(vUsage.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vOverrideID.elementAt(index).toString())) {
+                        library.setOverrideID(Integer.parseInt(vOverrideID.elementAt(index).toString()));
+                    }
+                    arch.addNewLibrary();
+                    arch.setLibraryArray(arch.getLibraryList().size() - 1, library);
+                }
+                arch
+                    .setArchType(SupportedArchitectures.Enum.forString(this.jComboBoxArch.getSelectedItem().toString()));
+                if (location > -1) {
+                    libraries.setArchArray(location, arch);
+                } else {
+                    libraries.addNewArch();
+                    libraries.setArchArray(libraries.getArchList().size() - 1, arch);
+                }
+            }
+        } catch (Exception e) {
+            Log.err("Update Source Files", e.getMessage());
+        }
+    }
+
+    /**
+     Get LibrariesDocument.Libraries
+     
+     @return LibrariesDocument.Libraries
+     
+     **/
+    public LibrariesDocument.Libraries getLibraries() {
+        return libraries;
+    }
+
+    /**
+     Set LibrariesDocument.Libraries
+     
+     @param libraries The input LibrariesDocument.Libraries
+     
+     **/
+    public void setLibraries(LibrariesDocument.Libraries libraries) {
+        this.libraries = libraries;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleAbout.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleAbout.java
new file mode 100644
index 0000000000..eb217f5f0a
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleAbout.java
@@ -0,0 +1,146 @@
+/** @file
+ 
+ To show a about window with copyright information
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import org.tianocore.packaging.common.ui.IDialog;
+
+/**
+ The class is used to show a about window with copyright information
+ It extends IDialog
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleAbout extends IDialog {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 2958136136667310962L;
+
+    //
+    //Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabel = null;
+
+    private JLabel jLabel1 = null;
+
+    private JLabel jLabel2 = null;
+
+    private JButton jButtonOK = null;
+
+    /**
+     This method initializes jButtonOK 
+     
+     @return javax.swing.JButton jButtonOK
+     
+     **/
+    private JButton getJButtonOK() {
+        if (jButtonOK == null) {
+            jButtonOK = new JButton();
+            jButtonOK.setBounds(new java.awt.Rectangle(105, 120, 90, 20));
+            jButtonOK.setText("OK");
+            jButtonOK.addActionListener(this);
+        }
+        return jButtonOK;
+    }
+
+    public static void main(String[] args) {
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleAbout() {
+        super();
+        init();
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(300, 200);
+        this.setContentPane(getJContentPane());
+        this.setTitle("About...");
+        this.getRootPane().setDefaultButton(jButtonOK);
+        this.centerWindow();
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel2 = new JLabel();
+            jLabel2.setBounds(new java.awt.Rectangle(15, 80, 270, 20));
+            jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+            jLabel2.setText("All rights reserved");
+            jLabel1 = new JLabel();
+            jLabel1.setBounds(new java.awt.Rectangle(15, 50, 270, 20));
+            jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+            jLabel1.setText("Copyright (c) 2006, Intel Corporation");
+            jLabel = new JLabel();
+            jLabel.setToolTipText("");
+            jLabel.setBounds(new java.awt.Rectangle(15, 20, 270, 20));
+            jLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+            jLabel.setText("Framework Development Package System 1.0");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(jLabel1, null);
+            jContentPane.add(jLabel2, null);
+            jContentPane.add(getJButtonOK(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     * 
+     * Override actionPerformed to listen all actions
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOK) {
+            this.dispose();
+        }
+    }
+
+    /**
+     Dispose when windows is closing
+     
+     @param arg0
+     
+     **/
+    public void windowClosing(WindowEvent arg0) {
+        this.dispose();
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java
new file mode 100644
index 0000000000..1acfa821e7
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java
@@ -0,0 +1,456 @@
+/** @file
+ 
+ The file is used to create, update BootModes of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.BootModeNames;
+import org.tianocore.BootModeUsage;
+import org.tianocore.BootModesDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update BootModes of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleBootModes extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -3888558623432442561L;
+
+    //
+    //Define class members
+    //
+    private BootModesDocument.BootModes bootModes = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelBootModeName = null;
+
+    private JComboBox jComboBoxBootModeName = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid 
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jComboBoxBootModeName 
+     
+     @return javax.swing.JComboBox jComboBoxBootModeName
+     
+     **/
+    private JComboBox getJComboBoxBootModeName() {
+        if (jComboBoxBootModeName == null) {
+            jComboBoxBootModeName = new JComboBox();
+            jComboBoxBootModeName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jComboBoxBootModeName;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(280, 115, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 115, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    public static void main(String[] args) {
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleBootModes() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inBootModes The input BootModesDocument.BootModes
+     
+     **/
+    public ModuleBootModes(BootModesDocument.BootModes inBootModes) {
+        super();
+        init(inBootModes);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inBootModes The input BootModesDocument.BootModes
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleBootModes(BootModesDocument.BootModes inBootModes, int type, int index) {
+        super();
+        init(inBootModes, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+
+     @param inBootModes BootModesDocument.BootModes
+     
+     **/
+    private void init(BootModesDocument.BootModes inBootModes) {
+        init();
+        this.setBootModes(inBootModes);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inBootModes The input BootModesDocument.BootModes
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(BootModesDocument.BootModes inBootModes, int type, int index) {
+        init(inBootModes);
+        this.location = index;
+        if (this.bootModes.getBootModeList().size() > 0) {
+            if (this.bootModes.getBootModeArray(index).getBootModeName() != null) {
+                this.jComboBoxBootModeName.setSelectedItem(this.bootModes.getBootModeArray(index).getBootModeName()
+                                                                         .toString());
+            }
+            if (this.bootModes.getBootModeArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.bootModes.getBootModeArray(index).getGuid());
+            }
+            if (this.bootModes.getBootModeArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.bootModes.getBootModeArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.bootModes.getBootModeArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     * This method initializes this
+     * 
+     * @return void
+     */
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Boot Mode");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 515));
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jComboBoxBootModeName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelBootModeName = new JLabel();
+            jLabelBootModeName.setText("Boot Mode Name");
+            jLabelBootModeName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelBootModeName, null);
+            jContentPane.add(getJComboBoxBootModeName(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes BootModeName groups and Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+
+        jComboBoxBootModeName.addItem("FULL");
+        jComboBoxBootModeName.addItem("MINIMAL");
+        jComboBoxBootModeName.addItem("NO_CHANGE");
+        jComboBoxBootModeName.addItem("DIAGNOSTICS");
+        jComboBoxBootModeName.addItem("DEFAULT");
+        jComboBoxBootModeName.addItem("S2_RESUME");
+        jComboBoxBootModeName.addItem("S3_RESUME");
+        jComboBoxBootModeName.addItem("S4_RESUME");
+        jComboBoxBootModeName.addItem("S5_RESUME");
+        jComboBoxBootModeName.addItem("FLASH_UPDATE");
+        jComboBoxBootModeName.addItem("RECOVERY");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Get BootModesDocument.BootModes
+     
+     @return BootModesDocument.BootModes
+     
+     **/
+    public BootModesDocument.BootModes getBootModes() {
+        return bootModes;
+    }
+
+    /**
+     Set BootModesDocument.BootModes
+     
+     @param bootModes BootModesDocument.BootModes
+     
+     **/
+    public void setBootModes(BootModesDocument.BootModes bootModes) {
+        this.bootModes = bootModes;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Mbd Header
+     if exists bootModes, set the value directly
+     if not exists bootModes, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.bootModes == null) {
+                bootModes = BootModesDocument.BootModes.Factory.newInstance();
+            }
+            BootModesDocument.BootModes.BootMode bootMode = BootModesDocument.BootModes.BootMode.Factory.newInstance();
+            bootMode.setBootModeName(BootModeNames.Enum.forString(jComboBoxBootModeName.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldGuid.getText())) {
+                bootMode.setGuid(this.jTextFieldGuid.getText());
+            }
+            bootMode.setUsage(BootModeUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                bootMode.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                bootModes.setBootModeArray(location, bootMode);
+            } else {
+                bootModes.addNewBootMode();
+                bootModes.setBootModeArray(bootModes.getBootModeList().size() - 1, bootMode);
+            }
+        } catch (Exception e) {
+            Log.err("Update Boot Modes", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java
new file mode 100644
index 0000000000..1d8e88c061
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java
@@ -0,0 +1,457 @@
+/** @file
+ 
+ The file is used to create, update DataHub of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.DataHubUsage;
+import org.tianocore.DataHubsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update DataHub of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleDataHubs extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -3667906991966638892L;
+
+    //
+    //Define class members
+    //
+    private DataHubsDocument.DataHubs dataHubs = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelDataHubRecord = null;
+
+    private JTextField jTextFieldDataHubRecord = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(280, 115, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 115, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldDataHubRecord 
+     
+     @return javax.swing.JTextField jTextFieldDataHubRecord
+     
+     **/
+    private JTextField getJTextFieldDataHubRecord() {
+        if (jTextFieldDataHubRecord == null) {
+            jTextFieldDataHubRecord = new JTextField();
+            jTextFieldDataHubRecord.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldDataHubRecord;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleDataHubs() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inDataHubs The input DataHubsDocument.DataHubs
+     
+     **/
+    public ModuleDataHubs(DataHubsDocument.DataHubs inDataHubs) {
+        super();
+        init(inDataHubs);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inDataHubs DataHubsDocument.DataHubs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleDataHubs(DataHubsDocument.DataHubs inDataHubs, int type, int index) {
+        super();
+        init(inDataHubs, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inDataHubs The input DataHubsDocument.DataHubs
+     
+     **/
+    private void init(DataHubsDocument.DataHubs inDataHubs) {
+        init();
+        this.setDataHubs(inDataHubs);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inDataHubs The input DataHubsDocument.DataHubs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(DataHubsDocument.DataHubs inDataHubs, int type, int index) {
+        init(inDataHubs);
+        this.location = index;
+        if (this.dataHubs.getDataHubRecordList().size() > 0) {
+            if (this.dataHubs.getDataHubRecordArray(index).getStringValue() != null) {
+                this.jTextFieldDataHubRecord.setText(this.dataHubs.getDataHubRecordArray(index).getStringValue()
+                                                                  .toString());
+            }
+            if (this.dataHubs.getDataHubRecordArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.dataHubs.getDataHubRecordArray(index).getGuid());
+            }
+            if (this.dataHubs.getDataHubRecordArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.dataHubs.getDataHubRecordArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID
+                                     .setText(String
+                                                    .valueOf(this.dataHubs.getDataHubRecordArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldDataHubRecord.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Data Hubs");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelDataHubRecord = new JLabel();
+            jLabelDataHubRecord.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelDataHubRecord.setText("Data Hub Record");
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelDataHubRecord, null);
+            jContentPane.add(getJTextFieldDataHubRecord(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Get DataHubsDocument.DataHubs
+     
+     @return DataHubsDocument.DataHubs
+     
+     **/
+    public DataHubsDocument.DataHubs getDataHubs() {
+        return dataHubs;
+    }
+
+    /**
+     Set DataHubsDocument.DataHubs
+     
+     @param dataHubs DataHubsDocument.DataHubs
+     
+     **/
+    public void setDataHubs(DataHubsDocument.DataHubs dataHubs) {
+        this.dataHubs = dataHubs;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldDataHubRecord.getText())) {
+            Log.err("Data Hub Record couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of DataHubs
+     if exists dataHubs, set the value directly
+     if not exists dataHubs, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.dataHubs == null) {
+                dataHubs = DataHubsDocument.DataHubs.Factory.newInstance();
+            }
+            DataHubsDocument.DataHubs.DataHubRecord dataHubRecord = DataHubsDocument.DataHubs.DataHubRecord.Factory
+                                                                                                                   .newInstance();
+            if (!isEmpty(this.jTextFieldDataHubRecord.getText())) {
+                dataHubRecord.setStringValue(this.jTextFieldDataHubRecord.getText());
+            }
+            if (!isEmpty(this.jTextFieldGuid.getText())) {
+                dataHubRecord.setGuid(this.jTextFieldGuid.getText());
+            }
+            dataHubRecord.setUsage(DataHubUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                dataHubRecord.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                dataHubs.setDataHubRecordArray(location, dataHubRecord);
+            } else {
+                dataHubs.addNewDataHubRecord();
+                dataHubs.setDataHubRecordArray(dataHubs.getDataHubRecordList().size() - 1, dataHubRecord);
+            }
+        } catch (Exception e) {
+            Log.err("Update Data Hubs", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java
new file mode 100644
index 0000000000..abc3653d29
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java
@@ -0,0 +1,626 @@
+/** @file
+ 
+ The file is used to create, update Event of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.tianocore.EventTypes;
+import org.tianocore.EventUsage;
+import org.tianocore.EventsDocument;
+import org.tianocore.GuidDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Event of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleEvents extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -4396143706422842331L;
+
+    //
+    //Define class members
+    //
+    private EventsDocument.Events events = null;
+
+    private EventsDocument.Events.CreateEvents createEvent = null;
+
+    private EventsDocument.Events.SignalEvents signalEvent = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelEventType = null;
+
+    private JRadioButton jRadioButtonEventCreate = null;
+
+    private JRadioButton jRadioButtonEventSignal = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelEventGroup = null;
+
+    private JComboBox jComboBoxEventGroup = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    /**
+     This method initializes jRadioButtonEnentType 
+     
+     @return javax.swing.JRadioButton jRadioButtonEventCreate
+     
+     **/
+    private JRadioButton getJRadioButtonEventCreate() {
+        if (jRadioButtonEventCreate == null) {
+            jRadioButtonEventCreate = new JRadioButton();
+            jRadioButtonEventCreate.setText("Create");
+            jRadioButtonEventCreate.setBounds(new java.awt.Rectangle(160, 10, 90, 20));
+            jRadioButtonEventCreate.addActionListener(this);
+            jRadioButtonEventCreate.setSelected(true);
+        }
+        return jRadioButtonEventCreate;
+    }
+
+    /**
+     This method initializes jRadioButtonEventSignal 
+     
+     @return javax.swing.JRadioButton jRadioButtonEventSignal
+     
+     **/
+    private JRadioButton getJRadioButtonEventSignal() {
+        if (jRadioButtonEventSignal == null) {
+            jRadioButtonEventSignal = new JRadioButton();
+            jRadioButtonEventSignal.setText("Signal");
+            jRadioButtonEventSignal.setBounds(new java.awt.Rectangle(320, 10, 90, 20));
+            jRadioButtonEventSignal.addActionListener(this);
+        }
+        return jRadioButtonEventSignal;
+    }
+
+    /**
+     This method initializes jTextFieldC_Name 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jComboBoxEventGroup 
+     
+     @return javax.swing.JComboBox jComboBoxEventGroup
+     
+     **/
+    private JComboBox getJComboBoxEventGroup() {
+        if (jComboBoxEventGroup == null) {
+            jComboBoxEventGroup = new JComboBox();
+            jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jComboBoxEventGroup;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButton() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 165, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 165, 90, 20));
+            jButtonCancel.setPreferredSize(new Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleEvents() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inEvents The input EventsDocument.Events
+     
+     **/
+    public ModuleEvents(EventsDocument.Events inEvents) {
+        super();
+        init(inEvents);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inEvents The input EventsDocument.Events
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleEvents(EventsDocument.Events inEvents, int type, int index) {
+        super();
+        init(inEvents, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inEvents The input EventsDocument.Events
+     
+     **/
+    private void init(EventsDocument.Events inEvents) {
+        init();
+        this.setEvents(inEvents);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inEvents EventsDocument.Events
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(EventsDocument.Events inEvents, int type, int index) {
+        init(inEvents);
+        this.location = index;
+        if (type == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM) {
+            this.jRadioButtonEventCreate.setSelected(true);
+            this.jRadioButtonEventSignal.setSelected(false);
+            if (this.events.getCreateEvents().getEventArray(index).getCName() != null) {
+                this.jTextFieldC_Name.setText(this.events.getCreateEvents().getEventArray(index).getCName());
+            }
+            if (this.events.getCreateEvents().getEventArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.events.getCreateEvents().getEventArray(index).getGuid()
+                                                       .getStringValue());
+            }
+            if (this.events.getCreateEvents().getEventArray(index).getEventGroup() != null) {
+                this.jComboBoxEventGroup.setSelectedItem(this.events.getCreateEvents().getEventArray(index)
+                                                                    .getEventGroup().toString());
+            }
+            if (this.events.getCreateEvents().getEventArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.events.getCreateEvents().getEventArray(index).getUsage()
+                                                               .toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.events.getCreateEvents().getEventArray(index)
+                                                                        .getOverrideID()));
+        } else if (type == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM) {
+            this.jRadioButtonEventCreate.setSelected(false);
+            this.jRadioButtonEventSignal.setSelected(true);
+            this.jComboBoxUsage.setEnabled(false);
+            if (this.events.getSignalEvents().getEventArray(index).getCName() != null) {
+                this.jTextFieldC_Name.setText(this.events.getSignalEvents().getEventArray(index).getCName());
+            }
+            if (this.events.getSignalEvents().getEventArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.events.getSignalEvents().getEventArray(index).getGuid().toString());
+            }
+            if (this.events.getSignalEvents().getEventArray(index).getEventGroup() != null) {
+                this.jComboBoxEventGroup.setSelectedItem(this.events.getSignalEvents().getEventArray(index)
+                                                                    .getEventGroup().toString());
+            }
+            if (this.events.getSignalEvents().getEventArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.events.getSignalEvents().getEventArray(index).getUsage()
+                                                               .toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.events.getSignalEvents().getEventArray(index)
+                                                                        .getOverrideID()));
+        }
+        this.jRadioButtonEventCreate.setEnabled(false);
+        this.jRadioButtonEventSignal.setEnabled(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Events");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jRadioButtonEventCreate.setEnabled(!isView);
+            this.jRadioButtonEventSignal.setEnabled(!isView);
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxEventGroup.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelEventGroup = new JLabel();
+            jLabelEventGroup.setText("Event Group");
+            jLabelEventGroup.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelEventType = new JLabel();
+            jLabelEventType.setText("Event Type");
+            jLabelEventType.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelEventType, null);
+            jContentPane.add(getJRadioButtonEventCreate(), null);
+            jContentPane.add(getJRadioButtonEventSignal(), null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelEventGroup, null);
+            jContentPane.add(getJComboBoxEventGroup(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setBounds(new java.awt.Rectangle(0, 10, 10, 20));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setBounds(new java.awt.Rectangle(0, 35, 10, 20));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes events groups and usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxEventGroup.addItem("EVENT_GROUP_EXIT_BOOT_SERVICES");
+        jComboBoxEventGroup.addItem("EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE");
+        jComboBoxEventGroup.addItem("EVENT_GROUP_MEMORY_MAP_CHANGE");
+        jComboBoxEventGroup.addItem("EVENT_GROUP_READY_TO_BOOT");
+        jComboBoxEventGroup.addItem("EVENT_GROUP_LEGACY_BOOT");
+
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jRadioButtonEventCreate) {
+            if (jRadioButtonEventCreate.isSelected()) {
+                jRadioButtonEventSignal.setSelected(false);
+            }
+            if (!jRadioButtonEventSignal.isSelected() && !jRadioButtonEventCreate.isSelected()) {
+                jRadioButtonEventCreate.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonEventSignal) {
+            if (jRadioButtonEventSignal.isSelected()) {
+                jRadioButtonEventCreate.setSelected(false);
+            }
+            if (!jRadioButtonEventSignal.isSelected() && !jRadioButtonEventCreate.isSelected()) {
+                jRadioButtonEventSignal.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    public EventsDocument.Events getEvents() {
+        return events;
+    }
+
+    public void setEvents(EventsDocument.Events events) {
+        this.events = events;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldC_Name.getText())) {
+            Log.err("C_Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Events
+     if exists events, set the value directly
+     if not exists events, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.events == null) {
+                events = EventsDocument.Events.Factory.newInstance();
+                createEvent = EventsDocument.Events.CreateEvents.Factory.newInstance();
+                signalEvent = EventsDocument.Events.SignalEvents.Factory.newInstance();
+            } else {
+                if (events.getCreateEvents() != null) {
+                    createEvent = events.getCreateEvents();
+                } else {
+                    createEvent = EventsDocument.Events.CreateEvents.Factory.newInstance();
+                }
+                if (events.getSignalEvents() != null) {
+                    signalEvent = events.getSignalEvents();
+                } else {
+                    signalEvent = EventsDocument.Events.SignalEvents.Factory.newInstance();
+                }
+
+            }
+            if (this.jRadioButtonEventCreate.isSelected()) {
+                EventsDocument.Events.CreateEvents.Event event = EventsDocument.Events.CreateEvents.Event.Factory
+                                                                                                                 .newInstance();
+                event.setCName(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    GuidDocument.Guid guid = GuidDocument.Guid.Factory.newInstance();
+                    guid.setStringValue(this.jTextFieldGuid.getText());
+                    event.setGuid(guid);
+                }
+                event.setEventGroup(EventTypes.Enum.forString(jComboBoxEventGroup.getSelectedItem().toString()));
+                event.setUsage(EventUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    event.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    createEvent.setEventArray(location, event);
+                } else {
+                    createEvent.addNewEvent();
+                    createEvent.setEventArray(createEvent.getEventList().size() - 1, event);
+                }
+                events.setCreateEvents(createEvent);
+            }
+            if (this.jRadioButtonEventSignal.isSelected()) {
+                EventsDocument.Events.SignalEvents.Event event = EventsDocument.Events.SignalEvents.Event.Factory
+                                                                                                                 .newInstance();
+                event.setCName(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    GuidDocument.Guid guid = GuidDocument.Guid.Factory.newInstance();
+                    guid.setStringValue(this.jTextFieldGuid.getText());
+                    event.setGuid(guid);
+                }
+                event.setEventGroup(EventTypes.Enum.forString(jComboBoxEventGroup.getSelectedItem().toString()));
+                event.setUsage(EventUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    event.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    signalEvent.setEventArray(location, event);
+                } else {
+                    signalEvent.addNewEvent();
+                    signalEvent.setEventArray(signalEvent.getEventList().size() - 1, event);
+                }
+                events.setSignalEvents(signalEvent);
+            }
+        } catch (Exception e) {
+            Log.err("Update Events", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java
new file mode 100644
index 0000000000..ad466eb621
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java
@@ -0,0 +1,1030 @@
+/** @file
+ 
+ The file is used to create, update DataHub of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.ExternUsage;
+import org.tianocore.ExternsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IComboBox;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+
+/**
+ The class is used to create, update DataHub of MSA/MBD file 
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleExterns extends IInternalFrame implements ItemListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -7382008402932047191L;
+
+    //
+    //Define class members
+    //
+    private ExternsDocument.Externs externs = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelName = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private JPanel jPanelType1 = null;
+
+    private JLabel jLabelModuleEntryPoint = null;
+
+    private JLabel jLabelModuleUnloadImage = null;
+
+    private IComboBox iComboBoxModuleEntryPoint = null;
+
+    private IComboBox iComboBoxModuleUnloadImage = null;
+
+    private JPanel jPanelType2 = null;
+
+    private JLabel jLabelConstructor = null;
+
+    private JTextField jTextFieldConstructor = null;
+
+    private JLabel jLabelDestructor = null;
+
+    private JTextField jTextFieldDestructor = null;
+
+    private JComboBox jComboBoxType = null;
+
+    private JPanel jPanelType3 = null;
+
+    private JLabel jLabelDriverBinding = null;
+
+    private JLabel jLabelComponentName = null;
+
+    private IComboBox iComboBoxComponentName = null;
+
+    private IComboBox iComboBoxDriverBinding = null;
+
+    private JLabel jLabelDriverConfig = null;
+
+    private JLabel jLabelDriverDiag = null;
+
+    private IComboBox iComboBoxDriverDiag = null;
+
+    private IComboBox iComboBoxDriverConfig = null;
+
+    private JPanel jPanelType4 = null;
+
+    private JLabel jLabelSetVirtualAddressMapCallBack = null;
+
+    private IComboBox iComboBoxSetVirtualAddressMapCallBack = null;
+
+    private JLabel jLabelExitBootServicesCallBack = null;
+
+    private IComboBox iComboBoxExitBootServicesCallBack = null;
+
+    private JPanel jPanelType5 = null;
+
+    private JLabel jLabelUserDefined = null;
+
+    private IComboBox iComboBoxUserDefined = null;
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setLocation(new java.awt.Point(290, 215));
+            jButtonOk.setSize(new java.awt.Dimension(90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setLocation(new java.awt.Point(390, 215));
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    /**
+     This method initializes jPanelType1 
+     
+     @return javax.swing.JPanel jPanelType1
+     
+     **/
+    private JPanel getJPanelType1() {
+        if (jPanelType1 == null) {
+            jLabelModuleUnloadImage = new JLabel();
+            jLabelModuleUnloadImage.setBounds(new java.awt.Rectangle(15, 30, 140, 20));
+            jLabelModuleUnloadImage.setText("Module Unload Image");
+            jLabelModuleEntryPoint = new JLabel();
+            jLabelModuleEntryPoint.setBounds(new java.awt.Rectangle(15, 5, 140, 20));
+            jLabelModuleEntryPoint.setText("Module Entry Point");
+            jPanelType1 = new JPanel();
+            jPanelType1.setLayout(null);
+            jPanelType1.setBounds(new java.awt.Rectangle(0, 105, 490, 55));
+            jPanelType1.add(jLabelModuleEntryPoint, null);
+            jPanelType1.add(jLabelModuleUnloadImage, null);
+            jPanelType1.add(getIComboBoxModuleUnloadImage(), null);
+            jPanelType1.add(getIComboBoxModuleEntryPoint(), null);
+        }
+        return jPanelType1;
+    }
+
+    /**
+     This method initializes jComboBoxModuleEntryPoint 
+     
+     @return javax.swing.JComboBox iComboBoxModuleEntryPoint
+     
+     **/
+    private IComboBox getIComboBoxModuleEntryPoint() {
+        if (iComboBoxModuleEntryPoint == null) {
+            iComboBoxModuleEntryPoint = new IComboBox();
+            iComboBoxModuleEntryPoint.setBounds(new java.awt.Rectangle(160, 5, 320, 20));
+        }
+        return iComboBoxModuleEntryPoint;
+    }
+
+    /**
+     This method initializes jComboBoxModuleUnloadImage 
+     
+     @return javax.swing.JComboBox iComboBoxModuleUnloadImage
+     
+     **/
+    private IComboBox getIComboBoxModuleUnloadImage() {
+        if (iComboBoxModuleUnloadImage == null) {
+            iComboBoxModuleUnloadImage = new IComboBox();
+            iComboBoxModuleUnloadImage.setBounds(new java.awt.Rectangle(160, 30, 320, 20));
+        }
+        return iComboBoxModuleUnloadImage;
+    }
+
+    /**
+     This method initializes jPanelType2 
+     
+     @return javax.swing.JPanel jPanelType2
+     
+     **/
+    private JPanel getJPanelType2() {
+        if (jPanelType2 == null) {
+            jLabelDestructor = new JLabel();
+            jLabelDestructor.setBounds(new java.awt.Rectangle(15, 30, 140, 20));
+            jLabelDestructor.setText("Destructor");
+            jLabelConstructor = new JLabel();
+            jLabelConstructor.setBounds(new java.awt.Rectangle(15, 5, 140, 20));
+            jLabelConstructor.setText("Constructor");
+            jPanelType2 = new JPanel();
+            jPanelType2.setLayout(null);
+            jPanelType2.setBounds(new java.awt.Rectangle(0, 105, 490, 55));
+            jPanelType2.add(jLabelConstructor, null);
+            jPanelType2.add(getJTextFieldConstructor(), null);
+            jPanelType2.add(jLabelDestructor, null);
+            jPanelType2.add(getJTextFieldDestructor(), null);
+        }
+        return jPanelType2;
+    }
+
+    /**
+     This method initializes jTextFieldConstructor 
+     
+     @return javax.swing.JTextField jTextFieldConstructor
+     
+     **/
+    private JTextField getJTextFieldConstructor() {
+        if (jTextFieldConstructor == null) {
+            jTextFieldConstructor = new JTextField();
+            jTextFieldConstructor.setBounds(new java.awt.Rectangle(160, 5, 320, 20));
+        }
+        return jTextFieldConstructor;
+    }
+
+    /**
+     This method initializes jTextFieldDestructor 
+     
+     @return javax.swing.JTextField jTextFieldDestructor
+     
+     **/
+    private JTextField getJTextFieldDestructor() {
+        if (jTextFieldDestructor == null) {
+            jTextFieldDestructor = new JTextField();
+            jTextFieldDestructor.setBounds(new java.awt.Rectangle(160, 30, 320, 20));
+        }
+        return jTextFieldDestructor;
+    }
+
+    /**
+     This method initializes jComboBoxType 
+     
+     @return javax.swing.JComboBox jComboBoxType
+     
+     **/
+    private JComboBox getJComboBoxType() {
+        if (jComboBoxType == null) {
+            jComboBoxType = new JComboBox();
+            jComboBoxType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+            jComboBoxType.addItemListener(this);
+        }
+        return jComboBoxType;
+    }
+
+    /**
+     This method initializes jPanelType3 
+     
+     @return javax.swing.JPanel jPanelType3
+     
+     **/
+    private JPanel getJPanelType3() {
+        if (jPanelType3 == null) {
+            jLabelDriverDiag = new JLabel();
+            jLabelDriverDiag.setBounds(new java.awt.Rectangle(15, 80, 140, 20));
+            jLabelDriverDiag.setText("Driver Diag");
+            jLabelDriverConfig = new JLabel();
+            jLabelDriverConfig.setBounds(new java.awt.Rectangle(15, 55, 140, 20));
+            jLabelDriverConfig.setText("Driver Config");
+            jLabelComponentName = new JLabel();
+            jLabelComponentName.setBounds(new java.awt.Rectangle(15, 30, 140, 20));
+            jLabelComponentName.setText("Component Name");
+            jLabelDriverBinding = new JLabel();
+            jLabelDriverBinding.setBounds(new java.awt.Rectangle(15, 5, 140, 20));
+            jLabelDriverBinding.setText("Driver Binding");
+            jPanelType3 = new JPanel();
+            jPanelType3.setLayout(null);
+            jPanelType3.setBounds(new java.awt.Rectangle(0, 105, 490, 105));
+            jPanelType3.add(jLabelDriverBinding, null);
+            jPanelType3.add(jLabelComponentName, null);
+            jPanelType3.add(getIComboBoxComponentName(), null);
+            jPanelType3.add(getIComboBoxDriverBinding(), null);
+            jPanelType3.add(jLabelDriverConfig, null);
+            jPanelType3.add(jLabelDriverDiag, null);
+            jPanelType3.add(getIComboBoxDriverDiag(), null);
+            jPanelType3.add(getIComboBoxDriverConfig(), null);
+        }
+        return jPanelType3;
+    }
+
+    /**
+     This method initializes jComboBoxComponentName 
+     
+     @return javax.swing.JComboBox iComboBoxComponentName
+     
+     **/
+    private IComboBox getIComboBoxComponentName() {
+        if (iComboBoxComponentName == null) {
+            iComboBoxComponentName = new IComboBox();
+            iComboBoxComponentName.setBounds(new java.awt.Rectangle(160, 30, 320, 20));
+        }
+        return iComboBoxComponentName;
+    }
+
+    /**
+     This method initializes jComboBoxDriverBinding 
+     
+     @return javax.swing.JComboBox iComboBoxDriverBinding
+     
+     **/
+    private IComboBox getIComboBoxDriverBinding() {
+        if (iComboBoxDriverBinding == null) {
+            iComboBoxDriverBinding = new IComboBox();
+            iComboBoxDriverBinding.setBounds(new java.awt.Rectangle(160, 5, 320, 20));
+        }
+        return iComboBoxDriverBinding;
+    }
+
+    /**
+     This method initializes jComboBoxDriverDiag 
+     
+     @return javax.swing.JComboBox iComboBoxDriverDiag
+     
+     **/
+    private IComboBox getIComboBoxDriverDiag() {
+        if (iComboBoxDriverDiag == null) {
+            iComboBoxDriverDiag = new IComboBox();
+            iComboBoxDriverDiag.setBounds(new java.awt.Rectangle(160, 80, 320, 20));
+        }
+        return iComboBoxDriverDiag;
+    }
+
+    /**
+     This method initializes jComboBoxDriverConfig 
+     
+     @return javax.swing.JComboBox iComboBoxDriverConfig
+     
+     */
+    private IComboBox getIComboBoxDriverConfig() {
+        if (iComboBoxDriverConfig == null) {
+            iComboBoxDriverConfig = new IComboBox();
+            iComboBoxDriverConfig.setBounds(new java.awt.Rectangle(160, 55, 320, 20));
+        }
+        return iComboBoxDriverConfig;
+    }
+
+    /**
+     This method initializes jPanelType4 
+     
+     @return javax.swing.JPanel jPanelType4
+     
+     **/
+    private JPanel getJPanelType4() {
+        if (jPanelType4 == null) {
+            jLabelExitBootServicesCallBack = new JLabel();
+            jLabelExitBootServicesCallBack.setBounds(new java.awt.Rectangle(15, 30, 200, 20));
+            jLabelExitBootServicesCallBack.setText("Exit Boot Services Call Back");
+            jLabelSetVirtualAddressMapCallBack = new JLabel();
+            jLabelSetVirtualAddressMapCallBack.setBounds(new java.awt.Rectangle(15, 5, 200, 20));
+            jLabelSetVirtualAddressMapCallBack.setText("Set Virtual Address Map Call Back");
+            jPanelType4 = new JPanel();
+            jPanelType4.setLayout(null);
+            jPanelType4.setBounds(new java.awt.Rectangle(0, 105, 490, 55));
+            jPanelType4.add(jLabelSetVirtualAddressMapCallBack, null);
+            jPanelType4.add(getIComboBoxSetVirtualAddressMapCallBack(), null);
+            jPanelType4.add(jLabelExitBootServicesCallBack, null);
+            jPanelType4.add(getIComboBoxExitBootServicesCallBack(), null);
+        }
+        return jPanelType4;
+    }
+
+    /**
+     This method initializes jComboBoxSetVirtualAddressMapCallBack 
+     
+     @return javax.swing.JComboBox iComboBoxSetVirtualAddressMapCallBack
+     
+     **/
+    private IComboBox getIComboBoxSetVirtualAddressMapCallBack() {
+        if (iComboBoxSetVirtualAddressMapCallBack == null) {
+            iComboBoxSetVirtualAddressMapCallBack = new IComboBox();
+            iComboBoxSetVirtualAddressMapCallBack.setBounds(new java.awt.Rectangle(220, 5, 260, 20));
+        }
+        return iComboBoxSetVirtualAddressMapCallBack;
+    }
+
+    /**
+     This method initializes jComboBoxExitBootServicesCallBack 
+     
+     @return javax.swing.JComboBox iComboBoxExitBootServicesCallBack
+     
+     **/
+    private IComboBox getIComboBoxExitBootServicesCallBack() {
+        if (iComboBoxExitBootServicesCallBack == null) {
+            iComboBoxExitBootServicesCallBack = new IComboBox();
+            iComboBoxExitBootServicesCallBack.setBounds(new java.awt.Rectangle(220, 30, 260, 20));
+        }
+        return iComboBoxExitBootServicesCallBack;
+    }
+
+    /**
+     This method initializes jPanelType5 
+     
+     @return javax.swing.JPanel jPanelType5
+     
+     **/
+    private JPanel getJPanelType5() {
+        if (jPanelType5 == null) {
+            jLabelUserDefined = new JLabel();
+            jLabelUserDefined.setBounds(new java.awt.Rectangle(15, 5, 140, 20));
+            jLabelUserDefined.setText("User Defined");
+            jPanelType5 = new JPanel();
+            jPanelType5.setLayout(null);
+            jPanelType5.setBounds(new java.awt.Rectangle(0, 105, 490, 30));
+            jPanelType5.add(jLabelUserDefined, null);
+            jPanelType5.add(getIComboBoxUserDefined(), null);
+        }
+        return jPanelType5;
+    }
+
+    /**
+     This method initializes jComboBoxUserDefined 
+     
+     @return javax.swing.JComboBox iComboBoxUserDefined
+     
+     **/
+    private IComboBox getIComboBoxUserDefined() {
+        if (iComboBoxUserDefined == null) {
+            iComboBoxUserDefined = new IComboBox();
+            iComboBoxUserDefined.setBounds(new java.awt.Rectangle(160, 5, 320, 20));
+        }
+        return iComboBoxUserDefined;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleExterns() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inExterns The input data of ExternsDocument.Externs
+     
+     **/
+    public ModuleExterns(ExternsDocument.Externs inExterns) {
+        super();
+        init(inExterns);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inExterns The input data of ExternsDocument.Externs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleExterns(ExternsDocument.Externs inExterns, int type, int index) {
+        super();
+        init(inExterns, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inExterns The input data of ExternsDocument.Externs
+     
+     **/
+    private void init(ExternsDocument.Externs inExterns) {
+        init();
+        this.setExterns(inExterns);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inExterns The input data of ExternsDocument.Externs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(ExternsDocument.Externs inExterns, int type, int index) {
+        init(inExterns);
+        this.location = index;
+        if (this.externs.getExternList().size() > 0) {
+            //
+            //Get common fields
+            //
+            if (this.externs.getExternArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.externs.getExternArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.externs.getExternArray(index).getOverrideID()));
+            //
+            //Type 1
+            //
+            if (this.externs.getExternArray(index).getModuleEntryPointList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(0);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getModuleEntryPointList().size(); indexI++) {
+                    this.iComboBoxModuleEntryPoint.addItem(this.externs.getExternArray(index)
+                                                                       .getModuleEntryPointArray(indexI));
+                }
+            }
+            if (this.externs.getExternArray(index).getModuleUnloadImageList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(0);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getModuleUnloadImageList().size(); indexI++) {
+                    this.iComboBoxModuleUnloadImage.addItem(this.externs.getExternArray(index)
+                                                                        .getModuleUnloadImageArray(indexI));
+                }
+            }
+
+            //
+            //Type 2
+            //
+            if (this.externs.getExternArray(index).getConstructor() != null) {
+                this.jComboBoxType.setSelectedIndex(1);
+                this.jTextFieldConstructor.setText(this.externs.getExternArray(index).getConstructor());
+            }
+            if (this.externs.getExternArray(index).getDestructor() != null) {
+                this.jComboBoxType.setSelectedIndex(1);
+                this.jTextFieldDestructor.setText(this.externs.getExternArray(index).getDestructor());
+            }
+
+            //
+            //Type 3
+            //
+            if (this.externs.getExternArray(index).getDriverBindingList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(2);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getDriverBindingList().size(); indexI++) {
+                    this.iComboBoxDriverBinding.addItem(this.externs.getExternArray(index)
+                                                                    .getDriverBindingArray(indexI));
+                }
+            }
+            if (this.externs.getExternArray(index).getComponentNameList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(2);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getComponentNameList().size(); indexI++) {
+                    this.iComboBoxComponentName.addItem(this.externs.getExternArray(index)
+                                                                    .getComponentNameArray(indexI));
+                }
+            }
+            if (this.externs.getExternArray(index).getDriverConfigList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(2);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getDriverConfigList().size(); indexI++) {
+                    this.iComboBoxDriverConfig.addItem(this.externs.getExternArray(index).getDriverConfigArray(indexI));
+                }
+            }
+            if (this.externs.getExternArray(index).getDriverDiagList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(2);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getDriverDiagList().size(); indexI++) {
+                    this.iComboBoxDriverDiag.addItem(this.externs.getExternArray(index).getDriverDiagArray(indexI));
+                }
+            }
+
+            //
+            //Type 4
+            //
+            if (this.externs.getExternArray(index).getSetVirtualAddressMapCallBackList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(3);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getSetVirtualAddressMapCallBackList()
+                                                          .size(); indexI++) {
+                    this.iComboBoxSetVirtualAddressMapCallBack
+                                                              .addItem(this.externs
+                                                                                   .getExternArray(index)
+                                                                                   .getSetVirtualAddressMapCallBackArray(
+                                                                                                                         indexI));
+                }
+            }
+            if (this.externs.getExternArray(index).getExitBootServicesCallBackList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(3);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getExitBootServicesCallBackList()
+                                                          .size(); indexI++) {
+                    this.iComboBoxExitBootServicesCallBack
+                                                          .addItem(this.externs
+                                                                               .getExternArray(index)
+                                                                               .getExitBootServicesCallBackArray(indexI));
+                }
+            }
+
+            //
+            //Type 5
+            //
+            if (this.externs.getExternArray(index).getUserDefinedList().size() > 0) {
+                this.jComboBoxType.setSelectedIndex(4);
+                for (int indexI = 0; indexI < this.externs.getExternArray(index).getUserDefinedList().size(); indexI++) {
+                    this.iComboBoxUserDefined.addItem(this.externs.getExternArray(index).getUserDefinedArray(indexI));
+                }
+            }
+
+            this.jComboBoxType.setEnabled(false);
+            switchType();
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Externs");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            //
+            //Type 1
+            //
+            this.iComboBoxModuleEntryPoint.setEnabled(!isView);
+            this.iComboBoxModuleUnloadImage.setEnabled(!isView);
+
+            //
+            //Type 2
+            //
+            this.jTextFieldConstructor.setEnabled(!isView);
+            this.jTextFieldDestructor.setEnabled(!isView);
+
+            //
+            //Type 3
+            //
+            this.iComboBoxDriverBinding.setEnabled(!isView);
+            this.iComboBoxComponentName.setEnabled(!isView);
+            this.iComboBoxDriverConfig.setEnabled(!isView);
+            this.iComboBoxDriverDiag.setEnabled(!isView);
+
+            //
+            //Type 4
+            //
+            this.iComboBoxSetVirtualAddressMapCallBack.setEnabled(!isView);
+            this.iComboBoxExitBootServicesCallBack.setEnabled(!isView);
+
+            //
+            //Type 5
+            //
+            this.iComboBoxUserDefined.setEnabled(!isView);
+
+            this.jComboBoxType.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelName = new JLabel();
+            jLabelName.setText("Choose Type");
+            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setSize(new java.awt.Dimension(490, 244));
+            jContentPane.add(getJPanelType2(), null);
+            jContentPane.add(jLabelName, null);
+            jContentPane.add(getJComboBoxType(), null);
+            jContentPane.add(getJPanelType3(), null);
+            jContentPane.add(getJPanelType4(), null);
+            jContentPane.add(getJPanelType5(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jContentPane.add(getJPanelType1(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type and Externs type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+
+        jComboBoxType.addItem("Type 1");
+        jComboBoxType.addItem("Type 2");
+        jComboBoxType.addItem("Type 3");
+        jComboBoxType.addItem("Type 4");
+        jComboBoxType.addItem("Type 5");
+
+        jPanelType1.setVisible(true);
+        jPanelType2.setVisible(false);
+        jPanelType3.setVisible(false);
+        jPanelType4.setVisible(false);
+        jPanelType5.setVisible(false);
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+    }
+
+    public void itemStateChanged(ItemEvent arg0) {
+        if (arg0.getSource() == jComboBoxType) {
+            if (arg0.getStateChange() == ItemEvent.SELECTED) {
+                switchType();
+            }
+        }
+    }
+
+    /**
+     Show/Hide relevant fields via select different types
+     
+     **/
+    private void switchType() {
+        if (jComboBoxType.getSelectedIndex() == 0) {
+            jPanelType1.setVisible(true);
+            jPanelType2.setVisible(false);
+            jPanelType3.setVisible(false);
+            jPanelType4.setVisible(false);
+            jPanelType5.setVisible(false);
+        }
+        if (jComboBoxType.getSelectedIndex() == 1) {
+            jPanelType1.setVisible(false);
+            jPanelType2.setVisible(true);
+            jPanelType3.setVisible(false);
+            jPanelType4.setVisible(false);
+            jPanelType5.setVisible(false);
+        }
+        if (jComboBoxType.getSelectedIndex() == 2) {
+            jPanelType1.setVisible(false);
+            jPanelType2.setVisible(false);
+            jPanelType3.setVisible(true);
+            jPanelType4.setVisible(false);
+            jPanelType5.setVisible(false);
+        }
+        if (jComboBoxType.getSelectedIndex() == 3) {
+            jPanelType1.setVisible(false);
+            jPanelType2.setVisible(false);
+            jPanelType3.setVisible(false);
+            jPanelType4.setVisible(true);
+            jPanelType5.setVisible(false);
+        }
+        if (jComboBoxType.getSelectedIndex() == 4) {
+            jPanelType1.setVisible(false);
+            jPanelType2.setVisible(false);
+            jPanelType3.setVisible(false);
+            jPanelType4.setVisible(false);
+            jPanelType5.setVisible(true);
+        }
+    }
+
+    /**
+     Set ExternsDocument.Externs
+     
+     @return ExternsDocument.Externs
+     
+     
+     **/
+    public ExternsDocument.Externs getExterns() {
+        return externs;
+    }
+
+    /**
+     Get ExternsDocument.Externs
+     
+     @param externs The input ExternsDocument.Externs
+     
+     **/
+    public void setExterns(ExternsDocument.Externs externs) {
+        this.externs = externs;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all fields have correct data types 
+        //
+        if (this.jComboBoxType.getSelectedIndex() == 1) {
+            if (!isEmpty(this.jTextFieldConstructor.getText())
+                && !DataValidation.isConstructor(this.jTextFieldConstructor.getText())) {
+                Log.err("Incorrect data type for Constructor");
+                return false;
+            }
+            if (!isEmpty(this.jTextFieldDestructor.getText())
+                && !DataValidation.isDestructor(this.jTextFieldDestructor.getText())) {
+                Log.err("Incorrect data type for Destructor");
+                return false;
+            }
+        }
+
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Externs
+     if exists externs, set the value directly
+     if not exists externs, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.externs == null) {
+                externs = ExternsDocument.Externs.Factory.newInstance();
+            }
+            ExternsDocument.Externs.Extern extern = ExternsDocument.Externs.Extern.Factory.newInstance();
+            //
+            //Save common fields
+            //
+            extern.setUsage(ExternUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                extern.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+
+            //
+            //Save type 1
+            //
+            if (this.jComboBoxType.getSelectedIndex() == 0) {
+                if (this.iComboBoxModuleEntryPoint.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxModuleEntryPoint.getItemCount(); index++) {
+                        extern.addNewModuleEntryPoint();
+                        extern.setModuleEntryPointArray(index, this.iComboBoxModuleEntryPoint.getItemAt(index)
+                                                                                             .toString());
+                    }
+                }
+                if (this.iComboBoxModuleEntryPoint.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxModuleUnloadImage.getItemCount(); index++) {
+                        extern.addNewModuleUnloadImage();
+                        extern.setModuleUnloadImageArray(index, this.iComboBoxModuleUnloadImage.getItemAt(index)
+                                                                                               .toString());
+                    }
+                }
+            }
+
+            //
+            //Save type 2
+            //
+            if (this.jComboBoxType.getSelectedIndex() == 1) {
+                if (!isEmpty(this.jTextFieldConstructor.getText())) {
+                    extern.setConstructor(this.jTextFieldConstructor.getText());
+                }
+                if (!isEmpty(this.jTextFieldDestructor.getText())) {
+                    extern.setDestructor(this.jTextFieldDestructor.getText());
+                }
+            }
+
+            //
+            //Save type 3
+            //
+            if (this.jComboBoxType.getSelectedIndex() == 2) {
+                if (this.iComboBoxDriverBinding.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxDriverBinding.getItemCount(); index++) {
+                        extern.addNewDriverBinding();
+                        extern.setDriverBindingArray(index, this.iComboBoxDriverBinding.getItemAt(index).toString());
+                    }
+                }
+                if (this.iComboBoxComponentName.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxComponentName.getItemCount(); index++) {
+                        extern.addNewComponentName();
+                        extern.setComponentNameArray(index, this.iComboBoxComponentName.getItemAt(index).toString());
+                    }
+                }
+                if (this.iComboBoxDriverConfig.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxDriverConfig.getItemCount(); index++) {
+                        extern.addNewDriverConfig();
+                        extern.setDriverConfigArray(index, this.iComboBoxDriverConfig.getItemAt(index).toString());
+                    }
+                }
+                if (this.iComboBoxDriverDiag.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxDriverDiag.getItemCount(); index++) {
+                        extern.addNewDriverDiag();
+                        extern.setDriverDiagArray(index, this.iComboBoxDriverDiag.getItemAt(index).toString());
+                    }
+                }
+            }
+
+            //
+            //Save type 4
+            //
+            if (this.jComboBoxType.getSelectedIndex() == 3) {
+                if (this.iComboBoxSetVirtualAddressMapCallBack.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxSetVirtualAddressMapCallBack.getItemCount(); index++) {
+                        extern.addNewSetVirtualAddressMapCallBack();
+                        extern
+                              .setSetVirtualAddressMapCallBackArray(
+                                                                    index,
+                                                                    this.iComboBoxSetVirtualAddressMapCallBack
+                                                                                                              .getItemAt(
+                                                                                                                         index)
+                                                                                                              .toString());
+                    }
+                }
+                if (this.iComboBoxExitBootServicesCallBack.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxExitBootServicesCallBack.getItemCount(); index++) {
+                        extern.addNewExitBootServicesCallBack();
+                        extern.setExitBootServicesCallBackArray(index,
+                                                                this.iComboBoxExitBootServicesCallBack.getItemAt(index)
+                                                                                                      .toString());
+                    }
+                }
+            }
+            //
+            //Save type 5
+            //
+            if (this.jComboBoxType.getSelectedIndex() == 4) {
+                if (this.iComboBoxUserDefined.getItemCount() > 0) {
+                    for (int index = 0; index < this.iComboBoxUserDefined.getItemCount(); index++) {
+                        extern.addNewUserDefined();
+                        extern.setUserDefinedArray(index, this.iComboBoxUserDefined.getItemAt(index).toString());
+                    }
+                }
+            }
+
+            if (location > -1) {
+                externs.setExternArray(location, extern);
+            } else {
+                externs.addNewExtern();
+                externs.setExternArray(externs.getExternList().size() - 1, extern);
+            }
+        } catch (Exception e) {
+            Log.err("Update Externs", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java
new file mode 100644
index 0000000000..f725379ca8
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java
@@ -0,0 +1,457 @@
+/** @file
+ 
+ The file is used to create, update Formset of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.FormSetUsage;
+import org.tianocore.FormsetsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Formset of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleFormsets extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -6851574146786158116L;
+
+    //
+    //Define class members
+    //
+    private FormsetsDocument.Formsets formsets = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelName = null;
+
+    private JTextField jTextFieldName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes jTextFieldName 
+     
+     @return javax.swing.JTextField jTextFieldName
+     
+     **/
+    private JTextField getJTextFieldName() {
+        if (jTextFieldName == null) {
+            jTextFieldName = new JTextField();
+            jTextFieldName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(280, 115, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 115, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleFormsets() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     * 
+     */
+    /**
+     This is the override edit constructor
+     
+     @param inFormsets The input data of FormsetsDocument.Formsets
+     
+     **/
+    public ModuleFormsets(FormsetsDocument.Formsets inFormsets) {
+        super();
+        init(inFormsets);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inFormsets The input data of FormsetsDocument.Formsets
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleFormsets(FormsetsDocument.Formsets inFormsets, int type, int index) {
+        super();
+        init(inFormsets, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inFormsets The input data of FormsetsDocument.Formsets
+     
+     **/
+    private void init(FormsetsDocument.Formsets inFormsets) {
+        init();
+        this.setFormsets(inFormsets);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inFormsets The input data of FormsetsDocument.Formsets
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(FormsetsDocument.Formsets inFormsets, int type, int index) {
+        init(inFormsets);
+        this.location = index;
+        if (this.formsets.getFormsetList().size() > 0) {
+            if (this.formsets.getFormsetArray(index).getStringValue() != null) {
+                this.jTextFieldName.setText(this.formsets.getFormsetArray(index).getStringValue().toString());
+            }
+            if (this.formsets.getFormsetArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.formsets.getFormsetArray(index).getGuid());
+            }
+            if (this.formsets.getFormsetArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.formsets.getFormsetArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.formsets.getFormsetArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Form Sets");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 515));
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelName = new JLabel();
+            jLabelName.setText("Name");
+            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelName, null);
+            jContentPane.add(getJTextFieldName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Set FormsetsDocument.Formsets
+     
+     @return FormsetsDocument.Formsets
+     
+     **/
+    public FormsetsDocument.Formsets getFormsets() {
+        return formsets;
+    }
+
+    /**
+     Get FormsetsDocument.Formsets
+     
+     @param formsets The input FormsetsDocument.Formsets
+     
+     **/
+    public void setFormsets(FormsetsDocument.Formsets formsets) {
+        this.formsets = formsets;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldName.getText())) {
+            Log.err("Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldName.getText())) {
+            Log.err("Incorrect data type for Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Formsets
+     if exists formset, set the value directly
+     if not exists formset, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.formsets == null) {
+                formsets = FormsetsDocument.Formsets.Factory.newInstance();
+            }
+            FormsetsDocument.Formsets.Formset formset = FormsetsDocument.Formsets.Formset.Factory.newInstance();
+            if (!isEmpty(this.jTextFieldName.getText())) {
+                formset.setStringValue(this.jTextFieldName.getText());
+            }
+            if (!isEmpty(this.jTextFieldGuid.getText())) {
+                formset.setGuid(this.jTextFieldGuid.getText());
+            }
+            formset.setUsage(FormSetUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                formset.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                formsets.setFormsetArray(location, formset);
+            } else {
+                formsets.addNewFormset();
+                formsets.setFormsetArray(formsets.getFormsetList().size() - 1, formset);
+            }
+        } catch (Exception e) {
+            Log.err("Update Formsets", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java
new file mode 100644
index 0000000000..186709644f
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java
@@ -0,0 +1,675 @@
+/** @file
+ 
+ The file is used to create, update Guids of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.tianocore.ConditionalExpressionDocument;
+import org.tianocore.DefaultValueDocument;
+import org.tianocore.GuidUsage;
+import org.tianocore.GuidsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IComboBox;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Guids of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleGuids extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 6710858997766979803L;
+
+    //
+    //Define class members
+    //
+    private GuidsDocument.Guids guids = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuidValue = null;
+
+    private JTextField jTextFieldGuidValue = null;
+
+    private JLabel jLabelFeatureFlag = null;
+
+    private IComboBox iComboBoxFeatureFlag = null;
+
+    private JLabel jLabelConditionalExpression = null;
+
+    private IComboBox iComboBoxConditionalExpression = null;
+
+    private JLabel jLabelDefault = null;
+
+    private JTextField jTextFieldDefaultValue = null;
+
+    private JLabel jLabelHelpText = null;
+
+    private JTextField jTextFieldHelpText = null;
+
+    private JLabel jLabelEnableFeature = null;
+
+    private JRadioButton jRadioButtonEnableFeature = null;
+
+    private JRadioButton jRadioButtonDisableFeature = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    /**
+     This method initializes jTextFieldC_Name 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldGuidValsue 
+     
+     @return javax.swing.JTextField jTextFieldGuidValue
+     
+     **/
+    private JTextField getJTextFieldGuidValsue() {
+        if (jTextFieldGuidValue == null) {
+            jTextFieldGuidValue = new JTextField();
+            jTextFieldGuidValue.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuidValue;
+    }
+
+    /**
+     This method initializes jTextFieldFeatureFlag 
+     
+     @return javax.swing.JTextField iComboBoxFeatureFlag
+     
+     **/
+    private IComboBox getIComboBoxFeatureFlag() {
+        if (iComboBoxFeatureFlag == null) {
+            iComboBoxFeatureFlag = new IComboBox();
+            iComboBoxFeatureFlag.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return iComboBoxFeatureFlag;
+    }
+
+    /**
+     This method initializes jTextFieldConditionalExpression 
+     
+     @return javax.swing.JTextField iComboBoxConditionalExpression
+     
+     **/
+    private IComboBox getIComboBoxConditionalExpression() {
+        if (iComboBoxConditionalExpression == null) {
+            iComboBoxConditionalExpression = new IComboBox();
+            iComboBoxConditionalExpression.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return iComboBoxConditionalExpression;
+    }
+
+    /**
+     This method initializes jTextFieldDefault 
+     
+     @return javax.swing.JTextField jTextFieldDefaultValue
+     
+     **/
+    private JTextField getJTextFieldDefaultValue() {
+        if (jTextFieldDefaultValue == null) {
+            jTextFieldDefaultValue = new JTextField();
+            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jTextFieldDefaultValue;
+    }
+
+    /**
+     This method initializes jTextFieldHelpText 
+     
+     @return javax.swing.JTextField jTextFieldHelpText
+     
+     **/
+    private JTextField getJTextFieldHelpText() {
+        if (jTextFieldHelpText == null) {
+            jTextFieldHelpText = new JTextField();
+            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jTextFieldHelpText;
+    }
+
+    /**
+     This method initializes jRadioButtonEnableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonEnableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonEnableFeature() {
+        if (jRadioButtonEnableFeature == null) {
+            jRadioButtonEnableFeature = new JRadioButton();
+            jRadioButtonEnableFeature.setText("Enable");
+            jRadioButtonEnableFeature.setBounds(new java.awt.Rectangle(160, 160, 90, 20));
+            jRadioButtonEnableFeature.setSelected(true);
+            jRadioButtonEnableFeature.addActionListener(this);
+        }
+        return jRadioButtonEnableFeature;
+    }
+
+    /**
+     This method initializes jRadioButtonDisableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonDisableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonDisableFeature() {
+        if (jRadioButtonDisableFeature == null) {
+            jRadioButtonDisableFeature = new JRadioButton();
+            jRadioButtonDisableFeature.setText("Disable");
+            jRadioButtonDisableFeature.setBounds(new java.awt.Rectangle(320, 160, 90, 20));
+            jRadioButtonDisableFeature.addActionListener(this);
+        }
+        return jRadioButtonDisableFeature;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 185, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 240, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 240, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 210, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleGuids() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inGuids The input data of GuidsDocument.Guids
+     
+     **/
+    public ModuleGuids(GuidsDocument.Guids inGuids) {
+        super();
+        init(inGuids);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inGuids The input data of GuidsDocument.Guids
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleGuids(GuidsDocument.Guids inGuids, int type, int index) {
+        super();
+        init(inGuids, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inGuids The input data of GuidsDocument.Guids
+     
+     **/
+    private void init(GuidsDocument.Guids inGuids) {
+        init();
+        this.setGuids(inGuids);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inGuids The input data of GuidsDocument.Guids
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(GuidsDocument.Guids inGuids, int type, int index) {
+        init(inGuids);
+        this.location = index;
+        if (this.guids.getGuidEntryList().size() > 0) {
+            if (this.guids.getGuidEntryArray(index).getCName() != null) {
+                this.jTextFieldC_Name.setText(this.guids.getGuidEntryArray(index).getCName());
+            }
+            if (this.guids.getGuidEntryArray(index).getGuidValue() != null) {
+                this.jTextFieldGuidValue.setText(this.guids.getGuidEntryArray(index).getGuidValue());
+            }
+            if (this.guids.getGuidEntryArray(index).getFeatureFlagList().size() > 0) {
+                for (int indexI = 0; indexI < this.guids.getGuidEntryArray(index).getFeatureFlagList().size(); indexI++) {
+                    this.iComboBoxFeatureFlag.addItem(this.guids.getGuidEntryArray(index).getFeatureFlagArray(indexI));
+                }
+            }
+            if (this.guids.getGuidEntryArray(index).getConditionalExpressionList().size() > 0) {
+                for (int indexI = 0; indexI < this.guids.getGuidEntryArray(index).getConditionalExpressionArray(0)
+                                                        .getConditionList().size(); indexI++) {
+                    this.iComboBoxConditionalExpression.addItem(this.guids.getGuidEntryArray(index)
+                                                                          .getConditionalExpressionArray(0)
+                                                                          .getConditionArray(indexI));
+                }
+            }
+            if (this.guids.getGuidEntryArray(index).getDefaultValue() != null) {
+                this.jTextFieldDefaultValue.setText(this.guids.getGuidEntryArray(index).getDefaultValue()
+                                                              .getStringValue());
+            }
+            if (this.guids.getGuidEntryArray(index).getHelpText() != null) {
+                this.jTextFieldHelpText.setText(this.guids.getGuidEntryArray(index).getHelpText());
+            }
+            if (this.guids.getGuidEntryArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.guids.getGuidEntryArray(index).getUsage().toString());
+            }
+            this.jRadioButtonEnableFeature.setSelected(this.guids.getGuidEntryArray(index).getEnableFeature());
+            this.jRadioButtonDisableFeature.setSelected(!this.guids.getGuidEntryArray(index).getEnableFeature());
+            this.jTextFieldOverrideID.setText(String.valueOf(this.guids.getGuidEntryArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Guids");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldGuidValue.setEnabled(!isView);
+            this.iComboBoxFeatureFlag.setEnabled(!isView);
+            this.iComboBoxConditionalExpression.setEnabled(!isView);
+            this.jTextFieldDefaultValue.setEnabled(!isView);
+            this.jTextFieldHelpText.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jRadioButtonEnableFeature.setEnabled(!isView);
+            this.jRadioButtonDisableFeature.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 210, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 185, 140, 20));
+            jLabelEnableFeature = new JLabel();
+            jLabelEnableFeature.setText("Enable Feature");
+            jLabelEnableFeature.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelHelpText = new JLabel();
+            jLabelHelpText.setText("Help Text");
+            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelDefault = new JLabel();
+            jLabelDefault.setText("Default Value");
+            jLabelDefault.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelConditionalExpression = new JLabel();
+            jLabelConditionalExpression.setText("Conditional Expression");
+            jLabelConditionalExpression.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelFeatureFlag = new JLabel();
+            jLabelFeatureFlag.setText("Feature Flag");
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuidValue = new JLabel();
+            jLabelGuidValue.setText("Guid Value");
+            jLabelGuidValue.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelGuidValue, null);
+            jContentPane.add(getJTextFieldGuidValsue(), null);
+            jContentPane.add(jLabelFeatureFlag, null);
+            jContentPane.add(getIComboBoxFeatureFlag(), null);
+            jContentPane.add(jLabelConditionalExpression, null);
+            jContentPane.add(getIComboBoxConditionalExpression(), null);
+            jContentPane.add(jLabelDefault, null);
+            jContentPane.add(getJTextFieldDefaultValue(), null);
+            jContentPane.add(jLabelHelpText, null);
+            jContentPane.add(getJTextFieldHelpText(), null);
+            jContentPane.add(jLabelEnableFeature, null);
+            jContentPane.add(getJRadioButtonEnableFeature(), null);
+            jContentPane.add(getJRadioButtonDisableFeature(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            StarLabel jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+
+            initFrame();
+
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuidValue.setText(Tools.generateUuidString());
+        }
+
+        //
+        //Contorl the selected status when click RadionButton
+        //Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonEnableFeature) {
+            if (jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonDisableFeature) {
+            if (jRadioButtonDisableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(true);
+            }
+        }
+    }
+
+    /**
+     Get GuidsDocument.Guids
+     
+     @return GuidsDocument.Guids
+     
+     **/
+    public GuidsDocument.Guids getGuids() {
+        return guids;
+    }
+
+    /**
+     Set GuidsDocument.Guids
+     
+     @param guids The input GuidsDocument.Guids
+     
+     **/
+    public void setGuids(GuidsDocument.Guids guids) {
+        this.guids = guids;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldC_Name.getText())) {
+            Log.err("C_Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuidValue.getText()) && !DataValidation.isGuid(this.jTextFieldGuidValue.getText())) {
+            Log.err("Incorrect data type for Guid Value");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Guids
+     if exists guids, set the value directly
+     if not exists guids, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.guids == null) {
+                guids = GuidsDocument.Guids.Factory.newInstance();
+            }
+            GuidsDocument.Guids.GuidEntry guid = GuidsDocument.Guids.GuidEntry.Factory.newInstance();
+            if (!isEmpty(this.jTextFieldC_Name.getText())) {
+                guid.setCName(this.jTextFieldC_Name.getText());
+            }
+            if (!isEmpty(this.jTextFieldGuidValue.getText())) {
+                guid.setGuidValue(this.jTextFieldGuidValue.getText());
+            }
+            if (this.iComboBoxFeatureFlag.getItemCount() > 0) {
+                for (int index = 0; index < this.iComboBoxFeatureFlag.getItemCount(); index++) {
+                    guid.addNewFeatureFlag();
+                    guid.setFeatureFlagArray(index, this.iComboBoxFeatureFlag.getItemAt(index).toString());
+                }
+            }
+            if (this.iComboBoxConditionalExpression.getItemCount() > 0) {
+                ConditionalExpressionDocument.ConditionalExpression ce = ConditionalExpressionDocument.ConditionalExpression.Factory
+                                                                                                                                    .newInstance();
+                for (int index = 0; index < this.iComboBoxConditionalExpression.getItemCount(); index++) {
+                    ce.addCondition(this.iComboBoxConditionalExpression.getItemAt(index).toString());
+                }
+                if (guid.getConditionalExpressionList().size() < 1) {
+                    guid.addNewConditionalExpression();
+                }
+                guid.setConditionalExpressionArray(0, ce);
+            }
+            if (!isEmpty(this.jTextFieldDefaultValue.getText())) {
+                DefaultValueDocument.DefaultValue dv = DefaultValueDocument.DefaultValue.Factory.newInstance();
+                dv.setStringValue(this.jTextFieldDefaultValue.getText());
+                guid.setDefaultValue(dv);
+            }
+            if (!isEmpty(this.jTextFieldHelpText.getText())) {
+                guid.setHelpText(this.jTextFieldHelpText.getText());
+            }
+            guid.setUsage(GuidUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            guid.setEnableFeature(this.jRadioButtonEnableFeature.isSelected());
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                guid.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+
+            if (location > -1) {
+                guids.setGuidEntryArray(location, guid);
+            } else {
+                guids.addNewGuidEntry();
+                guids.setGuidEntryArray(guids.getGuidEntryList().size() - 1, guid);
+            }
+        } catch (Exception e) {
+            Log.err("Update Guids", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java
new file mode 100644
index 0000000000..3d209e5634
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java
@@ -0,0 +1,596 @@
+/** @file
+ 
+ The file is used to create, update Hob of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.tianocore.GuidDocument;
+import org.tianocore.HobTypes;
+import org.tianocore.HobUsage;
+import org.tianocore.HobsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Hob of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleHobs extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -553473437579358325L;
+
+    //
+    //Define class members
+    //
+    private HobsDocument.Hobs hobs = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelName = null;
+
+    private JTextField jTextFieldName = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JLabel jLabelHobType = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JComboBox jComboBoxHobType = null;
+
+    private JLabel jLabelHobEnabled = null;
+
+    private JRadioButton jRadioButtonHobEnable = null;
+
+    private JRadioButton jRadioButtonHobDisable = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes jTextField 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextField 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldName 
+     
+     @return javax.swing.JTextField jTextFieldName
+     
+     **/
+    private JTextField getJTextFieldName() {
+        if (jTextFieldName == null) {
+            jTextFieldName = new JTextField();
+            jTextFieldName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldName;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jComboBoxHobType 
+     
+     @return javax.swing.JComboBox jComboBoxHobType
+     
+     **/
+    private JComboBox getJComboBoxHobType() {
+        if (jComboBoxHobType == null) {
+            jComboBoxHobType = new JComboBox();
+            jComboBoxHobType.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jComboBoxHobType;
+    }
+
+    /**
+     This method initializes jRadioButtonEnable 
+     
+     @return javax.swing.JRadioButton jRadioButtonHobEnable
+     
+     **/
+    private JRadioButton getJRadioButtonHobEnable() {
+        if (jRadioButtonHobEnable == null) {
+            jRadioButtonHobEnable = new JRadioButton();
+            jRadioButtonHobEnable.setText("Enable");
+            jRadioButtonHobEnable.setBounds(new java.awt.Rectangle(160, 135, 90, 20));
+            jRadioButtonHobEnable.setSelected(true);
+            jRadioButtonHobEnable.addActionListener(this);
+        }
+        return jRadioButtonHobEnable;
+    }
+
+    /**
+     This method initializes jRadioButtonDisable 
+     
+     @return javax.swing.JRadioButton jRadioButtonHobDisable
+     
+     **/
+    private JRadioButton getJRadioButtonHobDisable() {
+        if (jRadioButtonHobDisable == null) {
+            jRadioButtonHobDisable = new JRadioButton();
+            jRadioButtonHobDisable.setText("Disable");
+            jRadioButtonHobDisable.setBounds(new java.awt.Rectangle(320, 135, 90, 20));
+            jRadioButtonHobDisable.addActionListener(this);
+        }
+        return jRadioButtonHobDisable;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 190, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 190, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleHobs() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inHobs The input data of HobsDocument.Hobs
+     
+     **/
+    public ModuleHobs(HobsDocument.Hobs inHobs) {
+        super();
+        init(inHobs);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inHobs The input data of HobsDocument.Hobs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleHobs(HobsDocument.Hobs inHobs, int type, int index) {
+        super();
+        init(inHobs, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inHobs The input data of HobsDocument.Hobs
+     
+     **/
+    private void init(HobsDocument.Hobs inHobs) {
+        init();
+        this.setHobs(inHobs);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inHobs The input data of HobsDocument.Hobs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(HobsDocument.Hobs inHobs, int type, int index) {
+        init(inHobs);
+        this.location = index;
+        if (this.hobs.getHobList().size() > 0) {
+            if (this.hobs.getHobArray(index).getName() != null) {
+                this.jTextFieldName.setText(this.hobs.getHobArray(index).getName());
+            }
+            if (this.hobs.getHobArray(index).getCName() != null) {
+                this.jTextFieldC_Name.setText(this.hobs.getHobArray(index).getCName());
+            }
+            if (this.hobs.getHobArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.hobs.getHobArray(index).getGuid().getStringValue());
+            }
+            if (this.hobs.getHobArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.hobs.getHobArray(index).getUsage().toString());
+            }
+            this.jRadioButtonHobEnable.setSelected(this.hobs.getHobArray(index).getHobEnabled());
+            this.jRadioButtonHobDisable.setSelected(!this.hobs.getHobArray(index).getHobEnabled());
+            this.jTextFieldOverrideID.setText(String.valueOf(this.hobs.getHobArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Hobs");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldName.setEnabled(!isView);
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jComboBoxHobType.setEnabled(!isView);
+            this.jRadioButtonHobEnable.setEnabled(!isView);
+            this.jRadioButtonHobDisable.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    public JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelHobEnabled = new JLabel();
+            jLabelHobEnabled.setText("Hob Enabled");
+            jLabelHobEnabled.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelHobType = new JLabel();
+            jLabelHobType.setText("Hob Type");
+            jLabelHobType.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelName = new JLabel();
+            jLabelName.setText("Name");
+            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabel = new JLabel();
+            jLabel.setText("C_Name");
+            jLabel.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(jLabelName, null);
+            jContentPane.add(getJTextFieldName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(jLabelHobType, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJComboBoxHobType(), null);
+            jContentPane.add(jLabelHobEnabled, null);
+            jContentPane.add(getJRadioButtonHobEnable(), null);
+            jContentPane.add(getJRadioButtonHobDisable(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type and Hob type
+     
+     **/
+    private void initFrame() {
+        jComboBoxHobType.addItem("PHIT");
+        jComboBoxHobType.addItem("MEMORY_ALLOCATION");
+        jComboBoxHobType.addItem("RESOURCE_DESCRIPTOR");
+        jComboBoxHobType.addItem("GUID_EXTENSION");
+        jComboBoxHobType.addItem("FIRMWARE_VOLUME");
+        jComboBoxHobType.addItem("CPU");
+        jComboBoxHobType.addItem("POOL");
+        jComboBoxHobType.addItem("CAPSULE_VOLUME");
+
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        //
+        // Contorl the selected status when click RadionButton
+        // Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonHobEnable) {
+            if (jRadioButtonHobEnable.isSelected()) {
+                jRadioButtonHobDisable.setSelected(false);
+            }
+            if (!jRadioButtonHobDisable.isSelected() && !jRadioButtonHobEnable.isSelected()) {
+                jRadioButtonHobEnable.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonHobDisable) {
+            if (jRadioButtonHobDisable.isSelected()) {
+                jRadioButtonHobEnable.setSelected(false);
+            }
+            if (!jRadioButtonHobDisable.isSelected() && !jRadioButtonHobEnable.isSelected()) {
+                jRadioButtonHobDisable.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Get HobsDocument.Hobs
+     
+     @return HobsDocument.Hobs
+     
+     **/
+    public HobsDocument.Hobs getHobs() {
+        return hobs;
+    }
+
+    /**
+     Set HobsDocument.Hobs
+     
+     @param hobs The input data of HobsDocument.Hobs
+     
+     **/
+    public void setHobs(HobsDocument.Hobs hobs) {
+        this.hobs = hobs;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldName.getText())) {
+            Log.err("Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Hobs
+     if exists hobs, set the value directly
+     if not exists hobs, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.hobs == null) {
+                hobs = HobsDocument.Hobs.Factory.newInstance();
+            }
+            HobsDocument.Hobs.Hob hob = HobsDocument.Hobs.Hob.Factory.newInstance();
+            if (!isEmpty(this.jTextFieldName.getText())) {
+                hob.setName(this.jTextFieldName.getText());
+            }
+            if (!isEmpty(this.jTextFieldC_Name.getText())) {
+                hob.setCName(this.jTextFieldC_Name.getText());
+            }
+            if (!isEmpty(this.jTextFieldGuid.getText())) {
+                GuidDocument.Guid guid = GuidDocument.Guid.Factory.newInstance();
+                guid.setStringValue(this.jTextFieldGuid.getText());
+                hob.setGuid(guid);
+            }
+            hob.setUsage(HobUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            hob.setHobType(HobTypes.Enum.forString(jComboBoxHobType.getSelectedItem().toString()));
+            hob.setHobEnabled(this.jRadioButtonHobEnable.isSelected());
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                hob.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                hobs.setHobArray(location, hob);
+            } else {
+                hobs.addNewHob();
+                hobs.setHobArray(hobs.getHobList().size() - 1, hob);
+            }
+        } catch (Exception e) {
+            Log.err("Update Hobs", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java
new file mode 100644
index 0000000000..dccee3148a
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java
@@ -0,0 +1,867 @@
+/** @file
+ 
+ The file is used to create, update Include of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.IncludesDocument;
+import org.tianocore.PackageNameDocument;
+import org.tianocore.PackageType;
+import org.tianocore.PackageUsage;
+import org.tianocore.SupportedArchitectures;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Include of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleIncludes extends IInternalFrame implements ItemListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 3465193035145152131L;
+
+    //
+    //Define class members
+    //
+    private IncludesDocument.Includes includes = null;
+
+    private int location = -1;
+    
+    private int intSelectedItemId = 0;
+
+    //
+    //  1 - Add; 2 - Update
+    //
+    private int operation = -1;
+
+    private Vector<String> vPackageName = new Vector<String>();
+
+    private Vector<String> vUsage = new Vector<String>();
+
+    private Vector<String> vPackageType = new Vector<String>();
+
+    private Vector<String> vUpdatedDate = new Vector<String>();
+
+    private JPanel jContentPane = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelPackageName = null;
+
+    private JLabel jLabelPackageType = null;
+
+    private JComboBox jComboBoxPackageType = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private JTextField jTextFieldPackageName = null;
+
+    private JComboBox jComboBoxFileList = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonUpdate = null;
+
+    private JButton jButtonRemove = null;
+
+    private JLabel jLabelUpdatedDate = null;
+
+    private JTextField jTextFieldUpdatedDate = null;
+
+    private JCheckBox jCheckBoxArch = null;
+
+    private JComboBox jComboBoxArch = null;
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButton() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 165, 90, 20));
+            jButtonOk.addActionListener(this);
+
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButton1() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 165, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jComboBoxPackageType 
+     
+     @return javax.swing.JComboBox jComboBoxPackageType
+     
+     **/
+    private JComboBox getJComboBoxPackageType() {
+        if (jComboBoxPackageType == null) {
+            jComboBoxPackageType = new JComboBox();
+            jComboBoxPackageType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jComboBoxPackageType;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jTextFieldPackageName 
+     
+     @return javax.swing.JTextField jTextFieldPackageName
+     
+     **/
+    private JTextField getJTextFieldPackageName() {
+        if (jTextFieldPackageName == null) {
+            jTextFieldPackageName = new JTextField();
+            jTextFieldPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldPackageName;
+    }
+
+    /**
+     This method initializes jComboBoxFileList 
+     
+     @return javax.swing.JComboBox jComboBoxFileList
+     
+     **/
+    private JComboBox getJComboBoxFileList() {
+        if (jComboBoxFileList == null) {
+            jComboBoxFileList = new JComboBox();
+            jComboBoxFileList.setBounds(new java.awt.Rectangle(15, 110, 210, 20));
+            jComboBoxFileList.addActionListener(this);
+            jComboBoxFileList.addItemListener(this);
+        }
+        return jComboBoxFileList;
+    }
+
+    /**
+     This method initializes jButtonAdd 
+     
+     @return javax.swing.JButton jButtonAdd
+     
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 110, 80, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+     This method initializes jButtonUpdate 
+     
+     @return javax.swing.JButton jButtonUpdate
+     
+     **/
+    private JButton getJButtonUpdate() {
+        if (jButtonUpdate == null) {
+            jButtonUpdate = new JButton();
+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 110, 80, 20));
+            jButtonUpdate.setText("Update");
+            jButtonUpdate.addActionListener(this);
+        }
+        return jButtonUpdate;
+    }
+
+    /**
+     This method initializes jButtonRemove 
+     
+     @return javax.swing.JButton jButtonRemove
+     
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 110, 80, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+     This method initializes jTextFieldUpdatedDate 
+     
+     @return javax.swing.JTextField jTextFieldUpdatedDate
+     
+     **/
+    private JTextField getJTextFieldUpdatedDate() {
+        if (jTextFieldUpdatedDate == null) {
+            jTextFieldUpdatedDate = new JTextField();
+            jTextFieldUpdatedDate.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jTextFieldUpdatedDate;
+    }
+
+    /**
+     This method initializes jCheckBoxArch 
+     
+     @return javax.swing.JCheckBox jCheckBoxArch
+     
+     **/
+    private JCheckBox getJCheckBoxArch() {
+        if (jCheckBoxArch == null) {
+            jCheckBoxArch = new JCheckBox();
+            jCheckBoxArch.setBounds(new java.awt.Rectangle(10, 135, 120, 20));
+            jCheckBoxArch.setText("Specific Arch");
+            jCheckBoxArch.addActionListener(this);
+        }
+        return jCheckBoxArch;
+    }
+
+    /**
+     This method initializes jComboBoxArch 
+     
+     @return javax.swing.JComboBox jComboBoxArch
+     
+     **/
+    private JComboBox getJComboBoxArch() {
+        if (jComboBoxArch == null) {
+            jComboBoxArch = new JComboBox();
+            jComboBoxArch.setBounds(new java.awt.Rectangle(140, 135, 340, 20));
+            jComboBoxArch.setEnabled(false);
+        }
+        return jComboBoxArch;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleIncludes() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inIncludes The input data of IncludesDocument.Includes
+     
+     **/
+    public ModuleIncludes(IncludesDocument.Includes inIncludes) {
+        super();
+        init(inIncludes);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inIncludes The input data of IncludesDocument.Includes
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleIncludes(IncludesDocument.Includes inIncludes, int type, int index) {
+        super();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inIncludes The input data of IncludesDocument.Includes
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of current operation type
+     
+     **/
+    public ModuleIncludes(IncludesDocument.Includes inIncludes, int type, int index, int inOperation) {
+        super();
+        init(inIncludes, type, index, inOperation);
+        this.operation = inOperation;
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inIncludes
+     
+     **/
+    private void init(IncludesDocument.Includes inIncludes) {
+        init();
+        this.setIncludes(inIncludes);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inIncludes The input data of IncludesDocument.Includes
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of current operation type
+     
+     **/
+    private void init(IncludesDocument.Includes inIncludes, int type, int index, int inOperation) {
+        init(inIncludes);
+        this.location = index;
+        this.operation = inOperation;
+
+        if (operation == 2) {
+            this.jCheckBoxArch.setEnabled(false);
+            this.jComboBoxArch.setEnabled(false);
+
+            if (type == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME) {
+                if (this.includes.getPackageNameList().size() > 0) {
+                    for (int indexI = 0; indexI < this.includes.getPackageNameList().size(); indexI++) {
+                        if (this.includes.getPackageNameArray(indexI).getStringValue() != null) {
+                            vPackageName.addElement(this.includes.getPackageNameArray(indexI).getStringValue());
+                        } else {
+                            vPackageName.addElement("");
+                        }
+                        if (this.includes.getPackageNameArray(indexI).getUsage() != null) {
+                            vUsage.addElement(this.includes.getPackageNameArray(indexI).getUsage().toString());
+                        } else {
+                            vUsage.addElement("ALWAYS_CONSUMED");
+                        }
+                        if (this.includes.getPackageNameArray(indexI).getPackageType() != null) {
+                            vPackageType.addElement(this.includes.getPackageNameArray(indexI).getPackageType()
+                                                                 .toString());
+                        } else {
+                            vPackageType.addElement("SOURCE");
+                        }
+                        if (this.includes.getPackageNameArray(indexI).getUpdatedDate() != null) {
+                            vUpdatedDate.addElement(this.includes.getPackageNameArray(indexI).getUpdatedDate());
+                        } else {
+                            vUpdatedDate.addElement("");
+                        }
+                        jComboBoxFileList.addItem(this.includes.getPackageNameArray(indexI).getStringValue());
+                    }
+                }
+            }
+            if (type == IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM) {
+                this.jCheckBoxArch.setSelected(true);
+                this.jComboBoxArch.setSelectedItem(this.includes.getArchArray(index).getArchType().toString());
+                for (int indexI = 0; indexI < this.includes.getArchArray(index).getPackageNameList().size(); indexI++) {
+                    if (this.includes.getArchArray(index).getPackageNameArray(indexI).getStringValue() != null) {
+                        vPackageName.addElement(this.includes.getArchArray(index).getPackageNameArray(indexI)
+                                                             .getStringValue());
+                    } else {
+                        vPackageName.addElement("");
+                    }
+                    if (this.includes.getArchArray(index).getPackageNameArray(indexI).getUsage() != null) {
+                        vUsage.addElement(this.includes.getArchArray(index).getPackageNameArray(indexI).getUsage()
+                                                       .toString());
+                    } else {
+                        vUsage.addElement("");
+                    }
+                    if (this.includes.getArchArray(index).getPackageNameArray(indexI).getPackageType() != null) {
+                        vPackageType.addElement(this.includes.getArchArray(index).getPackageNameArray(indexI)
+                                                             .getPackageType().toString());
+                    } else {
+                        vPackageType.addElement("");
+                    }
+                    if (this.includes.getArchArray(index).getPackageNameArray(indexI).getUpdatedDate() != null) {
+                        vUpdatedDate.addElement(this.includes.getArchArray(index).getPackageNameArray(indexI)
+                                                             .getUpdatedDate());
+                    } else {
+                        vUpdatedDate.addElement("");
+                    }
+                    jComboBoxFileList.addItem(this.includes.getArchArray(index).getPackageNameArray(indexI)
+                                                           .getStringValue());
+                }
+            }
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Includes");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jComboBoxPackageType.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldPackageName.setEnabled(!isView);
+            this.jButtonAdd.setEnabled(!isView);
+            this.jButtonUpdate.setEnabled(!isView);
+            this.jButtonRemove.setEnabled(!isView);
+            this.jTextFieldUpdatedDate.setEnabled(!isView);
+            this.jCheckBoxArch.setEnabled(!isView);
+            this.jComboBoxArch.setEnabled(!isView);
+
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelUpdatedDate = new JLabel();
+            jLabelUpdatedDate.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelUpdatedDate.setText("Updated Date");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelUsage.setText("Usage");
+            jLabelPackageType = new JLabel();
+            jLabelPackageType.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelPackageType.setText("Package Type");
+            jLabelPackageName = new JLabel();
+            jLabelPackageName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelPackageName.setText("Package Name");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(jLabelPackageName, null);
+            jContentPane.add(jLabelPackageType, null);
+            jContentPane.add(getJComboBoxPackageType(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(getJTextFieldPackageName(), null);
+            jContentPane.add(getJComboBoxFileList(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonUpdate(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(jLabelUpdatedDate, null);
+            jContentPane.add(getJTextFieldUpdatedDate(), null);
+            jContentPane.add(getJCheckBoxArch(), null);
+            jContentPane.add(getJComboBoxArch(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonAdd) {
+            if (!checkAdd()) {
+                return;
+            }
+            addToList();
+        }
+        if (arg0.getSource() == jButtonRemove) {
+            removeFromList();
+        }
+        if (arg0.getSource() == jButtonUpdate) {
+            if (!checkAdd()) {
+                return;
+            }
+            updateForList();
+        }
+
+        //
+        //When and only when checked Arch box then can choose different arch types
+        //
+        if (arg0.getSource() == jCheckBoxArch) {
+            if (this.jCheckBoxArch.isSelected()) {
+                this.jComboBoxArch.setEnabled(true);
+            } else {
+                this.jComboBoxArch.setEnabled(false);
+            }
+        }
+    }
+
+    /**
+     This method initializes Usage type, Package type and Arch type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+
+        jComboBoxPackageType.addItem("SOURCE");
+        jComboBoxPackageType.addItem("BINARY");
+        jComboBoxPackageType.addItem("MIXED");
+
+        jComboBoxArch.addItem("ALL");
+        jComboBoxArch.addItem("EBC");
+        jComboBoxArch.addItem("ARM");
+        jComboBoxArch.addItem("IA32");
+        jComboBoxArch.addItem("X64");
+        jComboBoxArch.addItem("IPF");
+        jComboBoxArch.addItem("PPC");
+    }
+
+    /**
+     Add current item to Vector
+     
+     **/
+    private void addToList() {
+        intSelectedItemId = vPackageName.size();
+        vPackageName.addElement(this.jTextFieldPackageName.getText());
+        vUsage.addElement(this.jComboBoxUsage.getSelectedItem().toString());
+        vPackageType.addElement(this.jComboBoxPackageType.getSelectedItem().toString());
+        vUpdatedDate.addElement(this.jTextFieldUpdatedDate.getText());
+        jComboBoxFileList.addItem(this.jTextFieldPackageName.getText());
+        jComboBoxFileList.setSelectedItem(this.jTextFieldPackageName.getText());
+        
+        //
+        // Reset select item index
+        //
+        intSelectedItemId = vPackageName.size();
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Remove item from Vector
+     
+     **/
+    private void removeFromList() {
+        int intTempIndex = intSelectedItemId;
+        if (vPackageName.size() < 1) {
+            return;
+        }
+        
+        jComboBoxFileList.removeItemAt(intSelectedItemId);
+        
+        vPackageName.removeElementAt(intTempIndex);
+        vUsage.removeElementAt(intTempIndex);
+        vPackageType.removeElementAt(intTempIndex);
+        vUpdatedDate.removeElementAt(intTempIndex);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Update current item of Vector
+     
+     **/
+    private void updateForList() {
+        //
+        // Backup selected item index
+        //
+        int intTempIndex = intSelectedItemId;
+        
+        vPackageName.setElementAt(this.jTextFieldPackageName.getText(), intSelectedItemId);
+        vUsage.setElementAt(this.jComboBoxUsage.getSelectedItem().toString(), intSelectedItemId);
+        vPackageType.setElementAt(this.jComboBoxPackageType.getSelectedItem().toString(), intSelectedItemId);
+        vUpdatedDate.setElementAt(this.jTextFieldUpdatedDate.getText(), intSelectedItemId);
+        
+        jComboBoxFileList.removeAllItems();
+        for (int index = 0; index < vPackageName.size(); index++) {
+            jComboBoxFileList.addItem(vPackageName.elementAt(index));
+        }
+        
+        //
+        // Restore selected item index
+        //
+        intSelectedItemId = intTempIndex;
+        
+        //
+        // Reset select item index
+        //
+        jComboBoxFileList.setSelectedIndex(intSelectedItemId);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Refresh all fields' values of selected item of Vector
+     
+     **/
+    private void reloadFromList() {
+        if (vPackageName.size() > 0) {
+            //
+            // Get selected item index
+            //
+            intSelectedItemId = jComboBoxFileList.getSelectedIndex();
+            
+            this.jTextFieldPackageName.setText(vPackageName.elementAt(intSelectedItemId).toString());
+            this.jComboBoxUsage.setSelectedItem(vUsage.elementAt(intSelectedItemId).toString());
+            this.jComboBoxPackageType.setSelectedItem(vPackageType.elementAt(intSelectedItemId).toString());
+            this.jTextFieldUpdatedDate.setText(vUpdatedDate.elementAt(intSelectedItemId).toString());
+        } else {
+            this.jTextFieldPackageName.setText("");
+            this.jComboBoxUsage.setSelectedItem("");
+            this.jComboBoxPackageType.setSelectedItem("");
+            this.jTextFieldUpdatedDate.setText("");
+        }
+    }
+
+    /**
+     Get IncludesDocument.Includes
+     
+     @return IncludesDocument.Includes
+     
+     **/
+    public IncludesDocument.Includes getIncludes() {
+        return includes;
+    }
+
+    /**
+     Set IncludesDocument.Includes
+     
+     @param includes IncludesDocument.Includes
+     
+     **/
+    public void setIncludes(IncludesDocument.Includes includes) {
+        this.includes = includes;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
+     *
+     * Reflesh the frame when selected item changed
+     * 
+     */
+    public void itemStateChanged(ItemEvent arg0) {
+        if (arg0.getStateChange() == ItemEvent.SELECTED) {
+            reloadFromList();
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        if (this.jComboBoxFileList.getItemCount() < 1) {
+            Log.err("Must have one include at least!");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Data validation for all fields before add current item to Vector
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean checkAdd() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldPackageName.getText())) {
+            Log.err("File Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isPackageName(this.jTextFieldPackageName.getText())) {
+            Log.err("Incorrect data type for Package Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldUpdatedDate.getText())
+            && !DataValidation.isDateType(this.jTextFieldUpdatedDate.getText())) {
+            Log.err("Incorrect data type for Update Date");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Includes
+     if exists includes, set the value directly
+     if not exists includes, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.includes == null) {
+                includes = IncludesDocument.Includes.Factory.newInstance();
+            }
+            //
+            //Save as file name
+            //
+            if (!this.jCheckBoxArch.isSelected()) {
+                if (this.operation == 2) { //Add new packageName
+                    //
+                    //First remove all existed packageName
+                    //
+                    if (includes.getPackageNameList().size() > 0) {
+                        for (int index = includes.getPackageNameList().size() - 1; index >= 0; index--) {
+                            includes.removePackageName(index);
+                        }
+                    }
+                }
+                for (int index = 0; index < vPackageName.size(); index++) {
+                    PackageNameDocument.PackageName packageName = PackageNameDocument.PackageName.Factory.newInstance();
+                    if (!isEmpty(vPackageName.elementAt(index).toString())) {
+                        packageName.setStringValue(vPackageName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vUsage.elementAt(index).toString())) {
+                        packageName.setUsage(PackageUsage.Enum.forString(vUsage.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vPackageType.elementAt(index).toString())) {
+                        packageName
+                                   .setPackageType(PackageType.Enum.forString(vPackageType.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vUpdatedDate.elementAt(index).toString())) {
+                        packageName.setUpdatedDate(vUpdatedDate.elementAt(index).toString());
+                    }
+                    includes.addNewPackageName();
+                    includes.setPackageNameArray(includes.getPackageNameList().size() - 1, packageName);
+                }
+            }
+            //
+            //Save as Arch
+            //
+            if (this.jCheckBoxArch.isSelected()) {
+                IncludesDocument.Includes.Arch arch = IncludesDocument.Includes.Arch.Factory.newInstance();
+                if (this.operation == 2) {
+                    //
+                    //First remove all existed filename
+                    //
+                    for (int index = includes.getArchArray(location).getPackageNameList().size() - 1; index >= 0; index--) {
+                        includes.getArchArray(location).removePackageName(index);
+                    }
+                }
+
+                for (int index = 0; index < vPackageName.size(); index++) {
+                    PackageNameDocument.PackageName packageName = PackageNameDocument.PackageName.Factory.newInstance();
+                    if (!isEmpty(vPackageName.elementAt(index).toString())) {
+                        packageName.setStringValue(vPackageName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vUsage.elementAt(index).toString())) {
+                        packageName.setUsage(PackageUsage.Enum.forString(vUsage.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vPackageType.elementAt(index).toString())) {
+                        packageName
+                                   .setPackageType(PackageType.Enum.forString(vPackageType.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vUpdatedDate.elementAt(index).toString())) {
+                        packageName.setUpdatedDate(vUpdatedDate.elementAt(index).toString());
+                    }
+                    arch.addNewPackageName();
+                    arch.setPackageNameArray(arch.getPackageNameList().size() - 1, packageName);
+                }
+                arch
+                    .setArchType(SupportedArchitectures.Enum.forString(this.jComboBoxArch.getSelectedItem().toString()));
+                if (location > -1) {
+                    includes.setArchArray(location, arch);
+                } else {
+                    includes.addNewArch();
+                    includes.setArchArray(includes.getArchList().size() - 1, arch);
+                }
+            }
+        } catch (Exception e) {
+            Log.err("Update Source Files", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java
new file mode 100644
index 0000000000..dfd6893f18
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java
@@ -0,0 +1,625 @@
+/** @file
+ 
+ The file is used to create, update Library Class Definition of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+
+import org.tianocore.LibraryClassDefinitionsDocument;
+import org.tianocore.LibraryClassDocument;
+import org.tianocore.LibraryUsage;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+
+/**
+ The class is used to create, update Library Class Definition of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleLibraryClassDefinitions extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -1743248695411382857L;
+
+    //
+    //Define class members
+    //
+    private static String Separator = "::";
+
+    private DefaultListModel listItem = new DefaultListModel();
+
+    private LibraryClassDefinitionsDocument.LibraryClassDefinitions libraryClassDefinitions = null;
+
+    private JPanel jContentPane = null;
+
+    private JRadioButton jRadioButtonAdd = null;
+
+    private JRadioButton jRadioButtonSelect = null;
+
+    private JTextField jTextFieldAdd = null;
+
+    private JComboBox jComboBoxSelect = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JList jListLibraryClassDefinitions = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonClearAll = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonOk = null;
+
+    /**
+     This method initializes jRadioButtonAdd 
+     
+     @return javax.swing.JRadioButton jRadioButtonAdd
+     
+     **/
+    private JRadioButton getJRadioButtonAdd() {
+        if (jRadioButtonAdd == null) {
+            jRadioButtonAdd = new JRadioButton();
+            jRadioButtonAdd.setBounds(new java.awt.Rectangle(15, 35, 205, 20));
+            jRadioButtonAdd.setText("Add a new Library Class");
+            jRadioButtonAdd.addActionListener(this);
+            jRadioButtonAdd.setSelected(false);
+        }
+        return jRadioButtonAdd;
+    }
+
+    /**
+     This method initializes jRadioButtonSelect 
+     
+     @return javax.swing.JRadioButton jRadioButtonSelect
+     
+     **/
+    private JRadioButton getJRadioButtonSelect() {
+        if (jRadioButtonSelect == null) {
+            jRadioButtonSelect = new JRadioButton();
+            jRadioButtonSelect.setBounds(new java.awt.Rectangle(15, 10, 205, 20));
+            jRadioButtonSelect.setText("Select an existed Library Class");
+            jRadioButtonSelect.addActionListener(this);
+            jRadioButtonSelect.setSelected(true);
+        }
+        return jRadioButtonSelect;
+    }
+
+    /**
+     This method initializes jTextFieldAdd 
+     
+     @return javax.swing.JTextField jTextFieldAdd
+     
+     **/
+    private JTextField getJTextFieldAdd() {
+        if (jTextFieldAdd == null) {
+            jTextFieldAdd = new JTextField();
+            jTextFieldAdd.setBounds(new java.awt.Rectangle(220, 35, 260, 20));
+            jTextFieldAdd.setEnabled(false);
+        }
+        return jTextFieldAdd;
+    }
+
+    /**
+     This method initializes jComboBoxSelect 
+     
+     @return javax.swing.JComboBox jComboBoxSelect
+     
+     **/
+    private JComboBox getJComboBoxSelect() {
+        if (jComboBoxSelect == null) {
+            jComboBoxSelect = new JComboBox();
+            jComboBoxSelect.setBounds(new java.awt.Rectangle(220, 10, 260, 20));
+            jComboBoxSelect.setEnabled(true);
+        }
+        return jComboBoxSelect;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(220, 60, 260, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jScrollPane 
+     
+     @return javax.swing.JScrollPane jScrollPane
+     
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(15, 95, 350, 200));
+            jScrollPane.setViewportView(getJListLibraryClassDefinitions());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jListLibraryClassDefinitions 
+     
+     @return javax.swing.JList jListLibraryClassDefinitions
+     
+     **/
+    private JList getJListLibraryClassDefinitions() {
+        if (jListLibraryClassDefinitions == null) {
+            jListLibraryClassDefinitions = new JList(listItem);
+        }
+        return jListLibraryClassDefinitions;
+    }
+
+    /**
+     This method initializes jButtonAdd 
+     
+     @return javax.swing.JButton jButtonAdd
+     
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(380, 115, 90, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+     This method initializes jButtonRemove
+     
+     @return javax.swing.JButton jButtonRemove 
+     
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(380, 230, 90, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+     This method initializes jButtonRemoveAll 
+     
+     @return javax.swing.JButton jButtonClearAll
+     
+     **/
+    private JButton getJButtonClearAll() {
+        if (jButtonClearAll == null) {
+            jButtonClearAll = new JButton();
+            jButtonClearAll.setBounds(new java.awt.Rectangle(380, 260, 90, 20));
+            jButtonClearAll.setText("Clear All");
+            jButtonClearAll.addActionListener(this);
+        }
+        return jButtonClearAll;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.setLocation(new java.awt.Point(390, 305));
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setSize(new java.awt.Dimension(90, 20));
+            jButtonOk.setText("OK");
+            jButtonOk.setLocation(new java.awt.Point(290, 305));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleLibraryClassDefinitions() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inLibraryClassDefinitions The input data of LibraryClassDefinitionsDocument.LibraryClassDefinitions
+     
+     **/
+    public ModuleLibraryClassDefinitions(
+                                         LibraryClassDefinitionsDocument.LibraryClassDefinitions inLibraryClassDefinitions) {
+        super();
+        init(inLibraryClassDefinitions);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inLibraryClassDefinitions The input data of LibraryClassDefinitionsDocument.LibraryClassDefinitions
+     
+     **/
+    private void init(LibraryClassDefinitionsDocument.LibraryClassDefinitions inLibraryClassDefinitions) {
+        init();
+        this.setLibraryClassDefinitions(inLibraryClassDefinitions);
+        if (this.libraryClassDefinitions != null) {
+            if (this.libraryClassDefinitions.getLibraryClassList().size() > 0) {
+                for (int index = 0; index < this.libraryClassDefinitions.getLibraryClassList().size(); index++) {
+                    listItem.addElement(this.libraryClassDefinitions.getLibraryClassArray(index).getUsage().toString()
+                                        + ModuleLibraryClassDefinitions.Separator
+                                        + this.libraryClassDefinitions.getLibraryClassArray(index).getStringValue());
+                    this.libraryClassDefinitions.getLibraryClassList();
+                }
+            }
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Class Definitions");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 515));
+        //this.centerWindow();
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jRadioButtonAdd.setEnabled(!isView);
+            this.jRadioButtonSelect.setEnabled(!isView);
+            this.jTextFieldAdd.setEnabled(!isView);
+            this.jComboBoxSelect.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jButtonAdd.setEnabled(!isView);
+            this.jButtonRemove.setEnabled(!isView);
+            this.jButtonClearAll.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelUsage = new JLabel();
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 205, 20));
+            jLabelUsage.setText("Usage");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJRadioButtonAdd(), null);
+            jContentPane.add(getJRadioButtonSelect(), null);
+            jContentPane.add(getJTextFieldAdd(), null);
+            jContentPane.add(getJComboBoxSelect(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonClearAll(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonOk(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes all existing libraries and usage types
+     
+     **/
+    private void initFrame() {
+        jComboBoxSelect.addItem("BaseCpuICacheFlush");
+        jComboBoxSelect.addItem("BaseDebugLibNull");
+        jComboBoxSelect.addItem("BaseDebugLibReportStatusCode");
+        jComboBoxSelect.addItem("BaseIoLibIntrinsic");
+        jComboBoxSelect.addItem("BaseLib");
+        jComboBoxSelect.addItem("BaseMemoryLib");
+        jComboBoxSelect.addItem("BaseMemoryLibMmx");
+        jComboBoxSelect.addItem("BaseMemoryLibSse2");
+        jComboBoxSelect.addItem("BasePeCoffGetEntryPointLib");
+        jComboBoxSelect.addItem("BasePeCoffLib");
+        jComboBoxSelect.addItem("BasePrintLib");
+        jComboBoxSelect.addItem("BaseReportStatusCodeLibNull");
+        jComboBoxSelect.addItem("CommonPciCf8Lib");
+        jComboBoxSelect.addItem("CommonPciExpressLib");
+        jComboBoxSelect.addItem("CommonPciLibCf8");
+        jComboBoxSelect.addItem("CommonPciLibPciExpress");
+        jComboBoxSelect.addItem("DxeCoreEntryPoint");
+        jComboBoxSelect.addItem("DxeHobLib");
+        jComboBoxSelect.addItem("DxeIoLibCpuIo");
+        jComboBoxSelect.addItem("DxeLib");
+        jComboBoxSelect.addItem("DxePcdLib");
+        jComboBoxSelect.addItem("DxeReportStatusCodeLib");
+        jComboBoxSelect.addItem("DxeServicesTableLib");
+        jComboBoxSelect.addItem("PeiCoreEntryPoint");
+        jComboBoxSelect.addItem("PeiMemoryLib");
+        jComboBoxSelect.addItem("PeimEntryPoint");
+        jComboBoxSelect.addItem("PeiReportStatusCodeLib");
+        jComboBoxSelect.addItem("PeiServicesTablePointerLib");
+        jComboBoxSelect.addItem("PeiServicesTablePointerLibMm7");
+        jComboBoxSelect.addItem("UefiDebugLibConOut");
+        jComboBoxSelect.addItem("UefiDebugLibStdErr");
+        jComboBoxSelect.addItem("UefiDriverEntryPointMultiple");
+        jComboBoxSelect.addItem("UefiDriverEntryPointSingle");
+        jComboBoxSelect.addItem("UefiDriverEntryPointSingleUnload");
+        jComboBoxSelect.addItem("UefiDriverModelLib");
+        jComboBoxSelect.addItem("UefiDriverModelLibNoConfigNoDiag");
+        jComboBoxSelect.addItem("UefiLib");
+        jComboBoxSelect.addItem("UefiMemoryLib");
+
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.dispose();
+            this.setEdited(true);
+            this.save();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+            this.setEdited(false);
+        }
+
+        //
+        // Add current Library and its usage to the list
+        //
+        if (arg0.getSource() == jButtonAdd) {
+            if (!checkAdd()) {
+                return;
+            }
+            String strLibClass = "";
+            String strUsage = "";
+            if (jRadioButtonAdd.isSelected()) {
+                strLibClass = jTextFieldAdd.getText();
+            }
+            if (jRadioButtonSelect.isSelected()) {
+                strLibClass = jComboBoxSelect.getSelectedItem().toString();
+            }
+            strUsage = jComboBoxUsage.getSelectedItem().toString();
+            listItem.addElement(strUsage + ModuleLibraryClassDefinitions.Separator + strLibClass);
+        }
+
+        //
+        // Remove current Library and its usage of the list
+        //
+        if (arg0.getSource() == jButtonRemove) {
+            int intSelected[] = jListLibraryClassDefinitions.getSelectedIndices();
+            if (intSelected.length > 0) {
+                for (int index = intSelected.length - 1; index > -1; index--) {
+                    listItem.removeElementAt(intSelected[index]);
+                }
+            }
+            jListLibraryClassDefinitions.getSelectionModel().clearSelection();
+        }
+
+        if (arg0.getSource() == jButtonClearAll) {
+            listItem.removeAllElements();
+        }
+
+        //
+        // Contorl the selected status when click RadionButton
+        // Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonAdd) {
+            if (jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(false);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonAdd.setSelected(true);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonSelect) {
+            if (jRadioButtonSelect.isSelected()) {
+                jRadioButtonAdd.setSelected(false);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(true);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        if (listItem.getSize() < 1) {
+            Log.err("Must have one Library Class at least!");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean checkAdd() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (this.jRadioButtonAdd.isSelected() && isEmpty(this.jTextFieldAdd.getText())) {
+            Log.err("Library Class couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (this.jRadioButtonAdd.isSelected() && !DataValidation.isLibraryClass(this.jTextFieldAdd.getText())) {
+            Log.err("Incorrect data type for Library Class");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Save all components of Mbd Header
+     if exists mbdHeader, set the value directly
+     if not exists mbdHeader, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            int intLibraryCount = listItem.getSize();
+
+            if (this.libraryClassDefinitions == null) {
+                libraryClassDefinitions = LibraryClassDefinitionsDocument.LibraryClassDefinitions.Factory.newInstance();
+            }
+
+            if (intLibraryCount > 0) {
+                LibraryClassDocument.LibraryClass mLibraryClass = LibraryClassDocument.LibraryClass.Factory
+                                                                                                           .newInstance();
+                for (int index = this.libraryClassDefinitions.getLibraryClassList().size() - 1; index > -1; index--) {
+                    this.libraryClassDefinitions.removeLibraryClass(index);
+                }
+                for (int index = 0; index < intLibraryCount; index++) {
+                    String strAll = listItem.get(index).toString();
+                    String strUsage = strAll.substring(0, strAll.indexOf(ModuleLibraryClassDefinitions.Separator));
+                    String strLibraryClass = strAll.substring(strAll.indexOf(ModuleLibraryClassDefinitions.Separator)
+                                                              + ModuleLibraryClassDefinitions.Separator.length());
+                    mLibraryClass.setStringValue(strLibraryClass);
+                    mLibraryClass.setUsage(LibraryUsage.Enum.forString(strUsage));
+                    this.libraryClassDefinitions.addNewLibraryClass();
+                    this.libraryClassDefinitions.setLibraryClassArray(index, mLibraryClass);
+                }
+            } else {
+                this.libraryClassDefinitions.setNil();
+            }
+        } catch (Exception e) {
+            Log.err("Update Library Class Definitions", e.getMessage());
+        }
+    }
+
+    /**
+     Get LibraryClassDefinitionsDocument.LibraryClassDefinitions
+     
+     @return
+     
+     **/
+    public LibraryClassDefinitionsDocument.LibraryClassDefinitions getLibraryClassDefinitions() {
+        return libraryClassDefinitions;
+    }
+
+    /**
+     Set LibraryClassDefinitionsDocument.LibraryClassDefinitions
+     
+     @param libraryClassDefinitions The input data of LibraryClassDefinitionsDocument.LibraryClassDefinitions
+     
+     **/
+    public void setLibraryClassDefinitions(
+                                           LibraryClassDefinitionsDocument.LibraryClassDefinitions libraryClassDefinitions) {
+        this.libraryClassDefinitions = libraryClassDefinitions;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
new file mode 100644
index 0000000000..a9a0c21e5b
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
@@ -0,0 +1,4422 @@
+/** @file
+ 
+ The main GUI for module editor. 
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JButton;
+import javax.swing.JDesktopPane;
+import javax.swing.JFileChooser;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.border.BevelBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.tianocore.BootModesDocument;
+import org.tianocore.BuildOptionsDocument;
+import org.tianocore.DataHubsDocument;
+import org.tianocore.EventsDocument;
+import org.tianocore.ExternsDocument;
+import org.tianocore.FormsetsDocument;
+import org.tianocore.GuidsDocument;
+import org.tianocore.HobsDocument;
+import org.tianocore.IncludesDocument;
+import org.tianocore.LibrariesDocument;
+import org.tianocore.LibraryClassDefinitionsDocument;
+import org.tianocore.LibraryModuleBuildDescriptionDocument;
+import org.tianocore.LibraryModuleSurfaceAreaDocument;
+import org.tianocore.MbdHeaderDocument;
+import org.tianocore.MbdLibHeaderDocument;
+import org.tianocore.ModuleBuildDescriptionDocument;
+import org.tianocore.ModuleSurfaceAreaDocument;
+import org.tianocore.MsaHeaderDocument;
+import org.tianocore.MsaLibHeaderDocument;
+import org.tianocore.PCDsDocument;
+import org.tianocore.PPIsDocument;
+import org.tianocore.ProtocolsDocument;
+import org.tianocore.SourceFilesDocument;
+import org.tianocore.SystemTablesDocument;
+import org.tianocore.VariablesDocument;
+import org.tianocore.common.IFileFilter;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IDesktopManager;
+import org.tianocore.packaging.common.ui.IFrame;
+import org.tianocore.packaging.common.ui.ITree;
+import org.tianocore.packaging.workspace.common.Workspace;
+
+/**
+ The class is used to show main GUI of ModuleEditor
+ It extends IFrame implements MouseListener, TreeSelectionListener
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleMain extends IFrame implements MouseListener, TreeSelectionListener {
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -7103240960573031772L;
+
+    //
+    //Define class members
+    //
+    private String currentModule = "";
+
+    private String saveFileName = "";
+
+    ///
+    ///  0 - reserved; 1 - msa; 2 - mbd; 3 - lmsa; 4 - lmbd;
+    ///
+    private int currentModuleType = 0;
+
+    private int currentNodeType = -1;
+
+    private String windowTitle = "ModuleEditor 1.0 ";
+
+    private ModuleSurfaceAreaDocument xmlMsaDoc = null;
+
+    private ModuleBuildDescriptionDocument xmlMbdDoc = null;
+
+    private LibraryModuleSurfaceAreaDocument xmlMlsaDoc = null;
+
+    private LibraryModuleBuildDescriptionDocument xmlMlbdDoc = null;
+
+    private MsaHeaderDocument.MsaHeader xmlmh = null;
+
+    private MbdHeaderDocument.MbdHeader xmlmbdh = null;
+
+    private MsaLibHeaderDocument.MsaLibHeader xmlmlh = null;
+
+    private MbdLibHeaderDocument.MbdLibHeader xmlmlbdh = null;
+
+    private LibraryClassDefinitionsDocument.LibraryClassDefinitions xmllcd = null;
+
+    private LibrariesDocument.Libraries xmllib = null;
+
+    private SourceFilesDocument.SourceFiles xmlsf = null;
+
+    private IncludesDocument.Includes xmlic = null;
+
+    private ProtocolsDocument.Protocols xmlpl = null;
+
+    private EventsDocument.Events xmlen = null;
+
+    private HobsDocument.Hobs xmlhob = null;
+
+    private PPIsDocument.PPIs xmlppi = null;
+
+    private VariablesDocument.Variables xmlvb = null;
+
+    private BootModesDocument.BootModes xmlbm = null;
+
+    private SystemTablesDocument.SystemTables xmlst = null;
+
+    private DataHubsDocument.DataHubs xmldh = null;
+
+    private FormsetsDocument.Formsets xmlfs = null;
+
+    private GuidsDocument.Guids xmlgu = null;
+
+    private ExternsDocument.Externs xmlet = null;
+
+    private PCDsDocument.PCDs xmlpcd = null;
+
+    private BuildOptionsDocument.BuildOptions xmlbo = null;
+
+    IDefaultMutableTreeNode dmtnRoot = null;
+
+    private JPanel jContentPane = null;
+
+    private JMenuBar jMenuBar = null;
+
+    private JMenu jMenuModule = null;
+
+    private JMenu jMenuModuleNew = null;
+
+    private JMenuItem jMenuItemModuleNewModule = null;
+
+    private JMenuItem jMenuItemModuleSaveAs = null;
+
+    private JMenuItem jMenuItemModuleExit = null;
+
+    private JMenu jMenuEdit = null;
+
+    private JMenuItem jMenuItemEditAddLibraryClassDefinitions = null;
+
+    private JMenuItem jMenuItemEditAddSourceFiles = null;
+
+    private JMenuItem jMenuItemEditAddIncludes = null;
+
+    private JMenuItem jMenuItemEditAddProtocols = null;
+
+    private JMenuItem jMenuItemEditAddEvents = null;
+
+    private JMenuItem jMenuItemEditAddHobs = null;
+
+    private JMenuItem jMenuItemEditAddPPIs = null;
+
+    private JMenuItem jMenuItemEditAddVariables = null;
+
+    private JMenuItem jMenuItemEditAddBootModes = null;
+
+    private JMenuItem jMenuItemEditAddSystemTables = null;
+
+    private JMenuItem jMenuItemEditAddDataHubs = null;
+
+    private JMenuItem jMenuItemEditAddFormsets = null;
+
+    private JMenuItem jMenuItemEditAddGuids = null;
+
+    private JMenuItem jMenuItemEditAddExterns = null;
+
+    private JMenuItem jMenuItemEditAddPCDs = null;
+
+    private JDesktopPane jDesktopPane = null;
+
+    private IDesktopManager iDesktopManager = new IDesktopManager();
+
+    private JScrollPane jScrollPaneTree = null;
+
+    private ITree iTree = null;
+
+    private JMenu jMenuHelp = null;
+
+    private JMenuItem jMenuItemHelpAbout = null;
+
+    private JMenu jMenuEditAdd = null;
+
+    private JMenuItem jMenuItemEditDelete = null;
+
+    private JMenuItem jMenuItemEditUpdate = null;
+
+    private JPopupMenu jPopupMenu = null;
+
+    private JMenuItem jMenuItemPopupAdd = null;
+
+    private JMenuItem jMenuItemPopupUpdate = null;
+
+    private JMenuItem jMenuItemPopupDelete = null;
+
+    private Workspace ws = new Workspace();
+
+    private static final int OPENED = 0;
+
+    private static final int CLOSED = 1;
+
+    private static final int NEW_WITHOUT_CHANGE = 2;
+
+    private static final int NEW_WITH_CHANGE = 3;
+
+    private static final int UPDATE_WITHOUT_CHANGE = 4;
+
+    private static final int UPDATE_WITH_CHANGE = 5;
+
+    private static final int SAVE_WITHOUT_CHANGE = 6;
+
+    private static final int SAVE_WITH_CHANGE = 7;
+
+    private static final int ADD = 1;
+
+    private static final int UPDATE = 2;
+
+    //private static final int DELETE = 3;
+
+    private static final int VIEW = 4;
+
+    private MsaHeader msa = null;
+
+    private MbdHeader mbd = null;
+
+    private MsaLibHeader mlsa = null;
+
+    private MbdLibHeader mlbd = null;
+
+    private ModuleLibraryClassDefinitions mlcd = null;
+
+    private MbdLibraries mlib = null;
+
+    private ModuleSourceFiles msf = null;
+
+    private ModuleIncludes mic = null;
+
+    private ModuleProtocols mp = null;
+
+    private ModuleEvents mev = null;
+
+    private ModuleHobs mh = null;
+
+    private ModulePpis mpp = null;
+
+    private ModuleVariables mv = null;
+
+    private ModuleBootModes mbm = null;
+
+    private ModuleSystemTables mst = null;
+
+    private ModuleDataHubs mdh = null;
+
+    private ModuleFormsets mf = null;
+
+    private ModuleGuids mg = null;
+
+    private ModuleExterns met = null;
+
+    private ModulePCDs mpcd = null;
+
+    private JMenuItem jMenuItemModuleOpenModule = null;
+
+    private JMenuItem jMenuItemModuleNewModuleBuildDescription = null;
+
+    private JMenuItem jMenuItemModuleNewLibraryModule = null;
+
+    private JMenuItem jMenuItemModuleNewLibraryModuleBuildDescription = null;
+
+    private JMenu jMenuModuleOpen = null;
+
+    private JMenuItem jMenuItemModuleOpenModuleBuildDescription = null;
+
+    private JMenuItem jMenuItemModuleOpenLibraryModule = null;
+
+    private JMenuItem jMenuItemModuleOpenLibraryModuleBuildDescription = null;
+
+    private JMenuItem jMenuItemModuleSave = null;
+
+    private JMenuItem jMenuItemModuleClose = null;
+
+    private JMenu jMenuTools = null;
+
+    private JMenu jMenuWindow = null;
+
+    private JMenuItem jMenuItemEditAddLibraries = null;
+
+    private JPanel jPanelOperation = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    /**
+     This method initializes jMenuBar 
+     
+     @return javax.swing.JMenuBar Main menu bar for the entire GUI
+     
+     **/
+    private JMenuBar getjJMenuBar() {
+        if (jMenuBar == null) {
+            jMenuBar = new JMenuBar();
+            jMenuBar.setPreferredSize(new java.awt.Dimension(0, 18));
+            jMenuBar.add(getJMenuModule());
+            jMenuBar.add(getJMenuEdit());
+            jMenuBar.add(getJMenuTools());
+            jMenuBar.add(getJMenuWindow());
+            jMenuBar.add(getJMenuHelp());
+        }
+        return jMenuBar;
+    }
+
+    /**
+     This method initializes jMenuFile 
+     
+     @return javax.swing.JMenu jMenuModule
+     
+     **/
+    private JMenu getJMenuModule() {
+        if (jMenuModule == null) {
+            jMenuModule = new JMenu();
+            jMenuModule.setText("Module");
+            jMenuModule.add(getJMenuModuleNew());
+            jMenuModule.addSeparator();
+            jMenuModule.add(getJMenuModuleOpen());
+            jMenuModule.addSeparator();
+            jMenuModule.add(getJMenuItemModuleSave());
+            jMenuModule.add(getJMenuItemModuleSaveAs());
+            jMenuModule.addSeparator();
+            jMenuModule.add(getJMenuItemModuleClose());
+            jMenuModule.addSeparator();
+            jMenuModule.add(getJMenuItemModuleExit());
+        }
+        return jMenuModule;
+    }
+
+    /**
+     This method initializes jMenuItemModuleNewModule 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleNewModule
+     
+     **/
+    private JMenuItem getJMenuItemModuleNewModule() {
+        if (jMenuItemModuleNewModule == null) {
+            jMenuItemModuleNewModule = new JMenuItem();
+            jMenuItemModuleNewModule.setText("Module (.msa)");
+            jMenuItemModuleNewModule.addActionListener(this);
+        }
+        return jMenuItemModuleNewModule;
+    }
+
+    /**
+     This method initializes jMenuItemModuleSaveAs 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleSaveAs
+     
+     **/
+    private JMenuItem getJMenuItemModuleSaveAs() {
+        if (jMenuItemModuleSaveAs == null) {
+            jMenuItemModuleSaveAs = new JMenuItem();
+            jMenuItemModuleSaveAs.setText("Save As...");
+            jMenuItemModuleSaveAs.addActionListener(this);
+            jMenuItemModuleSaveAs.setEnabled(false);
+        }
+        return jMenuItemModuleSaveAs;
+    }
+
+    /**
+     This method initializes jMenuItemModuleExit 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleExit
+     
+     **/
+    private JMenuItem getJMenuItemModuleExit() {
+        if (jMenuItemModuleExit == null) {
+            jMenuItemModuleExit = new JMenuItem();
+            jMenuItemModuleExit.setText("Exit");
+            jMenuItemModuleExit.addActionListener(this);
+        }
+        return jMenuItemModuleExit;
+    }
+
+    /**
+     This method initializes jMenuEdit 
+     
+     @return javax.swing.JMenu jMenuEdit
+     
+     **/
+    private JMenu getJMenuEdit() {
+        if (jMenuEdit == null) {
+            jMenuEdit = new JMenu();
+            jMenuEdit.setText("Edit");
+            jMenuEdit.add(getJMenu());
+            jMenuEdit.add(getJMenuItemEditUpdate());
+            jMenuEdit.add(getJMenuItemEditDelete());
+        }
+        return jMenuEdit;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddLibraryClassDefinitions 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddLibraryClassDefinitions
+     
+     **/
+    private JMenuItem getJMenuItemEditAddLibraryClassDefinitions() {
+        if (jMenuItemEditAddLibraryClassDefinitions == null) {
+            jMenuItemEditAddLibraryClassDefinitions = new JMenuItem();
+            jMenuItemEditAddLibraryClassDefinitions.setText("Library Class Definitions");
+            jMenuItemEditAddLibraryClassDefinitions.addActionListener(this);
+        }
+        return jMenuItemEditAddLibraryClassDefinitions;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddSourceFiles 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddSourceFiles
+     
+     **/
+    private JMenuItem getJMenuItemEditAddSourceFiles() {
+        if (jMenuItemEditAddSourceFiles == null) {
+            jMenuItemEditAddSourceFiles = new JMenuItem();
+            jMenuItemEditAddSourceFiles.setText("Source Files");
+            jMenuItemEditAddSourceFiles.addActionListener(this);
+        }
+        return jMenuItemEditAddSourceFiles;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddIncludes 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddIncludes
+     
+     **/
+    private JMenuItem getJMenuItemEditAddIncludes() {
+        if (jMenuItemEditAddIncludes == null) {
+            jMenuItemEditAddIncludes = new JMenuItem();
+            jMenuItemEditAddIncludes.setText("Includes");
+            jMenuItemEditAddIncludes.addActionListener(this);
+        }
+        return jMenuItemEditAddIncludes;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddProtocols 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddProtocols
+     
+     **/
+    private JMenuItem getJMenuItemEditAddProtocols() {
+        if (jMenuItemEditAddProtocols == null) {
+            jMenuItemEditAddProtocols = new JMenuItem();
+            jMenuItemEditAddProtocols.setText("Protocols");
+            jMenuItemEditAddProtocols.addActionListener(this);
+        }
+        return jMenuItemEditAddProtocols;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddEvents 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddEvents
+     
+     **/
+    private JMenuItem getJMenuItemEditAddEvents() {
+        if (jMenuItemEditAddEvents == null) {
+            jMenuItemEditAddEvents = new JMenuItem();
+            jMenuItemEditAddEvents.setText("Events");
+            jMenuItemEditAddEvents.addActionListener(this);
+        }
+        return jMenuItemEditAddEvents;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddHobs 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddHobs
+     
+     **/
+    private JMenuItem getJMenuItemEditAddHobs() {
+        if (jMenuItemEditAddHobs == null) {
+            jMenuItemEditAddHobs = new JMenuItem();
+            jMenuItemEditAddHobs.setText("Hobs");
+            jMenuItemEditAddHobs.addActionListener(this);
+        }
+        return jMenuItemEditAddHobs;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddPPIs 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddPPIs
+     
+     **/
+    private JMenuItem getJMenuItemEditAddPPIs() {
+        if (jMenuItemEditAddPPIs == null) {
+            jMenuItemEditAddPPIs = new JMenuItem();
+            jMenuItemEditAddPPIs.setText("PPIs");
+            jMenuItemEditAddPPIs.addActionListener(this);
+        }
+        return jMenuItemEditAddPPIs;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddVariables 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddVariables
+     
+     **/
+    private JMenuItem getJMenuItemEditAddVariables() {
+        if (jMenuItemEditAddVariables == null) {
+            jMenuItemEditAddVariables = new JMenuItem();
+            jMenuItemEditAddVariables.setText("Variables");
+            jMenuItemEditAddVariables.addActionListener(this);
+        }
+        return jMenuItemEditAddVariables;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddBootModes 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddBootModes
+     
+     **/
+    private JMenuItem getJMenuItemAddBootModes() {
+        if (jMenuItemEditAddBootModes == null) {
+            jMenuItemEditAddBootModes = new JMenuItem();
+            jMenuItemEditAddBootModes.setText("Boot Modes");
+            jMenuItemEditAddBootModes.addActionListener(this);
+        }
+        return jMenuItemEditAddBootModes;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddSystemTables 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddSystemTables
+     
+     **/
+    private JMenuItem getJMenuItemAddSystemTables() {
+        if (jMenuItemEditAddSystemTables == null) {
+            jMenuItemEditAddSystemTables = new JMenuItem();
+            jMenuItemEditAddSystemTables.setText("System Tables");
+            jMenuItemEditAddSystemTables.addActionListener(this);
+        }
+        return jMenuItemEditAddSystemTables;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddDataHubs 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddDataHubs
+     
+     **/
+    private JMenuItem getJMenuItemEditAddDataHubs() {
+        if (jMenuItemEditAddDataHubs == null) {
+            jMenuItemEditAddDataHubs = new JMenuItem();
+            jMenuItemEditAddDataHubs.setText("Data Hubs");
+            jMenuItemEditAddDataHubs.addActionListener(this);
+        }
+        return jMenuItemEditAddDataHubs;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddFormsets 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddFormsets
+     
+     **/
+    private JMenuItem getJMenuItemEditAddFormsets() {
+        if (jMenuItemEditAddFormsets == null) {
+            jMenuItemEditAddFormsets = new JMenuItem();
+            jMenuItemEditAddFormsets.setText("Formsets");
+            jMenuItemEditAddFormsets.addActionListener(this);
+        }
+        return jMenuItemEditAddFormsets;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddGuids 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddGuids
+     
+     **/
+    private JMenuItem getJMenuItemEditAddGuids() {
+        if (jMenuItemEditAddGuids == null) {
+            jMenuItemEditAddGuids = new JMenuItem();
+            jMenuItemEditAddGuids.setText("Guids");
+            jMenuItemEditAddGuids.addActionListener(this);
+        }
+        return jMenuItemEditAddGuids;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddExterns 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddExterns
+     
+     **/
+    private JMenuItem getJMenuItemEditAddExterns() {
+        if (jMenuItemEditAddExterns == null) {
+            jMenuItemEditAddExterns = new JMenuItem();
+            jMenuItemEditAddExterns.setText("Externs");
+            jMenuItemEditAddExterns.addActionListener(this);
+        }
+        return jMenuItemEditAddExterns;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddPCDs 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddPCDs
+     
+     **/
+    private JMenuItem getJMenuItemEditAddPCDs() {
+        if (jMenuItemEditAddPCDs == null) {
+            jMenuItemEditAddPCDs = new JMenuItem();
+            jMenuItemEditAddPCDs.setText("PCDs");
+            jMenuItemEditAddPCDs.addActionListener(this);
+        }
+        return jMenuItemEditAddPCDs;
+    }
+
+    /**
+     This method initializes jDesktopPane 
+     
+     @return javax.swing.JDesktopPane jDesktopPane
+     
+     **/
+    private JDesktopPane getJDesktopPane() {
+        if (jDesktopPane == null) {
+            jDesktopPane = new JDesktopPane();
+            jDesktopPane.setBounds(new java.awt.Rectangle(295, 1, 500, 515));
+            jDesktopPane.setDesktopManager(iDesktopManager);
+        }
+        return jDesktopPane;
+    }
+
+    /**
+     This method initializes jScrollPaneTree 
+     
+     @return javax.swing.JScrollPane jScrollPaneTree
+     
+     **/
+    private JScrollPane getJScrollPaneTree() {
+        if (jScrollPaneTree == null) {
+            jScrollPaneTree = new JScrollPane();
+            jScrollPaneTree.setBounds(new java.awt.Rectangle(0, 1, 290, 545));
+            jScrollPaneTree.setViewportView(getITree());
+        }
+        return jScrollPaneTree;
+    }
+
+    /**
+     This method initializes iTree 
+     
+     @return org.tianocore.packaging.common.ui.ITree iTree
+     
+     **/
+    private ITree getITree() {
+        //
+        //Before open a real module, use an empty root node for the tree
+        //
+        IDefaultMutableTreeNode root = new IDefaultMutableTreeNode("No Msa/Mbd file opened", -1, -1);
+        iTree = new ITree(root);
+        return iTree;
+    }
+
+    /**
+     This method initializes jMenuHelp 
+     
+     @return javax.swing.JMenu jMenuHelp
+     
+     **/
+    private JMenu getJMenuHelp() {
+        if (jMenuHelp == null) {
+            jMenuHelp = new JMenu();
+            jMenuHelp.setText("Help");
+            jMenuHelp.add(getJMenuItemHelpAbout());
+        }
+        return jMenuHelp;
+    }
+
+    /**
+     This method initializes jMenuItemHelpAbout 
+     
+     @return javax.swing.JMenuItem jMenuItemHelpAbout
+     
+     **/
+    private JMenuItem getJMenuItemHelpAbout() {
+        if (jMenuItemHelpAbout == null) {
+            jMenuItemHelpAbout = new JMenuItem();
+            jMenuItemHelpAbout.setText("About...");
+            jMenuItemHelpAbout.addActionListener(this);
+        }
+        return jMenuItemHelpAbout;
+    }
+
+    /**
+     This method initializes jMenuEditAdd 
+     
+     @return javax.swing.JMenu jMenuEditAdd
+     
+     **/
+    private JMenu getJMenu() {
+        if (jMenuEditAdd == null) {
+            jMenuEditAdd = new JMenu();
+            jMenuEditAdd.setText("Add");
+            //
+            //Add all menu items of menu "Add"
+            //
+            jMenuEditAdd.add(getJMenuItemEditAddLibraries());
+            jMenuEditAdd.add(getJMenuItemEditAddLibraryClassDefinitions());
+            jMenuEditAdd.add(getJMenuItemEditAddSourceFiles());
+            jMenuEditAdd.add(getJMenuItemEditAddIncludes());
+            jMenuEditAdd.add(getJMenuItemEditAddProtocols());
+            jMenuEditAdd.add(getJMenuItemEditAddEvents());
+            jMenuEditAdd.add(getJMenuItemEditAddHobs());
+            jMenuEditAdd.add(getJMenuItemEditAddPPIs());
+            jMenuEditAdd.add(getJMenuItemEditAddVariables());
+            jMenuEditAdd.add(getJMenuItemAddBootModes());
+            jMenuEditAdd.add(getJMenuItemAddSystemTables());
+            jMenuEditAdd.add(getJMenuItemEditAddDataHubs());
+            jMenuEditAdd.add(getJMenuItemEditAddFormsets());
+            jMenuEditAdd.add(getJMenuItemEditAddGuids());
+            jMenuEditAdd.add(getJMenuItemEditAddExterns());
+            jMenuEditAdd.add(getJMenuItemEditAddPCDs());
+            jMenuEditAdd.setEnabled(false);
+        }
+        return jMenuEditAdd;
+    }
+
+    /**
+     This method initializes jMenuItemEditDelete 
+     
+     @return javax.swing.JMenuItem jMenuItemEditDelete
+     
+     **/
+    private JMenuItem getJMenuItemEditDelete() {
+        if (jMenuItemEditDelete == null) {
+            jMenuItemEditDelete = new JMenuItem();
+            jMenuItemEditDelete.setText("Delete");
+            jMenuItemEditDelete.addActionListener(this);
+            //
+            //Disabled when no module is open
+            //
+            jMenuItemEditDelete.setEnabled(false);
+        }
+        return jMenuItemEditDelete;
+    }
+
+    /**
+     This method initializes jMenuItemEditUpdate 
+     
+     @return javax.swing.JMenuItem jMenuItemEditUpdate
+     
+     **/
+    private JMenuItem getJMenuItemEditUpdate() {
+        if (jMenuItemEditUpdate == null) {
+            jMenuItemEditUpdate = new JMenuItem();
+            jMenuItemEditUpdate.setText("Update");
+            jMenuItemEditUpdate.addActionListener(this);
+            //
+            //Disabled when no module is open
+            //
+            jMenuItemEditUpdate.setEnabled(false);
+        }
+        return jMenuItemEditUpdate;
+    }
+
+    /**
+     This method initializes jPopupMenu 
+     
+     @return javax.swing.JPopupMenu jPopupMenu
+     
+     **/
+    private JPopupMenu getJPopupMenu() {
+        if (jPopupMenu == null) {
+            jPopupMenu = new JPopupMenu();
+            //
+            //Add menu items of popup menu
+            //
+            jPopupMenu.add(getJMenuItemPopupAdd());
+            jPopupMenu.add(getJMenuItemPopupUpdate());
+            jPopupMenu.add(getJMenuItemPopupDelete());
+            jPopupMenu.setBorder(new BevelBorder(BevelBorder.RAISED));
+            jPopupMenu.addMouseListener(this);
+        }
+        return jPopupMenu;
+    }
+
+    /**
+     This method initializes jMenuItemPopupAdd 
+     
+     @return javax.swing.JMenuItem jMenuItemPopupAdd
+     
+     **/
+    private JMenuItem getJMenuItemPopupAdd() {
+        if (jMenuItemPopupAdd == null) {
+            jMenuItemPopupAdd = new JMenuItem();
+            jMenuItemPopupAdd.setText("Add");
+            jMenuItemPopupAdd.addActionListener(this);
+            jMenuItemPopupAdd.setEnabled(false);
+        }
+        return jMenuItemPopupAdd;
+    }
+
+    /**
+     This method initializes jMenuItemPopupUpdate 
+     
+     @return javax.swing.JMenuItem jMenuItemPopupUpdate
+     
+     **/
+    private JMenuItem getJMenuItemPopupUpdate() {
+        if (jMenuItemPopupUpdate == null) {
+            jMenuItemPopupUpdate = new JMenuItem();
+            jMenuItemPopupUpdate.setText("Update");
+            jMenuItemPopupUpdate.addActionListener(this);
+            jMenuItemPopupUpdate.setEnabled(false);
+        }
+        return jMenuItemPopupUpdate;
+    }
+
+    /**
+     This method initializes jMenuItemPopupDelete 
+     
+     @return javax.swing.JMenuItem jMenuItemPopupDelete
+     
+     **/
+    private JMenuItem getJMenuItemPopupDelete() {
+        if (jMenuItemPopupDelete == null) {
+            jMenuItemPopupDelete = new JMenuItem();
+            jMenuItemPopupDelete.setText("Delete");
+            jMenuItemPopupDelete.addActionListener(this);
+            jMenuItemPopupDelete.setEnabled(false);
+        }
+        return jMenuItemPopupDelete;
+    }
+
+    /**
+     This method initializes jMenuModuleNew 
+     
+     @return javax.swing.JMenu jMenuModuleNew
+     
+     **/
+    private JMenu getJMenuModuleNew() {
+        if (jMenuModuleNew == null) {
+            jMenuModuleNew = new JMenu();
+            jMenuModuleNew.setText("New");
+            jMenuModuleNew.add(getJMenuItemModuleNewModule());
+            jMenuModuleNew.add(getJMenuItemModuleNewModuleBuildDescription());
+            jMenuModuleNew.add(getJMenuItemModuleNewLibraryModule());
+            jMenuModuleNew.add(getJMenuItemModuleNewLibraryModuleBuildDescription());
+        }
+        return jMenuModuleNew;
+    }
+
+    /**
+     This method initializes jMenuItemModuleOpenModule 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleOpenModule
+     
+     **/
+    private JMenuItem getJMenuItemModuleOpenModule() {
+        if (jMenuItemModuleOpenModule == null) {
+            jMenuItemModuleOpenModule = new JMenuItem();
+            jMenuItemModuleOpenModule.setText("Module (.msa)");
+            jMenuItemModuleOpenModule.addActionListener(this);
+        }
+        return jMenuItemModuleOpenModule;
+    }
+
+    /**
+     This method initializes jMenuItemFileNewModuleBuildDescription 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleNewModuleBuildDescription
+     
+     **/
+    private JMenuItem getJMenuItemModuleNewModuleBuildDescription() {
+        if (jMenuItemModuleNewModuleBuildDescription == null) {
+            jMenuItemModuleNewModuleBuildDescription = new JMenuItem();
+            jMenuItemModuleNewModuleBuildDescription.setText("Module Build Description (.mbd)");
+            jMenuItemModuleNewModuleBuildDescription.addActionListener(this);
+        }
+        return jMenuItemModuleNewModuleBuildDescription;
+    }
+
+    /**
+     This method initializes jMenuItemFileNewLibraryModule 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleNewLibraryModule
+     
+     **/
+    private JMenuItem getJMenuItemModuleNewLibraryModule() {
+        if (jMenuItemModuleNewLibraryModule == null) {
+            jMenuItemModuleNewLibraryModule = new JMenuItem();
+            jMenuItemModuleNewLibraryModule.setText("Library Module (*.msa)");
+            jMenuItemModuleNewLibraryModule.addActionListener(this);
+        }
+        return jMenuItemModuleNewLibraryModule;
+    }
+
+    /**
+     This method initializes jMenuItemFileNewLibraryModuleBuildDescription 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleNewLibraryModuleBuildDescription
+     
+     **/
+    private JMenuItem getJMenuItemModuleNewLibraryModuleBuildDescription() {
+        if (jMenuItemModuleNewLibraryModuleBuildDescription == null) {
+            jMenuItemModuleNewLibraryModuleBuildDescription = new JMenuItem();
+            jMenuItemModuleNewLibraryModuleBuildDescription.setText("Library Module Build Description (.mbd)");
+            jMenuItemModuleNewLibraryModuleBuildDescription.addActionListener(this);
+        }
+        return jMenuItemModuleNewLibraryModuleBuildDescription;
+    }
+
+    /**
+     This method initializes jMenuOpen 
+     
+     @return javax.swing.JMenu jMenuModuleOpen
+     
+     **/
+    private JMenu getJMenuModuleOpen() {
+        if (jMenuModuleOpen == null) {
+            jMenuModuleOpen = new JMenu();
+            jMenuModuleOpen.setText("Open");
+            jMenuModuleOpen.add(getJMenuItemModuleOpenModule());
+            jMenuModuleOpen.add(getJMenuItemModuleOpenModuleBuildDescription());
+            jMenuModuleOpen.add(getJMenuItemModuleOpenLibraryModule());
+            jMenuModuleOpen.add(getJMenuItemModuleOpenLibraryModuleBuildDescription());
+        }
+        return jMenuModuleOpen;
+    }
+
+    /**
+     This method initializes jMenuItemFileOpenModuleBuildDescription 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleOpenModuleBuildDescription
+     
+     **/
+    private JMenuItem getJMenuItemModuleOpenModuleBuildDescription() {
+        if (jMenuItemModuleOpenModuleBuildDescription == null) {
+            jMenuItemModuleOpenModuleBuildDescription = new JMenuItem();
+            jMenuItemModuleOpenModuleBuildDescription.setText("Module Build Description (.mbd)");
+            jMenuItemModuleOpenModuleBuildDescription.addActionListener(this);
+        }
+        return jMenuItemModuleOpenModuleBuildDescription;
+    }
+
+    /**
+     This method initializes jMenuItemFileOpenLibraryModule 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleOpenLibraryModule
+     
+     **/
+    private JMenuItem getJMenuItemModuleOpenLibraryModule() {
+        if (jMenuItemModuleOpenLibraryModule == null) {
+            jMenuItemModuleOpenLibraryModule = new JMenuItem();
+            jMenuItemModuleOpenLibraryModule.setText("Library Module (.msa)");
+            jMenuItemModuleOpenLibraryModule.addActionListener(this);
+        }
+        return jMenuItemModuleOpenLibraryModule;
+    }
+
+    /**
+     This method initializes jMenuItemFileOpenLibraryModuleBuildDescription 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleOpenLibraryModuleBuildDescription
+     
+     **/
+    private JMenuItem getJMenuItemModuleOpenLibraryModuleBuildDescription() {
+        if (jMenuItemModuleOpenLibraryModuleBuildDescription == null) {
+            jMenuItemModuleOpenLibraryModuleBuildDescription = new JMenuItem();
+            jMenuItemModuleOpenLibraryModuleBuildDescription.setText("Library Module Build Description (.mbd)");
+            jMenuItemModuleOpenLibraryModuleBuildDescription.addActionListener(this);
+        }
+        return jMenuItemModuleOpenLibraryModuleBuildDescription;
+    }
+
+    /**
+     This method initializes jMenuItemFileSave 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleSave
+     
+     **/
+    private JMenuItem getJMenuItemModuleSave() {
+        if (jMenuItemModuleSave == null) {
+            jMenuItemModuleSave = new JMenuItem();
+            jMenuItemModuleSave.setText("Save");
+            jMenuItemModuleSave.addActionListener(this);
+            jMenuItemModuleSave.setEnabled(false);
+        }
+        return jMenuItemModuleSave;
+    }
+
+    /**
+     This method initializes jMenuItemModuleClose 
+     
+     @return javax.swing.JMenuItem jMenuItemModuleClose
+     
+     **/
+    private JMenuItem getJMenuItemModuleClose() {
+        if (jMenuItemModuleClose == null) {
+            jMenuItemModuleClose = new JMenuItem();
+            jMenuItemModuleClose.setText("Close");
+            jMenuItemModuleClose.setEnabled(false);
+            jMenuItemModuleClose.addActionListener(this);
+        }
+        return jMenuItemModuleClose;
+    }
+
+    /**
+     This method initializes jMenuTools
+     Reserved 
+     
+     @return javax.swing.JMenu jMenuTools
+     
+     **/
+    private JMenu getJMenuTools() {
+        if (jMenuTools == null) {
+            jMenuTools = new JMenu();
+            jMenuTools.setText("Tools");
+            jMenuTools.addActionListener(this);
+            jMenuTools.setEnabled(false);
+        }
+        return jMenuTools;
+    }
+
+    /**
+     This method initializes jMenuWindow 
+     Reserved
+     
+     @return javax.swing.JMenu jMenuWindow
+     
+     **/
+    private JMenu getJMenuWindow() {
+        if (jMenuWindow == null) {
+            jMenuWindow = new JMenu();
+            jMenuWindow.setText("Window");
+            jMenuWindow.setEnabled(false);
+            jMenuWindow.addActionListener(this);
+        }
+        return jMenuWindow;
+    }
+
+    /**
+     This method initializes jMenuItemEditAddLibraries 
+     
+     @return javax.swing.JMenuItem jMenuItemEditAddLibraries
+     
+     **/
+    private JMenuItem getJMenuItemEditAddLibraries() {
+        if (jMenuItemEditAddLibraries == null) {
+            jMenuItemEditAddLibraries = new JMenuItem();
+            jMenuItemEditAddLibraries.setText("Libraries");
+            jMenuItemEditAddLibraries.addActionListener(this);
+        }
+        return jMenuItemEditAddLibraries;
+    }
+
+    /**
+     This method initializes jPanelOperation 
+     
+     @return javax.swing.JPanel jPanelOperation
+     
+     **/
+    private JPanel getJPanelOperation() {
+        if (jPanelOperation == null) {
+            jPanelOperation = new JPanel();
+            jPanelOperation.setLayout(null);
+            jPanelOperation.setBounds(new java.awt.Rectangle(295, 520, 500, 25));
+            jPanelOperation.add(getJButtonOk(), null);
+            jPanelOperation.add(getJButtonCancel(), null);
+        }
+        return jPanelOperation;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setBounds(new java.awt.Rectangle(395, 2, 90, 20));
+            jButtonOk.setText("Ok");
+            jButtonOk.setEnabled(false);
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setBounds(new java.awt.Rectangle(395, 2, 90, 20));
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setEnabled(false);
+            jButtonCancel.addActionListener(this);
+            jButtonCancel.setVisible(false);
+        }
+        return jButtonCancel;
+    }
+
+    /* (non-Javadoc)
+     * @see org.tianocore.packaging.common.ui.IFrame#main(java.lang.String[])
+     *
+     * Main class, start the GUI
+     * 
+     */
+    public static void main(String[] args) {
+        ModuleMain module = new ModuleMain();
+        module.setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleMain() {
+        super();
+        init();
+    }
+
+    /**
+     This method initializes this
+     
+     
+     **/
+    private void init() {
+        //
+        // Check if exists WORKSPACE
+        // 
+        //
+        if (!ws.checkCurrentWorkspace()) {
+            JOptionPane.showConfirmDialog(null, "You haven't a workspace yet. Please setup first.", "Warning",
+                                          JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE);
+            this.dispose();
+            System.exit(0);
+        }
+
+        this.setSize(800, 600);
+        this.setResizable(false);
+        this.setJMenuBar(getjJMenuBar());
+        this.setContentPane(getJContentPane());
+        this.setTitle(windowTitle + "- [" + ws.getCurrentWorkspace() + "]");
+        this.setExitType(1);
+        this.centerWindow();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJPanelOperation(), null);
+            jContentPane.add(getJDesktopPane(), null);
+            jContentPane.add(getJScrollPaneTree(), null);
+            jContentPane.add(getJPopupMenu(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     *
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        //
+        // Open relevant frame via clicking different menu items
+        //
+        if (arg0.getSource() == jMenuItemHelpAbout) {
+            ModuleAbout ma = new ModuleAbout();
+            ma.setEdited(false);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddLibraries) {
+            showLibraries(ModuleMain.ADD, IDefaultMutableTreeNode.LIBRARIES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddLibraryClassDefinitions) {
+            showLibraryClassDefinitions(ModuleMain.ADD, IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddSourceFiles) {
+            showSourceFiles(ModuleMain.ADD, IDefaultMutableTreeNode.SOURCEFILES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddIncludes) {
+            showIncludes(ModuleMain.ADD, IDefaultMutableTreeNode.INCLUDES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddProtocols) {
+            showProtocols(ModuleMain.ADD, IDefaultMutableTreeNode.PROTOCOLS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddEvents) {
+            showEvents(ModuleMain.ADD, IDefaultMutableTreeNode.EVENTS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddHobs) {
+            showHobs(ModuleMain.ADD, IDefaultMutableTreeNode.HOBS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddPPIs) {
+            showPpis(ModuleMain.ADD, IDefaultMutableTreeNode.PPIS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddVariables) {
+            showVariables(ModuleMain.ADD, IDefaultMutableTreeNode.VARIABLES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddBootModes) {
+            showBootModes(ModuleMain.ADD, IDefaultMutableTreeNode.BOOTMODES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddSystemTables) {
+            showSystemTables(ModuleMain.ADD, IDefaultMutableTreeNode.SYSTEMTABLES, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddDataHubs) {
+            showDataHubs(ModuleMain.ADD, IDefaultMutableTreeNode.DATAHUBS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddFormsets) {
+            showFormsets(ModuleMain.ADD, IDefaultMutableTreeNode.FORMSETS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddGuids) {
+            showGuids(ModuleMain.ADD, IDefaultMutableTreeNode.GUIDS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddExterns) {
+            showExterns(ModuleMain.ADD, IDefaultMutableTreeNode.EXTERNS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemEditAddPCDs) {
+            showPCDs(ModuleMain.ADD, IDefaultMutableTreeNode.PCDS, -1);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleNewModule) {
+            this.closeCurrentModule();
+            showMsaHeader(ModuleMain.ADD);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleNewModuleBuildDescription) {
+            this.closeCurrentModule();
+            showMbdHeader(ModuleMain.ADD);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleNewLibraryModule) {
+            this.closeCurrentModule();
+            showMlsaHeader(ModuleMain.ADD);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleNewLibraryModuleBuildDescription) {
+            this.closeCurrentModule();
+            showMlbdHeader(ModuleMain.ADD);
+        }
+
+        //
+        // Open Msa, Mbd, Lmsa and Lmbd
+        //
+        if (arg0.getSource() == jMenuItemModuleOpenModule) {
+            openFile(1, 1);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleOpenModuleBuildDescription) {
+            openFile(1, 2);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleOpenLibraryModule) {
+            openFile(1, 3);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleOpenLibraryModuleBuildDescription) {
+            openFile(1, 4);
+        }
+
+        //
+        // Listen popup menu items
+        //
+        if (arg0.getSource() == jMenuItemPopupAdd) {
+            int intCategory = iTree.getSelectCategory();
+            int intLocation = iTree.getSelectLoaction();
+            addCurrentModule(intCategory, intLocation);
+        }
+
+        if (arg0.getSource() == jMenuItemPopupUpdate || arg0.getSource() == jMenuItemEditUpdate) {
+            int intCategory = iTree.getSelectCategory();
+            int intLocation = iTree.getSelectLoaction();
+            updateCurrentModule(intCategory, intLocation);
+        }
+
+        if (arg0.getSource() == jMenuItemPopupDelete || arg0.getSource() == jMenuItemEditDelete) {
+            int intCategory = iTree.getSelectCategory();
+            int intLocation = iTree.getSelectLoaction();
+            deleteCurrentModule(intCategory, intLocation);
+        }
+
+        if (arg0.getSource() == jMenuItemModuleExit) {
+            this.onExit();
+        }
+
+        if (arg0.getSource() == jMenuItemModuleClose) {
+            closeCurrentModule();
+        }
+
+        if (arg0.getSource() == jMenuItemModuleSaveAs) {
+            saveAsCurrentModule();
+        }
+
+        if (arg0.getSource() == jMenuItemModuleSave) {
+            saveCurrentModule();
+        }
+
+        if (arg0.getSource() == jButtonOk) {
+            save();
+        }
+
+        if (arg0.getSource() == jButtonCancel) {
+
+        }
+    }
+
+    /**
+     Open file
+     
+     @param intOperationType Open - 1 or Save - 2
+     @param intFileType Msa - 1, Mbd - 2, Lmsa - 3, Lmbd - 4
+     @return opened file path
+     
+     **/
+    private void openFile(int intOperationType, int intFileType) {
+        String strCurrentPath = "";
+        if (this.currentModule == "") {
+            strCurrentPath = ws.getCurrentWorkspace();
+        } else {
+            strCurrentPath = this.currentModule
+                                               .substring(
+                                                          0,
+                                                          this.currentModule
+                                                                            .lastIndexOf(System
+                                                                                               .getProperty("file.separator")));
+        }
+
+        JFileChooser fc = new JFileChooser(strCurrentPath);
+        fc.setAcceptAllFileFilterUsed(false);
+        switch (intOperationType) {
+        case 1:
+            fc.setDialogTitle("Open");
+            break;
+        case 2:
+            fc.setDialogTitle("Save As");
+            break;
+        }
+        //
+        // Config File Filter via different file types
+        //
+        switch (intFileType) {
+        case 1:
+            fc.addChoosableFileFilter(new IFileFilter("msa"));
+            break;
+        case 2:
+            fc.addChoosableFileFilter(new IFileFilter("mbd"));
+            break;
+        case 3:
+            fc.addChoosableFileFilter(new IFileFilter("msa"));
+            break;
+        case 4:
+            fc.addChoosableFileFilter(new IFileFilter("mbd"));
+            break;
+        }
+
+        int result = fc.showOpenDialog(new JPanel());
+        //
+        // Open relevanf file after click "OK"
+        //
+        if (result == JFileChooser.APPROVE_OPTION) {
+            switch (intOperationType) {
+            case 1:
+                closeCurrentModule();
+                switch (intFileType) {
+                case 1:
+                    openMsaFile(fc.getSelectedFile().getPath());
+                    break;
+                case 2:
+                    openMbdFile(fc.getSelectedFile().getPath());
+                    break;
+                case 3:
+                    openMlsaFile(fc.getSelectedFile().getPath());
+                    break;
+                case 4:
+                    openMlbdFile(fc.getSelectedFile().getPath());
+                    break;
+                }
+                break;
+            case 2:
+                switch (intFileType) {
+                case 1:
+                    this.saveFileName = fc.getSelectedFile().getPath();
+                    break;
+                case 2:
+                    this.saveFileName = fc.getSelectedFile().getPath();
+                    break;
+                case 3:
+                    this.saveFileName = fc.getSelectedFile().getPath();
+                    break;
+                case 4:
+                    this.saveFileName = fc.getSelectedFile().getPath();
+                    break;
+                }
+                break;
+            }
+        } else {
+            if (intOperationType == 2) {
+                this.saveFileName = "";
+            }
+        }
+    }
+
+    /**
+     Open specificed Msa file and read its content
+     
+     @param strMsaFilePath The input data of Msa File Path
+     
+     **/
+    private void openMsaFile(String strMsaFilePath) {
+        Log.log("Open Msa", strMsaFilePath);
+        try {
+            File msaFile = new File(strMsaFilePath);
+            xmlMsaDoc = (ModuleSurfaceAreaDocument) XmlObject.Factory.parse(msaFile);
+            this.currentModule = strMsaFilePath;
+            this.saveFileName = strMsaFilePath;
+            this.currentModuleType = 1;
+        } catch (IOException e) {
+            Log.err("Open Msa " + strMsaFilePath, e.getMessage());
+            return;
+        } catch (XmlException e) {
+            Log.err("Open Msa " + strMsaFilePath, e.getMessage());
+            return;
+        } catch (Exception e) {
+            Log.err("Open Msa " + strMsaFilePath, e.getMessage());
+            return;
+        }
+
+        xmlmh = xmlMsaDoc.getModuleSurfaceArea().getMsaHeader();
+        xmllcd = xmlMsaDoc.getModuleSurfaceArea().getLibraryClassDefinitions();
+        xmlsf = xmlMsaDoc.getModuleSurfaceArea().getSourceFiles();
+        xmlic = xmlMsaDoc.getModuleSurfaceArea().getIncludes();
+        xmlpl = xmlMsaDoc.getModuleSurfaceArea().getProtocols();
+        xmlen = xmlMsaDoc.getModuleSurfaceArea().getEvents();
+        xmlhob = xmlMsaDoc.getModuleSurfaceArea().getHobs();
+        xmlppi = xmlMsaDoc.getModuleSurfaceArea().getPPIs();
+        xmlvb = xmlMsaDoc.getModuleSurfaceArea().getVariables();
+        xmlbm = xmlMsaDoc.getModuleSurfaceArea().getBootModes();
+        xmlst = xmlMsaDoc.getModuleSurfaceArea().getSystemTables();
+        xmldh = xmlMsaDoc.getModuleSurfaceArea().getDataHubs();
+        xmlfs = xmlMsaDoc.getModuleSurfaceArea().getFormsets();
+        xmlgu = xmlMsaDoc.getModuleSurfaceArea().getGuids();
+        xmlet = xmlMsaDoc.getModuleSurfaceArea().getExterns();
+        xmlpcd = xmlMsaDoc.getModuleSurfaceArea().getPCDs();
+        xmlbo = xmlMsaDoc.getModuleSurfaceArea().getBuildOptions();
+
+        this.showMsaHeader(ModuleMain.VIEW);
+        reloadTreeAndTable(ModuleMain.OPENED);
+        jMenuEditAdd.setEnabled(true);
+    }
+
+    /**
+     Open specificed Mbd file and read its content
+     
+     @param strMbdFilePath The input data of Mbd File Path
+     
+     **/
+    private void openMbdFile(String strMbdFilePath) {
+        Log.log("Open Mbd", strMbdFilePath);
+        try {
+            File mbdFile = new File(strMbdFilePath);
+            xmlMbdDoc = (ModuleBuildDescriptionDocument) XmlObject.Factory.parse(mbdFile);
+            this.currentModule = strMbdFilePath;
+            this.saveFileName = strMbdFilePath;
+            this.currentModuleType = 2;
+        } catch (IOException e) {
+            Log.err("Open Mbd " + strMbdFilePath, e.getMessage());
+            return;
+        } catch (XmlException e) {
+            Log.err("Open Mbd " + strMbdFilePath, e.getMessage());
+            return;
+        } catch (Exception e) {
+            Log.err("Open Mbd " + strMbdFilePath, e.getMessage());
+            return;
+        }
+
+        xmlmbdh = xmlMbdDoc.getModuleBuildDescription().getMbdHeader();
+        xmllib = xmlMbdDoc.getModuleBuildDescription().getLibraries();
+        xmlsf = xmlMbdDoc.getModuleBuildDescription().getSourceFiles();
+        xmlic = xmlMbdDoc.getModuleBuildDescription().getIncludes();
+        xmlpl = xmlMbdDoc.getModuleBuildDescription().getProtocols();
+        xmlen = xmlMbdDoc.getModuleBuildDescription().getEvents();
+        xmlhob = xmlMbdDoc.getModuleBuildDescription().getHobs();
+        xmlppi = xmlMbdDoc.getModuleBuildDescription().getPPIs();
+        xmlvb = xmlMbdDoc.getModuleBuildDescription().getVariables();
+        xmlbm = xmlMbdDoc.getModuleBuildDescription().getBootModes();
+        xmlst = xmlMbdDoc.getModuleBuildDescription().getSystemTables();
+        xmldh = xmlMbdDoc.getModuleBuildDescription().getDataHubs();
+        xmlfs = xmlMbdDoc.getModuleBuildDescription().getFormsets();
+        xmlgu = xmlMbdDoc.getModuleBuildDescription().getGuids();
+        xmlet = xmlMbdDoc.getModuleBuildDescription().getExterns();
+        xmlpcd = xmlMbdDoc.getModuleBuildDescription().getPCDs();
+        xmlbo = xmlMbdDoc.getModuleBuildDescription().getBuildOptions();
+
+        this.showMbdHeader(ModuleMain.VIEW);
+        reloadTreeAndTable(ModuleMain.OPENED);
+        jMenuEditAdd.setEnabled(true);
+    }
+
+    /**
+     Open specificed Mlsa file and read its content
+     
+     @param strMlsaFilePath The input data of Mlsa File Path
+     
+     **/
+    private void openMlsaFile(String strMlsaFilePath) {
+        Log.log("Open Mlsa", strMlsaFilePath);
+        try {
+            File mlsaFile = new File(strMlsaFilePath);
+            xmlMlsaDoc = (LibraryModuleSurfaceAreaDocument) XmlObject.Factory.parse(mlsaFile);
+            this.currentModule = strMlsaFilePath;
+            this.saveFileName = strMlsaFilePath;
+            this.currentModuleType = 3;
+        } catch (IOException e) {
+            Log.err("Open Mlsa " + strMlsaFilePath, e.getMessage());
+            return;
+        } catch (XmlException e) {
+            Log.err("Open Mlsa " + strMlsaFilePath, e.getMessage());
+            return;
+        } catch (Exception e) {
+            Log.err("Open Mlsa " + strMlsaFilePath, e.getMessage());
+            return;
+        }
+
+        xmlmlh = xmlMlsaDoc.getLibraryModuleSurfaceArea().getMsaLibHeader();
+        xmllcd = xmlMlsaDoc.getLibraryModuleSurfaceArea().getLibraryClassDefinitions();
+        xmlsf = xmlMlsaDoc.getLibraryModuleSurfaceArea().getSourceFiles();
+        xmlic = xmlMlsaDoc.getLibraryModuleSurfaceArea().getIncludes();
+        xmlpl = xmlMlsaDoc.getLibraryModuleSurfaceArea().getProtocols();
+        xmlen = xmlMlsaDoc.getLibraryModuleSurfaceArea().getEvents();
+        xmlhob = xmlMlsaDoc.getLibraryModuleSurfaceArea().getHobs();
+        xmlppi = xmlMlsaDoc.getLibraryModuleSurfaceArea().getPPIs();
+        xmlvb = xmlMlsaDoc.getLibraryModuleSurfaceArea().getVariables();
+        xmlbm = xmlMlsaDoc.getLibraryModuleSurfaceArea().getBootModes();
+        xmlst = xmlMlsaDoc.getLibraryModuleSurfaceArea().getSystemTables();
+        xmldh = xmlMlsaDoc.getLibraryModuleSurfaceArea().getDataHubs();
+        xmlfs = xmlMlsaDoc.getLibraryModuleSurfaceArea().getFormsets();
+        xmlgu = xmlMlsaDoc.getLibraryModuleSurfaceArea().getGuids();
+        xmlet = xmlMlsaDoc.getLibraryModuleSurfaceArea().getExterns();
+        xmlpcd = xmlMlsaDoc.getLibraryModuleSurfaceArea().getPCDs();
+        xmlbo = xmlMlsaDoc.getLibraryModuleSurfaceArea().getBuildOptions();
+
+        this.showMlsaHeader(ModuleMain.VIEW);
+        reloadTreeAndTable(ModuleMain.OPENED);
+        jMenuEditAdd.setEnabled(true);
+    }
+
+    /**
+     Open specificed Mlbd file and read its content
+     
+     @param strMlbdFilePath The input data of Mlbd File Path
+     
+     **/
+    private void openMlbdFile(String strMlbdFilePath) {
+        Log.log("Open Mlbd", strMlbdFilePath);
+        try {
+            File mlbdFile = new File(strMlbdFilePath);
+            xmlMlbdDoc = (LibraryModuleBuildDescriptionDocument) XmlObject.Factory.parse(mlbdFile);
+            this.currentModule = strMlbdFilePath;
+            this.saveFileName = strMlbdFilePath;
+            this.currentModuleType = 4;
+        } catch (IOException e) {
+            Log.err("Open Mlbd " + strMlbdFilePath, e.getMessage());
+            return;
+        } catch (XmlException e) {
+            Log.err("Open Mlbd " + strMlbdFilePath, e.getMessage());
+            return;
+        } catch (Exception e) {
+            Log.err("Open Mlbd " + strMlbdFilePath, e.getMessage());
+            return;
+        }
+
+        xmlmlbdh = xmlMlbdDoc.getLibraryModuleBuildDescription().getMbdLibHeader();
+        xmllib = xmlMlbdDoc.getLibraryModuleBuildDescription().getLibraries();
+        xmlsf = xmlMlbdDoc.getLibraryModuleBuildDescription().getSourceFiles();
+        xmlic = xmlMlbdDoc.getLibraryModuleBuildDescription().getIncludes();
+        xmlpl = xmlMlbdDoc.getLibraryModuleBuildDescription().getProtocols();
+        xmlen = xmlMlbdDoc.getLibraryModuleBuildDescription().getEvents();
+        xmlhob = xmlMlbdDoc.getLibraryModuleBuildDescription().getHobs();
+        xmlppi = xmlMlbdDoc.getLibraryModuleBuildDescription().getPPIs();
+        xmlvb = xmlMlbdDoc.getLibraryModuleBuildDescription().getVariables();
+        xmlbm = xmlMlbdDoc.getLibraryModuleBuildDescription().getBootModes();
+        xmlst = xmlMlbdDoc.getLibraryModuleBuildDescription().getSystemTables();
+        xmldh = xmlMlbdDoc.getLibraryModuleBuildDescription().getDataHubs();
+        xmlfs = xmlMlbdDoc.getLibraryModuleBuildDescription().getFormsets();
+        xmlgu = xmlMlbdDoc.getLibraryModuleBuildDescription().getGuids();
+        xmlet = xmlMlbdDoc.getLibraryModuleBuildDescription().getExterns();
+        xmlpcd = xmlMlbdDoc.getLibraryModuleBuildDescription().getPCDs();
+        xmlbo = xmlMlbdDoc.getLibraryModuleBuildDescription().getBuildOptions();
+
+        this.showMlbdHeader(ModuleMain.VIEW);
+        reloadTreeAndTable(ModuleMain.OPENED);
+        jMenuEditAdd.setEnabled(true);
+    }
+
+    /**
+     Create an empty tree if no file is open
+     
+     **/
+    private void makeEmptyTree() {
+        dmtnRoot = new IDefaultMutableTreeNode("No Msa/Mbd file opened", -1, -1);
+        iTree = new ITree(dmtnRoot);
+        jScrollPaneTree.setViewportView(iTree);
+    }
+
+    /**
+     Create the tree to display all components of current open file.
+     First to check if the component is null or not
+     If not null, hangs it to the tree
+     If null, skip it
+     
+     **/
+    private void makeTree() {
+        iTree.removeAll();
+
+        //
+        //Make an empty tree when closing
+        //
+        if (this.currentModuleType == 0) {
+            makeEmptyTree();
+            return;
+        }
+
+        //
+        //Msa File
+        //
+        if (this.currentModuleType == 1) {
+            //
+            //Add MsaHeader Node
+            //
+            if (xmlmh != null) {
+                dmtnRoot = new IDefaultMutableTreeNode(xmlmh.getBaseName().getStringValue(),
+                                                       IDefaultMutableTreeNode.MSA_HEADER,
+                                                       IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+            } else {
+                makeEmptyTree();
+                return;
+            }
+
+            //
+            //Add LibraryClassDefinitions Node
+            //
+            if (xmllcd != null && xmllcd.getLibraryClassList().size() > 0) {
+                IDefaultMutableTreeNode libraryClassDefinitions = new IDefaultMutableTreeNode(
+                                                                                              "Library Class Definitions",
+                                                                                              IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS,
+                                                                                              IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+                for (int indexI = 0; indexI < xmllcd.getLibraryClassList().size(); indexI++) {
+                    libraryClassDefinitions
+                                           .add(new IDefaultMutableTreeNode(
+                                                                            xmllcd.getLibraryClassArray(indexI)
+                                                                                  .getStringValue(),
+                                                                            IDefaultMutableTreeNode.LIBRARY_CLASS_DEFINITION,
+                                                                            IDefaultMutableTreeNode.OPERATION_NULL));
+                }
+                dmtnRoot.add(libraryClassDefinitions);
+            }
+        }
+
+        //
+        //Mbd File
+        //
+        if (this.currentModuleType == 2) {
+            //
+            //Add MsaHeader Node
+            //
+            if (xmlmbdh != null) {
+                dmtnRoot = new IDefaultMutableTreeNode(xmlmbdh.getBaseName().getStringValue(),
+                                                       IDefaultMutableTreeNode.MBD_HEADER,
+                                                       IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+            } else {
+                makeEmptyTree();
+                return;
+            }
+
+            //
+            //Add Libraries Node
+            //
+            if (xmllib != null) {
+                IDefaultMutableTreeNode libraries = new IDefaultMutableTreeNode(
+                                                                                "Libraries",
+                                                                                IDefaultMutableTreeNode.LIBRARIES,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                if (xmllib.getArchList().size() > 0) {
+                    IDefaultMutableTreeNode librariesArch = new IDefaultMutableTreeNode(
+                                                                                        "Arch",
+                                                                                        IDefaultMutableTreeNode.LIBRARIES_ARCH,
+                                                                                        IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                    for (int indexI = 0; indexI < xmllib.getArchList().size(); indexI++) {
+                        librariesArch.add(new IDefaultMutableTreeNode(xmllib.getArchArray(indexI).getArchType()
+                                                                            .toString(),
+                                                                      IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM,
+                                                                      IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                      indexI));
+                    }
+                    libraries.add(librariesArch);
+                }
+                if (xmllib.getLibraryList().size() > 0) {
+                    IDefaultMutableTreeNode library = new IDefaultMutableTreeNode(
+                                                                                  "Library",
+                                                                                  IDefaultMutableTreeNode.LIBRARIES_LIBRARY,
+                                                                                  IDefaultMutableTreeNode.OPERATION_ADD_UPDATE_DELETE);
+                    for (int indexI = 0; indexI < xmllib.getLibraryList().size(); indexI++) {
+                        library.add(new IDefaultMutableTreeNode(xmllib.getLibraryArray(indexI).getStringValue(),
+                                                                IDefaultMutableTreeNode.LIBRARIES_LIBRARY_ITEM,
+                                                                IDefaultMutableTreeNode.OPERATION_DELETE));
+                    }
+                    libraries.add(library);
+                }
+                dmtnRoot.add(libraries);
+            }
+        }
+
+        //
+        //MLsa File
+        //
+        if (this.currentModuleType == 3) {
+            //
+            //Add MsaHeader Node
+            //
+            if (xmlmlh != null) {
+                dmtnRoot = new IDefaultMutableTreeNode(xmlmlh.getBaseName().getStringValue(),
+                                                       IDefaultMutableTreeNode.MLSA_HEADER,
+                                                       IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+            } else {
+                makeEmptyTree();
+                return;
+            }
+
+            //
+            //Add LibraryClassDefinitions Node
+            //
+            if (xmllcd != null && xmllcd.getLibraryClassList().size() > 0) {
+                IDefaultMutableTreeNode libraryClassDefinitions = new IDefaultMutableTreeNode(
+                                                                                              "Library Class Definitions",
+                                                                                              IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS,
+                                                                                              IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+                for (int indexI = 0; indexI < xmllcd.getLibraryClassList().size(); indexI++) {
+                    libraryClassDefinitions
+                                           .add(new IDefaultMutableTreeNode(
+                                                                            xmllcd.getLibraryClassArray(indexI)
+                                                                                  .getStringValue(),
+                                                                            IDefaultMutableTreeNode.LIBRARY_CLASS_DEFINITION,
+                                                                            IDefaultMutableTreeNode.OPERATION_NULL));
+                }
+                dmtnRoot.add(libraryClassDefinitions);
+            }
+        }
+
+        //
+        //Mlbd File
+        //
+        if (this.currentModuleType == 4) {
+            //
+            //Add MsaHeader Node
+            //
+            if (xmlmlbdh != null) {
+                dmtnRoot = new IDefaultMutableTreeNode(xmlmlbdh.getBaseName().getStringValue(),
+                                                       IDefaultMutableTreeNode.MLBD_HEADER,
+                                                       IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE);
+            } else {
+                makeEmptyTree();
+                return;
+            }
+
+            //
+            //Add Libraries Node
+            //
+            if (xmllib != null) {
+                IDefaultMutableTreeNode libraries = new IDefaultMutableTreeNode(
+                                                                                "Libraries",
+                                                                                IDefaultMutableTreeNode.LIBRARIES,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                if (xmllib.getArchList().size() > 0) {
+                    IDefaultMutableTreeNode librariesArch = new IDefaultMutableTreeNode(
+                                                                                        "Arch",
+                                                                                        IDefaultMutableTreeNode.LIBRARIES_ARCH,
+                                                                                        IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                    for (int indexI = 0; indexI < xmllib.getArchList().size(); indexI++) {
+                        librariesArch.add(new IDefaultMutableTreeNode(xmllib.getArchArray(indexI).getArchType()
+                                                                            .toString(),
+                                                                      IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM,
+                                                                      IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                      indexI));
+                    }
+                    libraries.add(librariesArch);
+                }
+                if (xmllib.getLibraryList().size() > 0) {
+                    IDefaultMutableTreeNode library = new IDefaultMutableTreeNode(
+                                                                                  "Library",
+                                                                                  IDefaultMutableTreeNode.LIBRARIES_LIBRARY,
+                                                                                  IDefaultMutableTreeNode.OPERATION_ADD_UPDATE_DELETE);
+                    for (int indexI = 0; indexI < xmllib.getLibraryList().size(); indexI++) {
+                        library.add(new IDefaultMutableTreeNode(xmllib.getLibraryArray(indexI).getStringValue(),
+                                                                IDefaultMutableTreeNode.LIBRARIES_LIBRARY_ITEM,
+                                                                IDefaultMutableTreeNode.OPERATION_DELETE));
+                    }
+                    libraries.add(library);
+                }
+                dmtnRoot.add(libraries);
+            }
+        }
+
+        //
+        //Add SourceFiles Node
+        //
+        if (xmlsf != null) {
+            IDefaultMutableTreeNode sourceFiles = new IDefaultMutableTreeNode(
+                                                                              "Source Files",
+                                                                              IDefaultMutableTreeNode.SOURCEFILES,
+                                                                              IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlsf.getArchList().size() > 0) {
+                IDefaultMutableTreeNode sourceFilesArch = new IDefaultMutableTreeNode(
+                                                                                      "Arch",
+                                                                                      IDefaultMutableTreeNode.SOURCEFILES_ARCH,
+                                                                                      IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                for (int indexI = 0; indexI < xmlsf.getArchList().size(); indexI++) {
+                    sourceFilesArch
+                                   .add(new IDefaultMutableTreeNode(
+                                                                    xmlsf.getArchArray(indexI).getArchType().toString(),
+                                                                    IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM,
+                                                                    IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                    indexI));
+                }
+                sourceFiles.add(sourceFilesArch);
+            }
+            if (xmlsf.getFilenameList().size() > 0) {
+                IDefaultMutableTreeNode sourceFilesFileName = new IDefaultMutableTreeNode(
+                                                                                          "File Name",
+                                                                                          IDefaultMutableTreeNode.SOURCEFILES_FILENAME,
+                                                                                          IDefaultMutableTreeNode.OPERATION_ADD_UPDATE_DELETE);
+                for (int indexI = 0; indexI < xmlsf.getFilenameList().size(); indexI++) {
+                    sourceFilesFileName
+                                       .add(new IDefaultMutableTreeNode(
+                                                                        xmlsf.getFilenameArray(indexI).getStringValue(),
+                                                                        IDefaultMutableTreeNode.SOURCEFILES_FILENAME_ITEM,
+                                                                        IDefaultMutableTreeNode.OPERATION_DELETE));
+                }
+                sourceFiles.add(sourceFilesFileName);
+            }
+            dmtnRoot.add(sourceFiles);
+        }
+
+        //
+        //Add includes
+        //
+        if (xmlic != null) {
+            IDefaultMutableTreeNode includes = new IDefaultMutableTreeNode("Includes",
+                                                                           IDefaultMutableTreeNode.INCLUDES,
+                                                                           IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlic.getArchList().size() > 0) {
+                IDefaultMutableTreeNode includesArch = new IDefaultMutableTreeNode(
+                                                                                   "Arch",
+                                                                                   IDefaultMutableTreeNode.INCLUDES_ARCH,
+                                                                                   IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+                for (int indexI = 0; indexI < xmlic.getArchList().size(); indexI++) {
+                    includesArch.add(new IDefaultMutableTreeNode(xmlic.getArchArray(indexI).getArchType().toString(),
+                                                                 IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM,
+                                                                 IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                 indexI));
+                }
+                includes.add(includesArch);
+            }
+            if (xmlic.getPackageNameList().size() > 0) {
+                IDefaultMutableTreeNode includesPackageName = new IDefaultMutableTreeNode(
+                                                                                          "Package Name",
+                                                                                          IDefaultMutableTreeNode.INCLUDES_PACKAGENAME,
+                                                                                          IDefaultMutableTreeNode.OPERATION_ADD_UPDATE_DELETE);
+                for (int indexI = 0; indexI < xmlic.getPackageNameList().size(); indexI++) {
+                    includesPackageName
+                                       .add(new IDefaultMutableTreeNode(
+                                                                        xmlic.getPackageNameArray(indexI)
+                                                                             .getStringValue(),
+                                                                        IDefaultMutableTreeNode.INCLUDES_PACKAGENAME_ITEM,
+                                                                        IDefaultMutableTreeNode.OPERATION_DELETE));
+                }
+                includes.add(includesPackageName);
+            }
+            dmtnRoot.add(includes);
+        }
+
+        //
+        //Add protocols
+        //
+        if (xmlpl != null) {
+            IDefaultMutableTreeNode dmtnProtocols = new IDefaultMutableTreeNode(
+                                                                                "Protocols",
+                                                                                IDefaultMutableTreeNode.PROTOCOLS,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnProtocol = new IDefaultMutableTreeNode(
+                                                                               "Protocol",
+                                                                               IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL,
+                                                                               IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnProtocolNotify = new IDefaultMutableTreeNode(
+                                                                                     "Protocol Notify",
+                                                                                     IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY,
+                                                                                     IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlpl.getProtocolList().size() > 0) {
+                for (int indexI = 0; indexI < xmlpl.getProtocolList().size(); indexI++) {
+                    dmtnProtocol.add(new IDefaultMutableTreeNode(xmlpl.getProtocolArray(indexI).getStringValue(),
+                                                                 IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM,
+                                                                 IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                 indexI));
+                }
+                dmtnProtocols.add(dmtnProtocol);
+            }
+            if (xmlpl.getProtocolNotifyList().size() > 0) {
+                for (int indexI = 0; indexI < xmlpl.getProtocolNotifyList().size(); indexI++) {
+                    dmtnProtocolNotify
+                                      .add(new IDefaultMutableTreeNode(
+                                                                       xmlpl.getProtocolNotifyArray(indexI)
+                                                                            .getStringValue(),
+                                                                       IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM,
+                                                                       IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                       indexI));
+                }
+                dmtnProtocols.add(dmtnProtocolNotify);
+            }
+            dmtnRoot.add(dmtnProtocols);
+        }
+
+        //
+        //Add events
+        //
+        if (xmlen != null) {
+            IDefaultMutableTreeNode dmtnEvents = new IDefaultMutableTreeNode(
+                                                                             "Events",
+                                                                             IDefaultMutableTreeNode.EVENTS,
+                                                                             IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnCreateEvents = new IDefaultMutableTreeNode(
+                                                                                   "Create",
+                                                                                   IDefaultMutableTreeNode.EVENTS_CREATEEVENTS,
+                                                                                   IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnSignalEvents = new IDefaultMutableTreeNode(
+                                                                                   "Signal",
+                                                                                   IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS,
+                                                                                   IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlen.getCreateEvents() != null && xmlen.getCreateEvents().getEventList().size() > 0) {
+                for (int indexI = 0; indexI < xmlen.getCreateEvents().getEventList().size(); indexI++) {
+                    dmtnCreateEvents.add(new IDefaultMutableTreeNode(xmlen.getCreateEvents().getEventArray(indexI)
+                                                                          .getCName(),
+                                                                     IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM,
+                                                                     IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                     indexI));
+                }
+                dmtnEvents.add(dmtnCreateEvents);
+            }
+            if (xmlen.getSignalEvents() != null && xmlen.getSignalEvents().getEventList().size() > 0) {
+                for (int indexI = 0; indexI < xmlen.getSignalEvents().getEventList().size(); indexI++) {
+                    dmtnSignalEvents.add(new IDefaultMutableTreeNode(xmlen.getSignalEvents().getEventArray(indexI)
+                                                                          .getCName(),
+                                                                     IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM,
+                                                                     IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                     indexI));
+                }
+                dmtnEvents.add(dmtnSignalEvents);
+            }
+            dmtnRoot.add(dmtnEvents);
+        }
+
+        //
+        //Add hobs
+        //
+        if (xmlhob != null) {
+            IDefaultMutableTreeNode dmtnHobs = new IDefaultMutableTreeNode("Hobs", IDefaultMutableTreeNode.HOBS,
+                                                                           IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlhob.getHobList().size() > 0) {
+                for (int indexI = 0; indexI < xmlhob.getHobList().size(); indexI++) {
+                    dmtnHobs.add(new IDefaultMutableTreeNode(xmlhob.getHobArray(indexI).getName(),
+                                                             IDefaultMutableTreeNode.HOBS_HOB_ITEM,
+                                                             IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE, indexI));
+                }
+            }
+            dmtnRoot.add(dmtnHobs);
+        }
+
+        //
+        //Add ppis
+        //
+        if (xmlppi != null) {
+            IDefaultMutableTreeNode dmtnPpis = new IDefaultMutableTreeNode("Ppis", IDefaultMutableTreeNode.PPIS,
+                                                                           IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnPpi = new IDefaultMutableTreeNode("Ppi", IDefaultMutableTreeNode.PPIS_PPI,
+                                                                          IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            IDefaultMutableTreeNode dmtnPpiNotify = new IDefaultMutableTreeNode(
+                                                                                "Ppi Notify",
+                                                                                IDefaultMutableTreeNode.PPIS_PPINOTIFY,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlppi.getPpiList().size() > 0) {
+                for (int indexI = 0; indexI < xmlppi.getPpiList().size(); indexI++) {
+                    dmtnPpi.add(new IDefaultMutableTreeNode(xmlppi.getPpiArray(indexI).getStringValue(),
+                                                            IDefaultMutableTreeNode.PPIS_PPI_ITEM,
+                                                            IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE, indexI));
+                }
+                dmtnPpis.add(dmtnPpi);
+            }
+            if (xmlppi.getPpiNotifyList().size() > 0) {
+                for (int indexI = 0; indexI < xmlppi.getPpiNotifyList().size(); indexI++) {
+                    dmtnPpiNotify.add(new IDefaultMutableTreeNode(xmlppi.getPpiNotifyArray(indexI).getStringValue(),
+                                                                  IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM,
+                                                                  IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                  indexI));
+                }
+                dmtnPpis.add(dmtnPpiNotify);
+            }
+            dmtnRoot.add(dmtnPpis);
+        }
+
+        //
+        //Add variables
+        //
+        if (xmlvb != null) {
+            IDefaultMutableTreeNode dmtnVariables = new IDefaultMutableTreeNode(
+                                                                                "Variables",
+                                                                                IDefaultMutableTreeNode.VARIABLES,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlvb.getVariableList().size() > 0) {
+                for (int indexI = 0; indexI < xmlvb.getVariableList().size(); indexI++) {
+                    dmtnVariables.add(new IDefaultMutableTreeNode(xmlvb.getVariableArray(indexI).getString(),
+                                                                  IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM,
+                                                                  IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                  indexI));
+                }
+            }
+            dmtnRoot.add(dmtnVariables);
+        }
+
+        //
+        //Add bootmodes
+        //
+        if (xmlbm != null) {
+            IDefaultMutableTreeNode dmtnBootModes = new IDefaultMutableTreeNode(
+                                                                                "BootModes",
+                                                                                IDefaultMutableTreeNode.BOOTMODES,
+                                                                                IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlbm.getBootModeList().size() > 0) {
+                for (int indexI = 0; indexI < xmlbm.getBootModeList().size(); indexI++) {
+                    dmtnBootModes.add(new IDefaultMutableTreeNode(xmlbm.getBootModeArray(indexI).getBootModeName()
+                                                                       .toString(),
+                                                                  IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM,
+                                                                  IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                  indexI));
+                }
+            }
+            dmtnRoot.add(dmtnBootModes);
+        }
+
+        //
+        //Add systemtables
+        //
+        if (xmlst != null) {
+            IDefaultMutableTreeNode dmtnSystemTables = new IDefaultMutableTreeNode(
+                                                                                   "SystemTables",
+                                                                                   IDefaultMutableTreeNode.SYSTEMTABLES,
+                                                                                   IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlst.getSystemTableList().size() > 0) {
+                for (int indexI = 0; indexI < xmlst.getSystemTableList().size(); indexI++) {
+                    dmtnSystemTables
+                                    .add(new IDefaultMutableTreeNode(
+                                                                     xmlst.getSystemTableArray(indexI).getEntry(),
+                                                                     IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM,
+                                                                     IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                     indexI));
+                }
+            }
+            dmtnRoot.add(dmtnSystemTables);
+        }
+
+        //
+        //Add datahubs
+        //
+        if (xmldh != null) {
+            IDefaultMutableTreeNode dmtnDataHubs = new IDefaultMutableTreeNode(
+                                                                               "DataHubs",
+                                                                               IDefaultMutableTreeNode.DATAHUBS,
+                                                                               IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmldh.getDataHubRecordList().size() > 0) {
+                for (int indexI = 0; indexI < xmldh.getDataHubRecordList().size(); indexI++) {
+                    dmtnDataHubs.add(new IDefaultMutableTreeNode(xmldh.getDataHubRecordArray(indexI).getStringValue(),
+                                                                 IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM,
+                                                                 IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                 indexI));
+                }
+            }
+            dmtnRoot.add(dmtnDataHubs);
+        }
+
+        //
+        //Add formsets
+        //
+        if (xmlfs != null) {
+            IDefaultMutableTreeNode dmtnFormsets = new IDefaultMutableTreeNode(
+                                                                               "Formsets",
+                                                                               IDefaultMutableTreeNode.FORMSETS,
+                                                                               IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlfs.getFormsetList().size() > 0) {
+                for (int indexI = 0; indexI < xmlfs.getFormsetList().size(); indexI++) {
+                    dmtnFormsets.add(new IDefaultMutableTreeNode(xmlfs.getFormsetArray(indexI).getStringValue(),
+                                                                 IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM,
+                                                                 IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE,
+                                                                 indexI));
+                }
+            }
+            dmtnRoot.add(dmtnFormsets);
+        }
+
+        //
+        //Add guids
+        //
+        if (xmlgu != null) {
+            IDefaultMutableTreeNode dmtnGuids = new IDefaultMutableTreeNode(
+                                                                            "Guids",
+                                                                            IDefaultMutableTreeNode.GUIDS,
+                                                                            IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlgu.getGuidEntryList().size() > 0) {
+                for (int indexI = 0; indexI < xmlgu.getGuidEntryList().size(); indexI++) {
+                    dmtnGuids.add(new IDefaultMutableTreeNode(xmlgu.getGuidEntryArray(indexI).getCName(),
+                                                              IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM,
+                                                              IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE, indexI));
+                }
+            }
+            dmtnRoot.add(dmtnGuids);
+        }
+
+        //
+        //Add externs
+        //
+        if (xmlet != null) {
+            IDefaultMutableTreeNode dmtnExterns = new IDefaultMutableTreeNode(
+                                                                              "Externs",
+                                                                              IDefaultMutableTreeNode.EXTERNS,
+                                                                              IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlet.getExternList().size() > 0) {
+                for (int indexI = 0; indexI < xmlet.getExternList().size(); indexI++) {
+                    dmtnExterns
+                               .add(new IDefaultMutableTreeNode("Extern " + Integer.valueOf(indexI + 1),
+                                                                IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM,
+                                                                IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE, indexI));
+                }
+            }
+            dmtnRoot.add(dmtnExterns);
+        }
+
+        //
+        //Add pcds
+        //
+        if (xmlpcd != null) {
+            IDefaultMutableTreeNode dmtnPCDs = new IDefaultMutableTreeNode("PCDs", IDefaultMutableTreeNode.PCDS,
+                                                                           IDefaultMutableTreeNode.OPERATION_ADD_DELETE);
+            if (xmlpcd.getPcdDataList().size() > 0) {
+                for (int indexI = 0; indexI < xmlpcd.getPcdDataList().size(); indexI++) {
+                    dmtnPCDs.add(new IDefaultMutableTreeNode(xmlpcd.getPcdDataArray(indexI).getCName(),
+                                                             IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM,
+                                                             IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE, indexI));
+                }
+            }
+            dmtnRoot.add(dmtnPCDs);
+        }
+
+        iTree = new ITree(dmtnRoot);
+        iTree.addMouseListener(this);
+        iTree.addTreeSelectionListener(this);
+        jScrollPaneTree.setViewportView(iTree);
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     *
+     * Override windowClosing to popup warning message to confirm quit
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.onExit();
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
+     * 
+     * Override mouseClicked to check if need display popup menu
+     * 
+     */
+    public void mouseClicked(MouseEvent arg0) {
+        if (arg0.getButton() == MouseEvent.BUTTON1) {
+
+        }
+        if (arg0.getButton() == MouseEvent.BUTTON3) {
+            jPopupMenu.show(arg0.getComponent(), arg0.getX(), arg0.getY());
+        }
+    }
+
+    public void mouseEntered(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    public void mouseExited(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    public void mousePressed(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    public void mouseReleased(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+    }
+
+    /**
+     Init popup menu
+     
+     **/
+    public void valueChanged(TreeSelectionEvent arg0) {
+        int intOperation = iTree.getSelectOperation();
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_NULL) {
+            setMenuItemAddEnabled(false);
+            setMenuItemUpdateEnabled(false);
+            setMenuItemDeleteEnabled(false);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_ADD) {
+            setMenuItemAddEnabled(true);
+            setMenuItemUpdateEnabled(false);
+            setMenuItemDeleteEnabled(false);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_UPDATE) {
+            setMenuItemAddEnabled(false);
+            setMenuItemUpdateEnabled(true);
+            setMenuItemDeleteEnabled(false);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_DELETE) {
+            setMenuItemAddEnabled(false);
+            setMenuItemUpdateEnabled(false);
+            setMenuItemDeleteEnabled(true);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_ADD_UPDATE) {
+            setMenuItemAddEnabled(true);
+            setMenuItemUpdateEnabled(true);
+            setMenuItemDeleteEnabled(false);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_ADD_DELETE) {
+            setMenuItemAddEnabled(true);
+            setMenuItemUpdateEnabled(false);
+            setMenuItemDeleteEnabled(true);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_UPDATE_DELETE) {
+            setMenuItemAddEnabled(false);
+            setMenuItemUpdateEnabled(true);
+            setMenuItemDeleteEnabled(true);
+        }
+        if (intOperation == IDefaultMutableTreeNode.OPERATION_ADD_UPDATE_DELETE) {
+            setMenuItemAddEnabled(true);
+            setMenuItemUpdateEnabled(true);
+            setMenuItemDeleteEnabled(true);
+        }
+        viewCurrentModule();
+    }
+
+    /**
+     Enable/Disable add menu item
+     
+     **/
+    private void setMenuItemAddEnabled(boolean isEnable) {
+        jMenuItemPopupAdd.setEnabled(isEnable);
+    }
+
+    /**
+     Enable/Disable update menu item
+     
+     **/
+    private void setMenuItemUpdateEnabled(boolean isEnable) {
+        jMenuItemPopupUpdate.setEnabled(isEnable);
+        jMenuItemEditUpdate.setEnabled(isEnable);
+    }
+
+    /**
+     Enable/Disable delete menu item
+     
+     **/
+    private void setMenuItemDeleteEnabled(boolean isEnable) {
+        jMenuItemPopupDelete.setEnabled(isEnable);
+        jMenuItemEditDelete.setEnabled(isEnable);
+    }
+
+    /**
+     Close current open module
+
+     **/
+    private void closeCurrentModule() {
+        cleanAllXml();
+
+        reloadTreeAndTable(ModuleMain.CLOSED);
+        setMenuItemAddEnabled(false);
+        setMenuItemUpdateEnabled(false);
+        setMenuItemDeleteEnabled(false);
+        cleanDesktopPane();
+    }
+
+    /**
+     Remove all Internal Frame of Desktop Pane
+     
+     **/
+    private void cleanDesktopPane() {
+        JInternalFrame[] iif = this.jDesktopPane.getAllFrames();
+        for (int index = 0; index < iif.length; index++) {
+            iif[index].dispose();
+        }
+    }
+
+    /**
+     Set all xml document null
+     
+     **/
+    private void cleanAllXml() {
+        this.currentModule = "";
+        this.saveFileName = "";
+        this.currentModuleType = 0;
+        this.currentNodeType = 0;
+
+        xmlMsaDoc = null;
+        xmlMbdDoc = null;
+        xmlMlsaDoc = null;
+        xmlMlbdDoc = null;
+        xmlmh = null;
+        xmllcd = null;
+        xmllib = null;
+        xmlsf = null;
+        xmlic = null;
+        xmlpl = null;
+        xmlen = null;
+        xmlhob = null;
+        xmlppi = null;
+        xmlvb = null;
+        xmlbm = null;
+        xmlst = null;
+        xmldh = null;
+        xmlfs = null;
+        xmlgu = null;
+        xmlet = null;
+        xmlpcd = null;
+        xmlbo = null;
+    }
+
+    /**
+     Execute add operation for current node 
+     
+     @param intCategory The category of current node
+     @param intLocation The location of current node
+     
+     **/
+    private void addCurrentModule(int intCategory, int intLocation) {
+        //
+        //Add new libraries
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES
+            || intCategory == IDefaultMutableTreeNode.LIBRARIES_LIBRARY
+            || intCategory == IDefaultMutableTreeNode.LIBRARIES_ARCH) {
+            showLibraries(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new sourcefiles
+        //
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES
+            || intCategory == IDefaultMutableTreeNode.SOURCEFILES_FILENAME
+            || intCategory == IDefaultMutableTreeNode.SOURCEFILES_ARCH) {
+            showSourceFiles(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new includes
+        //
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES
+            || intCategory == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME
+            || intCategory == IDefaultMutableTreeNode.INCLUDES_ARCH) {
+            showIncludes(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new protocols
+        //
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS
+            || intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL
+            || intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY) {
+            showProtocols(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new events
+        //
+        if (intCategory == IDefaultMutableTreeNode.EVENTS || intCategory == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS
+            || intCategory == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS) {
+            showEvents(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new hobs
+        //
+        if (intCategory == IDefaultMutableTreeNode.HOBS || intCategory == IDefaultMutableTreeNode.HOBS_HOB_ITEM) {
+            showHobs(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new ppis
+        //
+        if (intCategory == IDefaultMutableTreeNode.PPIS || intCategory == IDefaultMutableTreeNode.PPIS_PPI
+            || intCategory == IDefaultMutableTreeNode.PPIS_PPINOTIFY) {
+            showPpis(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new variables
+        //
+        if (intCategory == IDefaultMutableTreeNode.VARIABLES
+            || intCategory == IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM) {
+            showVariables(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new BootModes
+        //
+        if (intCategory == IDefaultMutableTreeNode.BOOTMODES
+            || intCategory == IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM) {
+            showBootModes(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new SystemTables
+        //
+        if (intCategory == IDefaultMutableTreeNode.SYSTEMTABLES
+            || intCategory == IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM) {
+            showSystemTables(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new DataHubs
+        //
+        if (intCategory == IDefaultMutableTreeNode.DATAHUBS
+            || intCategory == IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM) {
+            showDataHubs(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new Formsets
+        //
+        if (intCategory == IDefaultMutableTreeNode.FORMSETS
+            || intCategory == IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM) {
+            showFormsets(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new Guids
+        //
+        if (intCategory == IDefaultMutableTreeNode.GUIDS || intCategory == IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM) {
+            showGuids(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new Externs
+        //
+        if (intCategory == IDefaultMutableTreeNode.EXTERNS
+            || intCategory == IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM) {
+            showExterns(ModuleMain.ADD, intCategory, -1);
+        }
+
+        //
+        //Add new PCDs
+        //
+        if (intCategory == IDefaultMutableTreeNode.PCDS || intCategory == IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM) {
+            showPCDs(ModuleMain.ADD, intCategory, -1);
+        }
+    }
+
+    /**
+     Execute delete operation of current node
+     
+     @param intCategory The category of current node
+     @param intLocation The location of current node
+     
+     **/
+    private void deleteCurrentModule(int intCategory, int intLocation) {
+        //
+        // Delete Msa Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MSA_HEADER || intCategory == IDefaultMutableTreeNode.MBD_HEADER
+            || intCategory == IDefaultMutableTreeNode.MLSA_HEADER || intCategory == IDefaultMutableTreeNode.MLBD_HEADER) {
+            if (JOptionPane.showConfirmDialog(null, "The module will be deleted permanently, do you want to continue?") == JOptionPane.YES_OPTION) {
+                try {
+                    File f = new File(currentModule);
+                    f.delete();
+                    closeCurrentModule();
+                } catch (Exception e) {
+                    Log.err("Delete " + currentModule, e.getMessage());
+                }
+            } else {
+                return;
+            }
+        }
+
+        //
+        //Delete LIBRARY CLASS DEFINITIONS
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS) {
+            xmllcd = null;
+        }
+
+        //
+        //Delete Libraries
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES) {
+            xmllib = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_LIBRARY) {
+            for (int indexI = xmllib.getLibraryList().size() - 1; indexI > -1; indexI--) {
+                xmllib.removeLibrary(indexI);
+            }
+            if (xmllib.getArchList().size() < 1 && xmllib.getLibraryList().size() < 1) {
+                xmllib = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_ARCH) {
+            for (int indexI = xmllib.getArchList().size() - 1; indexI > -1; indexI--) {
+                xmllib.removeArch(indexI);
+            }
+            if (xmllib.getArchList().size() < 1 && xmllib.getLibraryList().size() < 1) {
+                xmllib = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM) {
+            xmllib.removeArch(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_LIBRARY_ITEM) {
+            xmllib.removeLibrary(intLocation);
+        }
+
+        //
+        //Delete SourceFiles
+        //
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES) {
+            xmlsf = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_FILENAME) {
+            for (int indexI = xmlsf.getFilenameList().size() - 1; indexI > -1; indexI--) {
+                xmlsf.removeFilename(indexI);
+            }
+            if (xmlsf.getArchList().size() < 1 && xmlsf.getFilenameList().size() < 1) {
+                xmlsf = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_ARCH) {
+            for (int indexI = xmlsf.getArchList().size() - 1; indexI > -1; indexI--) {
+                xmlsf.removeArch(indexI);
+            }
+            if (xmlsf.getArchList().size() < 1 && xmlsf.getFilenameList().size() < 1) {
+                xmlsf = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM) {
+            xmlsf.removeArch(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_FILENAME_ITEM) {
+            xmlsf.removeFilename(intLocation);
+        }
+
+        //
+        //Delete Includes
+        //
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES) {
+            xmlic = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME) {
+            for (int indexI = xmlic.getPackageNameList().size() - 1; indexI > -1; indexI--) {
+                xmlic.removePackageName(indexI);
+            }
+            if (xmlic.getArchList().size() < 1 && xmlic.getPackageNameList().size() < 1) {
+                xmlic = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_ARCH) {
+            for (int indexI = xmlic.getArchList().size() - 1; indexI > -1; indexI--) {
+                xmlic.removeArch(indexI);
+            }
+            if (xmlic.getArchList().size() < 1 && xmlic.getPackageNameList().size() < 1) {
+                xmlic = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM) {
+            xmlic.removeArch(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME_ITEM) {
+            xmlic.removePackageName(intLocation);
+        }
+
+        //
+        //Delete Protocols
+        //
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS) {
+            xmlpl = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL) {
+            for (int indexI = xmlpl.getProtocolList().size() - 1; indexI > -1; indexI--) {
+                xmlpl.removeProtocol(indexI);
+            }
+            if (xmlpl.getProtocolList().size() < 1 && xmlpl.getProtocolNotifyList().size() < 1) {
+                xmlpl = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY) {
+            for (int indexI = xmlpl.getProtocolList().size() - 1; indexI > -1; indexI--) {
+                xmlpl.removeProtocolNotify(indexI);
+            }
+            if (xmlpl.getProtocolList().size() < 1 && xmlpl.getProtocolNotifyList().size() < 1) {
+                xmlpl = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM) {
+            xmlpl.removeProtocol(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM) {
+            xmlpl.removeProtocolNotify(intLocation);
+        }
+
+        //
+        //Delete Events
+        //
+        if (intCategory == IDefaultMutableTreeNode.EVENTS) {
+            xmlen = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS) {
+            for (int indexI = xmlen.getCreateEvents().getEventList().size() - 1; indexI > -1; indexI--) {
+                xmlen.getCreateEvents().removeEvent(indexI);
+            }
+            if (xmlen.getCreateEvents().getEventList().size() < 1 && xmlen.getSignalEvents().getEventList().size() < 1) {
+                xmlen = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS) {
+            for (int indexI = xmlen.getSignalEvents().getEventList().size() - 1; indexI > -1; indexI--) {
+                xmlen.getSignalEvents().removeEvent(indexI);
+            }
+            if (xmlen.getCreateEvents().getEventList().size() < 1 && xmlen.getSignalEvents().getEventList().size() < 1) {
+                xmlen = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM) {
+            xmlen.getCreateEvents().removeEvent(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM) {
+            xmlen.getSignalEvents().removeEvent(intLocation);
+        }
+
+        //
+        //Delete Hobs
+        //
+        if (intCategory == IDefaultMutableTreeNode.HOBS) {
+            xmlhob = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.HOBS_HOB_ITEM) {
+            xmlhob.removeHob(intLocation);
+            if (xmlhob.getHobList().size() < 1) {
+                xmlhob = null;
+            }
+        }
+
+        //
+        //Delete Ppis
+        //
+        if (intCategory == IDefaultMutableTreeNode.PPIS) {
+            xmlppi = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPI) {
+            for (int indexI = xmlppi.getPpiList().size() - 1; indexI > -1; indexI--) {
+                xmlppi.removePpi(indexI);
+            }
+            if (xmlppi.getPpiList().size() < 1 && xmlppi.getPpiNotifyList().size() < 1) {
+                xmlppi = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPINOTIFY) {
+            for (int indexI = xmlppi.getPpiNotifyList().size() - 1; indexI > -1; indexI--) {
+                xmlppi.removePpiNotify(indexI);
+            }
+            if (xmlppi.getPpiList().size() < 1 && xmlppi.getPpiNotifyList().size() < 1) {
+                xmlppi = null;
+            }
+        }
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPI_ITEM) {
+            xmlppi.removePpi(intLocation);
+        }
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM) {
+            xmlppi.removePpiNotify(intLocation);
+        }
+
+        //
+        //Delete Variables
+        //
+        if (intCategory == IDefaultMutableTreeNode.VARIABLES) {
+            xmlvb = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM) {
+            xmlvb.removeVariable(intLocation);
+            if (xmlvb.getVariableList().size() < 1) {
+                xmlvb = null;
+            }
+        }
+
+        //
+        //Delete BootModes
+        //
+        if (intCategory == IDefaultMutableTreeNode.BOOTMODES) {
+            xmlbm = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM) {
+            xmlbm.removeBootMode(intLocation);
+            if (xmlbm.getBootModeList().size() < 1) {
+                xmlbm = null;
+            }
+        }
+
+        //
+        //Delete SystemTables
+        //
+        if (intCategory == IDefaultMutableTreeNode.SYSTEMTABLES) {
+            xmlst = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM) {
+            xmlst.removeSystemTable(intLocation);
+            if (xmlst.getSystemTableList().size() < 1) {
+                xmlst = null;
+            }
+        }
+
+        //
+        //Delete DataHubs
+        //
+        if (intCategory == IDefaultMutableTreeNode.DATAHUBS) {
+            xmldh = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM) {
+            xmldh.removeDataHubRecord(intLocation);
+            if (xmldh.getDataHubRecordList().size() < 1) {
+                xmldh = null;
+            }
+        }
+
+        //
+        //Delete Formsets
+        //
+        if (intCategory == IDefaultMutableTreeNode.FORMSETS) {
+            xmlfs = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM) {
+            xmlfs.removeFormset(intLocation);
+            if (xmlfs.getFormsetList().size() < 1) {
+                xmlfs = null;
+            }
+        }
+
+        //
+        //Delete Guids
+        //
+        if (intCategory == IDefaultMutableTreeNode.GUIDS) {
+            xmlgu = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM) {
+            xmlgu.removeGuidEntry(intLocation);
+            if (xmlgu.getGuidEntryList().size() < 1) {
+                xmlgu = null;
+            }
+        }
+
+        //
+        //Delete Externs
+        //
+        if (intCategory == IDefaultMutableTreeNode.EXTERNS) {
+            xmlet = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM) {
+            xmlet.removeExtern(intLocation);
+            if (xmlet.getExternList().size() < 1) {
+                xmlet = null;
+            }
+        }
+
+        //
+        //Delete PCDs
+        //
+        if (intCategory == IDefaultMutableTreeNode.PCDS) {
+            xmlpcd = null;
+        }
+        if (intCategory == IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM) {
+            xmlpcd.removePcdData(intLocation);
+            if (xmlpcd.getPcdDataList().size() < 1) {
+                xmlpcd = null;
+            }
+        }
+        this.cleanDesktopPane();
+        reloadTreeAndTable(UPDATE_WITH_CHANGE);
+    }
+
+    /**
+     View current Module
+     
+     **/
+    private void viewCurrentModule() {
+        int intCategory = iTree.getSelectCategory();
+        int intLocation = iTree.getSelectLoaction();
+        //
+        //View Msa Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {
+            showMsaHeader(ModuleMain.VIEW);
+        }
+
+        //
+        //View Mbd Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MBD_HEADER) {
+            showMbdHeader(ModuleMain.VIEW);
+        }
+
+        //
+        //View Msa Lib Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MLSA_HEADER) {
+            showMlsaHeader(ModuleMain.VIEW);
+        }
+
+        //
+        //View Mbd Lib Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MLBD_HEADER) {
+            showMlbdHeader(ModuleMain.VIEW);
+        }
+
+        //
+        //View Libraries
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_LIBRARY
+            || intCategory == IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM) {
+            showLibraries(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View LIBRARY CLASS DEFINITIONS
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS) {
+            showLibraryClassDefinitions(ModuleMain.VIEW, intCategory);
+        }
+
+        //
+        //View Source Files
+        //
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_FILENAME
+            || intCategory == IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM) {
+            showSourceFiles(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Includes
+        //
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME
+            || intCategory == IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM) {
+            showIncludes(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Protocols
+        //
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM
+            || intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM) {
+            showProtocols(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Hobs
+        //
+        if (intCategory == IDefaultMutableTreeNode.HOBS_HOB_ITEM) {
+            showHobs(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Events
+        //
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM
+            || intCategory == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM) {
+            showEvents(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Ppis
+        //
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPI_ITEM
+            || intCategory == IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM) {
+            showPpis(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Variables
+        //
+        if (intCategory == IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM) {
+            showVariables(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View BootModes
+        //
+        if (intCategory == IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM) {
+            showBootModes(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View SystemTables
+        //
+        if (intCategory == IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM) {
+            showSystemTables(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View DataHubs
+        //
+        if (intCategory == IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM) {
+            showDataHubs(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Formsets
+        //
+        if (intCategory == IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM) {
+            showFormsets(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Guids
+        //
+        if (intCategory == IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM) {
+            showGuids(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View Externs
+        //
+        if (intCategory == IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM) {
+            showExterns(ModuleMain.VIEW, intCategory, intLocation);
+        }
+
+        //
+        //View PCDs
+        //
+        if (intCategory == IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM) {
+            showPCDs(ModuleMain.VIEW, intCategory, intLocation);
+        }
+    }
+
+    /**
+     Execute update operation of current module
+     
+     @param intCategory The category of current node
+     @param intLocation The location of current node
+     
+     **/
+    private void updateCurrentModule(int intCategory, int intLocation) {
+        //
+        //Update Msa Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {
+            showMsaHeader(ModuleMain.UPDATE);
+        }
+
+        //
+        //Update Mbd Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MBD_HEADER) {
+            showMbdHeader(ModuleMain.UPDATE);
+        }
+
+        //
+        //Update Msa Lib Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MLSA_HEADER) {
+            showMlsaHeader(ModuleMain.UPDATE);
+        }
+
+        //
+        //Update Mbd Lib Header
+        //
+        if (intCategory == IDefaultMutableTreeNode.MLBD_HEADER) {
+            showMlbdHeader(ModuleMain.UPDATE);
+        }
+
+        //
+        //Update Libraries
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARIES_LIBRARY
+            || intCategory == IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM) {
+            showLibraries(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update LIBRARY CLASS DEFINITIONS
+        //
+        if (intCategory == IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS) {
+            showLibraryClassDefinitions(ModuleMain.UPDATE, intCategory);
+        }
+
+        //
+        //Update Source Files
+        //
+        if (intCategory == IDefaultMutableTreeNode.SOURCEFILES_FILENAME
+            || intCategory == IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM) {
+            showSourceFiles(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Includes
+        //
+        if (intCategory == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME
+            || intCategory == IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM) {
+            showIncludes(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Protocols
+        //
+        if (intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM
+            || intCategory == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM) {
+            showProtocols(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Hobs
+        //
+        if (intCategory == IDefaultMutableTreeNode.HOBS_HOB_ITEM) {
+            showHobs(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Events
+        //
+        if (intCategory == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM
+            || intCategory == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM) {
+            showEvents(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Ppis
+        //
+        if (intCategory == IDefaultMutableTreeNode.PPIS_PPI_ITEM
+            || intCategory == IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM) {
+            showPpis(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Variables
+        //
+        if (intCategory == IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM) {
+            showVariables(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update BootModes
+        //
+        if (intCategory == IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM) {
+            showBootModes(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update SystemTables
+        //
+        if (intCategory == IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM) {
+            showSystemTables(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update DataHubs
+        //
+        if (intCategory == IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM) {
+            showDataHubs(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Formsets
+        //
+        if (intCategory == IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM) {
+            showFormsets(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Guids
+        //
+        if (intCategory == IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM) {
+            showGuids(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update Externs
+        //
+        if (intCategory == IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM) {
+            showExterns(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+
+        //
+        //Update PCDs
+        //
+        if (intCategory == IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM) {
+            showPCDs(ModuleMain.UPDATE, intCategory, intLocation);
+        }
+    }
+
+    /**
+     Save current module
+     Call relevant function via different file types
+     
+     **/
+    private void saveCurrentModule() {
+        if (this.saveFileName == "") {
+            openFile(2, this.currentModuleType);
+        }
+        if (this.saveFileName == "") {
+            this.saveFileName = this.currentModule;
+            return;
+        } else {
+            switch (this.currentModuleType) {
+            case 1:
+                saveMsa();
+                break;
+            case 2:
+                saveMbd();
+                break;
+            case 3:
+                saveMlsa();
+                break;
+            case 4:
+                saveMlbd();
+                break;
+            }
+
+        }
+
+        reloadTreeAndTable(SAVE_WITH_CHANGE);
+    }
+
+    /**
+     Save current module as
+     
+     **/
+    private void saveAsCurrentModule() {
+        this.saveFileName = "";
+        saveCurrentModule();
+    }
+
+    /**
+     Save file as msa
+     
+     **/
+    private void saveMsa() {
+        File f = new File(this.saveFileName);
+        ModuleSurfaceAreaDocument msaDoc = ModuleSurfaceAreaDocument.Factory.newInstance();
+        ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = ModuleSurfaceAreaDocument.ModuleSurfaceArea.Factory
+                                                                                                             .newInstance();
+
+        //
+        //Add all components into xml doc file
+        //
+        if (xmlmh != null) {
+            msa.setMsaHeader(xmlmh);
+        }
+        if (xmllcd != null) {
+            msa.setLibraryClassDefinitions(xmllcd);
+        }
+        if (xmlsf != null) {
+            msa.setSourceFiles(xmlsf);
+        }
+        if (xmlic != null) {
+            msa.setIncludes(xmlic);
+        }
+        if (xmlpl != null) {
+            msa.setProtocols(xmlpl);
+        }
+        if (xmlen != null) {
+            msa.setEvents(xmlen);
+        }
+        if (xmlhob != null) {
+            msa.setHobs(xmlhob);
+        }
+        if (xmlppi != null) {
+            msa.setPPIs(xmlppi);
+        }
+        if (xmlvb != null) {
+            msa.setVariables(xmlvb);
+        }
+        if (xmlbm != null) {
+            msa.setBootModes(xmlbm);
+        }
+        if (xmlst != null) {
+            msa.setSystemTables(xmlst);
+        }
+        if (xmldh != null) {
+            msa.setDataHubs(xmldh);
+        }
+        if (xmlfs != null) {
+            msa.setFormsets(xmlfs);
+        }
+        if (xmlgu != null) {
+            msa.setGuids(xmlgu);
+        }
+        if (xmlet != null) {
+            msa.setExterns(xmlet);
+        }
+        if (xmlpcd != null) {
+            msa.setPCDs(xmlpcd);
+        }
+        if (xmlbo != null) {
+            msa.setBuildOptions(xmlbo);
+        }
+        //
+        //Init namespace
+        //
+        XmlCursor cursor = msa.newCursor();
+        String uri = "http://www.TianoCore.org/2006/Edk2.0";
+        cursor.push();
+        cursor.toNextToken();
+        cursor.insertNamespace("", uri);
+        cursor.insertNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        cursor.pop();
+
+        //
+        //Config file format
+        //
+        XmlOptions options = new XmlOptions();
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+
+        //
+        //Create finial doc
+        //
+        msaDoc.addNewModuleSurfaceArea();
+        msaDoc.setModuleSurfaceArea((ModuleSurfaceAreaDocument.ModuleSurfaceArea) cursor.getObject());
+        try {
+            //
+            //Save the file
+            //
+            msaDoc.save(f, options);
+            this.currentModule = this.saveFileName;
+        } catch (Exception e) {
+            Log.err("Save Msa", e.getMessage());
+        }
+    }
+
+    /**
+     Save file as mbd
+     
+     **/
+    private void saveMbd() {
+        File f = new File(this.saveFileName);
+        ModuleBuildDescriptionDocument mbdDoc = ModuleBuildDescriptionDocument.Factory.newInstance();
+        ModuleBuildDescriptionDocument.ModuleBuildDescription mbd = ModuleBuildDescriptionDocument.ModuleBuildDescription.Factory
+                                                                                                                                 .newInstance();
+        //
+        //Add all components into xml doc file
+        //
+        if (xmlmbdh != null) {
+            mbd.setMbdHeader(xmlmbdh);
+        }
+        if (xmllib != null) {
+            mbd.setLibraries(xmllib);
+        }
+        if (xmlsf != null) {
+            mbd.setSourceFiles(xmlsf);
+        }
+        if (xmlic != null) {
+            mbd.setIncludes(xmlic);
+        }
+        if (xmlpl != null) {
+            mbd.setProtocols(xmlpl);
+        }
+        if (xmlen != null) {
+            mbd.setEvents(xmlen);
+        }
+        if (xmlhob != null) {
+            mbd.setHobs(xmlhob);
+        }
+        if (xmlppi != null) {
+            mbd.setPPIs(xmlppi);
+        }
+        if (xmlvb != null) {
+            mbd.setVariables(xmlvb);
+        }
+        if (xmlbm != null) {
+            mbd.setBootModes(xmlbm);
+        }
+        if (xmlst != null) {
+            mbd.setSystemTables(xmlst);
+        }
+        if (xmldh != null) {
+            mbd.setDataHubs(xmldh);
+        }
+        if (xmlfs != null) {
+            mbd.setFormsets(xmlfs);
+        }
+        if (xmlgu != null) {
+            mbd.setGuids(xmlgu);
+        }
+        if (xmlet != null) {
+            mbd.setExterns(xmlet);
+        }
+        if (xmlpcd != null) {
+            mbd.setPCDs(xmlpcd);
+        }
+        if (xmlbo != null) {
+            mbd.setBuildOptions(xmlbo);
+        }
+        //
+        //Init namespace
+        //
+        XmlCursor cursor = mbd.newCursor();
+        String uri = "http://www.TianoCore.org/2006/Edk2.0";
+        cursor.push();
+        cursor.toNextToken();
+        cursor.insertNamespace("", uri);
+        cursor.insertNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        cursor.pop();
+
+        //
+        //Config file format
+        //
+        XmlOptions options = new XmlOptions();
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+
+        //
+        //Create finial doc
+        //
+        mbdDoc.addNewModuleBuildDescription();
+        mbdDoc.setModuleBuildDescription((ModuleBuildDescriptionDocument.ModuleBuildDescription) cursor.getObject());
+        try {
+            //
+            //Save the file
+            //
+            mbdDoc.save(f, options);
+            this.currentModule = this.saveFileName;
+        } catch (Exception e) {
+            Log.err("Save Mbd", e.getMessage());
+        }
+    }
+
+    /**
+     Save file as mlsa
+     
+     **/
+    private void saveMlsa() {
+        File f = new File(this.saveFileName);
+        LibraryModuleSurfaceAreaDocument mlsaDoc = LibraryModuleSurfaceAreaDocument.Factory.newInstance();
+        LibraryModuleSurfaceAreaDocument.LibraryModuleSurfaceArea mlsa = LibraryModuleSurfaceAreaDocument.LibraryModuleSurfaceArea.Factory
+                                                                                                                                          .newInstance();
+        //
+        //Add all components into xml doc file
+        //
+        if (xmlmlh != null) {
+            mlsa.setMsaLibHeader(xmlmlh);
+        }
+        if (xmllcd != null) {
+            mlsa.setLibraryClassDefinitions(xmllcd);
+        }
+        if (xmlsf != null) {
+            mlsa.setSourceFiles(xmlsf);
+        }
+        if (xmlic != null) {
+            mlsa.setIncludes(xmlic);
+        }
+        if (xmlpl != null) {
+            mlsa.setProtocols(xmlpl);
+        }
+        if (xmlen != null) {
+            mlsa.setEvents(xmlen);
+        }
+        if (xmlhob != null) {
+            mlsa.setHobs(xmlhob);
+        }
+        if (xmlppi != null) {
+            mlsa.setPPIs(xmlppi);
+        }
+        if (xmlvb != null) {
+            mlsa.setVariables(xmlvb);
+        }
+        if (xmlbm != null) {
+            mlsa.setBootModes(xmlbm);
+        }
+        if (xmlst != null) {
+            mlsa.setSystemTables(xmlst);
+        }
+        if (xmldh != null) {
+            mlsa.setDataHubs(xmldh);
+        }
+        if (xmlfs != null) {
+            mlsa.setFormsets(xmlfs);
+        }
+        if (xmlgu != null) {
+            mlsa.setGuids(xmlgu);
+        }
+        if (xmlet != null) {
+            mlsa.setExterns(xmlet);
+        }
+        if (xmlpcd != null) {
+            mlsa.setPCDs(xmlpcd);
+        }
+        if (xmlbo != null) {
+            mlsa.setBuildOptions(xmlbo);
+        }
+        //
+        //Init namespace
+        //
+        XmlCursor cursor = mlsa.newCursor();
+        String uri = "http://www.TianoCore.org/2006/Edk2.0";
+        cursor.push();
+        cursor.toNextToken();
+        cursor.insertNamespace("", uri);
+        cursor.insertNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        cursor.pop();
+
+        //
+        //Config file format
+        //
+        XmlOptions options = new XmlOptions();
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+
+        //
+        //Create finial doc
+        //
+        mlsaDoc.addNewLibraryModuleSurfaceArea();
+        mlsaDoc
+               .setLibraryModuleSurfaceArea((LibraryModuleSurfaceAreaDocument.LibraryModuleSurfaceArea) cursor
+                                                                                                              .getObject());
+        try {
+            //
+            //Save the file
+            //
+            mlsaDoc.save(f, options);
+            this.currentModule = this.saveFileName;
+        } catch (Exception e) {
+            Log.err("Save Mlsa", e.getMessage());
+        }
+    }
+
+    /**
+     Save file as mbd
+     
+     **/
+    private void saveMlbd() {
+        File f = new File(this.saveFileName);
+        LibraryModuleBuildDescriptionDocument mlbdDoc = LibraryModuleBuildDescriptionDocument.Factory.newInstance();
+        LibraryModuleBuildDescriptionDocument.LibraryModuleBuildDescription mlbd = LibraryModuleBuildDescriptionDocument.LibraryModuleBuildDescription.Factory
+                                                                                                                                                              .newInstance();
+        //
+        //Add all components into xml doc file
+        //
+        if (xmlmlbdh != null) {
+            mlbd.setMbdLibHeader(xmlmlbdh);
+        }
+        if (xmllib != null) {
+            mlbd.setLibraries(xmllib);
+        }
+        if (xmlsf != null) {
+            mlbd.setSourceFiles(xmlsf);
+        }
+        if (xmlic != null) {
+            mlbd.setIncludes(xmlic);
+        }
+        if (xmlpl != null) {
+            mlbd.setProtocols(xmlpl);
+        }
+        if (xmlen != null) {
+            mlbd.setEvents(xmlen);
+        }
+        if (xmlhob != null) {
+            mlbd.setHobs(xmlhob);
+        }
+        if (xmlppi != null) {
+            mlbd.setPPIs(xmlppi);
+        }
+        if (xmlvb != null) {
+            mlbd.setVariables(xmlvb);
+        }
+        if (xmlbm != null) {
+            mlbd.setBootModes(xmlbm);
+        }
+        if (xmlst != null) {
+            mlbd.setSystemTables(xmlst);
+        }
+        if (xmldh != null) {
+            mlbd.setDataHubs(xmldh);
+        }
+        if (xmlfs != null) {
+            mlbd.setFormsets(xmlfs);
+        }
+        if (xmlgu != null) {
+            mlbd.setGuids(xmlgu);
+        }
+        if (xmlet != null) {
+            mlbd.setExterns(xmlet);
+        }
+        if (xmlpcd != null) {
+            mlbd.setPCDs(xmlpcd);
+        }
+        if (xmlbo != null) {
+            mlbd.setBuildOptions(xmlbo);
+        }
+        //
+        //Init namespace
+        //
+        XmlCursor cursor = mlbd.newCursor();
+        String uri = "http://www.TianoCore.org/2006/Edk2.0";
+        cursor.push();
+        cursor.toNextToken();
+        cursor.insertNamespace("", uri);
+        cursor.insertNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        cursor.pop();
+
+        //
+        //Config file format
+        //
+        XmlOptions options = new XmlOptions();
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+
+        //
+        //Create finial doc
+        //
+        mlbdDoc.addNewLibraryModuleBuildDescription();
+        mlbdDoc
+               .setLibraryModuleBuildDescription((LibraryModuleBuildDescriptionDocument.LibraryModuleBuildDescription) cursor
+                                                                                                                             .getObject());
+        try {
+            //
+            //Save the file
+            //
+            mlbdDoc.save(f, options);
+            this.currentModule = this.saveFileName;
+        } catch (Exception e) {
+            Log.err("Save Mbd", e.getMessage());
+        }
+    }
+
+    /**
+     Reflash the tree via current value of xml documents.
+     
+     @param intMode The input data of current operation type
+     
+     **/
+    private void reloadTreeAndTable(int intMode) {
+        makeTree();
+        if (intMode == ModuleMain.OPENED) {
+            this.jMenuItemModuleClose.setEnabled(true);
+            this.jMenuItemModuleSaveAs.setEnabled(true);
+            this.jMenuEditAdd.setEnabled(true);
+            this.setTitle(windowTitle + "- [" + this.currentModule + "]");
+            this.jButtonOk.setEnabled(false);
+            this.jButtonCancel.setEnabled(false);
+        }
+        if (intMode == ModuleMain.CLOSED) {
+            this.jMenuItemModuleClose.setEnabled(false);
+            this.jMenuItemModuleSave.setEnabled(false);
+            this.jMenuItemModuleSaveAs.setEnabled(false);
+            this.jMenuEditAdd.setEnabled(false);
+            this.setTitle(windowTitle + "- [" + ws.getCurrentWorkspace() + "]");
+            this.setButtonEnable(false);
+        }
+        if (intMode == ModuleMain.NEW_WITHOUT_CHANGE) {
+
+        }
+
+        if (intMode == ModuleMain.NEW_WITH_CHANGE) {
+            this.jMenuItemModuleClose.setEnabled(true);
+            this.jMenuItemModuleSave.setEnabled(true);
+            this.jMenuItemModuleSaveAs.setEnabled(true);
+            this.jMenuEditAdd.setEnabled(true);
+            setButtonEnable(false);
+        }
+        if (intMode == ModuleMain.UPDATE_WITHOUT_CHANGE) {
+
+        }
+        if (intMode == ModuleMain.UPDATE_WITH_CHANGE) {
+            this.jMenuItemModuleClose.setEnabled(true);
+            this.jMenuItemModuleSave.setEnabled(true);
+            this.jMenuItemModuleSaveAs.setEnabled(true);
+        }
+        if (intMode == ModuleMain.SAVE_WITHOUT_CHANGE) {
+            this.jMenuItemModuleClose.setEnabled(true);
+            this.jMenuItemModuleSave.setEnabled(true);
+            this.jMenuItemModuleSaveAs.setEnabled(true);
+            this.jButtonOk.setEnabled(false);
+            this.jButtonCancel.setEnabled(false);
+        }
+        if (intMode == ModuleMain.SAVE_WITH_CHANGE) {
+            this.jMenuItemModuleClose.setEnabled(true);
+            this.jMenuItemModuleSave.setEnabled(false);
+            this.jMenuItemModuleSaveAs.setEnabled(true);
+            this.jMenuItemEditUpdate.setEnabled(false);
+            this.jMenuItemEditDelete.setEnabled(false);
+            this.setTitle(windowTitle + "- [" + this.currentModule + "]");
+            this.jButtonOk.setEnabled(false);
+            this.jButtonCancel.setEnabled(false);
+        }
+
+        if (this.currentModuleType == 1 || this.currentModuleType == 3) {
+            this.jMenuItemEditAddLibraries.setEnabled(false);
+            this.jMenuItemEditAddLibraryClassDefinitions.setEnabled(true);
+        }
+        if (this.currentModuleType == 2 || this.currentModuleType == 4) {
+            this.jMenuItemEditAddLibraries.setEnabled(true);
+            this.jMenuItemEditAddLibraryClassDefinitions.setEnabled(false);
+        }
+    }
+
+    /**
+     Enable/Disable button Ok and Cancel
+     
+     @param isEnabled The input data to indicate if button is enabled or not
+     
+     **/
+    private void setButtonEnable(boolean isEnabled) {
+        this.jButtonCancel.setEnabled(isEnabled);
+        this.jButtonOk.setEnabled(isEnabled);
+    }
+
+    /**
+     Show msa header
+     When the operation is VIEW, disable all fields of internal frame
+     
+     @param type The input data of operation type
+     
+     **/
+    private void showMsaHeader(int type) {
+        msa = null;
+        msa = new MsaHeader(this.xmlmh);
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(msa, 1);
+        this.currentNodeType = IDefaultMutableTreeNode.MSA_HEADER;
+        this.currentModuleType = 1;
+        if (type == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            msa.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show MbdHeader
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showMbdHeader(int type) {
+        mbd = null;
+        mbd = new MbdHeader(this.xmlmbdh);
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mbd, 1);
+        this.currentNodeType = IDefaultMutableTreeNode.MBD_HEADER;
+        this.currentModuleType = 2;
+        if (type == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mbd.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show MlsaHeader
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showMlsaHeader(int type) {
+        mlsa = null;
+        mlsa = new MsaLibHeader(this.xmlmlh);
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mlsa, 1);
+        this.currentNodeType = IDefaultMutableTreeNode.MLSA_HEADER;
+        this.currentModuleType = 3;
+        if (type == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mlsa.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show MlbdHeader
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showMlbdHeader(int type) {
+        mlbd = null;
+        mlbd = new MbdLibHeader(this.xmlmlbdh);
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mlbd, 1);
+        this.currentNodeType = IDefaultMutableTreeNode.MLBD_HEADER;
+        this.currentModuleType = 4;
+        if (type == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mlbd.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Libraries
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showLibraries(int operationType, int nodeType, int location) {
+        mlib = null;
+        if (operationType == ModuleMain.ADD) {
+            mlib = new MbdLibraries(this.xmllib, -1, -1, 1);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mlib = new MbdLibraries(this.xmllib, nodeType, location, 2);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mlib, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mlib.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show LibraryClassDefinitions
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showLibraryClassDefinitions(int operationType, int nodeType) {
+        mlcd = null;
+        if (operationType == ModuleMain.ADD) {
+            mlcd = new ModuleLibraryClassDefinitions(this.xmllcd);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mlcd = new ModuleLibraryClassDefinitions(this.xmllcd);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mlcd, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mlcd.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show SourceFiles
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showSourceFiles(int operationType, int nodeType, int location) {
+        msf = null;
+        if (operationType == ModuleMain.ADD) {
+            msf = new ModuleSourceFiles(this.xmlsf, -1, -1, 1);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            msf = new ModuleSourceFiles(this.xmlsf, nodeType, location, 2);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(msf, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            msf.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Includes
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showIncludes(int operationType, int nodeType, int location) {
+        mic = null;
+        if (operationType == ModuleMain.ADD) {
+            mic = new ModuleIncludes(this.xmlic, -1, -1, 1);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mic = new ModuleIncludes(this.xmlic, nodeType, location, 2);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mic, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mic.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Protocols
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showProtocols(int operationType, int nodeType, int location) {
+        mp = null;
+        if (operationType == ModuleMain.ADD) {
+            mp = new ModuleProtocols(this.xmlpl);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mp = new ModuleProtocols(this.xmlpl, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mp, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mp.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Events
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showEvents(int operationType, int nodeType, int location) {
+        mev = null;
+        if (operationType == ModuleMain.ADD) {
+            mev = new ModuleEvents(this.xmlen);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mev = new ModuleEvents(this.xmlen, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mev, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mev.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Hobs
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showHobs(int operationType, int nodeType, int location) {
+        mh = null;
+        if (operationType == ModuleMain.ADD) {
+            mh = new ModuleHobs(this.xmlhob);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mh = new ModuleHobs(this.xmlhob, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mh, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mh.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Ppis
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showPpis(int operationType, int nodeType, int location) {
+        mpp = null;
+        if (operationType == ModuleMain.ADD) {
+            mpp = new ModulePpis(this.xmlppi);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mpp = new ModulePpis(this.xmlppi, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mpp, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mpp.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Variables
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showVariables(int operationType, int nodeType, int location) {
+        mv = null;
+        if (operationType == ModuleMain.ADD) {
+            mv = new ModuleVariables(this.xmlvb);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mv = new ModuleVariables(this.xmlvb, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mv, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mv.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show BootModes
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showBootModes(int operationType, int nodeType, int location) {
+        mbm = null;
+        if (operationType == ModuleMain.ADD) {
+            mbm = new ModuleBootModes(this.xmlbm);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mbm = new ModuleBootModes(this.xmlbm, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mbm, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mbm.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show SystemTables
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showSystemTables(int operationType, int nodeType, int location) {
+        mst = null;
+        if (operationType == ModuleMain.ADD) {
+            mst = new ModuleSystemTables(this.xmlst);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mst = new ModuleSystemTables(this.xmlst, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mst, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mst.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show DataHubs
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showDataHubs(int operationType, int nodeType, int location) {
+        mdh = null;
+        if (operationType == ModuleMain.ADD) {
+            mdh = new ModuleDataHubs(this.xmldh);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mdh = new ModuleDataHubs(this.xmldh, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mdh, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mdh.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Formsets
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showFormsets(int operationType, int nodeType, int location) {
+        mf = null;
+        if (operationType == ModuleMain.ADD) {
+            mf = new ModuleFormsets(this.xmlfs);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mf = new ModuleFormsets(this.xmlfs, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mf, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mf.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Show Guids
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showGuids(int operationType, int nodeType, int location) {
+        mg = null;
+        if (operationType == ModuleMain.ADD || operationType == ModuleMain.VIEW) {
+            mg = new ModuleGuids(this.xmlgu);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mg = new ModuleGuids(this.xmlgu, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mg, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mg.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show Externs
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showExterns(int operationType, int nodeType, int location) {
+        met = null;
+        if (operationType == ModuleMain.ADD) {
+            met = new ModuleExterns(this.xmlet);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            met = new ModuleExterns(this.xmlet, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(met, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            met.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Show PCDs
+    When the operation is VIEW, disable all fields of internal frame
+    
+    @param type The input data of operation type
+    
+    **/
+    private void showPCDs(int operationType, int nodeType, int location) {
+        mpcd = null;
+        if (operationType == ModuleMain.ADD) {
+            mpcd = new ModulePCDs(this.xmlpcd);
+        }
+        if (operationType == ModuleMain.UPDATE || operationType == ModuleMain.VIEW) {
+            mpcd = new ModulePCDs(this.xmlpcd, nodeType, location);
+        }
+        this.jDesktopPane.removeAll();
+        this.jDesktopPane.add(mpcd, 1);
+        this.currentNodeType = nodeType;
+        if (operationType == ModuleMain.VIEW) {
+            setButtonEnable(false);
+            mpcd.setViewMode(true);
+        } else {
+            setButtonEnable(true);
+        }
+    }
+
+    /**
+    Save currentModule when press button OK
+    
+    **/
+    private void save() {
+        if (this.currentNodeType == IDefaultMutableTreeNode.MSA_HEADER) {
+            if (!msa.check()) {
+                return;
+            }
+            msa.save();
+            msa.setViewMode(true);
+            this.xmlmh = msa.getMsaHeader();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.MBD_HEADER) {
+            if (!mbd.check()) {
+                return;
+            }
+            mbd.save();
+            mbd.setViewMode(true);
+            this.xmlmbdh = mbd.getMbdHeader();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.MLSA_HEADER) {
+            if (!mlsa.check()) {
+                return;
+            }
+            mlsa.save();
+            mlsa.setViewMode(true);
+            this.xmlmlh = mlsa.getMsaLibHeader();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.MLBD_HEADER) {
+            if (!mlbd.check()) {
+                return;
+            }
+            mlbd.save();
+            mlbd.setViewMode(true);
+            this.xmlmlbdh = mlbd.getMbdLibHeader();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.LIBRARIES
+            || this.currentNodeType == IDefaultMutableTreeNode.LIBRARIES_ARCH
+            || this.currentNodeType == IDefaultMutableTreeNode.LIBRARIES_ARCH_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.LIBRARIES_LIBRARY
+            || this.currentNodeType == IDefaultMutableTreeNode.LIBRARIES_LIBRARY_ITEM) {
+            if (!mlib.check()) {
+                return;
+            }
+            mlib.save();
+            mlib.setViewMode(true);
+            this.xmllib = mlib.getLibraries();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.LIBRARYCLASSDEFINITIONS
+            || this.currentNodeType == IDefaultMutableTreeNode.LIBRARY_CLASS_DEFINITION) {
+            if (!mlcd.check()) {
+                return;
+            }
+            mlcd.save();
+            mlcd.setViewMode(true);
+            this.xmllcd = mlcd.getLibraryClassDefinitions();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.SOURCEFILES
+            || this.currentNodeType == IDefaultMutableTreeNode.SOURCEFILES_ARCH
+            || this.currentNodeType == IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.SOURCEFILES_FILENAME
+            || this.currentNodeType == IDefaultMutableTreeNode.SOURCEFILES_FILENAME_ITEM) {
+            if (!msf.check()) {
+                return;
+            }
+            msf.save();
+            msf.setViewMode(true);
+            this.xmlsf = msf.getSourceFiles();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.INCLUDES
+            || this.currentNodeType == IDefaultMutableTreeNode.INCLUDES_ARCH
+            || this.currentNodeType == IDefaultMutableTreeNode.INCLUDES_ARCH_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME
+            || this.currentNodeType == IDefaultMutableTreeNode.INCLUDES_PACKAGENAME_ITEM) {
+            if (!mic.check()) {
+                return;
+            }
+            mic.save();
+            mic.setViewMode(true);
+            this.xmlic = mic.getIncludes();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.PROTOCOLS
+            || this.currentNodeType == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL
+            || this.currentNodeType == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY
+            || this.currentNodeType == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM) {
+            if (!mp.check()) {
+                return;
+            }
+            mp.save();
+            mp.setViewMode(true);
+            this.xmlpl = mp.getProtocols();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.EVENTS
+            || this.currentNodeType == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS
+            || this.currentNodeType == IDefaultMutableTreeNode.EVENTS_CREATEEVENTS_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS
+            || this.currentNodeType == IDefaultMutableTreeNode.EVENTS_SIGNALEVENTS_ITEM) {
+            if (!mev.check()) {
+                return;
+            }
+            mev.save();
+            mev.setViewMode(true);
+            this.xmlen = mev.getEvents();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.HOBS
+            || this.currentNodeType == IDefaultMutableTreeNode.HOBS_HOB_ITEM) {
+            if (!mh.check()) {
+                return;
+            }
+            mh.save();
+            mh.setViewMode(true);
+            this.xmlhob = mh.getHobs();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.PPIS
+            || this.currentNodeType == IDefaultMutableTreeNode.PPIS_PPI
+            || this.currentNodeType == IDefaultMutableTreeNode.PPIS_PPI_ITEM
+            || this.currentNodeType == IDefaultMutableTreeNode.PPIS_PPINOTIFY
+            || this.currentNodeType == IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM) {
+            if (!mpp.check()) {
+                return;
+            }
+            mpp.save();
+            mpp.setViewMode(true);
+            this.xmlppi = mpp.getPpis();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.VARIABLES
+            || this.currentNodeType == IDefaultMutableTreeNode.VARIABLES_VARIABLE_ITEM) {
+            if (!mv.check()) {
+                return;
+            }
+            mv.save();
+            mv.setViewMode(true);
+            this.xmlvb = mv.getVariables();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.BOOTMODES
+            || this.currentNodeType == IDefaultMutableTreeNode.BOOTMODES_BOOTMODE_ITEM) {
+            if (!mbm.check()) {
+                return;
+            }
+            mbm.save();
+            mbm.setViewMode(true);
+            this.xmlbm = mbm.getBootModes();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.SYSTEMTABLES
+            || this.currentNodeType == IDefaultMutableTreeNode.SYSTEMTABLES_SYSTEMTABLE_ITEM) {
+            if (!mst.check()) {
+                return;
+            }
+            mst.save();
+            mst.setViewMode(true);
+            this.xmlst = mst.getSystemTables();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.DATAHUBS
+            || this.currentNodeType == IDefaultMutableTreeNode.DATAHUBS_DATAHUB_ITEM) {
+            if (!mdh.check()) {
+                return;
+            }
+            mdh.save();
+            mdh.setViewMode(true);
+            this.xmldh = mdh.getDataHubs();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.FORMSETS
+            || this.currentNodeType == IDefaultMutableTreeNode.FORMSETS_FORMSET_ITEM) {
+            if (!mf.check()) {
+                return;
+            }
+            mf.save();
+            mf.setViewMode(true);
+            this.xmlfs = mf.getFormsets();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.GUIDS
+            || this.currentNodeType == IDefaultMutableTreeNode.GUIDS_GUIDENTRY_ITEM) {
+            if (!mg.check()) {
+                return;
+            }
+            mg.save();
+            mg.setViewMode(true);
+            this.xmlgu = mg.getGuids();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.EXTERNS
+            || this.currentNodeType == IDefaultMutableTreeNode.EXTERNS_EXTERN_ITEM) {
+            if (!met.check()) {
+                return;
+            }
+            met.save();
+            met.setViewMode(true);
+            this.xmlet = met.getExterns();
+        }
+
+        if (this.currentNodeType == IDefaultMutableTreeNode.PCDS
+            || this.currentNodeType == IDefaultMutableTreeNode.PCDS_PCDDATA_ITEM) {
+            if (!mpcd.check()) {
+                return;
+            }
+            mpcd.save();
+            mpcd.setViewMode(true);
+            this.xmlpcd = mpcd.getPcds();
+        }
+
+        reloadTreeAndTable(NEW_WITH_CHANGE);
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePCDs.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePCDs.java
new file mode 100644
index 0000000000..827efe9f3f
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePCDs.java
@@ -0,0 +1,519 @@
+/** @file
+ 
+ The file is used to create, update PCD of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.PCDsDocument;
+import org.tianocore.PcdDataTypes;
+import org.tianocore.PcdItemTypes;
+import org.tianocore.PcdUsage;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update PCD of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModulePCDs extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 2227717658188438696L;
+
+    //
+    //Define class members
+    //
+    private PCDsDocument.PCDs pcds = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelItemType = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JComboBox jComboBoxItemType = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelToken = null;
+
+    private JTextField jTextFieldToken = null;
+
+    private JLabel jLabelDefaultValue = null;
+
+    private JTextField jTextFieldDefaultValue = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelDatumType = null;
+
+    private JComboBox jComboBoxDatumType = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+    
+    /**
+     This method initializes jComboBoxItemType 
+     
+     @return javax.swing.JComboBox jComboBoxItemType
+     
+     **/
+    private JComboBox getJComboBoxItemType() {
+        if (jComboBoxItemType == null) {
+            jComboBoxItemType = new JComboBox();
+            jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jComboBoxItemType;
+    }
+
+    /**
+     This method initializes jTextFieldC_Name 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldToken 
+     
+     @return javax.swing.JTextField jTextFieldToken
+     
+     **/
+    private JTextField getJTextFieldToken() {
+        if (jTextFieldToken == null) {
+            jTextFieldToken = new JTextField();
+            jTextFieldToken.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldToken;
+    }
+
+    /**
+     This method initializes jTextFieldDefaultValue 
+     
+     @return javax.swing.JTextField jTextFieldDefaultValue
+     
+     **/
+    private JTextField getJTextFieldDefaultValue() {
+        if (jTextFieldDefaultValue == null) {
+            jTextFieldDefaultValue = new JTextField();
+            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jTextFieldDefaultValue;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(280, 290, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 290, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldDatumType 
+     
+     @return javax.swing.JTextField jComboBoxDatumType
+     
+     **/
+    private JComboBox getJComboBoxDatumType() {
+        if (jComboBoxDatumType == null) {
+            jComboBoxDatumType = new JComboBox();
+            jComboBoxDatumType.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jComboBoxDatumType;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModulePCDs() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inPcds The input data of PCDsDocument.PCDs
+     
+     **/
+    public ModulePCDs(PCDsDocument.PCDs inPcds) {
+        super();
+        init(inPcds);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inPcds The input data of PCDsDocument.PCDs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModulePCDs(PCDsDocument.PCDs inPcds, int type, int index) {
+        super();
+        init(inPcds, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inPcds The input data of PCDsDocument.PCDs
+     
+     **/
+    private void init(PCDsDocument.PCDs inPcds) {
+        init();
+        this.setPcds(inPcds);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inPcds The input data of PCDsDocument.PCDs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(PCDsDocument.PCDs inPcds, int type, int index) {
+        init(inPcds);
+        this.location = index;
+        if (this.pcds.getPcdDataList().size() > 0) {
+            if (this.pcds.getPcdDataArray(index).getCName() != null) {
+                this.jTextFieldC_Name.setText(this.pcds.getPcdDataArray(index).getCName());
+            }
+            if (this.pcds.getPcdDataArray(index).getToken() != null) {
+                this.jTextFieldToken.setText(this.pcds.getPcdDataArray(index).getToken());
+            }
+            if (this.pcds.getPcdDataArray(index).getDatumType() != null) {
+                this.jComboBoxDatumType.setSelectedItem(this.pcds.getPcdDataArray(index).getDatumType().toString());
+            }
+            if (this.pcds.getPcdDataArray(index).getDefaultValue() != null) {
+                this.jTextFieldDefaultValue.setText(this.pcds.getPcdDataArray(index).getDefaultValue());
+            }
+            if (this.pcds.getPcdDataArray(index).getPcdUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.pcds.getPcdDataArray(index).getPcdUsage().toString());
+            }
+            if (this.pcds.getPcdDataArray(index).getItemType() != null) {
+                this.jComboBoxItemType.setSelectedItem(this.pcds.getPcdDataArray(index).getItemType().toString());
+            }
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("PCDs");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldToken.setEnabled(!isView);
+            this.jComboBoxDatumType.setEnabled(!isView);
+            this.jTextFieldDefaultValue.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jComboBoxItemType.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelDatumType = new JLabel();
+            jLabelDatumType.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelDatumType.setText("Datum Type");
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelDefaultValue = new JLabel();
+            jLabelDefaultValue.setText("Default Value");
+            jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelToken = new JLabel();
+            jLabelToken.setText("Token");
+            jLabelToken.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelItemType = new JLabel();
+            jLabelItemType.setText("Item Type");
+            jLabelItemType.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setSize(new java.awt.Dimension(480,336));
+            jContentPane.add(jLabelItemType, null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelToken, null);
+            jContentPane.add(getJTextFieldToken(), null);
+            jContentPane.add(jLabelDefaultValue, null);
+            jContentPane.add(getJTextFieldDefaultValue(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJComboBoxItemType(), null);
+            jContentPane.add(jLabelDatumType, null);
+            jContentPane.add(getJComboBoxDatumType(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 110));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type, Item type and Datum type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+
+        jComboBoxItemType.addItem("FEATURE_FLAG");
+        jComboBoxItemType.addItem("FIXED_AT_BUILD");
+        jComboBoxItemType.addItem("PATCHABLE_IN_MODULE");
+        jComboBoxItemType.addItem("DYNAMIC");
+        jComboBoxItemType.addItem("DYNAMIC_EX");
+
+        jComboBoxDatumType.addItem("UINT8");
+        jComboBoxDatumType.addItem("UINT16");
+        jComboBoxDatumType.addItem("UINT32");
+        jComboBoxDatumType.addItem("UINT64");
+        jComboBoxDatumType.addItem("VOID*");
+        jComboBoxDatumType.addItem("BOOLEAN");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+    }
+
+    /**
+     Get PCDsDocument.PCDs
+     
+     @return PCDsDocument.PCDs
+     
+     **/
+    public PCDsDocument.PCDs getPcds() {
+        return pcds;
+    }
+
+    /**
+     Set PCDsDocument.PCDs
+     
+     @param pcds The input data of PCDsDocument.PCDs
+     
+     **/
+    public void setPcds(PCDsDocument.PCDs pcds) {
+        this.pcds = pcds;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldC_Name.getText())) {
+            Log.err("C_Name couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldToken.getText())) {
+            Log.err("Token couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!isEmpty(this.jTextFieldC_Name.getText()) && !DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldToken.getText()) && !DataValidation.isToken(this.jTextFieldToken.getText())) {
+            Log.err("Incorrect data type for Token");
+            return false;
+        }
+        
+        return true;
+    }
+
+    /**
+     Save all components of PCDs
+     if exists pcds, set the value directly
+     if not exists pcds, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.pcds == null) {
+                pcds = PCDsDocument.PCDs.Factory.newInstance();
+            }
+            PCDsDocument.PCDs.PcdData pcdData = PCDsDocument.PCDs.PcdData.Factory.newInstance();
+            if (!isEmpty(this.jTextFieldC_Name.getText())) {
+                pcdData.setCName(this.jTextFieldC_Name.getText());
+            }
+            if (!isEmpty(this.jTextFieldToken.getText())) {
+                pcdData.setToken(this.jTextFieldToken.getText());
+            }
+            pcdData.setDatumType(PcdDataTypes.Enum.forString(this.jComboBoxDatumType.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldDefaultValue.getText())) {
+                pcdData.setDefaultValue(this.jTextFieldDefaultValue.getText());
+            }
+            pcdData.setItemType(PcdItemTypes.Enum.forString(this.jComboBoxItemType.getSelectedItem().toString()));
+            pcdData.setPcdUsage(PcdUsage.Enum.forString(this.jComboBoxUsage.getSelectedItem().toString()));
+           
+
+            if (location > -1) {
+                pcds.setPcdDataArray(location, pcdData);
+            } else {
+                pcds.addNewPcdData();
+                pcds.setPcdDataArray(pcds.getPcdDataList().size() - 1, pcdData);
+            }
+        } catch (Exception e) {
+            Log.err("Update Hobs", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java
new file mode 100644
index 0000000000..41435d1483
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java
@@ -0,0 +1,711 @@
+/** @file
+ 
+ The file is used to create, update Ppi of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.tianocore.PPIsDocument;
+import org.tianocore.PpiNotifyUsage;
+import org.tianocore.PpiUsage;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Ppi of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModulePpis extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -4284901202357037724L;
+
+    //
+    //Define class members
+    //
+    private PPIsDocument.PPIs ppis = null;
+
+    private int location = -1;
+
+    private static int PPI = 1;
+
+    private static int PPI_NOTIFY = 2;
+
+    private JPanel jContentPane = null;
+
+    private JRadioButton jRadioButtonPpi = null;
+
+    private JRadioButton jRadioButtonPpiNotify = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JTextField jTextFieldFeatureFlag = null;
+
+    private JLabel jLabelFeatureFlag = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JLabel jLabelEnableFeature = null;
+
+    private JRadioButton jRadioButtonEnableFeature = null;
+
+    private JRadioButton jRadioButtonDisableFeature = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelPpiType = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    /**
+     This method initializes jRadioButtonPpi 
+     
+     @return javax.swing.JRadioButton jRadioButtonPpi
+     
+     **/
+    private JRadioButton getJRadioButtonPpiType() {
+        if (jRadioButtonPpi == null) {
+            jRadioButtonPpi = new JRadioButton();
+            jRadioButtonPpi.setText("Ppi");
+            jRadioButtonPpi.setBounds(new java.awt.Rectangle(160, 10, 100, 20));
+            jRadioButtonPpi.addActionListener(this);
+            jRadioButtonPpi.setSelected(true);
+        }
+        return jRadioButtonPpi;
+    }
+
+    /**
+     This method initializes jRadioButtonPpiNotify 
+     
+     @return javax.swing.JRadioButton jRadioButtonPpiNotify
+     
+     **/
+    private JRadioButton getJRadioButtonPpiNotify() {
+        if (jRadioButtonPpiNotify == null) {
+            jRadioButtonPpiNotify = new JRadioButton();
+            jRadioButtonPpiNotify.setText("Ppi Notify");
+            jRadioButtonPpiNotify.setBounds(new java.awt.Rectangle(320, 10, 100, 20));
+            jRadioButtonPpiNotify.addActionListener(this);
+        }
+        return jRadioButtonPpiNotify;
+    }
+
+    /**
+     This method initializes jTextFieldC_Name 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldFeatureFlag 
+     
+     @return javax.swing.JTextField jTextFieldFeatureFlag
+     
+     **/
+    private JTextField getJTextFieldFeatureFlag() {
+        if (jTextFieldFeatureFlag == null) {
+            jTextFieldFeatureFlag = new JTextField();
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jTextFieldFeatureFlag;
+    }
+
+    /**
+     This method initializes jComboBox
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBox() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jRadioButtonEnableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonEnableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonEnableFeature() {
+        if (jRadioButtonEnableFeature == null) {
+            jRadioButtonEnableFeature = new JRadioButton();
+            jRadioButtonEnableFeature.setText("Enable");
+            jRadioButtonEnableFeature.setBounds(new java.awt.Rectangle(160, 110, 90, 20));
+            jRadioButtonEnableFeature.addActionListener(this);
+            jRadioButtonEnableFeature.setSelected(true);
+        }
+        return jRadioButtonEnableFeature;
+    }
+
+    /**
+     This method initializes jRadioButtonDisableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonDisableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonDisableFeature() {
+        if (jRadioButtonDisableFeature == null) {
+            jRadioButtonDisableFeature = new JRadioButton();
+            jRadioButtonDisableFeature.setText("Disable");
+            jRadioButtonDisableFeature.setBounds(new java.awt.Rectangle(320, 110, 90, 20));
+            jRadioButtonDisableFeature.addActionListener(this);
+        }
+        return jRadioButtonDisableFeature;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 190, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 190, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModulePpis() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inPpis The input data of PPIsDocument.PPIs
+     
+     **/
+    public ModulePpis(PPIsDocument.PPIs inPpis) {
+        super();
+        init(inPpis);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inPpis The input data of PPIsDocument.PPIs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModulePpis(PPIsDocument.PPIs inPpis, int type, int index) {
+        super();
+        init(inPpis, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inPpis The input data of PPIsDocument.PPIs
+     
+     **/
+    private void init(PPIsDocument.PPIs inPpis) {
+        init();
+        this.setPpis(inPpis);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inPpis The input data of PPIsDocument.PPIs
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(PPIsDocument.PPIs inPpis, int type, int index) {
+        init(inPpis);
+        this.location = index;
+        if (type == IDefaultMutableTreeNode.PPIS_PPI_ITEM) {
+            initUsage(ModulePpis.PPI);
+            this.jRadioButtonPpi.setSelected(true);
+            this.jRadioButtonPpiNotify.setSelected(false);
+            if (this.ppis.getPpiArray(index).getStringValue() != null) {
+                this.jTextFieldC_Name.setText(this.ppis.getPpiArray(index).getStringValue());
+            }
+            if (this.ppis.getPpiArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.ppis.getPpiArray(index).getGuid());
+            }
+            if (this.ppis.getPpiArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.ppis.getPpiArray(index).getUsage().toString());
+            }
+            this.jRadioButtonEnableFeature.setSelected(this.ppis.getPpiArray(index).getEnableFeature());
+            this.jRadioButtonDisableFeature.setSelected(!this.ppis.getPpiArray(index).getEnableFeature());
+            if (this.ppis.getPpiArray(index).getFeatureFlag() != null) {
+                this.jTextFieldFeatureFlag.setText(this.ppis.getPpiArray(index).getFeatureFlag());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.ppis.getPpiArray(index).getOverrideID()));
+        } else if (type == IDefaultMutableTreeNode.PPIS_PPINOTIFY_ITEM) {
+            initUsage(ModulePpis.PPI_NOTIFY);
+            this.jRadioButtonPpi.setSelected(false);
+            this.jRadioButtonPpiNotify.setSelected(true);
+            if (this.ppis.getPpiNotifyArray(index).getStringValue() != null) {
+                this.jTextFieldC_Name.setText(this.ppis.getPpiNotifyArray(index).getStringValue());
+            }
+            if (this.ppis.getPpiNotifyArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.ppis.getPpiNotifyArray(index).getGuid());
+            }
+            if (this.ppis.getPpiNotifyArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.ppis.getPpiNotifyArray(index).getUsage().toString());
+            }
+            this.jRadioButtonEnableFeature.setSelected(this.ppis.getPpiNotifyArray(index).getEnableFeature());
+            this.jRadioButtonDisableFeature.setSelected(!this.ppis.getPpiNotifyArray(index).getEnableFeature());
+            if (this.ppis.getPpiNotifyArray(index).getFeatureFlag() != null) {
+                this.jTextFieldFeatureFlag.setText(this.ppis.getPpiNotifyArray(index).getFeatureFlag());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.ppis.getPpiNotifyArray(index).getOverrideID()));
+        }
+        this.jRadioButtonPpi.setEnabled(false);
+        this.jRadioButtonPpiNotify.setEnabled(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Ppis");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 515));
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jRadioButtonPpi.setEnabled(!isView);
+            this.jRadioButtonPpiNotify.setEnabled(!isView);
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jRadioButtonEnableFeature.setEnabled(!isView);
+            this.jRadioButtonDisableFeature.setEnabled(!isView);
+            this.jTextFieldFeatureFlag.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelPpiType = new JLabel();
+            jLabelPpiType.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelPpiType.setText("Ppi Type");
+            jLabelEnableFeature = new JLabel();
+            jLabelEnableFeature.setText("Enable Feature");
+            jLabelEnableFeature.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelFeatureFlag = new JLabel();
+            jLabelFeatureFlag.setText("Feature Flag");
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJRadioButtonPpiType(), null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(getJTextFieldFeatureFlag(), null);
+            jContentPane.add(jLabelFeatureFlag, null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBox(), null);
+            jContentPane.add(jLabelEnableFeature, null);
+            jContentPane.add(getJRadioButtonEnableFeature(), null);
+            jContentPane.add(getJRadioButtonDisableFeature(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJRadioButtonPpiNotify(), null);
+            jContentPane.add(jLabelPpiType, null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setBounds(new java.awt.Rectangle(0, 10, 10, 20));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setBounds(new java.awt.Rectangle(0, 35, 10, 20));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        //
+        //Contorl the selected status when click RadionButton
+        //Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonPpi) {
+            if (jRadioButtonPpi.isSelected()) {
+                jRadioButtonPpiNotify.setSelected(false);
+                initUsage(ModulePpis.PPI);
+            }
+            if (!jRadioButtonPpiNotify.isSelected() && !jRadioButtonPpi.isSelected()) {
+                jRadioButtonPpi.setSelected(true);
+                initUsage(ModulePpis.PPI);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonPpiNotify) {
+            if (jRadioButtonPpiNotify.isSelected()) {
+                jRadioButtonPpi.setSelected(false);
+                initUsage(ModulePpis.PPI_NOTIFY);
+            }
+            if (!jRadioButtonPpiNotify.isSelected() && !jRadioButtonPpi.isSelected()) {
+                jRadioButtonPpiNotify.setSelected(true);
+                initUsage(ModulePpis.PPI_NOTIFY);
+            }
+        }
+
+        //
+        //Contorl the selected status when click RadionButton
+        //Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonEnableFeature) {
+            if (jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonDisableFeature) {
+            if (jRadioButtonDisableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Get PPIsDocument.PPIs
+     
+     @return PPIsDocument.PPIs
+     
+     **/
+    public PPIsDocument.PPIs getPpis() {
+        return ppis;
+    }
+
+    /**
+     Set PPIsDocument.PPIs
+     
+     @param ppis The input data of PPIsDocument.PPIs
+     
+     **/
+    public void setPpis(PPIsDocument.PPIs ppis) {
+        this.ppis = ppis;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldC_Name.getText())) {
+            Log.err("C_Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldFeatureFlag.getText())
+            && !DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {
+            Log.err("Incorrect data type for Feature Flag");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of PPIs
+     if exists ppis, set the value directly
+     if not exists ppis, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.ppis == null) {
+                ppis = PPIsDocument.PPIs.Factory.newInstance();
+            }
+            if (this.jRadioButtonPpi.isSelected()) {
+                PPIsDocument.PPIs.Ppi ppi = PPIsDocument.PPIs.Ppi.Factory.newInstance();
+                ppi.setStringValue(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    ppi.setGuid(this.jTextFieldGuid.getText());
+                }
+                ppi.setUsage(PpiUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+                ppi.setEnableFeature(this.jRadioButtonEnableFeature.isSelected());
+                if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {
+                    ppi.setFeatureFlag(this.jTextFieldFeatureFlag.getText());
+                }
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    ppi.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    ppis.setPpiArray(location, ppi);
+                } else {
+                    ppis.addNewPpi();
+                    ppis.setPpiArray(ppis.getPpiList().size() - 1, ppi);
+                }
+            }
+            if (this.jRadioButtonPpiNotify.isSelected()) {
+                PPIsDocument.PPIs.PpiNotify ppiNotify = PPIsDocument.PPIs.PpiNotify.Factory.newInstance();
+                ppiNotify.setStringValue(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    ppiNotify.setGuid(this.jTextFieldGuid.getText());
+                }
+                ppiNotify.setUsage(PpiNotifyUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+                ppiNotify.setEnableFeature(this.jRadioButtonEnableFeature.isSelected());
+                if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {
+                    ppiNotify.setFeatureFlag(this.jTextFieldFeatureFlag.getText());
+                }
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    ppiNotify.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    ppis.setPpiNotifyArray(location, ppiNotify);
+                } else {
+                    ppis.addNewPpiNotify();
+                    ppis.setPpiNotifyArray(ppis.getPpiNotifyList().size() - 1, ppiNotify);
+                }
+            }
+        } catch (Exception e) {
+            Log.err("Update Protocols", e.getMessage());
+        }
+    }
+
+    /**
+     Enable/Disable relevant fields via different PPI types
+     
+     @param intType The input data of PPI type
+     
+     **/
+    private void initUsage(int intType) {
+        jComboBoxUsage.removeAllItems();
+        if (intType == ModulePpis.PPI) {
+            jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+            jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+            jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+            jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+            jComboBoxUsage.addItem("PRIVATE");
+        }
+        if (intType == ModulePpis.PPI_NOTIFY) {
+            jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java
new file mode 100644
index 0000000000..cd7a9b0324
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java
@@ -0,0 +1,705 @@
+/** @file
+ 
+ The file is used to create, update Protocol of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+
+import org.tianocore.ProtocolNotifyUsage;
+import org.tianocore.ProtocolUsage;
+import org.tianocore.ProtocolsDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Protocol of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleProtocols extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -9084913640747858848L;
+
+    //
+    //Define class members
+    //
+    private ProtocolsDocument.Protocols protocols = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelFeatureFlag = null;
+
+    private JTextField jTextFieldFeatureFlag = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JLabel jLabelEnableFeature = null;
+
+    private JRadioButton jRadioButtonEnableFeature = null;
+
+    private JRadioButton jRadioButtonDisableFeature = null;
+
+    private JRadioButton jRadioButtonProtocol = null;
+
+    private JRadioButton jRadioButtonProtocolNotify = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private JLabel jLabelProtocolType = null;
+
+    /**
+     This method initializes jTextFieldC_Name 
+     
+     @return javax.swing.JTextField jTextFieldC_Name
+     
+     **/
+    private JTextField getJTextFieldProtocolName() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldFeatureFlag 
+     
+     @return javax.swing.JTextField jTextFieldFeatureFlag
+     
+     **/
+    private JTextField getJTextFieldFeatureFlag() {
+        if (jTextFieldFeatureFlag == null) {
+            jTextFieldFeatureFlag = new JTextField();
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jTextFieldFeatureFlag;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 190, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 190, 90, 20));
+            jButtonCancel.setPreferredSize(new Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxProtocolUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jRadioButtonEnableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonEnableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonEnableFeature() {
+        if (jRadioButtonEnableFeature == null) {
+            jRadioButtonEnableFeature = new JRadioButton();
+            jRadioButtonEnableFeature.setText("Enable");
+            jRadioButtonEnableFeature.setBounds(new java.awt.Rectangle(160, 110, 90, 20));
+            jRadioButtonEnableFeature.addActionListener(this);
+            jRadioButtonEnableFeature.setSelected(true);
+        }
+        return jRadioButtonEnableFeature;
+    }
+
+    /**
+     This method initializes jRadioButtonDisableFeature 
+     
+     @return javax.swing.JRadioButton jRadioButtonDisableFeature
+     
+     **/
+    private JRadioButton getJRadioButtonDisableFeature() {
+        if (jRadioButtonDisableFeature == null) {
+            jRadioButtonDisableFeature = new JRadioButton();
+            jRadioButtonDisableFeature.setText("Disable");
+            jRadioButtonDisableFeature.setBounds(new java.awt.Rectangle(320, 110, 90, 20));
+            jRadioButtonDisableFeature.addActionListener(this);
+        }
+        return jRadioButtonDisableFeature;
+    }
+
+    /**
+     This method initializes jRadioButtonProtocol 
+     
+     @return javax.swing.JRadioButton jRadioButtonProtocol
+     
+     **/
+    private JRadioButton getJRadioButtonProtocol() {
+        if (jRadioButtonProtocol == null) {
+            jRadioButtonProtocol = new JRadioButton();
+            jRadioButtonProtocol.setText("Protocol");
+            jRadioButtonProtocol.setBounds(new java.awt.Rectangle(160, 10, 90, 20));
+            jRadioButtonProtocol.setSelected(true);
+            jRadioButtonProtocol.addActionListener(this);
+        }
+        return jRadioButtonProtocol;
+    }
+
+    /**
+     This method initializes jRadioButtonProtocolNotify 
+     
+     @return javax.swing.JRadioButton jRadioButtonProtocolNotify
+     
+     **/
+    private JRadioButton getJRadioButtonProtocolNotify() {
+        if (jRadioButtonProtocolNotify == null) {
+            jRadioButtonProtocolNotify = new JRadioButton();
+            jRadioButtonProtocolNotify.setText("Protocol Notify");
+            jRadioButtonProtocolNotify.setBounds(new java.awt.Rectangle(320, 10, 120, 20));
+            jRadioButtonProtocolNotify.addActionListener(this);
+        }
+        return jRadioButtonProtocolNotify;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleProtocols() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inProtocol The input data of ProtocolsDocument.Protocols
+     
+     **/
+    public ModuleProtocols(ProtocolsDocument.Protocols inProtocol) {
+        super();
+        init(inProtocol);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inProtocol The input data of ProtocolsDocument.Protocols
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleProtocols(ProtocolsDocument.Protocols inProtocol, int type, int index) {
+        super();
+        init(inProtocol, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inProtocol The input data of ProtocolsDocument.Protocols
+     
+     **/
+    private void init(ProtocolsDocument.Protocols inProtocol) {
+        init();
+        this.setProtocols(inProtocol);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inProtocol The input data of ProtocolsDocument.Protocols
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(ProtocolsDocument.Protocols inProtocol, int type, int index) {
+        init(inProtocol);
+        this.location = index;
+        if (type == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOL_ITEM) {
+            this.jRadioButtonProtocol.setSelected(true);
+            this.jRadioButtonProtocolNotify.setSelected(false);
+            if (this.protocols.getProtocolArray(index).getStringValue() != null) {
+                this.jTextFieldC_Name.setText(this.protocols.getProtocolArray(index).getStringValue());
+            }
+            if (this.protocols.getProtocolArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.protocols.getProtocolArray(index).getGuid());
+            }
+            if (this.protocols.getProtocolArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.protocols.getProtocolArray(index).getUsage().toString());
+            }
+            this.jRadioButtonEnableFeature.setSelected(this.protocols.getProtocolArray(index).getEnableFeature());
+            this.jRadioButtonDisableFeature.setSelected(!this.protocols.getProtocolArray(index).getEnableFeature());
+            if (this.protocols.getProtocolArray(index).getFeatureFlag() != null) {
+                this.jTextFieldFeatureFlag.setText(this.protocols.getProtocolArray(index).getFeatureFlag());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.protocols.getProtocolArray(index).getOverrideID()));
+        } else if (type == IDefaultMutableTreeNode.PROTOCOLS_PROTOCOLNOTIFY_ITEM) {
+            this.jRadioButtonProtocol.setSelected(false);
+            this.jRadioButtonProtocolNotify.setSelected(true);
+            this.jTextFieldFeatureFlag.setEditable(false);
+            this.jRadioButtonDisableFeature.setEnabled(false);
+            this.jRadioButtonEnableFeature.setEnabled(false);
+            this.jComboBoxUsage.setEnabled(false);
+            if (this.protocols.getProtocolNotifyArray(index).getStringValue() != null) {
+                this.jTextFieldC_Name.setText(this.protocols.getProtocolNotifyArray(index).getStringValue());
+            }
+            if (this.protocols.getProtocolNotifyArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.protocols.getProtocolNotifyArray(index).getGuid());
+            }
+            if (this.protocols.getProtocolNotifyArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.protocols.getProtocolNotifyArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.protocols.getProtocolNotifyArray(index)
+                                                                           .getOverrideID()));
+        }
+        this.jRadioButtonProtocol.setEnabled(false);
+        this.jRadioButtonProtocolNotify.setEnabled(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setName("JFrame");
+        this.setContentPane(getJContentPane());
+        this.setTitle("Protocols");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jRadioButtonProtocol.setEnabled(!isView);
+            this.jRadioButtonProtocolNotify.setEnabled(!isView);
+            this.jTextFieldC_Name.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jRadioButtonEnableFeature.setEnabled(!isView);
+            this.jRadioButtonDisableFeature.setEnabled(!isView);
+            this.jTextFieldFeatureFlag.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelProtocolType = new JLabel();
+            jLabelProtocolType.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jLabelProtocolType.setText("Protocol Type");
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelEnableFeature = new JLabel();
+            jLabelEnableFeature.setText("Enable Feature");
+            jLabelEnableFeature.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelFeatureFlag = new JLabel();
+            jLabelFeatureFlag.setText("Feature Flag");
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldProtocolName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelFeatureFlag, null);
+            jContentPane.add(getJTextFieldFeatureFlag(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxProtocolUsage(), null);
+            jContentPane.add(jLabelEnableFeature, null);
+            jContentPane.add(getJRadioButtonEnableFeature(), null);
+            jContentPane.add(getJRadioButtonDisableFeature(), null);
+            jContentPane.add(getJRadioButtonProtocol(), null);
+            jContentPane.add(getJRadioButtonProtocolNotify(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+            jContentPane.add(jLabelProtocolType, null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setBounds(new java.awt.Rectangle(0, 10, 10, 20));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setBounds(new java.awt.Rectangle(0, 35, 10, 20));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("TO_START");
+        jComboBoxUsage.addItem("BY_START");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     * 
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        //
+        // Contorl the selected status when click RadionButton
+        // Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonProtocol) {
+            if (jRadioButtonProtocol.isSelected()) {
+                jRadioButtonProtocolNotify.setSelected(false);
+                jRadioButtonEnableFeature.setEnabled(true);
+                jRadioButtonDisableFeature.setEnabled(true);
+                jTextFieldFeatureFlag.setEnabled(true);
+                jComboBoxUsage.setEnabled(true);
+            }
+            if (!jRadioButtonProtocolNotify.isSelected() && !jRadioButtonProtocol.isSelected()) {
+                jRadioButtonProtocol.setSelected(true);
+                jRadioButtonEnableFeature.setEnabled(true);
+                jRadioButtonDisableFeature.setEnabled(true);
+                jTextFieldFeatureFlag.setEnabled(true);
+                jComboBoxUsage.setEnabled(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonProtocolNotify) {
+            if (jRadioButtonProtocolNotify.isSelected()) {
+                jRadioButtonProtocol.setSelected(false);
+                jRadioButtonEnableFeature.setEnabled(false);
+                jRadioButtonDisableFeature.setEnabled(false);
+                jTextFieldFeatureFlag.setEnabled(false);
+                jComboBoxUsage.setSelectedIndex(1);
+                jComboBoxUsage.setEnabled(false);
+            }
+            if (!jRadioButtonProtocolNotify.isSelected() && !jRadioButtonProtocol.isSelected()) {
+                jRadioButtonProtocolNotify.setSelected(true);
+                jRadioButtonEnableFeature.setEnabled(false);
+                jRadioButtonDisableFeature.setEnabled(false);
+                jTextFieldFeatureFlag.setEnabled(false);
+                jComboBoxUsage.setSelectedIndex(1);
+                jComboBoxUsage.setEnabled(false);
+            }
+        }
+
+        //
+        // Contorl the selected status when click RadionButton
+        // Do not use Radio Button Group
+        //
+        if (arg0.getSource() == jRadioButtonEnableFeature) {
+            if (jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonDisableFeature) {
+            if (jRadioButtonDisableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Get ProtocolsDocument.Protocols
+     
+     @return ProtocolsDocument.Protocols
+     
+     **/
+    public ProtocolsDocument.Protocols getProtocols() {
+        return protocols;
+    }
+
+    /**
+     Set ProtocolsDocument.Protocols
+     
+     @param protocols The input data of ProtocolsDocument.Protocols
+     
+     **/
+    public void setProtocols(ProtocolsDocument.Protocols protocols) {
+        this.protocols = protocols;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldC_Name.getText())) {
+            Log.err("C_Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isCName(this.jTextFieldC_Name.getText())) {
+            Log.err("Incorrect data type for C_Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldFeatureFlag.getText())
+            && !DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {
+            Log.err("Incorrect data type for Feature Flag");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Protocols
+     if exists protocols, set the value directly
+     if not exists protocols, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.protocols == null) {
+                protocols = ProtocolsDocument.Protocols.Factory.newInstance();
+            }
+            if (this.jRadioButtonProtocol.isSelected()) {
+                ProtocolsDocument.Protocols.Protocol protocol = ProtocolsDocument.Protocols.Protocol.Factory
+                                                                                                            .newInstance();
+                protocol.setStringValue(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    protocol.setGuid(this.jTextFieldGuid.getText());
+                }
+                protocol.setUsage(ProtocolUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+                protocol.setEnableFeature(this.jRadioButtonEnableFeature.isSelected());
+                if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {
+                    protocol.setFeatureFlag(this.jTextFieldFeatureFlag.getText());
+                }
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    protocol.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    protocols.setProtocolArray(location, protocol);
+                } else {
+                    protocols.addNewProtocol();
+                    protocols.setProtocolArray(protocols.getProtocolList().size() - 1, protocol);
+                }
+            }
+            if (this.jRadioButtonProtocolNotify.isSelected()) {
+                ProtocolsDocument.Protocols.ProtocolNotify protocolNofity = ProtocolsDocument.Protocols.ProtocolNotify.Factory
+                                                                                                                              .newInstance();
+                protocolNofity.setStringValue(this.jTextFieldC_Name.getText());
+                if (!isEmpty(this.jTextFieldGuid.getText())) {
+                    protocolNofity.setGuid(this.jTextFieldGuid.getText());
+                }
+                protocolNofity
+                              .setUsage(ProtocolNotifyUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+
+                if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                    protocolNofity.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+                }
+                if (location > -1) {
+                    protocols.setProtocolNotifyArray(location, protocolNofity);
+                } else {
+                    protocols.addNewProtocolNotify();
+                    protocols.setProtocolNotifyArray(protocols.getProtocolNotifyList().size() - 1, protocolNofity);
+                }
+            }
+        } catch (Exception e) {
+            Log.err("Update Protocols", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSourceFiles.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSourceFiles.java
new file mode 100644
index 0000000000..036ca9a709
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSourceFiles.java
@@ -0,0 +1,1060 @@
+/** @file
+ 
+ The file is used to create, update SourceFile of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.FilenameDocument;
+import org.tianocore.SourceFilesDocument;
+import org.tianocore.SupportedArchitectures;
+import org.tianocore.ToolChains;
+import org.tianocore.common.DataType;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+import org.tianocore.packaging.workspace.common.Workspace;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+/**
+ The class is used to create, update SourceFile of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleSourceFiles extends IInternalFrame implements ItemListener {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -6765742852142775378L;
+
+    //
+    // Define class members
+    //
+    private SourceFilesDocument.SourceFiles sourceFiles = null;
+
+    private int location = -1;
+    
+    private int intSelectedItemId = 0;
+
+    //
+    // 1 - Add; 2 - Update
+    //
+    private int operation = -1;
+
+    private Workspace ws = new Workspace();
+
+    private Vector<String> vFileName = new Vector<String>();
+
+    private Vector<String> vGuid = new Vector<String>();
+
+    private Vector<String> vPath = new Vector<String>();
+
+    private Vector<String> vFileType = new Vector<String>();
+
+    private Vector<String> vToolChain = new Vector<String>();
+
+    private Vector<String> vOverrideID = new Vector<String>();
+
+    private JPanel jContentPane = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelFileName = null;
+
+    private JTextField jTextFieldFileName = null;
+
+    private JButton jButtonOpenFile = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JComboBox jComboBoxArch = null;
+
+    private JLabel jLabelPath = null;
+
+    private JTextField jTextFieldPath = null;
+
+    private JLabel jLabelFileType = null;
+
+    private JTextField jTextFieldFileType = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private JComboBox jComboBoxFileList = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonUpdate = null;
+
+    private JCheckBox jCheckBoxArch = null;
+
+    private JLabel jLabelToolChain = null;
+
+    private JComboBox jComboBoxToolChain = null;
+
+    private JScrollPane jScrollPaneFileList = null;
+
+    private JTextArea jTextAreaFileList = null;
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButton() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 340, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButton1() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 340, 90, 20));
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldFileName 
+     
+     @return javax.swing.JTextField jTextFieldFileName
+     
+     **/
+    private JTextField getJTextFieldSourceFilesDirectory() {
+        if (jTextFieldFileName == null) {
+            jTextFieldFileName = new JTextField();
+            jTextFieldFileName.setBounds(new java.awt.Rectangle(140,10,250,20));
+        }
+        return jTextFieldFileName;
+    }
+
+    /**
+     This method initializes jButtonOpenFile 
+     
+     @return javax.swing.JButton jButtonOpenFile
+     
+     **/
+    private JButton getJButtonOpenFile() {
+        if (jButtonOpenFile == null) {
+            jButtonOpenFile = new JButton();
+            jButtonOpenFile.setText("Browse");
+            jButtonOpenFile.setBounds(new java.awt.Rectangle(395,10,85,20));
+            jButtonOpenFile.addActionListener(this);
+        }
+        return jButtonOpenFile;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(140,35,250,20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(395,35,85,20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jComboBoxArch 
+     
+     @return javax.swing.JComboBox jComboBoxArch
+     
+     **/
+    private JComboBox getJComboBoxArch() {
+        if (jComboBoxArch == null) {
+            jComboBoxArch = new JComboBox();
+            jComboBoxArch.setBounds(new java.awt.Rectangle(140, 160, 340, 20));
+            jComboBoxArch.setEnabled(false);
+        }
+        return jComboBoxArch;
+    }
+
+    /**
+     This method initializes jTextFieldPath 
+     
+     @return javax.swing.JTextField jTextFieldPath
+     
+     **/
+    private JTextField getJTextFieldPath() {
+        if (jTextFieldPath == null) {
+            jTextFieldPath = new JTextField();
+            jTextFieldPath.setBounds(new java.awt.Rectangle(140, 60, 340, 20));
+        }
+        return jTextFieldPath;
+    }
+
+    /**
+     This method initializes jTextFieldFileType 
+     
+     @return javax.swing.JTextField jTextFieldFileType
+     
+     **/
+    private JTextField getJTextFieldFileType() {
+        if (jTextFieldFileType == null) {
+            jTextFieldFileType = new JTextField();
+            jTextFieldFileType.setBounds(new java.awt.Rectangle(140, 85, 340, 20));
+        }
+        return jTextFieldFileType;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(140, 135, 50, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    /**
+     This method initializes jComboBoxFileList 
+     
+     @return javax.swing.JComboBox jComboBoxFileList
+     
+     **/
+    private JComboBox getJComboBoxFileList() {
+        if (jComboBoxFileList == null) {
+            jComboBoxFileList = new JComboBox();
+            jComboBoxFileList.setBounds(new java.awt.Rectangle(15, 185, 210, 20));
+            jComboBoxFileList.addItemListener(this);
+            jComboBoxFileList.addActionListener(this);
+        }
+        return jComboBoxFileList;
+    }
+
+    /**
+     This method initializes jButtonAdd 
+     
+     @return javax.swing.JButton jButtonAdd
+     
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 185, 80, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+     This method initializes jButtonRemove 
+     
+     @return javax.swing.JButton jButtonRemove
+     
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 185, 80, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+     This method initializes jButtonUpdate 
+     
+     @return javax.swing.JButton jButtonUpdate
+     
+     **/
+    private JButton getJButtonUpdate() {
+        if (jButtonUpdate == null) {
+            jButtonUpdate = new JButton();
+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 185, 80, 20));
+            jButtonUpdate.setText("Update");
+            jButtonUpdate.addActionListener(this);
+        }
+        return jButtonUpdate;
+    }
+
+    /**
+     This method initializes jCheckBoxArch 
+     
+     @return javax.swing.JCheckBox jCheckBoxArch
+     
+     **/
+    private JCheckBox getJCheckBoxArch() {
+        if (jCheckBoxArch == null) {
+            jCheckBoxArch = new JCheckBox();
+            jCheckBoxArch.setBounds(new java.awt.Rectangle(15, 160, 120, 20));
+            jCheckBoxArch.setText("Specific Arch");
+            jCheckBoxArch.addActionListener(this);
+        }
+        return jCheckBoxArch;
+    }
+
+    /**
+     This method initializes jComboBoxToolChain 
+     
+     @return javax.swing.JComboBox jComboBoxToolChain
+     
+     **/
+    private JComboBox getJComboBoxToolChain() {
+        if (jComboBoxToolChain == null) {
+            jComboBoxToolChain = new JComboBox();
+            jComboBoxToolChain.setBounds(new java.awt.Rectangle(140, 110, 340, 20));
+        }
+        return jComboBoxToolChain;
+    }
+
+    /**
+     * This method initializes jScrollPaneFileList	
+     * 	
+     * @return javax.swing.JScrollPane	
+     */
+    private JScrollPane getJScrollPaneFileList() {
+        if (jScrollPaneFileList == null) {
+            jScrollPaneFileList = new JScrollPane();
+            jScrollPaneFileList.setBounds(new java.awt.Rectangle(15,210,465,240));
+            jScrollPaneFileList.setViewportView(getJTextAreaFileList());
+        }
+        return jScrollPaneFileList;
+    }
+
+    /**
+     * This method initializes jTextAreaFileList	
+     * 	
+     * @return javax.swing.JTextArea	
+     */
+    private JTextArea getJTextAreaFileList() {
+        if (jTextAreaFileList == null) {
+            jTextAreaFileList = new JTextArea();
+            jTextAreaFileList.setEditable(false);
+        }
+        return jTextAreaFileList;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleSourceFiles() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inSourceFiles The input data of SourceFilesDocument.SourceFiles
+     
+     **/
+    public ModuleSourceFiles(SourceFilesDocument.SourceFiles inSourceFiles) {
+        super();
+        init(inSourceFiles);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inSourceFiles The input data of SourceFilesDocument.SourceFiles
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of current operation type
+     
+     **/
+    public ModuleSourceFiles(SourceFilesDocument.SourceFiles inSourceFiles, int type, int index, int inOperation) {
+        super();
+        init(inSourceFiles, type, index, inOperation);
+        this.operation = inOperation;
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inSourceFiles The input data of SourceFilesDocument.SourceFiles
+     
+     **/
+    private void init(SourceFilesDocument.SourceFiles inSourceFiles) {
+        init();
+        this.setSourceFiles(inSourceFiles);
+    }
+
+    /**         
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     
+     @param inSourceFiles The input data of SourceFilesDocument.SourceFiles
+     @param type The input data of node type
+     @param index The input data of node index
+     @param inOperation The input data of current operation type
+     
+     **/
+    private void init(SourceFilesDocument.SourceFiles inSourceFiles, int type, int index, int inOperation) {
+        init(inSourceFiles);
+        this.location = index;
+        this.operation = inOperation;
+
+        //
+        // When update
+        //
+        if (operation == 2) {
+            this.jCheckBoxArch.setEnabled(false);
+            this.jComboBoxArch.setEnabled(false);
+
+            if (type == IDefaultMutableTreeNode.SOURCEFILES_FILENAME) {
+                if (this.sourceFiles.getFilenameList().size() > 0) {
+                    for (int indexI = 0; indexI < this.sourceFiles.getFilenameList().size(); indexI++) {
+                        if (this.sourceFiles.getFilenameArray(indexI).getStringValue() != null) {
+                            vFileName.addElement(this.sourceFiles.getFilenameArray(indexI).getStringValue());
+                        } else {
+                            vFileName.addElement("");
+                        }
+                        if (this.sourceFiles.getFilenameArray(indexI).getGuid() != null) {
+                            vGuid.addElement(this.sourceFiles.getFilenameArray(indexI).getGuid());
+                        } else {
+                            vGuid.addElement("");
+                        }
+                        if (this.sourceFiles.getFilenameArray(indexI).getPath() != null) {
+                            vPath.addElement(this.sourceFiles.getFilenameArray(indexI).getPath());
+                        } else {
+                            vPath.addElement("");
+                        }
+                        if (this.sourceFiles.getFilenameArray(indexI).getFileType() != null) {
+                            vFileType.addElement(this.sourceFiles.getFilenameArray(indexI).getFileType());
+                        } else {
+                            vFileType.addElement("");
+                        }
+                        if (this.sourceFiles.getFilenameArray(indexI).getToolChain() != null) {
+                            vToolChain.addElement(this.sourceFiles.getFilenameArray(indexI).getToolChain().toString());
+                        } else {
+                            vToolChain.addElement(DataType.EMPTY_SELECT_ITEM);
+                        }
+                        vOverrideID.addElement(String.valueOf(this.sourceFiles.getFilenameArray(indexI).getOverrideID()));
+                        jComboBoxFileList.addItem(this.sourceFiles.getFilenameArray(indexI).getStringValue());
+                    }
+                }
+            }
+            if (type == IDefaultMutableTreeNode.SOURCEFILES_ARCH_ITEM) {
+                this.jCheckBoxArch.setSelected(true);
+                this.jComboBoxArch.setSelectedItem(this.sourceFiles.getArchArray(index).getArchType().toString());
+                for (int indexI = 0; indexI < this.sourceFiles.getArchArray(index).getFilenameList().size(); indexI++) {
+                    if (this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getStringValue() != null) {
+                        vFileName.addElement(this.sourceFiles.getArchArray(index).getFilenameArray(indexI)
+                                                             .getStringValue());
+                    } else {
+                        vFileName.addElement("");
+                    }
+                    if (this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getGuid() != null) {
+                        vGuid.addElement(this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getGuid());
+                    } else {
+                        vGuid.addElement("");
+                    }
+                    if (this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getPath() != null) {
+                        vPath.addElement(this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getPath());
+                    } else {
+                        vPath.addElement("");
+                    }
+                    if (this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getFileType() != null) {
+                        vFileType.addElement(this.sourceFiles.getArchArray(index).getFilenameArray(indexI)
+                                                             .getFileType());
+                    } else {
+                        vFileType.addElement("");
+                    }
+                    if (this.sourceFiles.getArchArray(index).getFilenameArray(indexI).getToolChain() != null) {
+                        vToolChain.addElement(this.sourceFiles.getArchArray(index).getFilenameArray(indexI)
+                                                              .getToolChain().toString());
+                    } else {
+                        vToolChain.addElement("");
+                    }
+                    vOverrideID.addElement(String.valueOf(this.sourceFiles.getArchArray(index).getFilenameArray(indexI)
+                                                           .getOverrideID()));
+                    jComboBoxFileList.addItem(this.sourceFiles.getArchArray(index).getFilenameArray(indexI)
+                                                              .getStringValue());
+                }
+            }
+            //
+            // Update the file list
+            //
+            reloadFileListArea();
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Source Files");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jButtonOk.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jTextFieldFileName.setEnabled(!isView);
+            this.jButtonOpenFile.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jTextFieldPath.setEnabled(!isView);
+            this.jTextFieldFileType.setEnabled(!isView);
+            this.jComboBoxToolChain.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+
+            this.jButtonAdd.setEnabled(!isView);
+            this.jButtonRemove.setEnabled(!isView);
+            this.jButtonUpdate.setEnabled(!isView);
+            this.jCheckBoxArch.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelToolChain = new JLabel();
+            jLabelToolChain.setBounds(new java.awt.Rectangle(15, 110, 120, 20));
+            jLabelToolChain.setText("Tool Chain");
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 135, 120, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelFileType = new JLabel();
+            jLabelFileType.setBounds(new java.awt.Rectangle(15, 85, 120, 20));
+            jLabelFileType.setText("File Type");
+            jLabelPath = new JLabel();
+            jLabelPath.setBounds(new java.awt.Rectangle(15, 60, 120, 20));
+            jLabelPath.setText("Path");
+            jLabelGuid = new JLabel();
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 120, 20));
+            jLabelGuid.setText("Guid");
+            jLabelFileName = new JLabel();
+            jLabelFileName.setText("File Name");
+            jLabelFileName.setBounds(new java.awt.Rectangle(15, 10, 120, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setSize(new java.awt.Dimension(480,400));
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(jLabelFileName, null);
+            jContentPane.add(getJTextFieldSourceFilesDirectory(), null);
+            jContentPane.add(getJButtonOpenFile(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(getJComboBoxArch(), null);
+            jContentPane.add(jLabelPath, null);
+            jContentPane.add(getJTextFieldPath(), null);
+            jContentPane.add(jLabelFileType, null);
+            jContentPane.add(getJTextFieldFileType(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(getJComboBoxFileList(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonUpdate(), null);
+            jContentPane.add(getJCheckBoxArch(), null);
+            jContentPane.add(jLabelToolChain, null);
+            jContentPane.add(getJComboBoxToolChain(), null);
+
+            jContentPane.add(getJScrollPaneFileList(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     *  
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+        if (arg0.getSource() == jButtonOpenFile) {
+            selectFile();
+        }
+        if (arg0.getSource() == jButtonAdd) {
+            if (!checkAdd()) {
+                return;
+            }
+            addToList();
+        }
+        if (arg0.getSource() == jButtonRemove) {
+            removeFromList();
+        }
+        if (arg0.getSource() == jButtonUpdate) {
+            if (!checkAdd()) {
+                return;
+            }
+            updateForList();
+        }
+
+        //
+        //When and only when checked Arch box then can choose different arch types
+        //
+        if (arg0.getSource() == jCheckBoxArch) {
+            if (this.jCheckBoxArch.isSelected()) {
+                this.jComboBoxArch.setEnabled(true);
+            } else {
+                this.jComboBoxArch.setEnabled(false);
+            }
+        }
+    }
+
+    /**
+     This method initializes Usage type and Arch type
+     
+     **/
+    private void initFrame() {
+        jComboBoxArch.addItem("ALL");
+        jComboBoxArch.addItem("EBC");
+        jComboBoxArch.addItem("ARM");
+        jComboBoxArch.addItem("IA32");
+        jComboBoxArch.addItem("X64");
+        jComboBoxArch.addItem("IPF");
+        jComboBoxArch.addItem("PPC");
+
+        jComboBoxToolChain.addItem(DataType.EMPTY_SELECT_ITEM);
+        jComboBoxToolChain.addItem("MSFT");
+        jComboBoxToolChain.addItem("INTEL");
+        jComboBoxToolChain.addItem("GCC");
+        jComboBoxToolChain.addItem("CYGWIN");
+    }
+
+    /**
+     Add current item to Vector
+     
+     **/
+    private void addToList() {
+        intSelectedItemId = vFileName.size();
+        vFileName.addElement(this.jTextFieldFileName.getText());
+        vGuid.addElement(this.jTextFieldGuid.getText());
+        vPath.addElement(this.jTextFieldPath.getText());
+        vFileType.addElement(this.jTextFieldFileType.getText());
+        vToolChain.addElement(this.jComboBoxToolChain.getSelectedItem().toString());
+        vOverrideID.addElement(this.jTextFieldOverrideID.getText());
+        jComboBoxFileList.addItem(this.jTextFieldFileName.getText());
+        jComboBoxFileList.setSelectedItem(this.jTextFieldFileName.getText());
+        
+        //
+        // Reset select item index
+        //
+        intSelectedItemId = vFileName.size();
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Remove current item from Vector
+     
+     **/
+    private void removeFromList() {
+        int intTempIndex = intSelectedItemId;
+        if (vFileName.size() < 1) {
+            return;
+        }
+        
+        jComboBoxFileList.removeItemAt(intSelectedItemId);
+        
+        vFileName.removeElementAt(intTempIndex);
+        vGuid.removeElementAt(intTempIndex);
+        vPath.removeElementAt(intTempIndex);
+        vFileType.removeElementAt(intTempIndex);
+        vToolChain.removeElementAt(intTempIndex);
+        vOverrideID.removeElementAt(intTempIndex);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Update current item of Vector
+     
+     **/
+    private void updateForList() {
+        //
+        // Backup selected item index
+        //
+        int intTempIndex = intSelectedItemId;
+        vFileName.setElementAt(this.jTextFieldFileName.getText(), intSelectedItemId);
+        vGuid.setElementAt(this.jTextFieldGuid.getText(), intSelectedItemId);
+        vPath.setElementAt(this.jTextFieldPath.getText(), intSelectedItemId);
+        vFileType.setElementAt(this.jTextFieldFileType.getText(), intSelectedItemId);
+        vToolChain.setElementAt(this.jComboBoxToolChain.getSelectedItem().toString(), intSelectedItemId);
+        vOverrideID.setElementAt(this.jTextFieldOverrideID.getText(), intSelectedItemId);
+        jComboBoxFileList.removeAllItems();
+        for (int index = 0; index < vFileName.size(); index++) {
+            jComboBoxFileList.addItem(vFileName.elementAt(index));
+        }
+        
+        //
+        // Restore selected item index
+        //
+        intSelectedItemId = intTempIndex;
+        
+        //
+        // Reset select item index
+        //
+        jComboBoxFileList.setSelectedIndex(intSelectedItemId);
+        
+        //
+        // Reload all fields of selected item
+        //
+        reloadFromList();
+    }
+
+    /**
+     Refresh all fields' values of selected item of Vector
+     
+     **/
+    private void reloadFromList() {
+        if (vFileName.size() > 0) {
+            //
+            // Get selected item index
+            //
+            intSelectedItemId = jComboBoxFileList.getSelectedIndex();
+            
+            this.jTextFieldFileName.setText(vFileName.elementAt(intSelectedItemId).toString());
+            this.jTextFieldGuid.setText(vGuid.elementAt(intSelectedItemId).toString());
+            this.jTextFieldPath.setText(vPath.elementAt(intSelectedItemId).toString());
+            this.jTextFieldFileType.setText(vFileType.elementAt(intSelectedItemId).toString());
+            this.jComboBoxToolChain.setSelectedItem(vToolChain.elementAt(intSelectedItemId).toString());
+            this.jTextFieldOverrideID.setText(vOverrideID.elementAt(intSelectedItemId).toString());    
+        } else {
+            this.jTextFieldFileName.setText("");
+            this.jTextFieldGuid.setText("");
+            this.jTextFieldPath.setText("");
+            this.jTextFieldFileType.setText("");
+            this.jComboBoxToolChain.setSelectedItem(DataType.EMPTY_SELECT_ITEM);
+            this.jTextFieldOverrideID.setText("");
+        }
+        
+        reloadFileListArea();
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
+     *
+     * Reflesh the frame when selected item changed
+     * 
+     */
+    public void itemStateChanged(ItemEvent arg0) {
+        if (arg0.getStateChange() == ItemEvent.SELECTED) {
+            reloadFromList();
+        }
+    }
+
+    /**
+     Get SourceFilesDocument.SourceFiles
+     
+     @return SourceFilesDocument.SourceFiles
+     
+     **/
+    public SourceFilesDocument.SourceFiles getSourceFiles() {
+        return sourceFiles;
+    }
+
+    /**
+     Set SourceFilesDocument.SourceFiles
+     
+     @param sourceFiles The input data of SourceFilesDocument.SourceFiles
+     
+     **/
+    public void setSourceFiles(SourceFilesDocument.SourceFiles sourceFiles) {
+        this.sourceFiles = sourceFiles;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        if (this.jComboBoxFileList.getItemCount() < 1) {
+            Log.err("Must have one file at least!");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean checkAdd() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldFileName.getText())) {
+            Log.err("File Name couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isFileName(this.jTextFieldFileName.getText())) {
+            Log.err("Incorrect data type for File Name");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldPath.getText()) && !DataValidation.isPath(this.jTextFieldPath.getText())) {
+            Log.err("Incorrect data type for Path");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of SourceFiles
+     if exists sourceFiles, set the value directly
+     if not exists sourceFiles, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.sourceFiles == null) {
+                sourceFiles = SourceFilesDocument.SourceFiles.Factory.newInstance();
+            }
+            //
+            //Save as file name
+            //
+            if (!this.jCheckBoxArch.isSelected()) {
+                if (this.operation == 2) { //Add new filename
+                    //
+                    //First remove all existed filename
+                    //
+                    if (sourceFiles.getFilenameList().size() > 0) {
+                        for (int index = sourceFiles.getFilenameList().size() - 1; index >= 0; index--) {
+                            sourceFiles.removeFilename(index);
+                        }
+                    }
+                }
+                for (int index = 0; index < vFileName.size(); index++) {
+                    FilenameDocument.Filename filename = FilenameDocument.Filename.Factory.newInstance();
+                    if (!isEmpty(vFileName.elementAt(index).toString())) {
+                        filename.setStringValue(vFileName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vGuid.elementAt(index).toString())) {
+                        filename.setGuid(vGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vPath.elementAt(index).toString())) {
+                        filename.setPath(vPath.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vFileType.elementAt(index).toString())) {
+                        filename.setFileType(vFileType.elementAt(index).toString());
+                    }
+                    if (!vToolChain.elementAt(index).toString().equals(DataType.EMPTY_SELECT_ITEM)) {
+                        filename.setToolChain(ToolChains.Enum.forString(vToolChain.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vOverrideID.elementAt(index).toString())) {
+                        filename.setOverrideID(Integer.parseInt(vOverrideID.elementAt(index).toString()));
+                    }
+                    sourceFiles.addNewFilename();
+                    sourceFiles.setFilenameArray(sourceFiles.getFilenameList().size() - 1, filename);
+                }
+            }
+            //
+            //Save as Arch
+            //
+            if (this.jCheckBoxArch.isSelected()) {
+                SourceFilesDocument.SourceFiles.Arch arch = SourceFilesDocument.SourceFiles.Arch.Factory.newInstance();
+                if (this.operation == 2) {
+                    //
+                    //First remove all existed filename
+                    //
+                    for (int index = sourceFiles.getArchArray(location).getFilenameList().size() - 1; index >= 0; index--) {
+                        sourceFiles.getArchArray(location).removeFilename(index);
+                    }
+                }
+                for (int index = 0; index < vFileName.size(); index++) {
+                    FilenameDocument.Filename filename = FilenameDocument.Filename.Factory.newInstance();
+                    if (!isEmpty(vFileName.elementAt(index).toString())) {
+                        filename.setStringValue(vFileName.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vGuid.elementAt(index).toString())) {
+                        filename.setGuid(vGuid.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vPath.elementAt(index).toString())) {
+                        filename.setPath(vPath.elementAt(index).toString());
+                    }
+                    if (!isEmpty(vFileType.elementAt(index).toString())) {
+                        filename.setFileType(vFileType.elementAt(index).toString());
+                    }
+                    if (!vToolChain.elementAt(index).toString().equals(DataType.EMPTY_SELECT_ITEM)) {
+                        filename.setToolChain(ToolChains.Enum.forString(vToolChain.elementAt(index).toString()));
+                    }
+                    if (!isEmpty(vOverrideID.elementAt(index).toString())) {
+                        filename.setOverrideID(Integer.parseInt(vOverrideID.elementAt(index).toString()));
+                    }
+                    arch.addNewFilename();
+                    arch.setFilenameArray(arch.getFilenameList().size() - 1, filename);
+                }
+                arch
+                    .setArchType(SupportedArchitectures.Enum.forString(this.jComboBoxArch.getSelectedItem().toString()));
+                if (location > -1) {
+                    sourceFiles.setArchArray(location, arch);
+                } else {
+                    sourceFiles.addNewArch();
+                    sourceFiles.setArchArray(sourceFiles.getArchList().size() - 1, arch);
+                }
+            }
+        } catch (Exception e) {
+            Log.err("Update Source Files", e.getMessage());
+        }
+    }
+
+    /**
+     Display a file open browser to let user select file
+     
+     **/
+    private void selectFile() {
+        JFileChooser fc = new JFileChooser(ws.getCurrentWorkspace());
+
+        int result = fc.showOpenDialog(new JPanel());
+        if (result == JFileChooser.APPROVE_OPTION) {
+            this.jTextFieldFileName.setText(fc.getSelectedFile().getName());
+        }
+    }
+    
+    /**
+    Update file list pane via the elements of Vector
+    
+    **/
+    private void reloadFileListArea() {
+        String strFileList = "";
+        for (int index = 0; index < vFileName.size(); index++) {
+            strFileList = strFileList + vFileName.elementAt(index).toString() + DataType.UNXI_LINE_SEPARATOR;
+        }
+        this.jTextAreaFileList.setText(strFileList);
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
new file mode 100644
index 0000000000..aeaf88f9fd
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
@@ -0,0 +1,393 @@
+/** @file
+
+ The file is used to create, update SystemTable of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.SystemTableUsage;
+import org.tianocore.SystemTablesDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update SystemTable of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleSystemTables extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 7488769180379442276L;
+
+    //
+    //Define class members
+    //
+    private SystemTablesDocument.SystemTables systemTables = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelEntry = null;
+
+    private JTextField jTextFieldEntry = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes jTextFieldEntry 
+     
+     @return javax.swing.JTextField jTextFieldEntry
+     
+     **/
+    private JTextField getJTextFieldEntry() {
+        if (jTextFieldEntry == null) {
+            jTextFieldEntry = new JTextField();
+            jTextFieldEntry.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldEntry;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(280, 90, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 90, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleSystemTables() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inSystemTables The input data of SystemTablesDocument.SystemTables
+     
+     **/
+    public ModuleSystemTables(SystemTablesDocument.SystemTables inSystemTables) {
+        super();
+        init(inSystemTables);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inSystemTables The input data of SystemTablesDocument.SystemTables
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleSystemTables(SystemTablesDocument.SystemTables inSystemTables, int type, int index) {
+        super();
+        init(inSystemTables, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inSystemTables The input data of SystemTablesDocument.SystemTables
+     
+     **/
+    private void init(SystemTablesDocument.SystemTables inSystemTables) {
+        init();
+        this.setSystemTables(inSystemTables);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inSystemTables The input data of SystemTablesDocument.SystemTables
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(SystemTablesDocument.SystemTables inSystemTables, int type, int index) {
+        init(inSystemTables);
+        this.location = index;
+        if (this.systemTables.getSystemTableList().size() > 0) {
+            if (this.systemTables.getSystemTableArray(index).getEntry() != null) {
+                this.jTextFieldEntry.setText(this.systemTables.getSystemTableArray(index).getEntry());
+            }
+            if (this.systemTables.getSystemTableArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.systemTables.getSystemTableArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.systemTables.getSystemTableArray(index)
+                                                                              .getOverrideID()));
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("System Tables");
+        initFrame();
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldEntry.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelOverrideID.setText("Override ID");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelEntry = new JLabel();
+            jLabelEntry.setText("Entry");
+            jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelEntry, null);
+            jContentPane.add(getJTextFieldEntry(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setBounds(new java.awt.Rectangle(0, 10, 10, 20));
+
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     *  Override actionPerformed to listen all actions
+     *  
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+    }
+
+    /**
+     Get SystemTablesDocument.SystemTables
+     
+     @return SystemTablesDocument.SystemTables
+     
+     **/
+    public SystemTablesDocument.SystemTables getSystemTables() {
+        return systemTables;
+    }
+
+    /**
+     Set SystemTablesDocument.SystemTables
+     
+     @param systemTables The input data of SystemTablesDocument.SystemTables
+     
+     **/
+    public void setSystemTables(SystemTablesDocument.SystemTables systemTables) {
+        this.systemTables = systemTables;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldEntry.getText())) {
+            Log.err("Entry couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of SystemTables
+     if exists systemTables, set the value directly
+     if not exists systemTables, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.systemTables == null) {
+                systemTables = SystemTablesDocument.SystemTables.Factory.newInstance();
+            }
+            SystemTablesDocument.SystemTables.SystemTable systemTable = SystemTablesDocument.SystemTables.SystemTable.Factory
+                                                                                                                             .newInstance();
+            systemTable.setEntry(this.jTextFieldEntry.getText());
+
+            systemTable.setUsage(SystemTableUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                systemTable.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                systemTables.setSystemTableArray(location, systemTable);
+            } else {
+                systemTables.addNewSystemTable();
+                systemTables.setSystemTableArray(systemTables.getSystemTableList().size() - 1, systemTable);
+            }
+        } catch (Exception e) {
+            Log.err("Update System Tables", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleVariables.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleVariables.java
new file mode 100644
index 0000000000..90a28591f5
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleVariables.java
@@ -0,0 +1,601 @@
+/** @file
+ 
+ The file is used to create, update Variable of MSA/MBD file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import org.tianocore.GuidDocument;
+import org.tianocore.VariableUsage;
+import org.tianocore.VariablesDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update Variable of MSA/MBD file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class ModuleVariables extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -6998982978030439446L;
+
+    //
+    //Define class members
+    //
+    private VariablesDocument.Variables variables = null;
+
+    private int location = -1;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelString = null;
+
+    private JTextField jTextFieldString = null;
+
+    private JLabel jLabelBitOffset = null;
+
+    private JTextField jTextFieldBitOffset = null;
+
+    private JLabel jLabelByteOffset = null;
+
+    private JTextField jTextFieldByteOffset = null;
+
+    private JLabel jLabelOffsetBitSize = null;
+
+    private JTextField jTextFieldOffsetBitSize = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private JLabel jLabelByteOffsetHint = null;
+
+    private JLabel jLabelBitOffsetHint = null;
+
+    private JLabel jLabelOffsetBitSizeHint = null;
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setSize(new java.awt.Dimension(250, 20));
+            jTextFieldGuid.setLocation(new java.awt.Point(160, 35));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldString 
+     
+     @return javax.swing.JTextField jTextFieldString
+     
+     **/
+    private JTextField getJTextFieldString() {
+        if (jTextFieldString == null) {
+            jTextFieldString = new JTextField();
+            jTextFieldString.setSize(new java.awt.Dimension(320, 20));
+            jTextFieldString.setLocation(new java.awt.Point(160, 10));
+        }
+        return jTextFieldString;
+    }
+
+    /**
+     This method initializes jTextFieldBitOffset 
+     
+     @return javax.swing.JTextField jTextFieldBitOffset
+     
+     **/
+    private JTextField getJTextFieldBitOffset() {
+        if (jTextFieldBitOffset == null) {
+            jTextFieldBitOffset = new JTextField();
+            jTextFieldBitOffset.setSize(new java.awt.Dimension(80, 20));
+            jTextFieldBitOffset.setLocation(new java.awt.Point(160, 85));
+        }
+        return jTextFieldBitOffset;
+    }
+
+    /**
+     This method initializes jTextFieldByteOffset 
+     
+     @return javax.swing.JTextField jTextFieldByteOffset
+     
+     **/
+    private JTextField getJTextFieldByteOffset() {
+        if (jTextFieldByteOffset == null) {
+            jTextFieldByteOffset = new JTextField();
+            jTextFieldByteOffset.setLocation(new java.awt.Point(160, 60));
+            jTextFieldByteOffset.setSize(new java.awt.Dimension(80, 20));
+        }
+        return jTextFieldByteOffset;
+    }
+
+    /**
+     This method initializes jTextFieldBitSize 
+     
+     @return javax.swing.JTextField jTextFieldOffsetBitSize
+     
+     **/
+    private JTextField getJTextFieldOffsetBitSize() {
+        if (jTextFieldOffsetBitSize == null) {
+            jTextFieldOffsetBitSize = new JTextField();
+            jTextFieldOffsetBitSize.setSize(new java.awt.Dimension(80, 20));
+            jTextFieldOffsetBitSize.setLocation(new java.awt.Point(160, 110));
+        }
+        return jTextFieldOffsetBitSize;
+    }
+
+    /**
+     This method initializes jComboBoxUsage 
+     
+     @return javax.swing.JComboBox jComboBoxUsage
+     
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 190, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 190, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID 
+     
+     @return javax.swing.JTextField jTextFieldOverrideID
+     
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 50, 20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public ModuleVariables() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inVariables The input data of VariablesDocument.Variables
+     
+     **/
+    public ModuleVariables(VariablesDocument.Variables inVariables) {
+        super();
+        init(inVariables);
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inVariables The input data of VariablesDocument.Variables
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    public ModuleVariables(VariablesDocument.Variables inVariables, int type, int index) {
+        super();
+        init(inVariables, type, index);
+        this.setVisible(true);
+    }
+
+    /**
+     This method initializes this
+     
+     @param inVariables The input data of VariablesDocument.Variables
+     
+     **/
+    private void init(VariablesDocument.Variables inVariables) {
+        init();
+        this.setVariables(inVariables);
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inVariables The input data of VariablesDocument.Variables
+     @param type The input data of node type
+     @param index The input data of node index
+     
+     **/
+    private void init(VariablesDocument.Variables inVariables, int type, int index) {
+        init(inVariables);
+        this.location = index;
+        if (this.variables.getVariableList().size() > 0) {
+            if (this.variables.getVariableArray(index).getString() != null) {
+                this.jTextFieldString.setText(this.variables.getVariableArray(index).getString());
+            }
+            if (this.variables.getVariableArray(index).getGuid() != null) {
+                this.jTextFieldGuid.setText(this.variables.getVariableArray(index).getGuid().getStringValue());
+            }
+            if (this.variables.getVariableArray(index).getByteOffset() != null) {
+                this.jTextFieldByteOffset
+                                         .setText(String
+                                                        .valueOf(this.variables.getVariableArray(index).getByteOffset()));
+            }
+            if (String.valueOf(this.variables.getVariableArray(index).getBitOffset()) != null) {
+                this.jTextFieldBitOffset.setText(String.valueOf(this.variables.getVariableArray(index).getBitOffset()));
+            }
+            if (String.valueOf(this.variables.getVariableArray(index).getOffsetBitSize()) != null) {
+                this.jTextFieldOffsetBitSize.setText(String.valueOf(this.variables.getVariableArray(index)
+                                                                                  .getOffsetBitSize()));
+            }
+            if (this.variables.getVariableArray(index).getUsage() != null) {
+                this.jComboBoxUsage.setSelectedItem(this.variables.getVariableArray(index).getUsage().toString());
+            }
+            this.jTextFieldOverrideID.setText(String.valueOf(this.variables.getVariableArray(index).getOverrideID()));
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Add Variables");
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldString.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jTextFieldByteOffset.setEnabled(!isView);
+            this.jTextFieldBitOffset.setEnabled(!isView);
+            this.jTextFieldOffsetBitSize.setEnabled(!isView);
+            this.jComboBoxUsage.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jTextFieldOverrideID.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelByteOffsetHint = new JLabel();
+            jLabelByteOffsetHint.setBounds(new java.awt.Rectangle(245,60,235,20));
+            jLabelByteOffsetHint.setText("0x00");
+            jLabelOffsetBitSizeHint = new JLabel();
+            jLabelOffsetBitSizeHint.setBounds(new java.awt.Rectangle(245,110,235,20));
+            jLabelOffsetBitSizeHint.setText("1~7");
+            jLabelBitOffsetHint = new JLabel();
+            jLabelBitOffsetHint.setBounds(new java.awt.Rectangle(245,85,235,20));
+            jLabelBitOffsetHint.setText("0~7");
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setText("Override ID");
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelUsage = new JLabel();
+            jLabelUsage.setText("Usage");
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelOffsetBitSize = new JLabel();
+            jLabelOffsetBitSize.setText("Offset Bit Size");
+            jLabelOffsetBitSize.setLocation(new java.awt.Point(15, 110));
+            jLabelOffsetBitSize.setSize(new java.awt.Dimension(140, 20));
+            jLabelByteOffset = new JLabel();
+            jLabelByteOffset.setText("Byte Offset");
+            jLabelByteOffset.setLocation(new java.awt.Point(15, 60));
+            jLabelByteOffset.setSize(new java.awt.Dimension(140, 20));
+            jLabelBitOffset = new JLabel();
+            jLabelBitOffset.setText("Bit Offset");
+            jLabelBitOffset.setLocation(new java.awt.Point(15, 85));
+            jLabelBitOffset.setSize(new java.awt.Dimension(140, 20));
+            jLabelString = new JLabel();
+            jLabelString.setText("String");
+            jLabelString.setLocation(new java.awt.Point(15, 10));
+            jLabelString.setSize(new java.awt.Dimension(140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setLocation(new java.awt.Point(15, 35));
+            jLabelGuid.setSize(new java.awt.Dimension(140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelString, null);
+            jContentPane.add(getJTextFieldString(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelByteOffset, null);
+            jContentPane.add(getJTextFieldByteOffset(), null);
+            jContentPane.add(jLabelBitOffset, null);
+            jContentPane.add(getJTextFieldBitOffset(), null);
+            jContentPane.add(jLabelOffsetBitSize, null);
+            jContentPane.add(getJTextFieldOffsetBitSize(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+
+            jContentPane.add(jLabelByteOffsetHint, null);
+            jContentPane.add(jLabelBitOffsetHint, null);
+            jContentPane.add(jLabelOffsetBitSizeHint, null);
+            initFrame();
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     *  
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.setEdited(true);
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     This method initializes Usage type
+     
+     **/
+    private void initFrame() {
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /**
+     Get VariablesDocument.Variables
+     
+     @return VariablesDocument.Variables
+     
+     **/
+    public VariablesDocument.Variables getVariables() {
+        return variables;
+    }
+
+    /**
+     Set VariablesDocument.Variables
+     
+     @param variables The input data of VariablesDocument.Variables
+     
+     **/
+    public void setVariables(VariablesDocument.Variables variables) {
+        this.variables = variables;
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldString.getText())) {
+            Log.err("String couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldGuid.getText())) {
+            Log.err("Guid couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!isEmpty(this.jTextFieldGuid.getText()) && !DataValidation.isGuid(this.jTextFieldGuid.getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldByteOffset.getText())
+            && !DataValidation.isByteOffset(this.jTextFieldByteOffset.getText())) {
+            Log.err("Incorrect data type for Byte Offset");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldBitOffset.getText())
+            && !DataValidation.isBitOffset(this.jTextFieldBitOffset.getText())) {
+            Log.err("Incorrect data type for Bit Offset");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOffsetBitSize.getText())
+            && !DataValidation.isOffsetBitSize(this.jTextFieldOffsetBitSize.getText())) {
+            Log.err("Incorrect data type for Bit Offset");
+            return false;
+        }
+        if (!isEmpty(this.jTextFieldOverrideID.getText())
+            && !DataValidation.isOverrideID(this.jTextFieldOverrideID.getText())) {
+            Log.err("Incorrect data type for Override ID");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     Save all components of Variables
+     if exists variables, set the value directly
+     if not exists variables, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.variables == null) {
+                variables = VariablesDocument.Variables.Factory.newInstance();
+            }
+            VariablesDocument.Variables.Variable variable = VariablesDocument.Variables.Variable.Factory.newInstance();
+            if (!isEmpty(this.jTextFieldString.getText())) {
+                variable.setString(this.jTextFieldString.getText());
+            }
+            if (!isEmpty(this.jTextFieldGuid.getText())) {
+                GuidDocument.Guid guid = GuidDocument.Guid.Factory.newInstance();
+                guid.setStringValue(this.jTextFieldGuid.getText());
+                variable.setGuid(guid);
+            }
+            if (!isEmpty(this.jTextFieldByteOffset.getText())) {
+                variable.setByteOffset(this.jTextFieldByteOffset.getText());
+            }
+            if (!isEmpty(this.jTextFieldBitOffset.getText())) {
+                variable.setBitOffset(Integer.parseInt(this.jTextFieldBitOffset.getText()));
+            }
+            if (!isEmpty(this.jTextFieldBitOffset.getText())) {
+                variable.setOffsetBitSize(Integer.parseInt(this.jTextFieldBitOffset.getText()));
+            }
+            variable.setUsage(VariableUsage.Enum.forString(jComboBoxUsage.getSelectedItem().toString()));
+            if (!isEmpty(this.jTextFieldOverrideID.getText())) {
+                variable.setOverrideID(Integer.parseInt(this.jTextFieldOverrideID.getText()));
+            }
+            if (location > -1) {
+                variables.setVariableArray(location, variable);
+            } else {
+                variables.addNewVariable();
+                variables.setVariableArray(variables.getVariableList().size() - 1, variable);
+            }
+        } catch (Exception e) {
+            Log.err("Update Variables", e.getMessage());
+        }
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
new file mode 100644
index 0000000000..f3e7011b3d
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
@@ -0,0 +1,843 @@
+/** @file
+ 
+ The file is used to create, update MsaHeader of MSA file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.tianocore.AbstractDocument;
+import org.tianocore.BaseNameDocument;
+import org.tianocore.FrameworkComponentTypes;
+import org.tianocore.GuidDocument;
+import org.tianocore.LicenseDocument;
+import org.tianocore.ModuleTypeDef;
+import org.tianocore.MsaHeaderDocument;
+import org.tianocore.SpecificationDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update MsaHeader of MSA file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class MsaHeader extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = -8152099582923006900L;
+
+    //
+    //Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JLabel jLabelSpecification = null;
+
+    private JTextField jTextFieldSpecification = null;
+
+    private JTextField jTextFieldSpecificationVersion = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneCopyright = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private JLabel jLabelSpecVersion = null;
+
+    private JLabel jLabelAbstract = null;
+
+    private JTextField jTextFieldAbstract = null;
+
+    private JLabel jLabelModuleType = null;
+
+    private JLabel jLabelCompontentType = null;
+
+    private JComboBox jComboBoxCompontentType = null;
+
+    private JComboBox jComboBoxModuleType = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private StarLabel jStarLabel7 = null;
+
+    private StarLabel jStarLabel8 = null;
+
+    private StarLabel jStarLabel9 = null;
+
+    private MsaHeaderDocument.MsaHeader msaHeader = null;
+
+    private JLabel jLabelURL = null;
+
+    private JTextField jTextFieldAbstractURL = null;
+
+    /**
+     This method initializes jTextFieldBaseName 
+     
+     @return javax.swing.JTextField jTextFieldBaseName
+     
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion 
+     
+     @return javax.swing.JTextField jTextFieldVersion
+     
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense 
+     
+     @return javax.swing.JTextArea jTextAreaLicense
+     
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright 
+     
+     @return javax.swing.JTextArea jTextAreaCopyright
+     
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription 
+     
+     @return javax.swing.JTextArea jTextAreaDescription
+     
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jTextFieldSpecification 
+     
+     @return javax.swing.JTextField jTextFieldSpecification
+     
+     **/
+    private JTextField getJTextFieldSpecification() {
+        if (jTextFieldSpecification == null) {
+            jTextFieldSpecification = new JTextField();
+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 340, 220, 20));
+        }
+        return jTextFieldSpecification;
+    }
+
+    /**
+     This method initializes jTextFieldSpecificationVersion 
+     
+     @return javax.swing.JTextField jTextFieldSpecificationVersion
+     
+     **/
+    private JTextField getJTextFieldSpecificationVersion() {
+        if (jTextFieldSpecificationVersion == null) {
+            jTextFieldSpecificationVersion = new JTextField();
+            jTextFieldSpecificationVersion.setBounds(new java.awt.Rectangle(400, 340, 80, 20));
+        }
+        return jTextFieldSpecificationVersion;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPaneLicense 
+     
+     @return javax.swing.JScrollPane jScrollPaneLicense
+     
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPaneCopyright 
+     
+     @return javax.swing.JScrollPane jScrollPaneCopyright
+     
+     **/
+    private JScrollPane getJScrollPaneCopyright() {
+        if (jScrollPaneCopyright == null) {
+            jScrollPaneCopyright = new JScrollPane();
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
+            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
+        }
+        return jScrollPaneCopyright;
+    }
+
+    /**
+     This method initializes jScrollPaneDescription 
+     
+     @return javax.swing.JScrollPane jScrollPaneDescription
+     
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+        }
+        return jScrollPaneDescription;
+    }
+
+    /**
+     This method initializes jTextFieldAbstract 
+     
+     @return javax.swing.JTextField jTextFieldAbstract
+     
+     **/
+    private JTextField getJTextFieldAbstract() {
+        if (jTextFieldAbstract == null) {
+            jTextFieldAbstract = new JTextField();
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 365, 200, 20));
+        }
+        return jTextFieldAbstract;
+    }
+
+    /**
+     This method initializes jComboBoxCompontentType 
+     
+     @return javax.swing.JComboBox jComboBoxCompontentType
+     
+     **/
+    private JComboBox getJComboBoxCompontentType() {
+        if (jComboBoxCompontentType == null) {
+            jComboBoxCompontentType = new JComboBox();
+            jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 415, 320, 20));
+        }
+        return jComboBoxCompontentType;
+    }
+
+    /**
+     This method initializes jComboBoxModuleType 
+     
+     @return javax.swing.JComboBox jComboBoxModuleType
+     
+     **/
+    private JComboBox getJComboBoxModuleType() {
+        if (jComboBoxModuleType == null) {
+            jComboBoxModuleType = new JComboBox();
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 390, 320, 20));
+        }
+        return jComboBoxModuleType;
+    }
+
+    /**
+     This method initializes jTextFieldAbstractURL 
+     
+     @return javax.swing.JTextField jTextFieldAbstractURL
+     
+     **/
+    private JTextField getJTextFieldAbstractURL() {
+        if (jTextFieldAbstractURL == null) {
+            jTextFieldAbstractURL = new JTextField();
+            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(390, 365, 90, 20));
+        }
+        return jTextFieldAbstractURL;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public MsaHeader() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inMsaHeader The input data of MsaHeaderDocument.MsaHeader
+     
+     **/
+    public MsaHeader(MsaHeaderDocument.MsaHeader inMsaHeader) {
+        super();
+        init(inMsaHeader);
+        this.setVisible(true);
+        this.setViewMode(false);
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldBaseName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jTextFieldVersion.setEnabled(!isView);
+            this.jTextAreaLicense.setEnabled(!isView);
+            this.jTextAreaCopyright.setEnabled(!isView);
+            this.jTextAreaDescription.setEnabled(!isView);
+            this.jTextFieldSpecification.setEnabled(!isView);
+            this.jTextFieldSpecificationVersion.setEnabled(!isView);
+            this.jTextFieldAbstract.setEnabled(!isView);
+            this.jTextFieldAbstractURL.setEnabled(!isView);
+            this.jComboBoxModuleType.setEnabled(!isView);
+            this.jComboBoxCompontentType.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Module Surface Area Header");
+        initFrame();
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inMsaHeader  The input data of MsaHeaderDocument.MsaHeader
+     
+     **/
+    private void init(MsaHeaderDocument.MsaHeader inMsaHeader) {
+        init();
+        if (inMsaHeader != null) {
+            setMsaHeader(inMsaHeader);
+            if (this.msaHeader.getBaseName() != null) {
+                this.jTextFieldBaseName.setText(this.msaHeader.getBaseName().getStringValue());
+            }
+            if (this.msaHeader.getGuid() != null) {
+                this.jTextFieldGuid.setText(this.msaHeader.getGuid().getStringValue());
+            }
+            if (this.msaHeader.getVersion() != null) {
+                this.jTextFieldVersion.setText(this.msaHeader.getVersion());
+            }
+            if (this.msaHeader.getLicense() != null) {
+                this.jTextAreaLicense.setText(this.msaHeader.getLicense().getStringValue());
+            }
+            if (this.msaHeader.getCopyright() != null) {
+                this.jTextAreaCopyright.setText(this.msaHeader.getCopyright());
+            }
+            if (this.msaHeader.getDescription() != null) {
+                this.jTextAreaDescription.setText(this.msaHeader.getDescription());
+            }
+            if (this.msaHeader.getSpecification() != null) {
+                this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue());
+            }
+            if (this.msaHeader.getSpecification() != null) {
+                this.jTextFieldSpecificationVersion.setText(this.msaHeader.getSpecification().getVersion());
+            }
+            if (this.msaHeader.getAbstract() != null) {
+                this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue());
+                this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL());
+            }
+            if (this.msaHeader.getModuleType() != null) {
+                this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString());
+            }
+            if (this.msaHeader.getComponentType() != null) {
+                this.jComboBoxCompontentType.setSelectedItem(this.msaHeader.getComponentType().toString());
+            }
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelURL = new JLabel();
+            jLabelURL.setBounds(new java.awt.Rectangle(365, 365, 25, 20));
+            jLabelURL.setText("URL");
+            jLabelCompontentType = new JLabel();
+            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 415, 140, 20));
+            jLabelCompontentType.setText("Compontent Type");
+            jLabelModuleType = new JLabel();
+            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 390, 140, 20));
+            jLabelModuleType.setText("Module Type");
+            jLabelAbstract = new JLabel();
+            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 365, 140, 20));
+            jLabelAbstract.setText("Abstract");
+            jLabelSpecVersion = new JLabel();
+            jLabelSpecVersion.setBounds(new java.awt.Rectangle(382, 340, 15, 20));
+            jLabelSpecVersion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+            jLabelSpecVersion.setText("V");
+            jLabelSpecification = new JLabel();
+            jLabelSpecification.setText("Specification");
+            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 340, 140, 20));
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Base Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(jLabelSpecification, null);
+            jContentPane.add(getJTextFieldSpecification(), null);
+            jContentPane.add(getJTextFieldSpecificationVersion(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneCopyright(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+            jContentPane.add(jLabelAbstract, null);
+            jContentPane.add(getJTextFieldAbstract(), null);
+            jContentPane.add(jLabelSpecVersion, null);
+            jContentPane.add(jLabelModuleType, null);
+            jContentPane.add(jLabelCompontentType, null);
+            jContentPane.add(getJComboBoxCompontentType(), null);
+            jContentPane.add(getJComboBoxModuleType(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 170));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(0, 255));
+            jStarLabel7 = new StarLabel();
+            jStarLabel7.setLocation(new java.awt.Point(0, 365));
+            jStarLabel8 = new StarLabel();
+            jStarLabel8.setLocation(new java.awt.Point(0, 390));
+            jStarLabel9 = new StarLabel();
+            jStarLabel9.setLocation(new java.awt.Point(0, 415));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+            jContentPane.add(jStarLabel7, null);
+            jContentPane.add(jStarLabel8, null);
+            jContentPane.add(jStarLabel9, null);
+            jContentPane.add(jLabelURL, null);
+            jContentPane.add(getJTextFieldAbstractURL(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     *
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.setEdited(true);
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.setEdited(false);
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldBaseName.getText())) {
+            Log.err("Base Name couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldGuid.getText())) {
+            Log.err("Guid couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldVersion.getText())) {
+            Log.err("Version couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaLicense.getText())) {
+            Log.err("License couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaCopyright.getText())) {
+            Log.err("Copyright couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaDescription.getText())) {
+            Log.err("Description couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldAbstract.getText())) {
+            Log.err("Abstract couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {
+            Log.err("Incorrect data type for Base Name");
+            return false;
+        }
+        if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {
+            Log.err("Incorrect data type for Abstract");
+            return false;
+        }
+        if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+            Log.err("Incorrect data type for Copyright");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Save all components of Msa Header
+     if exists msaHeader, set the value directly
+     if not exists msaHeader, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.msaHeader == null) {
+                msaHeader = MsaHeaderDocument.MsaHeader.Factory.newInstance();
+            }
+            if (this.msaHeader.getBaseName() != null) {
+                this.msaHeader.getBaseName().setStringValue(this.jTextFieldBaseName.getText());
+            } else {
+                BaseNameDocument.BaseName mBaseName = BaseNameDocument.BaseName.Factory.newInstance();
+                mBaseName.setStringValue(this.jTextFieldBaseName.getText());
+                this.msaHeader.setBaseName(mBaseName);
+            }
+
+            if (this.msaHeader.getGuid() != null) {
+                this.msaHeader.getGuid().setStringValue(this.jTextFieldGuid.getText());
+            } else {
+                GuidDocument.Guid mGuid = GuidDocument.Guid.Factory.newInstance();
+                mGuid.setStringValue(this.jTextFieldGuid.getText());
+                this.msaHeader.setGuid(mGuid);
+            }
+
+            this.msaHeader.setVersion(this.jTextFieldVersion.getText());
+
+            if (this.msaHeader.getLicense() != null) {
+                this.msaHeader.getLicense().setStringValue(this.jTextAreaLicense.getText());
+            } else {
+                LicenseDocument.License mLicense = LicenseDocument.License.Factory.newInstance();
+                mLicense.setStringValue(this.jTextAreaLicense.getText());
+                this.msaHeader.setLicense(mLicense);
+            }
+
+            this.msaHeader.setCopyright(this.jTextAreaCopyright.getText());
+            this.msaHeader.setDescription(this.jTextAreaDescription.getText());
+
+            if (this.msaHeader.getSpecification() != null) {
+                this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());
+                this.msaHeader.getSpecification().setVersion(this.jTextFieldSpecificationVersion.getText());
+            } else {
+                SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory
+                                                                                                                .newInstance();
+                mSpecification.setStringValue(this.jTextFieldSpecification.getText());
+                mSpecification.setVersion(this.jTextFieldSpecificationVersion.getText());
+                this.msaHeader.setSpecification(mSpecification);
+            }
+
+            if (this.msaHeader.getAbstract() != null) {
+                this.msaHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText());
+                this.msaHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());
+            } else {
+                AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();
+                mAbstract.setStringValue(this.jTextFieldAbstract.getText());
+                mAbstract.setURL(this.jTextFieldAbstractURL.getText());
+                this.msaHeader.setAbstract(mAbstract);
+            }
+            this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()
+                                                                                              .toString()));
+            this.msaHeader
+                          .setComponentType(FrameworkComponentTypes.Enum
+                                                                        .forString(this.jComboBoxCompontentType
+                                                                                                               .getSelectedItem()
+                                                                                                               .toString()));
+            if (this.msaHeader.getCreated() == null) {
+                this.msaHeader.setCreated(Tools.getCurrentDateTime());
+            } else {
+                this.msaHeader.setUpdated(Tools.getCurrentDateTime());
+            }
+
+        } catch (Exception e) {
+            Log.err("Save Module", e.getMessage());
+        }
+    }
+
+    /**
+     This method initializes Module type and Compontent type
+     
+     **/
+    private void initFrame() {
+        jComboBoxModuleType.addItem("BASE");
+        jComboBoxModuleType.addItem("SEC");
+        jComboBoxModuleType.addItem("PEI_CORE");
+        jComboBoxModuleType.addItem("PEIM");
+        jComboBoxModuleType.addItem("DXE_CORE");
+        jComboBoxModuleType.addItem("DXE_DRIVER");
+        jComboBoxModuleType.addItem("DXE_RUNTIME_DRIVER");
+        jComboBoxModuleType.addItem("DXE_SAL_DRIVER");
+        jComboBoxModuleType.addItem("DXE_SMM_DRIVER");
+        jComboBoxModuleType.addItem("TOOLS");
+        jComboBoxModuleType.addItem("UEFI_DRIVER");
+        jComboBoxModuleType.addItem("UEFI_APPLICATION");
+        jComboBoxModuleType.addItem("USER_DEFINED");
+
+        jComboBoxCompontentType.addItem("APRIORI");
+        jComboBoxCompontentType.addItem("LIBRARY");
+        jComboBoxCompontentType.addItem("FV_IMAGE_FILE");
+        jComboBoxCompontentType.addItem("BS_DRIVER");
+        jComboBoxCompontentType.addItem("RT_DRIVER");
+        jComboBoxCompontentType.addItem("SAL_RT_DRIVER");
+        jComboBoxCompontentType.addItem("PE32_PEIM");
+        jComboBoxCompontentType.addItem("PIC_PEIM");
+        jComboBoxCompontentType.addItem("COMBINED_PEIM_DRIVER");
+        jComboBoxCompontentType.addItem("PEI_CORE");
+        jComboBoxCompontentType.addItem("DXE_CORE");
+        jComboBoxCompontentType.addItem("APPLICATION");
+        jComboBoxCompontentType.addItem("BS_DRIVER_EFI");
+        jComboBoxCompontentType.addItem("SHELLAPP");
+    }
+
+    /**
+     Get MsaHeaderDocument.MsaHeader
+     
+     @return MsaHeaderDocument.MsaHeader
+     
+     **/
+    public MsaHeaderDocument.MsaHeader getMsaHeader() {
+        return msaHeader;
+    }
+
+    /**
+     Set MsaHeaderDocument.MsaHeader
+     
+     @param msaHeader The input data of MsaHeaderDocument.MsaHeader
+     
+     **/
+    public void setMsaHeader(MsaHeaderDocument.MsaHeader msaHeader) {
+        this.msaHeader = msaHeader;
+    }
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
new file mode 100644
index 0000000000..0760a76786
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
@@ -0,0 +1,845 @@
+/** @file
+ 
+ The file is used to create, update MsaLibHeader of a MSA file
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.module.ui;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
+
+import org.tianocore.AbstractDocument;
+import org.tianocore.BaseNameDocument;
+import org.tianocore.FrameworkComponentTypes;
+import org.tianocore.GuidDocument;
+import org.tianocore.LicenseDocument;
+import org.tianocore.ModuleTypeDef;
+import org.tianocore.MsaLibHeaderDocument;
+import org.tianocore.SpecificationDocument;
+import org.tianocore.common.DataValidation;
+import org.tianocore.common.Log;
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.IInternalFrame;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ The class is used to create, update MsaLibHeader of a MSA file
+ It extends IInternalFrame
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class MsaLibHeader extends IInternalFrame {
+
+    ///
+    /// Define class Serial Version UID
+    ///
+    private static final long serialVersionUID = 5526729363068526262L;
+
+    //
+    //Define class members
+    //
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JLabel jLabelSpecification = null;
+
+    private JTextField jTextFieldSpecification = null;
+
+    private JTextField jTextFieldSpecificationVersion = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneCopyright = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private JLabel jLabelSpecVersion = null;
+
+    private JLabel jLabelAbstract = null;
+
+    private JTextField jTextFieldAbstract = null;
+
+    private JLabel jLabelModuleType = null;
+
+    private JLabel jLabelCompontentType = null;
+
+    private JComboBox jComboBoxCompontentType = null;
+
+    private JComboBox jComboBoxModuleType = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private StarLabel jStarLabel7 = null;
+
+    private StarLabel jStarLabel8 = null;
+
+    private StarLabel jStarLabel9 = null;
+
+    private MsaLibHeaderDocument.MsaLibHeader msaLibHeader = null;
+
+    private JLabel jLabelURL = null;
+
+    private JTextField jTextFieldAbstractURL = null;
+
+    /**
+     This method initializes jTextFieldBaseName 
+     
+     @return javax.swing.JTextField jTextFieldBaseName
+     
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid 
+     
+     @return javax.swing.JTextField jTextFieldGuid
+     
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion 
+     
+     @return javax.swing.JTextField jTextFieldVersion
+     
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid 
+     
+     @return javax.swing.JButton jButtonGenerateGuid
+     
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense 
+     
+     @return javax.swing.JTextArea jTextAreaLicense
+     
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright 
+     
+     @return javax.swing.JTextArea jTextAreaCopyright
+     
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription 
+     
+     @return javax.swing.JTextArea jTextAreaDescription
+     
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jTextFieldSpecification 
+     
+     @return javax.swing.JTextField jTextFieldSpecification
+     
+     **/
+    private JTextField getJTextFieldSpecification() {
+        if (jTextFieldSpecification == null) {
+            jTextFieldSpecification = new JTextField();
+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 340, 220, 20));
+        }
+        return jTextFieldSpecification;
+    }
+
+    /**
+     This method initializes jTextFieldSpecificationVersion 
+     
+     @return javax.swing.JTextField jTextFieldSpecificationVersion
+     
+     **/
+    private JTextField getJTextFieldSpecificationVersion() {
+        if (jTextFieldSpecificationVersion == null) {
+            jTextFieldSpecificationVersion = new JTextField();
+            jTextFieldSpecificationVersion.setBounds(new java.awt.Rectangle(400, 340, 80, 20));
+        }
+        return jTextFieldSpecificationVersion;
+    }
+
+    /**
+     This method initializes jButtonOk 
+     
+     @return javax.swing.JButton jButtonOk
+     
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel 
+     
+     @return javax.swing.JButton jButtonCancel
+     
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPaneLicense 
+     
+     @return javax.swing.JScrollPane  jScrollPaneLicense
+     
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPaneCopyright 
+     
+     @return javax.swing.JScrollPane jScrollPaneCopyright
+     
+     **/
+    private JScrollPane getJScrollPaneCopyright() {
+        if (jScrollPaneCopyright == null) {
+            jScrollPaneCopyright = new JScrollPane();
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
+            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
+        }
+        return jScrollPaneCopyright;
+    }
+
+    /**
+     This method initializes jScrollPaneDescription 
+     
+     @return javax.swing.JScrollPane jScrollPaneDescription
+     
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+        }
+        return jScrollPaneDescription;
+    }
+
+    /**
+     This method initializes jTextFieldAbstract 
+     
+     @return javax.swing.JTextField jTextFieldAbstract
+     
+     **/
+    private JTextField getJTextFieldAbstract() {
+        if (jTextFieldAbstract == null) {
+            jTextFieldAbstract = new JTextField();
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 365, 200, 20));
+        }
+        return jTextFieldAbstract;
+    }
+
+    /**
+     This method initializes jComboBoxCompontentType 
+     
+     @return javax.swing.JComboBox jComboBoxCompontentType
+     
+     **/
+    private JComboBox getJComboBoxCompontentType() {
+        if (jComboBoxCompontentType == null) {
+            jComboBoxCompontentType = new JComboBox();
+            jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 415, 320, 20));
+        }
+        return jComboBoxCompontentType;
+    }
+
+    /**
+     This method initializes jComboBoxModuleType 
+     
+     @return javax.swing.JComboBox jComboBoxModuleType
+     
+     **/
+    private JComboBox getJComboBoxModuleType() {
+        if (jComboBoxModuleType == null) {
+            jComboBoxModuleType = new JComboBox();
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 390, 320, 20));
+        }
+        return jComboBoxModuleType;
+    }
+
+    /**
+     This method initializes jTextFieldAbstractURL 
+     
+     @return javax.swing.JTextField jTextFieldAbstractURL
+     
+     **/
+    private JTextField getJTextFieldAbstractURL() {
+        if (jTextFieldAbstractURL == null) {
+            jTextFieldAbstractURL = new JTextField();
+            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(390, 365, 90, 20));
+        }
+        return jTextFieldAbstractURL;
+    }
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     
+     **/
+    public MsaLibHeader() {
+        super();
+        init();
+        this.setVisible(true);
+    }
+
+    /**
+     This is the override edit constructor
+     
+     @param inMsaLibHeader The input data of MsaLibHeaderDocument.MsaLibHeader
+     
+     **/
+    public MsaLibHeader(MsaLibHeaderDocument.MsaLibHeader inMsaLibHeader) {
+        super();
+        init(inMsaLibHeader);
+        this.setVisible(true);
+        this.setViewMode(false);
+    }
+
+    /**
+     This method initializes this
+     
+     **/
+    private void init() {
+        this.setSize(500, 515);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Module");
+        initFrame();
+    }
+
+    /**
+     This method initializes this
+     Fill values to all fields if these values are not empty
+     
+     @param inMsaLibHeader The input data of MsaLibHeaderDocument.MsaLibHeader
+     
+     **/
+    private void init(MsaLibHeaderDocument.MsaLibHeader inMsaLibHeader) {
+        init();
+        this.setMsaLibHeader(inMsaLibHeader);
+        if (inMsaLibHeader != null) {
+            if (this.msaLibHeader.getBaseName() != null) {
+                this.jTextFieldBaseName.setText(this.msaLibHeader.getBaseName().getStringValue());
+            }
+            if (this.msaLibHeader.getGuid() != null) {
+                this.jTextFieldGuid.setText(this.msaLibHeader.getGuid().getStringValue());
+            }
+            if (this.msaLibHeader.getVersion() != null) {
+                this.jTextFieldVersion.setText(this.msaLibHeader.getVersion());
+            }
+            if (this.msaLibHeader.getLicense() != null) {
+                this.jTextAreaLicense.setText(this.msaLibHeader.getLicense().getStringValue());
+            }
+            if (this.msaLibHeader.getCopyright() != null) {
+                this.jTextAreaCopyright.setText(this.msaLibHeader.getCopyright());
+            }
+            if (this.msaLibHeader.getDescription() != null) {
+                this.jTextAreaDescription.setText(this.msaLibHeader.getDescription());
+            }
+            if (this.msaLibHeader.getSpecification() != null) {
+                this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification().getStringValue());
+            }
+            if (this.msaLibHeader.getSpecification() != null) {
+                this.jTextFieldSpecificationVersion.setText(this.msaLibHeader.getSpecification().getVersion());
+            }
+            if (this.msaLibHeader.getAbstract() != null) {
+                this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract().getStringValue());
+                this.jTextFieldAbstractURL.setText(this.msaLibHeader.getAbstract().getURL());
+            }
+            if (this.msaLibHeader.getModuleType() != null) {
+                this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString());
+            }
+            if (this.msaLibHeader.getComponentType() != null) {
+                this.jComboBoxCompontentType.setSelectedItem(this.msaLibHeader.getComponentType().toString());
+            }
+        }
+    }
+
+    /**
+     Disable all components when the mode is view
+     
+     @param isView true - The view mode; false - The non-view mode
+     
+     **/
+    public void setViewMode(boolean isView) {
+        this.jButtonOk.setVisible(false);
+        this.jButtonCancel.setVisible(false);
+        if (isView) {
+            this.jTextFieldBaseName.setEnabled(!isView);
+            this.jTextFieldGuid.setEnabled(!isView);
+            this.jTextFieldVersion.setEnabled(!isView);
+            this.jTextAreaLicense.setEnabled(!isView);
+            this.jTextAreaCopyright.setEnabled(!isView);
+            this.jTextAreaDescription.setEnabled(!isView);
+            this.jTextFieldSpecification.setEnabled(!isView);
+            this.jTextFieldSpecificationVersion.setEnabled(!isView);
+            this.jTextFieldAbstract.setEnabled(!isView);
+            this.jTextFieldAbstractURL.setEnabled(!isView);
+            this.jComboBoxModuleType.setEnabled(!isView);
+            this.jComboBoxCompontentType.setEnabled(!isView);
+            this.jButtonCancel.setEnabled(!isView);
+            this.jButtonGenerateGuid.setEnabled(!isView);
+            this.jButtonOk.setEnabled(!isView);
+        }
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel jContentPane
+     
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelURL = new JLabel();
+            jLabelURL.setBounds(new java.awt.Rectangle(365, 365, 25, 20));
+            jLabelURL.setText("URL");
+            jLabelCompontentType = new JLabel();
+            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 415, 140, 20));
+            jLabelCompontentType.setText("Compontent Type");
+            jLabelModuleType = new JLabel();
+            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 390, 140, 20));
+            jLabelModuleType.setText("Module Type");
+            jLabelAbstract = new JLabel();
+            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 365, 140, 20));
+            jLabelAbstract.setText("Abstract");
+            jLabelSpecVersion = new JLabel();
+            jLabelSpecVersion.setBounds(new java.awt.Rectangle(382, 340, 15, 20));
+            jLabelSpecVersion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+            jLabelSpecVersion.setText("V");
+            jLabelSpecification = new JLabel();
+            jLabelSpecification.setText("Specification");
+            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 340, 140, 20));
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Base Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(jLabelSpecification, null);
+            jContentPane.add(getJTextFieldSpecification(), null);
+            jContentPane.add(getJTextFieldSpecificationVersion(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneCopyright(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+            jContentPane.add(jLabelAbstract, null);
+            jContentPane.add(getJTextFieldAbstract(), null);
+            jContentPane.add(jLabelSpecVersion, null);
+            jContentPane.add(jLabelModuleType, null);
+            jContentPane.add(jLabelCompontentType, null);
+            jContentPane.add(getJComboBoxCompontentType(), null);
+            jContentPane.add(getJComboBoxModuleType(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 170));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(0, 255));
+            jStarLabel7 = new StarLabel();
+            jStarLabel7.setLocation(new java.awt.Point(0, 365));
+            jStarLabel8 = new StarLabel();
+            jStarLabel8.setLocation(new java.awt.Point(0, 390));
+            jStarLabel9 = new StarLabel();
+            jStarLabel9.setLocation(new java.awt.Point(0, 415));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+            jContentPane.add(jStarLabel7, null);
+            jContentPane.add(jStarLabel8, null);
+            jContentPane.add(jStarLabel9, null);
+            jContentPane.add(jLabelURL, null);
+            jContentPane.add(getJTextFieldAbstractURL(), null);
+        }
+        return jContentPane;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     *
+     * Override actionPerformed to listen all actions
+     *  
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.dispose();
+            this.save();
+            this.setEdited(true);
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+            this.setEdited(false);
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Data validation for all fields
+     
+     @retval true - All datas are valid
+     @retval false - At least one data is invalid
+     
+     **/
+    public boolean check() {
+        //
+        // Check if all required fields are not empty
+        //
+        if (isEmpty(this.jTextFieldBaseName.getText())) {
+            Log.err("Base Name couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldGuid.getText())) {
+            Log.err("Guid couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldVersion.getText())) {
+            Log.err("Version couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaLicense.getText())) {
+            Log.err("License couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaCopyright.getText())) {
+            Log.err("Copyright couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextAreaDescription.getText())) {
+            Log.err("Description couldn't be empty");
+            return false;
+        }
+        if (isEmpty(this.jTextFieldAbstract.getText())) {
+            Log.err("Abstract couldn't be empty");
+            return false;
+        }
+
+        //
+        // Check if all fields have correct data types 
+        //
+        if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {
+            Log.err("Incorrect data type for Base Name");
+            return false;
+        }
+        if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {
+            Log.err("Incorrect data type for Guid");
+            return false;
+        }
+        if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {
+            Log.err("Incorrect data type for Abstract");
+            return false;
+        }
+        if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+            Log.err("Incorrect data type for Copyright");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Save all components of Msa Lib Header
+     if exists msaLibHeader, set the value directly
+     if not exists msaLibHeader, new an instance first
+     
+     **/
+    public void save() {
+        try {
+            if (this.msaLibHeader == null) {
+                msaLibHeader = MsaLibHeaderDocument.MsaLibHeader.Factory.newInstance();
+            }
+            if (this.msaLibHeader.getBaseName() != null) {
+                this.msaLibHeader.getBaseName().setStringValue(this.jTextFieldBaseName.getText());
+            } else {
+                BaseNameDocument.BaseName mBaseName = BaseNameDocument.BaseName.Factory.newInstance();
+                mBaseName.setStringValue(this.jTextFieldBaseName.getText());
+                this.msaLibHeader.setBaseName(mBaseName);
+            }
+
+            if (this.msaLibHeader.getGuid() != null) {
+                this.msaLibHeader.getGuid().setStringValue(this.jTextFieldGuid.getText());
+            } else {
+                GuidDocument.Guid mGuid = GuidDocument.Guid.Factory.newInstance();
+                mGuid.setStringValue(this.jTextFieldGuid.getText());
+                this.msaLibHeader.setGuid(mGuid);
+            }
+
+            this.msaLibHeader.setVersion(this.jTextFieldVersion.getText());
+
+            if (this.msaLibHeader.getLicense() != null) {
+                this.msaLibHeader.getLicense().setStringValue(this.jTextAreaLicense.getText());
+            } else {
+                LicenseDocument.License mLicense = LicenseDocument.License.Factory.newInstance();
+                mLicense.setStringValue(this.jTextAreaLicense.getText());
+                this.msaLibHeader.setLicense(mLicense);
+            }
+
+            this.msaLibHeader.setCopyright(this.jTextAreaCopyright.getText());
+            this.msaLibHeader.setDescription(this.jTextAreaDescription.getText());
+
+            if (this.msaLibHeader.getSpecification() != null) {
+                this.msaLibHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());
+                this.msaLibHeader.getSpecification().setVersion(this.jTextFieldSpecificationVersion.getText());
+            } else {
+                SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory
+                                                                                                                .newInstance();
+                mSpecification.setStringValue(this.jTextFieldSpecification.getText());
+                mSpecification.setVersion(this.jTextFieldSpecificationVersion.getText());
+                this.msaLibHeader.setSpecification(mSpecification);
+            }
+
+            if (this.msaLibHeader.getAbstract() != null) {
+                this.msaLibHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText());
+                this.msaLibHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());
+            } else {
+                AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();
+                mAbstract.setStringValue(this.jTextFieldAbstract.getText());
+                mAbstract.setURL(this.jTextFieldAbstractURL.getText());
+                this.msaLibHeader.setAbstract(mAbstract);
+            }
+
+            this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()
+                                                                                                 .toString()));
+            this.msaLibHeader
+                             .setComponentType(FrameworkComponentTypes.Enum
+                                                                           .forString(this.jComboBoxCompontentType
+                                                                                                                  .getSelectedItem()
+                                                                                                                  .toString()));
+
+            if (this.msaLibHeader.getCreated() == null) {
+                this.msaLibHeader.setCreated(Tools.getCurrentDateTime());
+            } else {
+                this.msaLibHeader.setUpdated(Tools.getCurrentDateTime());
+            }
+        } catch (Exception e) {
+            Log.err("Save Module", e.getMessage());
+        }
+    }
+
+    /**
+     This method initializes module type and compontent type
+     
+     **/
+    private void initFrame() {
+        jComboBoxModuleType.addItem("BASE");
+        jComboBoxModuleType.addItem("SEC");
+        jComboBoxModuleType.addItem("PEI_CORE");
+        jComboBoxModuleType.addItem("PEIM");
+        jComboBoxModuleType.addItem("DXE_CORE");
+        jComboBoxModuleType.addItem("DXE_DRIVER");
+        jComboBoxModuleType.addItem("DXE_RUNTIME_DRIVER");
+        jComboBoxModuleType.addItem("DXE_SMM_DRIVER");
+        jComboBoxModuleType.addItem("DXE_SAL_DRIVER");
+        jComboBoxModuleType.addItem("UEFI_DRIVER");
+        jComboBoxModuleType.addItem("UEFI_APPLICATION");
+
+        jComboBoxCompontentType.addItem("APRIORI");
+        jComboBoxCompontentType.addItem("LIBRARY");
+        jComboBoxCompontentType.addItem("FV_IMAGE_FILE");
+        jComboBoxCompontentType.addItem("BS_DRIVER");
+        jComboBoxCompontentType.addItem("RT_DRIVER");
+        jComboBoxCompontentType.addItem("SAL_RT_DRIVER");
+        jComboBoxCompontentType.addItem("PE32_PEIM");
+        jComboBoxCompontentType.addItem("PIC_PEIM");
+        jComboBoxCompontentType.addItem("COMBINED_PEIM_DRIVER");
+        jComboBoxCompontentType.addItem("PEI_CORE");
+        jComboBoxCompontentType.addItem("DXE_CORE");
+        jComboBoxCompontentType.addItem("APPLICATION");
+        jComboBoxCompontentType.addItem("BS_DRIVER_EFI");
+        jComboBoxCompontentType.addItem("SHELLAPP");
+    }
+
+    /**
+     Get MsaLibHeaderDocument.MsaLibHeader
+     
+     @return MsaLibHeaderDocument.MsaLibHeader
+     
+     **/
+    public MsaLibHeaderDocument.MsaLibHeader getMsaLibHeader() {
+        return msaLibHeader;
+    }
+
+    /**
+     Set MsaLibHeaderDocument.MsaLibHeader
+     
+     @param msaLibHeader The input data of MsaLibHeaderDocument.MsaLibHeader
+     
+     **/
+    public void setMsaLibHeader(MsaLibHeaderDocument.MsaLibHeader msaLibHeader) {
+        this.msaLibHeader = msaLibHeader;
+    }
+
+}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java
new file mode 100644
index 0000000000..1d98909832
--- /dev/null
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java
@@ -0,0 +1,147 @@
+/** @file
+ 
+ The file is used to init workspace and get basic information of workspace
+ 
+ Copyright (c) 2006, Intel Corporation
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution.  The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+ 
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ 
+ **/
+
+package org.tianocore.packaging.workspace.common;
+
+import java.io.File;
+
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.tianocore.FrameworkDatabaseDocument;
+import org.tianocore.common.Log;
+
+/**
+ The file is used to init workspace and get basic information of workspace
+ 
+ @since ModuleEditor 1.0
+
+ **/
+public class Workspace {
+
+    //
+    // Define class members
+    //
+    private String currentWorkspace = null;
+
+    private FrameworkDatabaseDocument xmlFrameworkDbDoc = null;
+
+    private String strWorkspaceDatabaseFile = System.getProperty("file.separator") + "Tools"
+                                              + System.getProperty("file.separator") + "Conf"
+                                              + System.getProperty("file.separator") + "FrameworkDatabase.db";
+
+    public static void main(String[] args) {
+
+    }
+
+    /**
+     This is the default constructor
+     Get current WORKSPACE from system environment variable
+     
+     **/
+    public Workspace() {
+        this.currentWorkspace = System.getenv("WORKSPACE");
+    }
+
+    /**
+     Check if current workspace exists of not
+     
+     @retval true - The current WORKSPACE exists
+     @retval false - The current WORKSPACE doesn't exist
+     
+     **/
+    public boolean checkCurrentWorkspace() {
+        return checkCurrentWorkspace(getCurrentWorkspace());
+    }
+
+    /**
+     Check if current workspace exists or not via input workspace path
+     
+     @param strWorkspace The input data of WORKSPACE path
+     @retval true - The current WORKSPACE exists
+     @retval false - The current WORKSPACE doesn't exist
+     
+     **/
+    public boolean checkCurrentWorkspace(String strWorkspace) {
+        if (strWorkspace == null || strWorkspace == "") {
+            return false;
+        }
+        File f = new File(strWorkspace);
+        if (!f.isDirectory()) {
+            return false;
+        }
+        if (!f.exists()) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     Get Current Workspace
+     
+     @return currentWorkspace
+     
+     **/
+    public String getCurrentWorkspace() {
+        return currentWorkspace;
+    }
+
+    /**
+     Set Current Workspace
+     
+     @param currentWorkspace The input data of currentWorkspace
+     
+     **/
+    public void setCurrentWorkspace(String currentWorkspace) {
+        this.currentWorkspace = currentWorkspace;
+    }
+
+    /**
+     Open Framework Database file
+     
+     **/
+    private void openFrameworkDb() {
+        String strFrameworkDbFilePath = this.getCurrentWorkspace() + strWorkspaceDatabaseFile;
+        try {
+            xmlFrameworkDbDoc = (FrameworkDatabaseDocument) XmlObject.Factory.parse(strFrameworkDbFilePath);
+        } catch (XmlException e) {
+            Log.err("Open Framework Database " + strFrameworkDbFilePath, e.getMessage());
+            return;
+        } catch (Exception e) {
+            Log.err("Open Framework Database " + strFrameworkDbFilePath, "Invalid file type");
+            return;
+        }
+    }
+
+    /**
+     Get FrameworkDatabaseDocument
+     
+     @return FrameworkDatabaseDocument
+     
+     **/
+    public FrameworkDatabaseDocument getXmlFrameworkDbDoc() {
+        openFrameworkDb();
+        return xmlFrameworkDbDoc;
+    }
+
+    /**
+     Set FrameworkDatabaseDocument
+     
+     @param xmlFrameworkDbDoc The input data of FrameworkDatabaseDocument
+     
+     **/
+    public void setXmlFrameworkDbDoc(FrameworkDatabaseDocument xmlFrameworkDbDoc) {
+        this.xmlFrameworkDbDoc = xmlFrameworkDbDoc;
+    }
+}
diff --git a/Tools/Source/PackageEditor/MANIFEST.MF b/Tools/Source/PackageEditor/MANIFEST.MF
new file mode 100644
index 0000000000..996b1f7159
--- /dev/null
+++ b/Tools/Source/PackageEditor/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.tianocore.packaging.PackagingMain
+Class-Path: ../Jars/SurfaceArea.jar ../Jars/FDPManifest.jar ./xmlbeans/lib/jsr173_1.0_api.jar ./xmlbeans/lib/xbean.jar ./xmlbeans/lib/xbean_xpath.jar ./xmlbeans/lib/xmlpublic.jar ./xmlbeans/lib/saxon8.jar ./xmlbeans/lib/saxon8-jdom.jar ./xmlbeans/lib/saxon8-sql.jar ./xmlbeans/lib/resolver.jar
diff --git a/Tools/Source/PackageEditor/build.xml b/Tools/Source/PackageEditor/build.xml
new file mode 100644
index 0000000000..2dd3dce273
--- /dev/null
+++ b/Tools/Source/PackageEditor/build.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="PackageEditor" default="all" basedir=".">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>
+  </path>
+  <property name="buildDir" value="build"/>
+  <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>
+  <target name="all" depends="install"/>
+  <target name="source">
+    <mkdir dir="${buildDir}"/>
+    <javac srcdir="src" destdir="${buildDir}">
+      <classpath refid="classpath"/>
+      <!-- <compilerarg value="-Xlint"/> -->
+    </javac>
+  </target>
+  <target name="clean">
+    <delete dir="${buildDir}"/>
+  </target>
+  <target name="cleanall">
+    <delete dir="${buildDir}"/>
+    <delete file="${installLocation}/PackageEditor.jar"/>
+  </target>
+  <target name="install" depends="source">
+    <jar destfile="${installLocation}/PackageEditor.jar"
+      basedir="${buildDir}"
+      includes="**"
+      manifest="MANIFEST.MF"
+    />
+  </target>
+</project>
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/common/Tools.java b/Tools/Source/PackageEditor/src/org/tianocore/common/Tools.java
new file mode 100644
index 0000000000..e372812e1f
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/common/Tools.java
@@ -0,0 +1,73 @@
+/** @file
+  Java class Tools contains common use procedures.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.common;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ This class contains static methods for some common operations
+  
+ @since PackageEditor 1.0
+**/
+public class Tools {
+	
+	/**
+	  get current date and time, then return
+	  @return String
+	 **/
+	public static String getCurrentDateTime() {
+		Date now = new Date(System.currentTimeMillis());
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+	    return sdf.format(now);
+	}
+	
+	/**
+	  Delete a folder and all its files
+	  @param strFolderName
+	  @return boolean
+	 **/
+	public static boolean deleteFolder(File fleFolderName) {
+		boolean blnIsDeleted = true;
+		File[] aryAllFiles = fleFolderName.listFiles();
+		
+		for (int indexI = 0; indexI < aryAllFiles.length; indexI++) {
+			if (blnIsDeleted) {
+				if (aryAllFiles[indexI].isDirectory()) {
+					blnIsDeleted  = deleteFolder(aryAllFiles[indexI]);
+				} else if (aryAllFiles[indexI].isFile()) {
+					if (!aryAllFiles[indexI].delete()) {
+						blnIsDeleted = false;
+					}
+				}
+			}
+		}
+		if (blnIsDeleted) {
+			fleFolderName.delete();
+		}
+		return blnIsDeleted;
+	}
+	
+	/**
+	 Get a new GUID
+     
+	 @return String
+	**/
+	public static String generateUuidString() {
+		return UUID.randomUUID().toString();
+	}
+	
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/CreateFdp.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/CreateFdp.java
new file mode 100644
index 0000000000..6988b5ae01
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/CreateFdp.java
@@ -0,0 +1,93 @@
+/** @file
+  Java class CreateFdp is used to create a distributable package containing 
+  FDPManifest.xml file in its root directory.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.io.*;
+import java.util.jar.*;
+
+/**
+ This class contains static method create to generate *.fdp format package.
+ 
+ @since PackageEditor 1.0
+**/
+public class CreateFdp {
+
+    /**
+     recursively add contents under dir into output package.
+     
+     @param dir The directory with files that will be put into package
+     @param jos Stream used to create output package
+     @param wkDir The position of source directory
+     @throws Exception Any exception occurred during this process
+    **/
+    public static void create(File dir, JarOutputStream jos, String wkDir) throws Exception {
+        
+        String[] list = dir.list();
+        
+        try {
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+
+            //
+            // Loop through the file names provided.
+            //
+            for (int i = 0; i < list.length; i++) {
+                
+                File f = new File(dir, list[i]);
+                if (f.getName().equals("..")) {
+                    continue;
+                }
+                if (f.isDirectory()) {
+                    //
+                    // Call this method recursively for directory
+                    //
+                    CreateFdp.create(f, jos, wkDir);
+                    continue;
+                }
+
+                try {
+                    //
+                    // Open the file
+                    //
+                    FileInputStream fis = new FileInputStream(f);
+
+                    try {
+                        //
+                        // Create a Jar entry and add it, keep relative path only.
+                        //
+                        JarEntry entry = new JarEntry(f.getPath().substring(wkDir.length() + 1));
+                        jos.putNextEntry(entry);
+
+                        //
+                        // Read the file and write it to the Jar.
+                        //
+                        while ((bytesRead = fis.read(buffer)) != -1) {
+                            jos.write(buffer, 0, bytesRead);
+                        }
+
+                        System.out.println(entry.getName() + " added.");
+                    } catch (Exception ex) {
+                        System.out.println(ex);
+                    } finally {
+                        fis.close();
+                    }
+                } catch (IOException ex) {
+                    System.out.println(ex);
+                }
+            }
+        } finally {
+            System.out.println(dir.getPath() + " processed.");
+        }
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/DbFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/DbFileContents.java
new file mode 100644
index 0000000000..44b8d27d2a
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/DbFileContents.java
@@ -0,0 +1,315 @@
+/** @file
+  Java class DbFileContents is used to deal with FrameworkDatabase.db file cotents.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+
+import org.tianocore.*;
+
+/**
+ This class provides methods for add, remove, query FrameworkDatabase.db file.
+  
+ @since PackageEditor 1.0
+**/
+public class DbFileContents {
+
+    ///
+    /// return values for various conditions. 
+    ///
+    static final int BASE_PACKAGE_NOT_INSTALLED = 1;
+
+    static final int VERSION_NOT_EQUAL = 2;
+
+    static final int GUID_NOT_EQUAL = 3;
+
+    static final int SAME_ALL = 4;
+
+    private File dbFile = null;
+
+    private FrameworkDatabaseDocument fdd = null;
+
+    private FrameworkDatabaseDocument.FrameworkDatabase fddRoot = null;
+    
+    private PackageListDocument.PackageList pkgList = null;
+
+    public DbFileContents() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+    /**
+       Parse file f, store its xml data in fdd, store root xml element in fddRoot.
+       
+       @param f DB file to parse
+    **/
+    public DbFileContents(File f) {
+        try {
+            dbFile = f;
+            if (fdd == null) {
+                fdd = ((FrameworkDatabaseDocument) XmlObject.Factory.parse(dbFile));
+            }
+            fddRoot = fdd.getFrameworkDatabase();
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+    
+    /**
+     Generate the Package element in FrameworkDatabase.db
+     
+     @param baseName Base name of package
+     @param ver Version of package
+     @param guid GUID of package
+     @param path Where the package installed
+     @param installDate When the package installed
+    **/
+    public void genPackage (String baseName, String ver, String guid, String path, String installDate) {
+        if (getPkgList() == null) {
+            pkgList = fddRoot.addNewPackageList();
+        }
+        PackageListDocument.PackageList.Package p = pkgList.addNewPackage();
+        p.addNewPackageName().setStringValue(baseName);
+        p.addNewGuid().setStringValue(guid);
+        p.addVersion(ver);
+        p.addNewPath().setStringValue(path);
+        p.addNewInstalledDate().setStringValue(installDate);
+    }
+    
+    /**
+     Get PackageList
+     
+     @return PackageListDocument.PackageList
+    **/
+    public PackageListDocument.PackageList getPkgList() {
+        if (pkgList == null) {
+            pkgList = fddRoot.getPackageList();
+        }
+        return pkgList;
+    }
+    
+    /**
+     Remove PackageList and all elements under it.
+    **/
+    public void removePackageList() {
+        XmlObject o = fddRoot.getPackageList();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+    /**
+     Get the number of Package elements.
+     
+     @return int
+    **/
+    public int getPackageCount () {
+        return fddRoot.getPackageList().getPackageList().size();
+    }
+    
+    /**
+     Get all Package contents into String array
+     
+     @param pkg Two dimentional array to store Package info.
+    **/
+    public void getPackageList(String[][] pkg) {
+        List<PackageListDocument.PackageList.Package> l = fddRoot.getPackageList().getPackageList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) li
+                                                                                                                                      .next();
+            if (p.getPackageNameArray(0)!= null) {
+                pkg[i][0] = p.getPackageNameArray(0).getStringValue();
+            }
+            
+            pkg[i][1] = p.getVersionArray(0);
+            
+            if (p.getGuidArray(0) != null) {
+                pkg[i][2] = p.getGuidArray(0).getStringValue();
+            }
+            if (p.getPathArray(0) != null) {
+                pkg[i][3] = p.getPathArray(0).getStringValue();
+            }
+            if (p.getInstalledDateArray(0) != null) {
+                pkg[i][4] = p.getInstalledDateArray(0);
+            }
+            i++;
+        }
+    }
+    /**
+     Check whether destDir has been used by one Package
+     
+     @param destDir The directory to check.
+     @retval <1> destDir has been used
+     @retval <0> destDir has not been used
+     @return int
+    **/
+    public int checkDir(String destDir) {
+        List<PackageListDocument.PackageList.Package> lp = fddRoot.getPackageList().getPackageList();
+
+        ListIterator lpi = lp.listIterator();
+        while (lpi.hasNext()) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) lpi.next();
+            if (p.getPathArray(0).getStringValue().equals(destDir)) {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     Find the package info. and store results into list of same base name or list
+     of same version.
+     
+     @param base The base name of package
+     @param version The version of package
+     @param guid the GUID of package
+     @param lpSameBase The list to store package info with the same base name with "base"
+     @param lpSameVersion The list to store package info from lpSameBase and same version
+            with "version"
+     @retval <0> No package installed has base name "base"
+     @retval <VERSION_NOT_EQUAL> At least one package installed with "base" but no "version"
+     @retval <GUID_NOT_EQUAL> At least one package installed with "base" and "version" but no "guid"
+     @retval <SAME_ALL> One installed package has the same base, version and guid
+     @return int
+    **/
+    public int query(String base, String version, String guid,
+                     List<PackageListDocument.PackageList.Package> lpSameBase,
+                     List<PackageListDocument.PackageList.Package> lpSameVersion) {
+
+        List<PackageListDocument.PackageList.Package> lp = fddRoot.getPackageList().getPackageList();
+
+        ListIterator lpi = lp.listIterator();
+        while (lpi.hasNext()) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) lpi.next();
+            if (p.getPackageNameArray(0).getStringValue().equals(base)) {
+                lpSameBase.add(p);
+            }
+        }
+
+        if (lpSameBase.size() == 0) {
+            return 0;
+        }
+
+        for (ListIterator li = lpSameBase.listIterator(); li.hasNext();) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) li.next();
+            if (p.getVersionArray(0).equals(version)) {
+                lpSameVersion.add(p);
+            }
+        }
+
+        if (lpSameVersion.size() == 0) {
+            return VERSION_NOT_EQUAL;
+        }
+
+        for (ListIterator li = lpSameVersion.listIterator(); li.hasNext();) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) li.next();
+            if (!p.getGuidArray(0).getStringValue().equals(guid)) {
+                return GUID_NOT_EQUAL;
+            }
+        }
+
+        return SAME_ALL;
+
+    }
+
+    /**
+     Update package info (name, version, guid) with installDir, newVer, newGuid.
+     And update install date with current date. if no package info available, add 
+     a new entry.
+     
+     @param name Original base name
+     @param version Original version
+     @param guid Original GUID
+     @param installDir original path
+     @param newVer Version value of package to be installed
+     @param newGuid GUID value of package to be installed
+     @throws IOException Exception during file operation
+    **/
+    public void updatePkgInfo(String name, String version, String guid, String installDir, String newVer, String newGuid)
+                                                                                                                         throws IOException {
+        List<PackageListDocument.PackageList.Package> lp = fddRoot.getPackageList().getPackageList();
+
+        ListIterator lpi = lp.listIterator();
+        while (lpi.hasNext()) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) lpi.next();
+            if (p.getPackageNameArray(0).getStringValue().equals(name)) {
+                if (p.getVersionArray(0).equals(version)) {
+                    if (p.getGuidArray(0).getStringValue().equals(guid)) {
+                        p.setVersionArray(0, newVer);
+                        p.getGuidArray(0).setStringValue(newGuid);
+                        p.getPathArray(0).setStringValue(installDir);
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                        Date date = new Date();
+                        p.setInstalledDateArray(0, format.format(date));
+                        saveAs();
+                        return;
+
+                    }
+                }
+            }
+        }
+
+        addNewPkgInfo(name, newVer, newGuid, installDir);
+    }
+
+    /**
+     Add one new package entry.
+     
+     @param name Package base name
+     @param version Package version
+     @param guid Package Guid
+     @param installDir Package path
+     @throws IOException Exception during file operation
+    **/
+    public void addNewPkgInfo(String name, String version, String guid, String installDir) throws IOException {
+
+        PackageListDocument.PackageList.Package p = fddRoot.getPackageList().addNewPackage();
+        p.addNewPackageName().setStringValue(name);
+        p.addNewGuid().setStringValue(guid);
+        p.addNewVersion().setStringValue(version);
+        p.addNewPath().setStringValue(installDir);
+
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        Date date = new Date();
+        p.addNewInstalledDate().setStringValue(format.format(date));
+        saveAs();
+    }
+
+    /**
+     Save the fdd into file with format options
+    **/
+    public void saveAs() {
+        XmlOptions options = new XmlOptions();
+
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+        try {
+            fdd.save(dbFile, options);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/ForceInstallPkg.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ForceInstallPkg.java
new file mode 100644
index 0000000000..4fe88b49fd
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ForceInstallPkg.java
@@ -0,0 +1,80 @@
+/** @file
+  Java class ForceInstallPkg is used to install a package without DB check.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.io.*;
+import java.util.jar.*;
+import org.apache.xmlbeans.XmlException;
+
+/**
+ Derived class from FrameworkPkg, installation skipping some checks.
+  
+ @since PackageEditor 1.0
+**/
+public class ForceInstallPkg extends FrameworkPkg {
+
+    private String oldVer = null;
+
+    private String oldGuid = null;
+
+    /**
+       Constructor with parameters
+       
+       @param s Package path to be installed 
+       @param d Destination directory
+    **/
+    public ForceInstallPkg(String s, String d) {
+        super(s, d);
+       
+    }
+
+    public void setOldVersion(String v) {
+        oldVer = v;
+    }
+
+    public void setOldGuid(String guid) {
+        oldGuid = guid;
+    }
+
+    /**
+     Set jar file to package name to be installed
+     **/
+    protected void pre_install() throws DirSame, IOException {
+        setJf(new JarFile(getPkg()));
+        
+    }
+
+    /**
+     Update database file contents after install
+     **/
+    protected void post_install() throws IOException, XmlException {
+        //
+        // Get package info. from FDPManifest.xml file
+        //
+        setJf(new JarFile(getPkg()));
+        ManifestContents manFile = new ManifestContents(getManifestInputStream(getJf()));
+        setBName(manFile.getBaseName());
+        setPVer(manFile.getVersion());
+        setPGuid(manFile.getGuid());
+        getJf().close();
+
+        //
+        // Add force installed package info. into database file
+        //
+        setDbFile(new File(getWkSpace() + System.getProperty("file.separator") + FrameworkPkg.dbConfigFile));
+        setDfc(new DbFileContents(new File(getWkSpace() + System.getProperty("file.separator") + dbConfigFile)));
+        getDfc().updatePkgInfo(getBName(), oldVer, oldGuid, getWkDir().substring(getWkSpace().length() + 1), getPVer(),
+                               getPGuid());
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/FrameworkPkg.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/FrameworkPkg.java
new file mode 100644
index 0000000000..b184cf9364
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/FrameworkPkg.java
@@ -0,0 +1,402 @@
+/** @file
+  Java class FrameworkPkg is used to do package related operations.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.io.*;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.jar.*;
+import org.apache.xmlbeans.*;
+
+import org.tianocore.PackageListDocument;
+
+/**
+ This class deals with package related operations
+  
+ @since PackageEditor 1.0
+**/
+public class FrameworkPkg {
+
+    private String pkg = null;
+
+    private JarFile jf = null;
+
+    ///
+    /// where the package will be extracted to
+    /// 
+    private String wkDir = null;
+
+    private String bName = null;
+
+    private String pVer = null;
+
+    private String pGuid = null;
+
+    ///
+    /// current WORKSPACE location
+    ///
+    private String wkSpace = null;
+
+    private File dbFile = null;
+
+    private DbFileContents dfc = null;
+
+    ///
+    /// relative path of FrameworkDatabase.db file
+    ///
+    final static String dbConfigFile = "Tools" + System.getProperty("file.separator") + "Conf"
+                                       + System.getProperty("file.separator") + "FrameworkDatabase.db";
+
+
+    public FrameworkPkg() {
+
+    }
+
+    public FrameworkPkg(String package_name, String work_space) {
+        pkg = package_name;
+        wkSpace = work_space;
+    }
+
+    /**
+     install package (*.fdp file) to dir
+     
+     @param dir Destination directory
+     @retval <0> Install successfully
+     @return int
+     @throws IOException
+     @throws XmlException Xml file exception
+     @throws DirSame One package already installed to dir
+     @throws BasePkgNotInstalled Some package must be installed first
+     @throws VerNotEqual At least one package info with same base name but version different
+     @throws GuidNotEqual At least one package info with same base name and version but guid different
+     @throws SameAll At least one package info with same base name, version and guid same
+    **/
+    public int install(final String dir) throws IOException, XmlException, DirSame, BasePkgNotInstalled, VerNotEqual,
+                                        GuidNotEqual, SameAll {
+        wkDir = dir;
+        pre_install();
+        extract(wkDir);
+        post_install();
+        return 0;
+    }
+
+    public int uninstall() {
+
+        return 0;
+    }
+
+    /**
+     Check package info. against Frameworkdatabase.db
+     
+     @throws IOException
+     @throws XmlException Xml file exception
+     @throws DirSame One package already installed to dir
+     @throws BasePkgNotInstalled Some package must be installed first
+     @throws VerNotEqual At least one package info with same base name but version different
+     @throws GuidNotEqual At least one package info with same base name and version but guid different
+     @throws SameAll At least one package info with same base name, version and guid same
+    **/
+    protected void pre_install() throws IOException, XmlException, DirSame, BasePkgNotInstalled, VerNotEqual,
+                                GuidNotEqual, SameAll {
+
+        jf = new JarFile(pkg);
+
+        ManifestContents manFile = new ManifestContents(getManifestInputStream(jf));
+
+        String baseName = manFile.getBaseName();
+        String pkgVersion = manFile.getVersion();
+        String pkgGuid = manFile.getGuid();
+        bName = baseName;
+        pVer = pkgVersion;
+        pGuid = pkgGuid;
+
+        if (dbFile == null) {
+            dbFile = new File(wkSpace + System.getProperty("file.separator") + dbConfigFile);
+        }
+        //
+        // the db file should exist if base packages have been installed
+        //
+        if (!dbFile.exists()) {
+            throw new BasePkgNotInstalled();
+        }
+
+        if (dfc == null) {
+            dfc = new DbFileContents(dbFile);
+        }
+        if (dfc.checkDir(wkDir) != 0) {
+            throw new DirSame();
+        }
+        
+        //
+        // Get database info into lists
+        //
+        List<PackageListDocument.PackageList.Package> lpSameBase = new LinkedList<PackageListDocument.PackageList.Package>();
+        List<PackageListDocument.PackageList.Package> lpSameVersion = new LinkedList<PackageListDocument.PackageList.Package>();
+        int i = dfc.query(baseName, pkgVersion, pkgGuid, lpSameBase, lpSameVersion);
+
+        //
+        // throw various kind of exceptions according to query return value.
+        //
+        if (i == DbFileContents.VERSION_NOT_EQUAL) {
+
+            jf.close();
+            throw new VerNotEqual(lpSameBase);
+        }
+        if (i == DbFileContents.GUID_NOT_EQUAL) {
+
+            jf.close();
+            throw new GuidNotEqual(lpSameVersion);
+        }
+        if (i == DbFileContents.SAME_ALL) {
+            jf.close();
+            throw new SameAll(lpSameVersion);
+        }
+
+    }
+
+    /**
+     Add package info into db file.
+     
+     @throws IOException
+     @throws XmlException
+    **/
+    protected void post_install() throws IOException, XmlException {
+
+        dfc.addNewPkgInfo(bName, pVer, pGuid, wkDir.substring(wkSpace.length() + 1));
+
+    }
+
+    /**
+     Extract package to dir
+     
+     @param dir Destination directory
+     @throws DirSame
+     @throws IOException
+    **/
+    private void extract(String dir) throws DirSame, IOException {
+
+        new File(dir).mkdirs();
+        dir += System.getProperty("file.separator");
+        try {
+            for (Enumeration e = jf.entries(); e.hasMoreElements();) {
+                JarEntry je = (JarEntry) e.nextElement();
+                
+                //
+                // jar entry contains directory only, make these directories
+                //
+                if (je.isDirectory()) {
+                    new File(dir + je.getName()).mkdirs();
+                    continue;
+                }
+                
+                //
+                // jar entry contains relative path and file name, make relative directories
+                // under destination dir
+                //
+                int index = je.getName().lastIndexOf(System.getProperty("file.separator"));
+                if (index != -1) {
+                    String dirPath = je.getName().substring(0, index);
+                    new File(dir + dirPath).mkdirs();
+                }
+                
+                if (je != null) {
+                    //
+                    // Get an input stream for this entry.
+                    //
+                    InputStream entryStream = jf.getInputStream(je);
+
+                    try {
+                        //
+                        // Create the output file (clobbering the file if it exists).
+                        //
+                        FileOutputStream file = new FileOutputStream(dir + je.getName());
+
+                        try {
+
+                            byte[] buffer = new byte[1024];
+                            int bytesRead;
+                            //
+                            // Read the entry data and write it to the output file.
+                            //
+                            while ((bytesRead = entryStream.read(buffer)) != -1) {
+                                file.write(buffer, 0, bytesRead);
+                            }
+
+                            System.out.println(je.getName() + " extracted.");
+                        } finally {
+                            file.close();
+                        }
+                    } finally {
+                        entryStream.close();
+                    }
+                }
+
+            }
+
+        } finally {
+            jf.close();
+
+        }
+
+    }
+
+    public String getBName() {
+        return bName;
+    }
+
+    public void setBName(String name) {
+        bName = name;
+    }
+
+    public File getDbFile() {
+        return dbFile;
+    }
+
+    public void setDbFile(File dbFile) {
+        this.dbFile = dbFile;
+    }
+
+    public DbFileContents getDfc() {
+        return dfc;
+    }
+
+    public void setDfc(DbFileContents dfc) {
+        this.dfc = dfc;
+    }
+
+    public String getPGuid() {
+        return pGuid;
+    }
+
+    public void setPGuid(String guid) {
+        pGuid = guid;
+    }
+
+    public String getPVer() {
+        return pVer;
+    }
+
+    public void setPVer(String ver) {
+        pVer = ver;
+    }
+
+    public String getWkDir() {
+        return wkDir;
+    }
+
+    public void setWkDir(String wkDir) {
+        this.wkDir = wkDir;
+    }
+
+    public String getWkSpace() {
+        return wkSpace;
+    }
+
+    public void setWkSpace(String wkSpace) {
+        this.wkSpace = wkSpace;
+    }
+
+    public JarFile getJf() {
+        return jf;
+    }
+
+    public void setJf(JarFile jf) {
+        this.jf = jf;
+    }
+
+    public String getPkg() {
+        return pkg;
+    }
+
+    public void setPkg(String pkg) {
+        this.pkg = pkg;
+    }
+
+    /**
+     Get the input stream of FDPManifest.xml file from jar entry
+     
+     @param jf The Jar file that contains FDPManifest.xml file
+     @return InputStream
+     @throws IOException
+    **/
+    protected InputStream getManifestInputStream(JarFile jf) throws IOException {
+        JarEntry je = null;
+        for (Enumeration e = jf.entries(); e.hasMoreElements();) {
+            je = (JarEntry) e.nextElement();
+            if (je.getName().contains("FDPManifest.xml"))
+                return jf.getInputStream(je);
+        }
+
+        return null;
+    }
+
+}
+
+
+/**
+ Various Exception classes for what happened when database info and package info
+ are compared.
+  
+ @since PackageEditor 1.0
+**/
+class DirSame extends Exception {
+    final static long serialVersionUID = 0;
+}
+
+class BasePkgNotInstalled extends Exception {
+    final static long serialVersionUID = 0;
+}
+
+class VerNotEqual extends Exception {
+    final static long serialVersionUID = 0;
+
+    //private String version = null;
+    List<PackageListDocument.PackageList.Package> lppSameBase = null;
+
+    VerNotEqual(List<PackageListDocument.PackageList.Package> ver) {
+        lppSameBase = ver;
+    }
+
+    public List<PackageListDocument.PackageList.Package> getVersion() {
+        return lppSameBase;
+    }
+}
+
+class GuidNotEqual extends Exception {
+    final static long serialVersionUID = 0;
+
+    private List<PackageListDocument.PackageList.Package> lppSameVer = null;
+
+    GuidNotEqual(List<PackageListDocument.PackageList.Package> ver) {
+        lppSameVer = ver;
+    }
+
+    public List<PackageListDocument.PackageList.Package> getGuid() {
+        return lppSameVer;
+    }
+}
+
+class SameAll extends Exception {
+    final static long serialVersionUID = 0;
+
+    private List<PackageListDocument.PackageList.Package> version = null;
+
+    SameAll(List<PackageListDocument.PackageList.Package> ver) {
+        version = ver;
+    }
+
+    public List<PackageListDocument.PackageList.Package> getVersion() {
+        return version;
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgInstall.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgInstall.java
new file mode 100644
index 0000000000..3e757206f7
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgInstall.java
@@ -0,0 +1,804 @@
+/** @file
+  Java class GuiPkgInstall is GUI for package installation.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.Toolkit;
+
+import java.awt.FlowLayout;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import java.awt.ComponentOrientation;
+import java.io.File;
+import java.util.Hashtable;
+
+import javax.swing.SwingConstants;
+import javax.swing.JProgressBar;
+import javax.swing.filechooser.FileFilter;
+
+import org.apache.xmlbeans.XmlException;
+
+
+/**
+ GUI for package installation. 
+  
+ @since PackageEditor 1.0
+**/
+public class GuiPkgInstall extends JFrame implements MouseListener {
+
+    final static long serialVersionUID = 0;
+
+    static JFrame frame;
+
+    ///
+    /// backup of "this". As we cannot use "this" to refer outer class inside inner class
+    ///
+    private JFrame pThis = null;
+
+    private JFileChooser chooser = null;
+
+    private JPanel jPanel = null;
+
+    private JPanel jPanel1 = null;
+
+    private JTextField jTextField = null;
+
+    private JButton jButton = null;
+
+    private JPanel jPanel2 = null;
+
+    private JLabel jLabel1 = null;
+
+    private JPanel jPanel4 = null;
+
+    private JTextField jTextField1 = null;
+
+    private JButton jButton1 = null;
+
+    private JPanel jPanel5 = null;
+
+    private JPanel jPanel6 = null;
+
+    private JPanel jPanel7 = null;
+
+    private JLabel jLabel2 = null;
+
+    private JTextField jTextField2 = null;
+
+    private JButton jButton2 = null;
+
+    private JButton jButton3 = null;
+
+    private JPanel jPanel3 = null;
+
+    private JLabel jLabel = null;
+
+    private JProgressBar jProgressBar = null;
+
+    private JButton jButton4 = null;
+
+
+    public GuiPkgInstall() {
+        super();
+        initialize();
+
+    }
+
+    /**
+     GUI initialization
+    **/
+    private void initialize() {
+        this.setSize(new java.awt.Dimension(454, 313));
+        this.setContentPane(getJPanel());
+        this.setTitle("Package Installation");
+        this.addWindowListener(new GuiPkgInstallAdapter(this));
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
+        this.centerWindow();
+        pThis = this;
+    }
+
+    /**
+     make window appear center of screen
+     
+     @param intWidth
+     @param intHeight
+    **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+    **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes jPanel
+     @return javax.swing.JPanel
+    **/
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            GridLayout gridLayout = new GridLayout();
+            gridLayout.setRows(7);
+            gridLayout.setColumns(1);
+            jPanel = new JPanel();
+            jPanel.setLayout(gridLayout);
+            jPanel.add(getJPanel3(), null);
+            jPanel.add(getJPanel1(), null);
+            jPanel.add(getJPanel2(), null);
+            jPanel.add(getJPanel4(), null);
+            jPanel.add(getJPanel5(), null);
+            jPanel.add(getJPanel6(), null);
+            jPanel.add(getJPanel7(), null);
+        }
+        return jPanel;
+    }
+
+    /**
+      This method initializes jPanel1	
+     	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel1() {
+        if (jPanel1 == null) {
+            FlowLayout flowLayout = new FlowLayout();
+            flowLayout.setAlignment(java.awt.FlowLayout.LEFT);
+            jPanel1 = new JPanel();
+            jPanel1.setLayout(flowLayout);
+            jPanel1.add(getJTextField(), null);
+            jPanel1.add(getJButton(), null);
+        }
+        return jPanel1;
+    }
+
+    /**
+      This method initializes jTextField	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setHorizontalAlignment(javax.swing.JTextField.LEFT);
+            jTextField.setPreferredSize(new java.awt.Dimension(350, 20));
+        }
+        return jTextField;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+    **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+            jButton.setText("Browse");
+            jButton.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT);
+            jButton.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+            jButton.setToolTipText("Where is the package?");
+            jButton.setFont(new java.awt.Font("Dialog", java.awt.Font.BOLD, 12));
+
+            jButton.setPreferredSize(new java.awt.Dimension(80, 20));
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (chooser == null) {
+                        chooser = new JFileChooser();
+                    }
+                    //
+                    // disable multi-selection, you can only select one item each time.
+                    //
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                    chooser.setFileFilter(new PkgFileFilter("fdp"));
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+
+                        File theFile = chooser.getSelectedFile();
+                        jTextField.setText(theFile.getPath());
+                        //
+                        // set a default directory for installation (WORKSPACE\PackageFileName)
+                        //
+                        if (jTextField1.getText().length() > 0) {
+                            int indexbegin = jTextField.getText().lastIndexOf(System.getProperty("file.separator"));
+                            int indexend = jTextField.getText().lastIndexOf('.');
+                            if (indexbegin >= 0 && indexend >= 0) {
+                                jTextField2.setText(jTextField1.getText()
+                                                    + jTextField.getText().substring(indexbegin, indexend));
+                            } else {
+                                JOptionPane.showMessageDialog(frame, "Wrong Path:" + jTextField.getText());
+                            }
+                        }
+                    }
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+      This method initializes jPanel2	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel2() {
+        if (jPanel2 == null) {
+            FlowLayout flowLayout1 = new FlowLayout();
+            flowLayout1.setAlignment(java.awt.FlowLayout.LEFT);
+            flowLayout1.setVgap(20);
+            jLabel1 = new JLabel();
+            jLabel1.setText("Enter Workspace Location");
+            jLabel1.setComponentOrientation(java.awt.ComponentOrientation.UNKNOWN);
+            jLabel1.setHorizontalTextPosition(javax.swing.SwingConstants.TRAILING);
+            jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+            jPanel2 = new JPanel();
+            jPanel2.setLayout(flowLayout1);
+            jPanel2.add(jLabel1, null);
+        }
+        return jPanel2;
+    }
+
+    /**
+      This method initializes jPanel4	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel4() {
+        if (jPanel4 == null) {
+            FlowLayout flowLayout2 = new FlowLayout();
+            flowLayout2.setAlignment(java.awt.FlowLayout.LEFT);
+            jPanel4 = new JPanel();
+            jPanel4.setLayout(flowLayout2);
+            jPanel4.add(getJTextField1(), null);
+            jPanel4.add(getJButton1(), null);
+        }
+        return jPanel4;
+    }
+
+    /**
+      This method initializes jTextField1	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField1() {
+        if (jTextField1 == null) {
+            jTextField1 = new JTextField();
+            jTextField1.setPreferredSize(new java.awt.Dimension(350, 20));
+
+        }
+        //
+        // default value is WORKSPACE environmental variable value
+        //
+        jTextField1.setText(System.getenv("WORKSPACE"));
+        return jTextField1;
+    }
+
+    /**
+      This method initializes jButton1	
+      	
+      @return javax.swing.JButton	
+    **/
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT);
+            
+            jButton1.setHorizontalAlignment(javax.swing.SwingConstants.LEADING);
+            jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.TRAILING);
+            jButton1.setText("Browse");
+            jButton1.setPreferredSize(new java.awt.Dimension(80, 20));
+            jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (chooser == null) {
+                        chooser = new JFileChooser();
+                    }
+                    //
+                    // only directories can be selected for workspace location.
+                    //
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+
+                        File theFile = chooser.getSelectedFile();
+                        jTextField1.setText(theFile.getPath());
+                        //
+                        // set a default directory for installation (WORKSPACE\PackageFileName)
+                        //
+                        if (jTextField.getText().length() > 0) {
+                            int indexbegin = jTextField.getText().lastIndexOf(System.getProperty("file.separator"));
+                            int indexend = jTextField.getText().lastIndexOf('.');
+                            if (indexbegin >= 0 && indexend >= 0) {
+                                jTextField2.setText(jTextField1.getText()
+                                                    + jTextField.getText().substring(indexbegin, indexend));
+                            } else {
+                                JOptionPane.showMessageDialog(frame, "Wrong Path:" + jTextField.getText());
+                            }
+                        }
+                    }
+
+                }
+            });
+        }
+        return jButton1;
+    }
+
+    /**
+      This method initializes jButton4 
+       
+      @return javax.swing.JButton  
+     **/
+    private JButton getJButton4() {
+        if (jButton4 == null) {
+            jButton4 = new JButton();
+            jButton4.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+            
+            jButton4.setHorizontalAlignment(SwingConstants.LEADING);
+            jButton4.setHorizontalTextPosition(SwingConstants.TRAILING);
+            jButton4.setText("Browse");
+            jButton4.setPreferredSize(new Dimension(80, 20));
+            jButton4.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    JFileChooser chooser = new JFileChooser(jTextField1.getText());
+                    
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        //
+                        // specify installation directory from file chooser 
+                        //
+                        File theFile = chooser.getSelectedFile();
+                        jTextField2.setText(theFile.getPath());
+                        
+                    }
+                }
+            });
+            
+        }
+        return jButton4;
+    }
+    /**
+      This method initializes jPanel5	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel5() {
+        if (jPanel5 == null) {
+            FlowLayout flowLayout3 = new FlowLayout();
+            flowLayout3.setAlignment(java.awt.FlowLayout.LEFT);
+            flowLayout3.setVgap(20);
+            jLabel2 = new JLabel();
+            jLabel2.setComponentOrientation(java.awt.ComponentOrientation.UNKNOWN);
+            jLabel2.setHorizontalTextPosition(javax.swing.SwingConstants.TRAILING);
+            jLabel2.setText("Enter Installation  Location Within Workspace");
+            jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+            jPanel5 = new JPanel();
+            jPanel5.setLayout(flowLayout3);
+            jPanel5.add(jLabel2, null);
+        }
+        return jPanel5;
+    }
+
+    /**
+      This method initializes jPanel6	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel6() {
+        if (jPanel6 == null) {
+            FlowLayout flowLayout4 = new FlowLayout();
+            flowLayout4.setAlignment(java.awt.FlowLayout.LEFT);
+            jPanel6 = new JPanel();
+            jPanel6.setLayout(flowLayout4);
+            jPanel6.add(getJTextField2(), null);
+            jPanel6.add(getJButton4(), null);
+        }
+        return jPanel6;
+    }
+
+    /**
+      This method initializes jPanel7	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel7() {
+        if (jPanel7 == null) {
+            FlowLayout flowLayout5 = new FlowLayout();
+            flowLayout5.setAlignment(java.awt.FlowLayout.RIGHT);
+            jPanel7 = new JPanel();
+            jPanel7.setLayout(flowLayout5);
+            jPanel7.add(getJProgressBar(), null);
+            jPanel7.add(getJButton2(), null);
+            jPanel7.add(getJButton3(), null);
+        }
+        return jPanel7;
+    }
+
+    /**
+      This method initializes jTextField2	
+     	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField2() {
+        if (jTextField2 == null) {
+            jTextField2 = new JTextField();
+            jTextField2.setPreferredSize(new java.awt.Dimension(350, 20));
+        }
+        return jTextField2;
+    }
+
+    /**
+      This method initializes jButton2	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setPreferredSize(new java.awt.Dimension(80, 20));
+            jButton2.setText("Ok");
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    try {
+                        //
+                        // The installation directory must under workspace directory
+                        //
+                        locationcheck(jTextField.getText(), jTextField1.getText(), jTextField2.getText());
+                    } catch (Exception ee) {
+                        JOptionPane.showMessageDialog(frame, "Package Location Error!");
+                        return;
+                    }
+                    
+                    try {
+                        //
+                        // create a new FrameworkPkg object with user-selected package, current workspace location.
+                        // install the package to dest dir from jTextField2
+                        //
+                        int i = new FrameworkPkg(jTextField.getText(), jTextField1.getText())
+                                                                                             .install(jTextField2
+                                                                                                                 .getText());
+                        //
+                        // the package is installed smoothly
+                        //
+                        if (i == 0) {
+                            JOptionPane.showMessageDialog(frame, "Package" + jTextField.getText()
+                                                                 + " Installed Successfully!");
+                        }
+                    } catch (BasePkgNotInstalled bpni) {
+                        //
+                        // exception no base package installed
+                        //
+                        JOptionPane
+                                   .showMessageDialog(frame,
+                                                      "The Edk package needs to be installed before installing any other packages.");
+                    } catch (VerNotEqual vne) {
+                        //
+                        // show modal GUI PkgInstallTypeChooser with user selected package name, 
+                        // current workspace location and the list of package info with same base name
+                        //
+                        ModalFrameUtil.showAsModal(new PkgInstallTypeChooser(jTextField.getText(),
+                                                                             jTextField1.getText(), vne.getVersion()),
+                                                   pThis);
+
+                    } catch (GuidNotEqual gne) {
+                        //
+                        // show modal GUI PkgInstallTypeChooser with user selected package name, 
+                        // current workspace location and the list of package info with same base name and version
+                        //
+                        ModalFrameUtil.showAsModal(new PkgInstallTypeChooser(jTextField.getText(),
+                                                                             jTextField1.getText(), gne.getGuid()),
+                                                   pThis);
+
+                    } catch (SameAll sa) {
+                        //
+                        // the package with same (base, version, guid) already exists. confirm user action.
+                        // quit or replace the original info. (So only one package info entry in db file that may be triple same)
+                        //
+                        int retVal = JOptionPane
+                                                .showConfirmDialog(
+                                                                   frame,
+                                                                   "Package already exists. Would you like to replace it?",
+                                                                   "Package Installation", JOptionPane.YES_NO_OPTION);
+                        if (retVal == JOptionPane.YES_OPTION) {
+                            String installDir = sa.getVersion().listIterator().next().getPathArray(0).getStringValue();
+                            try {
+                                ForceInstallPkg f = new ForceInstallPkg(jTextField.getText(), jTextField1.getText());
+                                //
+                                // Get old packag info to meet the calling parameter layout of DbFileContents.updatePkgInfo
+                                // ForceInstallPkg will call it after installation to update package info.
+                                //
+                                f.setOldVersion(sa.getVersion().listIterator().next().getVersionArray(0));
+                                f.setOldGuid(sa.getVersion().listIterator().next().getGuidArray(0).getStringValue());
+                                int i = f.install(jTextField1.getText() + System.getProperty("file.separator") + installDir);
+                                if (i == 0) {
+                                    JOptionPane.showMessageDialog(frame, "Package" + jTextField.getText()
+                                                                         + " Installed Successfully!");
+                                }
+                            } catch (Exception sae) {
+                                System.out.println(sae.toString());
+                                JOptionPane.showMessageDialog(frame, "Extraction Error!");
+                            }
+                        }
+                        return;
+                    } catch (XmlException xmle) {
+                        System.out.println(xmle.toString());
+                        JOptionPane.showMessageDialog(frame, "Package Format Error!");
+                    } catch (DirSame ds) {
+                        //
+                        // You cannot install different packages into the same directory.
+                        //
+                        System.out.println(ds.toString());
+                        JOptionPane.showMessageDialog(frame,
+                                                      "Another Package Exists There, Please Select Another Directory!");
+                    } catch (Exception ext) {
+                        System.out.println(ext.toString());
+                        JOptionPane.showMessageDialog(frame, "Extraction Error!");
+                    }
+                }
+            });
+        }
+        return jButton2;
+    }
+
+    /**
+     * This method initializes jButton3	
+     * 	
+     * @return javax.swing.JButton	
+     */
+    private JButton getJButton3() {
+        if (jButton3 == null) {
+            jButton3 = new JButton();
+            jButton3.setPreferredSize(new java.awt.Dimension(80, 20));
+            jButton3.setText("Cancel");
+            jButton3.addMouseListener(this);
+        }
+        return jButton3;
+
+    }
+
+    /**
+      This method initializes jPanel3	
+      	
+      @return javax.swing.JPanel	
+     */
+    private JPanel getJPanel3() {
+        if (jPanel3 == null) {
+            jLabel = new JLabel();
+            jLabel.setComponentOrientation(ComponentOrientation.UNKNOWN);
+            jLabel.setHorizontalTextPosition(SwingConstants.TRAILING);
+            jLabel.setText("Enter Package Location");
+            jLabel.setHorizontalAlignment(SwingConstants.TRAILING);
+            FlowLayout flowLayout6 = new FlowLayout();
+            flowLayout6.setVgap(20);
+            flowLayout6.setAlignment(FlowLayout.LEFT);
+            jPanel3 = new JPanel();
+            jPanel3.setLayout(flowLayout6);
+            jPanel3.add(jLabel, null);
+        }
+        return jPanel3;
+    }
+
+    /**
+     check user input validity
+    
+     @param s package path
+     @param s1 workspace path
+     @param s2 installation path
+     @throws Exception
+    **/
+    private void locationcheck(String s, String s1, String s2) throws Exception {
+        if (new File(s).isFile() == false)
+            throw new Exception();
+        if (new File(s1).isDirectory() == false)
+            throw new Exception();
+        if (s2.startsWith(s1) == false)
+            throw new Exception();
+    }
+
+ 
+    public void mouseClicked(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+        int retVal = JOptionPane.showConfirmDialog(frame, "Are you sure to exit?", "Quit", JOptionPane.YES_NO_OPTION);
+        if (retVal == JOptionPane.YES_OPTION) {
+            this.dispose();
+        }
+        return;
+    }
+
+    public void mouseEntered(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseExited(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mousePressed(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseReleased(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    /**
+      This method initializes jProgressBar	
+      	
+      @return javax.swing.JProgressBar	
+     **/
+    private JProgressBar getJProgressBar() {
+        if (jProgressBar == null) {
+            jProgressBar = new JProgressBar();
+            jProgressBar.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT);
+            jProgressBar.setVisible(false);
+        }
+        return jProgressBar;
+    }
+
+   
+
+} //  @jve:decl-index=0:visual-constraint="24,82"
+
+/**
+Derived from WindowAdapter, Event adapter for windowClosing event
+ 
+@since PackageEditor 1.0
+**/
+class GuiPkgInstallAdapter extends WindowAdapter {
+
+   private JFrame frame = null;
+
+   GuiPkgInstallAdapter(JFrame f) {
+       super();
+       frame = f;
+   }
+
+   /* (non-Javadoc)
+    * @see java.awt.event.WindowAdapter#windowClosing(java.awt.event.WindowEvent)
+    */
+   @Override
+   public void windowClosing(WindowEvent arg0) {
+       // TODO Auto-generated method stub
+       super.windowClosing(arg0);
+       int retVal = JOptionPane.showConfirmDialog(frame, "Are you sure to exit?", "Quit",
+                                                  JOptionPane.YES_NO_OPTION);
+       if (retVal == JOptionPane.YES_OPTION) {
+           frame.dispose();
+       }
+
+   }
+
+}
+
+/**
+ Filter out some specific type of file
+ 
+ @since PackageEditor 1.0
+**/
+class PkgFileFilter extends FileFilter {
+
+    ///
+    /// hash table used to store filter info.
+    ///
+    private Hashtable<String, String> filters = null;
+    
+
+    public PkgFileFilter() {
+        this.filters = new Hashtable<String, String>();
+    }
+    
+    /**
+       Create filter and add extension to hash table
+        
+       @param extension file extension string (e.g. "exe")
+    **/
+    public PkgFileFilter(String extension) {
+        this();
+        if(extension!=null) {
+            addExtension(extension);
+        }
+    
+    }
+
+    public PkgFileFilter(String[] fileFilters) {
+        this();
+        int i = 0; 
+        while (i < fileFilters.length) {
+            // add filters one by one
+            addExtension(fileFilters[i]);
+            i++;
+        }
+    
+    }
+
+ 
+    /* (non-Javadoc)
+     * @see javax.swing.filechooser.FileFilter#accept(java.io.File)
+     */
+    public boolean accept(File f) {
+        if (f != null) {
+            if (f.isDirectory()) {
+                return true;
+            }
+            
+            if (getExtension(f) != null && filters.get(getExtension(f)) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    
+    /**
+     Get the extension string of file
+     
+     @param f target file
+     @return String
+    **/
+    public String getExtension(File f) {
+        if (f != null) {
+            int i = f.getName().lastIndexOf('.');
+            if (i>0 && i<f.getName().length()-1) {
+                return f.getName().substring(i+1).toLowerCase();
+            }
+        }
+        return null;
+    }
+
+    
+    /**
+     Add extension info into hash table
+     
+     @param ext extension string for file name
+    **/
+    public void addExtension(String ext) {
+        if (filters == null) {
+            filters = new Hashtable<String, String>(5);
+        }
+        filters.put(ext.toLowerCase(), "ext");
+   
+    }
+    
+    /* (non-Javadoc)
+     * @see javax.swing.filechooser.FileFilter#getDescription()
+     */
+    public String getDescription() {
+        return null;
+    }
+
+}
+
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgUninstall.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgUninstall.java
new file mode 100644
index 0000000000..667f65bf29
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuiPkgUninstall.java
@@ -0,0 +1,370 @@
+/** @file
+  Java class GuiPkgUninstall is GUI for package installation.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import java.awt.FlowLayout;
+//import java.awt.GridLayout;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import java.awt.Dimension;
+import javax.swing.JButton;
+import java.awt.ComponentOrientation;
+import java.awt.Font;
+import java.awt.Toolkit;
+import java.io.File;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.SwingConstants;
+import javax.swing.JList;
+import javax.swing.JTextPane;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ GUI for package uninstallation.
+ 
+ @since PackageEditor 1.0
+**/
+public class GuiPkgUninstall extends JFrame {
+
+    final static long serialVersionUID = 0;
+    
+    static JFrame frame;
+
+    private JPanel jPanel = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextField = null;
+
+    private JButton jButton = null;
+
+    private JLabel jLabel1 = null;
+
+    private JPanel jPanel1 = null;
+
+    private JButton jButton1 = null;
+
+    private JButton jButton2 = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private JButton jButton3 = null;
+    
+    private PkgRemoveTableModel model = null;
+    
+    private DbFileContents dfc = null;
+    
+    private JFrame pThis = null;
+
+    
+    public GuiPkgUninstall() {
+        super();
+        initialize();
+    }
+
+   
+    private void initialize() {
+        this.setSize(481, 404);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setContentPane(getJPanel());
+        this.setTitle("Package Uninstallation");
+        this.centerWindow();
+        pThis = this;
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     initialize table contents from db file
+     
+     @param f FrameworkDatabase.db file under workspace
+    **/
+    protected void loadDB(File f) {
+        if (!f.exists()) {
+            JOptionPane.showMessageDialog(frame,
+                                          "No FrameworkDatabase.db File!");
+            return;
+        }
+        dfc = new DbFileContents(f);
+        if (dfc.getPackageCount() == 0) {
+            return;
+        }
+        //
+        // Get package list info. and add them one by one into table
+        //
+        String[][] saa = new String[dfc.getPackageCount()][5];
+        dfc.getPackageList(saa);
+        int i = 0;
+        while (i < saa.length) {
+            model.addRow(saa[i]);
+            i++;
+        }
+ 
+    }
+    /**
+     save package info. from table to db file
+    **/
+    protected void save() {
+        dfc.removePackageList();
+        int rowCount = jTable.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            
+            dfc.genPackage(jTable.getValueAt(i, 0).toString(), jTable.getValueAt(i, 1).toString(),
+                           jTable.getValueAt(i, 2).toString(), jTable.getValueAt(i, 3).toString(),
+                           jTable.getValueAt(i, 4).toString());
+            i++;
+        }
+        dfc.saveAs();
+    }
+ 
+    private JPanel getJPanel() {
+        if (jPanel == null) {
+            jLabel1 = new JLabel();
+            jLabel1.setBounds(new java.awt.Rectangle(20, 83, 141, 16));
+            jLabel1.setText("  Packages Installed");
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(17, 16, 171, 16));
+            jLabel.setText(" Enter Workspace Location");
+            jPanel = new JPanel();
+            jPanel.setLayout(null);
+            jPanel.add(jLabel, null);
+            jPanel.add(getJTextField(), null);
+            jPanel.add(getJButton(), null);
+            jPanel.add(jLabel1, null);
+            jPanel.add(getJPanel1(), null);
+            jPanel.add(getJScrollPane(), null);
+        }
+        return jPanel;
+    }
+
+    /**
+      This method initializes jTextField	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(16, 41, 350, 20));
+            jTextField.setHorizontalAlignment(JTextField.LEFT);
+            jTextField.setEditable(false);
+            jTextField.setText(System.getenv("WORKSPACE"));
+            jTextField.setPreferredSize(new Dimension(350, 20));
+        }
+        return jTextField;
+    }
+
+    /**
+      This method initializes jButton	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(372,40,78,20));
+            jButton.setFont(new Font("Dialog", Font.BOLD, 12));
+            jButton.setPreferredSize(new Dimension(80, 20));
+            jButton.setToolTipText("Where is the package?");
+            jButton.setHorizontalAlignment(SwingConstants.LEFT);
+            jButton.setHorizontalTextPosition(SwingConstants.CENTER);
+            jButton.setText("Browse");
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // user can select another workspace directory
+                    //
+                    JFileChooser chooser = new JFileChooser();
+                    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                    chooser.setMultiSelectionEnabled(false);
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        //
+                        // update table when user selects a new workspace directory
+                        //
+                        jTextField.setText(chooser.getSelectedFile().getPath());
+                        File f = new File(chooser.getSelectedFile(), FrameworkPkg.dbConfigFile);
+                        loadDB(f);
+                    }
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+      This method initializes jPanel1	
+      	
+      @return javax.swing.JPanel	
+     **/
+    private JPanel getJPanel1() {
+        if (jPanel1 == null) {
+            FlowLayout flowLayout = new FlowLayout();
+            flowLayout.setAlignment(java.awt.FlowLayout.LEFT);
+            flowLayout.setHgap(20);
+            jPanel1 = new JPanel();
+            jPanel1.setLayout(flowLayout);
+            jPanel1.setBounds(new java.awt.Rectangle(133,310,318,53));
+            jPanel1.add(getJButton3(), null);
+            jPanel1.add(getJButton1(), null);
+            jPanel1.add(getJButton2(), null);
+        }
+        return jPanel1;
+    }
+
+    /**
+      This method initializes jButton1	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setPreferredSize(new java.awt.Dimension(85, 20));
+            jButton1.setText("Ok");
+            jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
+            jButton1.setEnabled(true);
+            jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (dfc != null) {
+                        //
+                        // save package info. to file before exit
+                        //
+                        save();
+                    }
+                    pThis.dispose();
+                }
+            });
+        }
+        return jButton1;
+    }
+
+    /**
+      This method initializes jButton2	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setPreferredSize(new java.awt.Dimension(85, 20));
+            jButton2.setText("Cancel");
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    pThis.dispose();
+                }
+            });
+        }
+        return jButton2;
+    }
+
+    /**
+      This method initializes jScrollPane	
+      	
+      @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(20,108,431,194));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+      This method initializes jTable	
+      	
+      @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new PkgRemoveTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            jTable.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+            jTable.setRowSelectionAllowed(true);
+            model.addColumn("PackageName");
+            model.addColumn("Version");
+            model.addColumn("GUID");
+            model.addColumn("Path");
+            model.addColumn("InstallDate");
+            File f = new File(jTextField.getText(), FrameworkPkg.dbConfigFile);
+            loadDB(f);
+        }
+        return jTable;
+    }
+
+    /**
+      This method initializes jButton3	
+      	
+      @return javax.swing.JButton	
+    **/
+    private JButton getJButton3() {
+        if (jButton3 == null) {
+            jButton3 = new JButton();
+            jButton3.setText("Remove");
+            jButton3.setPreferredSize(new java.awt.Dimension(85,20));
+            jButton3.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (model != null){
+                        int index = jTable.getSelectedRow();
+                        if (index > -1) {
+                            model.removeRow(index);
+                        }
+                    }
+                }
+            });
+        }
+        return jButton3;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="10,10"
+
+/**
+ Derived table model which disables table edit
+  
+ @since PackageEditor 1.0
+**/
+class PkgRemoveTableModel extends DefaultTableModel {
+    PkgRemoveTableModel() {
+        super();
+    }
+    
+    public boolean isCellEditable (int row, int col) {
+        return false;
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/ManifestContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ManifestContents.java
new file mode 100644
index 0000000000..7bebc627a2
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ManifestContents.java
@@ -0,0 +1,74 @@
+/** @file
+  Java class ManifestContents is used to deal with FDPManifest.xml file related
+  operations.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import org.apache.xmlbeans.XmlException;
+
+import org.tianocore.*;
+import java.io.*;
+
+/**
+ This class operates on FDPManifest.xml file
+  
+ @since PackageEditor 1.0
+**/
+public class ManifestContents {
+
+    ///
+    /// it is more convenient to get input stream from Jar entry of to-be-installed package file.
+    /// so i use InputStream instead of File
+    ///
+    private InputStream manIs = null;
+
+    FrameworkDevPkgManifestDocument manDoc = null;
+
+    HeaderDocument hdr = null;
+
+    FrameworkDevPkgManifestDocument.FrameworkDevPkgManifest manRoot = null;
+
+    public ManifestContents(InputStream fis) throws XmlException, IOException {
+
+        manIs = fis;
+        manDoc = FrameworkDevPkgManifestDocument.Factory.parse(manIs);
+        manRoot = manDoc.getFrameworkDevPkgManifest();
+
+    }
+
+    /**
+     Get package name from manifest file header.
+     
+     @return String
+    **/
+    public String getBaseName() {
+        return manRoot.getHeader().getPackageName().getStringValue();
+    }
+
+    /**
+     Get package version from manifest file header.
+     
+     @return String
+    **/
+    public String getVersion() {
+        return manRoot.getHeader().getVersion();
+    }
+
+    /**
+     Get package GUID from manifest file header.
+     
+     @return String
+    **/
+    public String getGuid() {
+        return manRoot.getHeader().getGuid().getStringValue();
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/ModalFrameUtil.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ModalFrameUtil.java
new file mode 100644
index 0000000000..a748a82f76
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/ModalFrameUtil.java
@@ -0,0 +1,107 @@
+/** @file
+  Java class ModalFrameUtil is used to show modal frame.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ This class is used to show modal frame.
+  
+ @since PackageEditor 1.0
+**/
+public class ModalFrameUtil {
+    /**
+     Invocation handler for event threads
+      
+     @since PackageEditor 1.0
+    **/
+    static class EventPump implements InvocationHandler {
+        Frame frame;
+
+        public EventPump(Frame frame) {
+            this.frame = frame;
+        }
+
+        /**
+         Invocation handler invoked by Method.invoke
+         **/
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            //
+            // return frame showing status for Conditional.evaluate()
+            //
+            return frame.isShowing() ? Boolean.TRUE : Boolean.FALSE;
+        }
+
+        public void start() throws Exception {
+            Class clazz = Class.forName("java.awt.Conditional");
+            //
+            // Conditional proxy instance will invoke "this" InvocationHandler.invoke when calling its methods
+            //
+            Object conditional = Proxy.newProxyInstance(clazz.getClassLoader(), new Class[] { clazz }, this);
+            //
+            // EventDisaptchThread.pumpEvents will be called under Conditional "conditional"
+            //
+            Method pumpMethod = Class.forName("java.awt.EventDispatchThread").getDeclaredMethod("pumpEvents",
+                                                                                                new Class[] { clazz });
+            pumpMethod.setAccessible(true);
+            //
+            // pumpEvents when conditional.evaluate() == true (frame.isShowing() in EventPump.invoke)
+            //
+            pumpMethod.invoke(Thread.currentThread(), new Object[] { conditional });
+        }
+    }
+
+    /**
+     Show modal frame, return only when frame closed.
+     
+     @param frame Frame to be modal
+     @param owner Parent Frame
+    **/
+    public static void showAsModal(final Frame frame, final Frame owner) {
+        frame.addWindowListener(new WindowAdapter() {
+            public void windowOpened(WindowEvent e) {
+                owner.setEnabled(false);
+            }
+
+            public void windowClosed(WindowEvent e) {
+                owner.setEnabled(true);
+                owner.setVisible(true);
+                owner.removeWindowListener(this);
+            }
+        });
+
+        owner.addWindowListener(new WindowAdapter() {
+            public void windowActivated(WindowEvent e) {
+                if (frame.isShowing()) {
+                    frame.setExtendedState(JFrame.NORMAL);
+                    frame.toFront();
+                } else {
+                    owner.removeWindowListener(this);
+                }
+            }
+        });
+
+        frame.setVisible(true);
+        try {
+            new EventPump(frame).start();
+        } catch (Throwable throwable) {
+            throw new RuntimeException(throwable);
+        }
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageAction.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageAction.java
new file mode 100644
index 0000000000..71d291548d
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageAction.java
@@ -0,0 +1,348 @@
+/** @file
+  Java class PackageAction is GUI for create spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import java.awt.GridLayout;
+import java.io.File;
+
+import javax.swing.JButton;
+
+/**
+ GUI for create spd file
+  
+ @since PackageEditor 1.0
+**/
+public class PackageAction extends JFrame {
+
+    static JFrame frame;
+
+    private JPanel jContentPane = null;
+
+    private JButton jButton = null;
+
+    private JButton jButton1 = null;
+
+    private JButton jButton2 = null;
+
+    private JButton jButton3 = null;
+
+    private JButton jButton4 = null;
+
+    private JButton jButton5 = null;
+
+    private JButton jButton6 = null;
+
+    private JButton jButton7 = null;
+
+    ///
+    /// SpdFileContents object passed from main
+    ///
+    private SpdFileContents sfc = null;
+
+    private JFrame pThis = null;  //  @jve:decl-index=0:visual-constraint="304,10"
+
+    private JButton jButton8 = null;
+
+    private JButton jButton9 = null;  //  @jve:decl-index=0:visual-constraint="116,388"
+
+    /**
+      This is the default constructor
+     **/
+    public PackageAction(SpdFileContents sfc) {
+        super();
+        initialize();
+        this.sfc = sfc;
+    }
+
+    /**
+      This method initializes this
+      
+      @return void
+     **/
+    private void initialize() {
+        this.setSize(305, 385);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Please Choose an Action");
+        this.centerWindow();
+        this.pThis = this;
+     
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+      This method initializes jContentPane
+      
+      @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            GridLayout gridLayout = new GridLayout();
+            gridLayout.setRows(10);
+            gridLayout.setColumns(1);
+            jContentPane = new JPanel();
+            jContentPane.setPreferredSize(new java.awt.Dimension(200,300));
+            jContentPane.setLayout(gridLayout);
+            jContentPane.add(getJButton8(), null);
+            jContentPane.add(getJButton7(), null);
+            jContentPane.add(getJButton6(), null);
+            jContentPane.add(getJButton5(), null);
+            jContentPane.add(getJButton4(), null);
+            jContentPane.add(getJButton3(), null);
+            jContentPane.add(getJButton2(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButton9(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+      This method initializes jButton	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setText("Save");
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // save sfc contents to file
+                    //
+                    JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));
+                    chooser.setMultiSelectionEnabled(false);
+
+                    int retval = chooser.showSaveDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        try {
+                            File theFile = chooser.getSelectedFile();
+                            if (theFile.exists()) {
+                                int retVal = JOptionPane.showConfirmDialog(frame, "Are you sure to replace the exising one?", "File Exists",
+                                                                           JOptionPane.YES_NO_OPTION);
+                                if (retVal == JOptionPane.NO_OPTION) {
+                                    return;
+                                } 
+                            }
+                            sfc.saveAs(theFile);
+
+                        } catch (Exception ee) {
+                            System.out.println(ee.toString());
+                        }
+//                        pThis.dispose();
+                    }
+
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+      This method initializes jButton1	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setText("Add PCD Information");
+            jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // Add PCD frame show modal
+                    //
+                    ModalFrameUtil.showAsModal(new PackagePCD(sfc), pThis);
+                }
+            });
+        }
+        return jButton1;
+    }
+
+    /**
+      This method initializes jButton2	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setText("Add PPI Declarations");
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // Add PPI frame show modal
+                    //
+                    ModalFrameUtil.showAsModal(new PackagePpi(sfc), pThis);
+                }
+            });
+        }
+        return jButton2;
+    }
+
+    /**
+      This method initializes jButton3	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton3() {
+        if (jButton3 == null) {
+            jButton3 = new JButton();
+            jButton3.setText("Add Protocol Declarations");
+            jButton3.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackageProtocols(sfc), pThis);
+                }
+            });
+        }
+        return jButton3;
+    }
+
+    /**
+      This method initializes jButton4	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton4() {
+        if (jButton4 == null) {
+            jButton4 = new JButton();
+            jButton4.setText("Add GUID Declarations");
+            jButton4.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackageGuids(sfc), pThis);
+                }
+            });
+        }
+        return jButton4;
+    }
+
+    /**
+      This method initializes jButton5	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton5() {
+        if (jButton5 == null) {
+            jButton5 = new JButton();
+            jButton5.setText("Add Package Headers");
+            jButton5.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackagePkgHeader(sfc), pThis);
+                }
+            });
+        }
+        return jButton5;
+    }
+
+    /**
+      This method initializes jButton6	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton6() {
+        if (jButton6 == null) {
+            jButton6 = new JButton();
+            jButton6.setText("Add MSA Files");
+            jButton6.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackageMsaFile(sfc), pThis);
+                }
+            });
+        }
+        return jButton6;
+    }
+
+    /**
+      This method initializes jButton7	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton7() {
+        if (jButton7 == null) {
+            jButton7 = new JButton();
+            jButton7.setText("Add Library Classes");
+            jButton7.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackageLibraryClass(sfc), pThis);
+                }
+            });
+        }
+        return jButton7;
+    }
+
+    /**
+      This method initializes jButton8	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton8() {
+        if (jButton8 == null) {
+            jButton8 = new JButton();
+            jButton8.setText("Add SPD Header");
+            jButton8.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new PackageNew(sfc), pThis);
+                }
+            });
+        }
+        return jButton8;
+    }
+
+    /**
+      This method initializes jButton9	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButton9() {
+        if (jButton9 == null) {
+            jButton9 = new JButton();
+            jButton9.setText("Done");
+            jButton9.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // quit current frame
+                    //
+                    pThis.dispose();
+                   
+                }
+            });
+        }
+        return jButton9;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="104,41"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageGuids.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageGuids.java
new file mode 100644
index 0000000000..6562a2772f
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageGuids.java
@@ -0,0 +1,354 @@
+/** @file
+  Java class PackageGuids is GUI for create GUID elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JRadioButton;
+import javax.swing.JComboBox;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+import javax.swing.JScrollPane;
+import javax.swing.JList;
+
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ GUI for create GUID elements of spd file
+  
+ @since PackageEditor 1.0
+**/
+public class PackageGuids extends JFrame implements ActionListener {
+
+    private SpdFileContents sfc = null;
+
+    private static String separator = "::";
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuidValue = null;
+
+    private JTextField jTextFieldGuidValue = null;
+
+    private JLabel jLabelHelpText = null;
+
+    private JTextField jTextFieldName = null;
+
+    private JLabel jLabelEnableFeature = null;
+
+    private JRadioButton jRadioButtonEnableFeature = null;
+
+    private JRadioButton jRadioButtonDisableFeature = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private StarLabel starLabel = null;
+
+    private StarLabel starLabel1 = null;
+
+    /**
+      This method initializes this
+      
+     **/
+    private void initialize() {
+        this.setTitle("Guid Declarations");
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+      This method initializes jTextFieldC_Name	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+      This method initializes jTextFieldGuidValsue	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldGuidValsue() {
+        if (jTextFieldGuidValue == null) {
+            jTextFieldGuidValue = new JTextField();
+            jTextFieldGuidValue.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuidValue;
+    }
+
+    /**
+      This method initializes jTextFieldName	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldName() {
+        if (jTextFieldName == null) {
+            jTextFieldName = new JTextField();
+            jTextFieldName.setBounds(new java.awt.Rectangle(160, 70, 320, 20));
+        }
+        return jTextFieldName;
+    }
+
+    /**
+      This method initializes jRadioButtonEnableFeature	
+      	
+      @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonEnableFeature() {
+        if (jRadioButtonEnableFeature == null) {
+            jRadioButtonEnableFeature = new JRadioButton();
+            jRadioButtonEnableFeature.setText("Enable");
+            jRadioButtonEnableFeature.setBounds(new java.awt.Rectangle(160, 104, 90, 20));
+            jRadioButtonEnableFeature.setEnabled(false);
+            jRadioButtonEnableFeature.setSelected(true);
+        }
+        return jRadioButtonEnableFeature;
+    }
+
+    /**
+      This method initializes jRadioButtonDisableFeature	
+      	
+      @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonDisableFeature() {
+        if (jRadioButtonDisableFeature == null) {
+            jRadioButtonDisableFeature = new JRadioButton();
+            jRadioButtonDisableFeature.setText("Disable");
+            jRadioButtonDisableFeature.setEnabled(false);
+            jRadioButtonDisableFeature.setBounds(new java.awt.Rectangle(250, 104, 90, 20));
+        }
+        return jRadioButtonDisableFeature;
+    }
+
+    /**
+      This method initializes jButtonOk	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(300, 240, 75, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+      This method initializes jButtonCancel	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 240, 74, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+      This method initializes jButtonGenerateGuid	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+      This is the default constructor
+     **/
+    public PackageGuids(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.setVisible(true);
+        this.sfc = sfc;
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+      This method initializes this
+      
+      @return void
+     **/
+    private void init() {
+        this.setSize(500, 300);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Add Guids");
+        this.centerWindow();
+        initFrame();
+    }
+
+    /**
+      This method initializes jContentPane
+      
+      @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            starLabel1 = new StarLabel();
+            starLabel1.setBounds(new java.awt.Rectangle(5, 34, 10, 20));
+            starLabel = new StarLabel();
+            starLabel.setBounds(new java.awt.Rectangle(6, 10, 10, 20));
+            jLabelEnableFeature = new JLabel();
+            jLabelEnableFeature.setText("Enable Feature");
+            jLabelEnableFeature.setEnabled(false);
+            jLabelEnableFeature.setBounds(new java.awt.Rectangle(15, 104, 140, 20));
+            jLabelHelpText = new JLabel();
+            jLabelHelpText.setText("Name");
+            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 70, 140, 20));
+            jLabelGuidValue = new JLabel();
+            jLabelGuidValue.setText("Guid Value");
+            jLabelGuidValue.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelGuidValue, null);
+            jContentPane.add(getJTextFieldGuidValsue(), null);
+
+            jContentPane.add(jLabelHelpText, null);
+            jContentPane.add(getJTextFieldName(), null);
+            jContentPane.add(jLabelEnableFeature, null);
+            jContentPane.add(getJRadioButtonEnableFeature(), null);
+            jContentPane.add(getJRadioButtonDisableFeature(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+
+            jContentPane.add(starLabel, null);
+            jContentPane.add(starLabel1, null);
+
+            initFrame();
+
+        }
+        return jContentPane;
+    }
+
+    /**
+      This method initializes events groups and usage type
+      
+     **/
+    private void initFrame() {
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        //
+        // save and exit
+        //
+        if (arg0.getSource() == jButtonOk) {
+
+            this.save();
+            this.dispose();
+        }
+        //
+        // exit
+        //
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+        //
+        // generate a new GUID
+        //
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuidValue.setText(Tools.generateUuidString());
+        }
+        
+        if (arg0.getSource() == jRadioButtonEnableFeature) {
+            if (jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonDisableFeature) {
+            if (jRadioButtonDisableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(true);
+            }
+        }
+    }
+
+    /**
+     Add GUID entry to SpdFileContents object with element values from jTextFields*
+    **/
+    protected void save() {
+        try {
+            String strName = jTextFieldName.getText();
+            String strCName = jTextFieldC_Name.getText();
+            String strGuid = jTextFieldGuidValue.getText();
+            sfc.genSpdGuidDeclarations(strName, strCName, strGuid, null);
+
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+} //  @jve:decl-index=0:visual-constraint="10,10"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageLibraryClass.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageLibraryClass.java
new file mode 100644
index 0000000000..efd6a767b4
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageLibraryClass.java
@@ -0,0 +1,545 @@
+/** @file
+  Java class PackageLibraryClass is GUI for create library definition elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Vector;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+/**
+ GUI for create library definition elements of spd file.
+  
+ @since PackageEditor 1.0
+**/
+public class PackageLibraryClass extends JFrame implements ActionListener {
+    static JFrame frame;
+    
+    private static String Separator = "::";
+
+    private DefaultListModel listItem = new DefaultListModel();
+
+    private SpdFileContents sfc = null;
+
+    private JPanel jContentPane = null;
+
+    private JRadioButton jRadioButtonAdd = null;
+
+    private JRadioButton jRadioButtonSelect = null;
+
+    private JTextField jTextFieldAdd = null;
+
+    private JComboBox jComboBoxSelect = null;
+
+    private JLabel jLabelUsage = null;
+
+    private JComboBox jComboBoxUsage = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JList jListLibraryClassDefinitions = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonClearAll = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonOk = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextField = null;
+
+    private JButton jButtonBrowse = null;
+
+    /**
+      This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setTitle("Library Declarations");
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+      This method initializes jRadioButtonAdd	
+      	
+      @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonAdd() {
+        if (jRadioButtonAdd == null) {
+            jRadioButtonAdd = new JRadioButton();
+            jRadioButtonAdd.setBounds(new java.awt.Rectangle(10, 35, 205, 20));
+            jRadioButtonAdd.setText("Add a new Library Class");
+            jRadioButtonAdd.addActionListener(this);
+            jRadioButtonAdd.setSelected(false);
+        }
+        return jRadioButtonAdd;
+    }
+
+    /**
+      This method initializes jRadioButtonSelect	
+      	
+      @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonSelect() {
+        if (jRadioButtonSelect == null) {
+            jRadioButtonSelect = new JRadioButton();
+            jRadioButtonSelect.setBounds(new java.awt.Rectangle(10, 10, 205, 20));
+            jRadioButtonSelect.setText("Select Existing Library Class");
+            jRadioButtonSelect.addActionListener(this);
+            jRadioButtonSelect.setSelected(true);
+        }
+        return jRadioButtonSelect;
+    }
+
+    /**
+      This method initializes jTextFieldAdd	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAdd() {
+        if (jTextFieldAdd == null) {
+            jTextFieldAdd = new JTextField();
+            jTextFieldAdd.setBounds(new java.awt.Rectangle(220, 35, 260, 20));
+            jTextFieldAdd.setEnabled(false);
+        }
+        return jTextFieldAdd;
+    }
+
+    /**
+      This method initializes jComboBoxSelect	
+      	
+      @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxSelect() {
+        if (jComboBoxSelect == null) {
+            jComboBoxSelect = new JComboBox();
+            jComboBoxSelect.setBounds(new java.awt.Rectangle(220, 10, 260, 20));
+            jComboBoxSelect.setEnabled(true);
+        }
+        return jComboBoxSelect;
+    }
+
+    /**
+      This method initializes jComboBoxUsage	
+      	
+      @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxUsage() {
+        if (jComboBoxUsage == null) {
+            jComboBoxUsage = new JComboBox();
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(220, 60, 260, 20));
+            jComboBoxUsage.setEnabled(false);
+        }
+        return jComboBoxUsage;
+    }
+
+    /**
+      This method initializes jScrollPane	
+      	
+      @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(10,149,350,146));
+            jScrollPane.setViewportView(getJListLibraryClassDefinitions());
+        }
+        return jScrollPane;
+    }
+
+    /**
+      This method initializes jListLibraryClassDefinitions	
+      	
+      @return javax.swing.JList	
+     **/
+    private JList getJListLibraryClassDefinitions() {
+        if (jListLibraryClassDefinitions == null) {
+            jListLibraryClassDefinitions = new JList(listItem);
+        }
+        return jListLibraryClassDefinitions;
+    }
+
+    /**
+      This method initializes jButtonAdd	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(375,152,90,20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+      This method initializes jButtonRemove	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(375, 230, 90, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+      This method initializes jButtonRemoveAll	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonClearAll() {
+        if (jButtonClearAll == null) {
+            jButtonClearAll = new JButton();
+            jButtonClearAll.setBounds(new java.awt.Rectangle(375, 260, 90, 20));
+            jButtonClearAll.setText("Clear All");
+            jButtonClearAll.addActionListener(this);
+        }
+        return jButtonClearAll;
+    }
+
+    /**
+      This method initializes jButtonCancel	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.setLocation(new java.awt.Point(390, 305));
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+      This method initializes jButton	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setSize(new java.awt.Dimension(90, 20));
+            jButtonOk.setText("OK");
+            jButtonOk.setLocation(new java.awt.Point(290, 305));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+      This is the default constructor
+     **/
+    public PackageLibraryClass(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.sfc = sfc;
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+      This method initializes this
+      
+      @return void
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Class Declarations");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 370));
+        this.centerWindow();
+        initFrame();
+    }
+
+    /**
+      This method initializes jContentPane
+      
+      @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(14, 85, 201, 22));
+            jLabel.setText("Include Header for Selected Class");
+            jLabelUsage = new JLabel();
+            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 200, 20));
+            jLabelUsage.setEnabled(false);
+            jLabelUsage.setText("Usage");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJRadioButtonAdd(), null);
+            jContentPane.add(getJRadioButtonSelect(), null);
+            jContentPane.add(getJTextFieldAdd(), null);
+            jContentPane.add(getJComboBoxSelect(), null);
+            jContentPane.add(jLabelUsage, null);
+            jContentPane.add(getJComboBoxUsage(), null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonClearAll(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJTextField(), null);
+            jContentPane.add(getJButtonBrowse(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     fill ComboBoxes with pre-defined contents
+    **/
+    private void initFrame() {
+        jComboBoxSelect.addItem("BaseCpuICacheFlush");
+        jComboBoxSelect.addItem("BaseDebugLibNull");
+        jComboBoxSelect.addItem("BaseDebugLibReportStatusCode");
+        jComboBoxSelect.addItem("BaseIoLibIntrinsic");
+        jComboBoxSelect.addItem("BaseLib");
+        jComboBoxSelect.addItem("BaseMemoryLib");
+        jComboBoxSelect.addItem("BaseMemoryLibMmx");
+        jComboBoxSelect.addItem("BaseMemoryLibSse2");
+        jComboBoxSelect.addItem("BasePeCoffGetEntryPointLib");
+        jComboBoxSelect.addItem("BasePeCoffLib");
+        jComboBoxSelect.addItem("BasePrintLib");
+        jComboBoxSelect.addItem("BaseReportStatusCodeLibNull");
+        jComboBoxSelect.addItem("CommonPciCf8Lib");
+        jComboBoxSelect.addItem("CommonPciExpressLib");
+        jComboBoxSelect.addItem("CommonPciLibCf8");
+        jComboBoxSelect.addItem("CommonPciLibPciExpress");
+        jComboBoxSelect.addItem("DxeCoreEntryPoint");
+        jComboBoxSelect.addItem("DxeHobLib");
+        jComboBoxSelect.addItem("DxeIoLibCpuIo");
+        jComboBoxSelect.addItem("DxeLib");
+        jComboBoxSelect.addItem("DxePcdLib");
+        jComboBoxSelect.addItem("DxeReportStatusCodeLib");
+        jComboBoxSelect.addItem("DxeServicesTableLib");
+        jComboBoxSelect.addItem("PeiCoreEntryPoint");
+        jComboBoxSelect.addItem("PeiMemoryLib");
+        jComboBoxSelect.addItem("PeimEntryPoint");
+        jComboBoxSelect.addItem("PeiReportStatusCodeLib");
+        jComboBoxSelect.addItem("PeiServicesTablePointerLib");
+        jComboBoxSelect.addItem("PeiServicesTablePointerLibMm7");
+        jComboBoxSelect.addItem("UefiDebugLibConOut");
+        jComboBoxSelect.addItem("UefiDebugLibStdErr");
+        jComboBoxSelect.addItem("UefiDriverEntryPointMultiple");
+        jComboBoxSelect.addItem("UefiDriverEntryPointSingle");
+        jComboBoxSelect.addItem("UefiDriverEntryPointSingleUnload");
+        jComboBoxSelect.addItem("UefiDriverModelLib");
+        jComboBoxSelect.addItem("UefiDriverModelLibNoConfigNoDiag");
+        jComboBoxSelect.addItem("UefiLib");
+        jComboBoxSelect.addItem("UefiMemoryLib");
+
+        jComboBoxUsage.addItem("ALWAYS_CONSUMED");
+        jComboBoxUsage.addItem("SOMETIMES_CONSUMED");
+        jComboBoxUsage.addItem("ALWAYS_PRODUCED");
+        jComboBoxUsage.addItem("SOMETIMES_PRODUCED");
+        jComboBoxUsage.addItem("DEFAULT");
+        jComboBoxUsage.addItem("PRIVATE");
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+     */
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonAdd) {
+            String strLibClass = "";
+            if (jRadioButtonAdd.isSelected()) {
+                strLibClass = jTextFieldAdd.getText();
+            }
+            if (jRadioButtonSelect.isSelected()) {
+                strLibClass = jComboBoxSelect.getSelectedItem().toString();
+            }
+            listItem.addElement(jTextField.getText() + this.Separator + strLibClass);
+        }
+        //
+        // remove selected line
+        //
+        if (arg0.getSource() == jButtonRemove) {
+            int intSelected[] = jListLibraryClassDefinitions.getSelectedIndices();
+            if (intSelected.length > 0) {
+                for (int index = intSelected.length - 1; index > -1; index--) {
+                    listItem.removeElementAt(intSelected[index]);
+                }
+            }
+            jListLibraryClassDefinitions.getSelectionModel().clearSelection();
+        }
+
+        if (arg0.getSource() == jButtonClearAll) {
+            listItem.removeAllElements();
+        }
+
+        if (arg0.getSource() == jRadioButtonAdd) {
+            if (jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(false);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonAdd.setSelected(true);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonSelect) {
+            if (jRadioButtonSelect.isSelected()) {
+                jRadioButtonAdd.setSelected(false);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(true);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+        }
+    }
+
+    /**
+     Add contents in list to sfc
+    **/
+    protected void save() {
+        try {
+            int intLibraryCount = listItem.getSize();
+
+            if (intLibraryCount > 0) {
+
+                for (int index = 0; index < intLibraryCount; index++) {
+                    String strAll = listItem.get(index).toString();
+                    String strInclude = strAll.substring(0, strAll.indexOf(Separator));
+                    String strLibraryClass = strAll.substring(strAll.indexOf(Separator) + Separator.length());
+                    sfc.genSpdLibClassDeclarations(strLibraryClass, null, strInclude, null, null, null, null, null,
+                                                   null, null);
+                }
+            } else {
+
+            }
+
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+
+    /**
+      This method initializes jTextField	
+      	
+      @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(12,112,346,21));
+        }
+        return jTextField;
+    }
+
+    /**
+      This method initializes jButtonBrowse	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonBrowse() {
+        if (jButtonBrowse == null) {
+            jButtonBrowse = new JButton();
+            jButtonBrowse.setBounds(new java.awt.Rectangle(374,111,92,21));
+            jButtonBrowse.setText("Browse");
+            jButtonBrowse.setPreferredSize(new java.awt.Dimension(34,20));
+            jButtonBrowse.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    //
+                    // Select files from current workspace
+                    //
+                    JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));
+                    
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+
+                        File theFile = chooser.getSelectedFile();
+                        String file = theFile.getPath();
+                        if (!file.startsWith(System.getenv("WORKSPACE"))) {
+                            JOptionPane.showMessageDialog(frame, "You can only select files in current workspace!");
+                            return;
+                        }
+                        //
+                        // record relative path of selected file. Assume top level package directory lies directly in workspace
+                        //
+                        int fileIndex = file.indexOf(System.getProperty("file.separator"), System.getenv("WORKSPACE").length() + 1);
+                        jTextField.setText(file.substring(fileIndex + 1));
+                        
+                    }
+                }
+            });
+        }
+        return jButtonBrowse;
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageMsaFile.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageMsaFile.java
new file mode 100644
index 0000000000..b57a1b23d4
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageMsaFile.java
@@ -0,0 +1,352 @@
+/** @file
+  Java class PackageMsaFile is GUI for create MsaFile elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Vector;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+/**
+ GUI for create MsaFile elements of spd file
+  
+ @since PackageEditor 1.0
+**/
+public class PackageMsaFile extends JFrame implements ActionListener {
+    static JFrame frame;
+    
+    private DefaultListModel listItem = new DefaultListModel();
+
+    private SpdFileContents sfc = null;
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JList jListLibraryClassDefinitions = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonClearAll = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonOk = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextField = null;
+
+    private JButton jButton = null;
+
+    /**
+      This method initializes this
+      
+     **/
+    private void initialize() {
+        this.setTitle("MSA Files");
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+      This method initializes jScrollPane	
+      	
+      @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(10, 85, 350, 210));
+            jScrollPane.setViewportView(getJListLibraryClassDefinitions());
+        }
+        return jScrollPane;
+    }
+
+    /**
+      This method initializes jListLibraryClassDefinitions	
+      	
+      @return javax.swing.JList	
+     **/
+    private JList getJListLibraryClassDefinitions() {
+        if (jListLibraryClassDefinitions == null) {
+            jListLibraryClassDefinitions = new JList(listItem);
+        }
+        return jListLibraryClassDefinitions;
+    }
+
+    /**
+      This method initializes jButtonAdd	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(375, 132, 90, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+      This method initializes jButtonRemove	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(375, 230, 90, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+      This method initializes jButtonRemoveAll	
+      	
+      @return javax.swing.JButton	
+     **/
+    private JButton getJButtonClearAll() {
+        if (jButtonClearAll == null) {
+            jButtonClearAll = new JButton();
+            jButtonClearAll.setBounds(new java.awt.Rectangle(375, 260, 90, 20));
+            jButtonClearAll.setText("Clear All");
+            jButtonClearAll.addActionListener(this);
+        }
+        return jButtonClearAll;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.setLocation(new java.awt.Point(390, 305));
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setSize(new java.awt.Dimension(90, 20));
+            jButtonOk.setText("OK");
+            jButtonOk.setLocation(new java.awt.Point(290, 305));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public PackageMsaFile(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.sfc = sfc;
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     */
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Class Declarations");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 370));
+        this.centerWindow();
+        initFrame();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(11,20,143,22));
+            jLabel.setText("Msa File Path and Name");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonClearAll(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJTextField(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    private void initFrame() {
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.dispose();
+            this.save();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonAdd) {
+
+            listItem.addElement(jTextField.getText());
+        }
+
+        if (arg0.getSource() == jButtonRemove) {
+            int intSelected[] = jListLibraryClassDefinitions.getSelectedIndices();
+            if (intSelected.length > 0) {
+                for (int index = intSelected.length - 1; index > -1; index--) {
+                    listItem.removeElementAt(intSelected[index]);
+                }
+            }
+            jListLibraryClassDefinitions.getSelectionModel().clearSelection();
+        }
+
+        if (arg0.getSource() == jButtonClearAll) {
+            listItem.removeAllElements();
+        }
+
+    }
+
+    protected void save() {
+        try {
+            int intLibraryCount = listItem.getSize();
+
+            if (intLibraryCount > 0) {
+
+                for (int index = 0; index < intLibraryCount; index++) {
+                    String strAll = listItem.get(index).toString();
+                    sfc.genSpdMsaFiles(strAll, null);
+                }
+            } else {
+
+            }
+
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+
+    /**
+     This method initializes jTextField	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(11,44,349,21));
+        }
+        return jTextField;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(377,46,89,20));
+            jButton.setText("Browse");
+            jButton.setPreferredSize(new java.awt.Dimension(34,20));
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    JFileChooser chooser = new JFileChooser(System.getenv("WORKSPACE"));
+                    
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                    chooser.setFileFilter(new PkgFileFilter("msa"));
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+
+                        File theFile = chooser.getSelectedFile();
+                        String file = theFile.getPath();
+                        if (!file.startsWith(System.getenv("WORKSPACE"))) {
+                            JOptionPane.showMessageDialog(frame, "You can only select files in current workspace!");
+                            return;
+                        }
+                        int fileIndex = file.indexOf(System.getProperty("file.separator"), System.getenv("WORKSPACE").length() + 1);
+                        jTextField.setText(file.substring(fileIndex + 1));
+                        
+                    }
+                }
+            });
+        }
+        return jButton;
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageNew.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageNew.java
new file mode 100644
index 0000000000..85676a4b84
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageNew.java
@@ -0,0 +1,533 @@
+/** @file
+  Java class PackageNew is the top level GUI for create spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+import javax.swing.JComboBox;
+
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ This class contains GUI components to show various GUIs for creating spd file elements
+  
+ @since PackageEditor 1.0
+**/
+public class PackageNew extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null; //  @jve:decl-index=0:visual-constraint="128,4"
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private JLabel jLabelAbstract = null;
+
+    private JTextField jTextFieldAbstract = null;
+
+    private JLabel jLabelModuleType = null;
+
+    private JLabel jLabelCompontentType = null;
+
+    private JComboBox jComboBox1 = null;
+
+    private JComboBox jComboBoxModuleType = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private StarLabel jStarLabel7 = null;
+
+    private StarLabel jStarLabel8 = null;
+
+    private JLabel jLabelURL = null;
+
+    private JTextField jTextFieldAbstractURL = null;
+
+    private JLabel jLabel = null;
+
+    private JComboBox jComboBox = null;
+
+    private SpdFileContents sfc = null;
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+     This method initializes jTextFieldBaseName	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+            jTextAreaCopyright.setBounds(new java.awt.Rectangle(160,172,319,20));
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jButtonNext	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 481, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 481, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPane2	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 322, 320, 80));
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+        return jScrollPaneDescription;
+    }
+
+    /**
+     This method initializes jTextFieldAbstract	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAbstract() {
+        if (jTextFieldAbstract == null) {
+            jTextFieldAbstract = new JTextField();
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(159,218,318,70));
+        }
+        return jTextFieldAbstract;
+    }
+
+    /**
+     This method initializes jComboBoxCompontentType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBox1() {
+        if (jComboBox1 == null) {
+            jComboBox1 = new JComboBox();
+            jComboBox1.setBounds(new java.awt.Rectangle(160, 465, 91, 20));
+        }
+        return jComboBox1;
+    }
+
+    /**
+     This method initializes jComboBoxModuleType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxModuleType() {
+        if (jComboBoxModuleType == null) {
+            jComboBoxModuleType = new JComboBox();
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 440, 91, 20));
+        }
+        return jComboBoxModuleType;
+    }
+
+    /**
+     This method initializes jTextFieldAbstractURL	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAbstractURL() {
+        if (jTextFieldAbstractURL == null) {
+            jTextFieldAbstractURL = new JTextField();
+            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(159, 414, 320, 20));
+        }
+        return jTextFieldAbstractURL;
+    }
+
+    public PackageNew(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.setVisible(true);
+        this.sfc = sfc;
+
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 560);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setContentPane(getJContentPane());
+        this.setTitle("SPD File Header");
+        this.centerWindow();
+        //this.getRootPane().setDefaultButton(jButtonOk);
+        initFrame();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(15, 490, 140, 21));
+            jLabel.setText("Re-Package");
+            jLabelURL = new JLabel();
+            jLabelURL.setBounds(new java.awt.Rectangle(16, 414, 25, 20));
+            jLabelURL.setText("URL");
+            jLabelCompontentType = new JLabel();
+            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 465, 140, 20));
+            jLabelCompontentType.setText("Read Only");
+            jLabelModuleType = new JLabel();
+            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 440, 140, 20));
+            jLabelModuleType.setText("Package Type");
+            jLabelAbstract = new JLabel();
+            jLabelAbstract.setBounds(new java.awt.Rectangle(15,218,140,20));
+            jLabelAbstract.setText("Abstract");
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(16, 325, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 171, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Package Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+            jContentPane.add(jLabelAbstract, null);
+            jContentPane.add(getJTextFieldAbstract(), null);
+            jContentPane.add(jLabelModuleType, null);
+            jContentPane.add(jLabelCompontentType, null);
+            jContentPane.add(getJComboBox1(), null);
+            jContentPane.add(getJComboBoxModuleType(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 171));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(1, 325));
+            jStarLabel7 = new StarLabel();
+            jStarLabel7.setLocation(new java.awt.Point(0,218));
+            jStarLabel8 = new StarLabel();
+            jStarLabel8.setLocation(new java.awt.Point(0, 440));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+            jContentPane.add(jStarLabel7, null);
+            jContentPane.add(jStarLabel8, null);
+            jContentPane.add(jLabelURL, null);
+            jContentPane.add(getJTextFieldAbstractURL(), null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJComboBox(), null);
+            jContentPane.add(getJTextAreaCopyright(), null);
+        }
+        return jContentPane;
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Save all components of Msa Header
+     if exist, set the value directly
+     if not exist, new instance first
+     
+     **/
+    private void save() {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        Date date = new Date();
+        sfc.genSpdHeader(jTextFieldBaseName.getText(), jTextFieldGuid.getText(), jTextFieldVersion.getText(),
+                         jTextFieldAbstract.getText(), jTextAreaDescription.getText(), jTextAreaCopyright.getText(),
+                         jTextAreaLicense.getText(), format.format(date), format.format(date),
+                         jTextFieldAbstractURL.getText(), jComboBoxModuleType.getSelectedItem().toString(),
+                         jComboBox1.getSelectedItem().toString(), jComboBox.getSelectedItem().toString(), null, null);
+    }
+
+    /**
+     This method initializes module type and compontent type
+     
+     **/
+    private void initFrame() {
+        jComboBoxModuleType.addItem("SOURCE");
+        jComboBoxModuleType.addItem("BINARY");
+        jComboBoxModuleType.addItem("MIXED");
+
+        jComboBox1.addItem("true");
+        jComboBox1.addItem("false");
+
+        jComboBox.addItem("false");
+        jComboBox.addItem("true");
+
+    }
+
+    /**
+     This method initializes jComboBox	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBox() {
+        if (jComboBox == null) {
+            jComboBox = new JComboBox();
+            jComboBox.setBounds(new java.awt.Rectangle(160, 490, 90, 20));
+        }
+        return jComboBox;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="38,-22"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePCD.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePCD.java
new file mode 100644
index 0000000000..910540c4eb
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePCD.java
@@ -0,0 +1,321 @@
+/** @file
+  Java class PackagePCD is GUI for create PCD definition elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ GUI for create PCD definition elements of spd file
+  
+ @since PackageEditor 1.0
+**/
+public class PackagePCD extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelItemType = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JComboBox jComboBoxItemType = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelToken = null;
+
+    private JTextField jTextFieldToken = null;
+
+    private JLabel jLabelDataType = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JComboBox jComboBoxDataType = null;
+
+    private JLabel jLabelOverrideID = null;
+
+    private JTextField jTextFieldOverrideID = null;
+
+    private ButtonGroup bg1 = null;
+
+    private ButtonGroup bg2 = null;
+
+    private ButtonGroup bg3 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private SpdFileContents sfc = null;
+
+    private StarLabel jStarLabel = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setTitle("PCD Definition");
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+     This method initializes jComboBoxItemType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxItemType() {
+        if (jComboBoxItemType == null) {
+            jComboBoxItemType = new JComboBox();
+            jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+        }
+        return jComboBoxItemType;
+    }
+
+    /**
+     This method initializes jTextFieldC_Name	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldC_Name() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldToken	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldToken() {
+        if (jTextFieldToken == null) {
+            jTextFieldToken = new JTextField();
+            jTextFieldToken.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+        }
+        return jTextFieldToken;
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(279,247,90,20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(389,247,90,20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jComboBoxDataType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxDataType() {
+        if (jComboBoxDataType == null) {
+            jComboBoxDataType = new JComboBox();
+            jComboBoxDataType.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+        }
+        return jComboBoxDataType;
+    }
+
+    /**
+     This method initializes jTextFieldOverrideID	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldOverrideID() {
+        if (jTextFieldOverrideID == null) {
+            jTextFieldOverrideID = new JTextField();
+            jTextFieldOverrideID.setBounds(new java.awt.Rectangle(159,198,320,20));
+        }
+        return jTextFieldOverrideID;
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public PackagePCD(SpdFileContents sfc) {
+        super();
+        init();
+        initialize();
+        this.sfc = sfc;
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 450);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Add PCDs");
+        this.centerWindow();
+        this.getRootPane().setDefaultButton(jButtonOk);
+        initFrame();
+        this.setVisible(true);
+    }
+
+    /**
+     Start the window at the center of screen
+     *
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     *
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabelOverrideID = new JLabel();
+            jLabelOverrideID.setBounds(new java.awt.Rectangle(14,197,140,20));
+            jLabelOverrideID.setText("Default Value");
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelDataType = new JLabel();
+            jLabelDataType.setText("Data Type");
+            jLabelDataType.setBounds(new java.awt.Rectangle(15, 160, 140, 20));
+            jLabelToken = new JLabel();
+            jLabelToken.setText("Token");
+            jLabelToken.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelItemType = new JLabel();
+            jLabelItemType.setText("Item Type");
+            jLabelItemType.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            bg1 = new ButtonGroup();
+            bg2 = new ButtonGroup();
+            bg3 = new ButtonGroup();
+            //bg1.add(getJRadioButtonPCData());
+            //bg2.add(getJRadioButtonPcdBuildData());
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            //jContentPane.add(bg1);
+            jContentPane.add(jLabelItemType, null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldC_Name(), null);
+            jContentPane.add(jLabelToken, null);
+            jContentPane.add(getJTextFieldToken(), null);
+            jContentPane.add(jLabelDataType, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJComboBoxItemType(), null);
+            jContentPane.add(getJComboBoxDataType(), null);
+            jContentPane.add(jLabelOverrideID, null);
+            jContentPane.add(getJTextFieldOverrideID(), null);
+
+            jStarLabel = new StarLabel();
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setBounds(new java.awt.Rectangle(6, 59, 10, 20));
+            jStarLabel2 = new StarLabel();
+            jStarLabel3 = new StarLabel();
+            jStarLabel.setLocation(new java.awt.Point(6, 110));
+            jStarLabel.setLocation(new java.awt.Point(5, 85));
+            jStarLabel2.setLocation(new java.awt.Point(5, 134));
+            jStarLabel3.setLocation(new java.awt.Point(5, 159));
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel, null);
+            jContentPane.add(jStarLabel1, null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes comboboxes			
+     
+     **/
+    private void initFrame() {
+
+        jComboBoxItemType.addItem("FEATURE_FLAG");
+        jComboBoxItemType.addItem("FIXED_AT_BUILD");
+        jComboBoxItemType.addItem("PATCHABLE_IN_MODULE");
+        jComboBoxItemType.addItem("DYNAMIC");
+        jComboBoxItemType.addItem("DYNAMIC_EX");
+
+        jComboBoxDataType.addItem("UINT8");
+        jComboBoxDataType.addItem("UINT16");
+        jComboBoxDataType.addItem("UINT32");
+        jComboBoxDataType.addItem("UINT64");
+        jComboBoxDataType.addItem("VOID*");
+        jComboBoxDataType.addItem("BOOLEAN");
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+        
+
+    }
+
+    protected void save() {
+        
+        sfc.genSpdPcdDefinitions(jComboBoxItemType.getSelectedItem().toString(), jTextFieldC_Name.getText(),
+                                 jTextFieldToken.getText(), jComboBoxDataType.getSelectedItem().toString(), null,
+                                 null, null, null, null, null, jTextFieldOverrideID.getText());
+    }
+} //  @jve:decl-index=0:visual-constraint="22,11"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePkgHeader.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePkgHeader.java
new file mode 100644
index 0000000000..982dbe224f
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePkgHeader.java
@@ -0,0 +1,454 @@
+/** @file
+  Java class PackagePkgHeader is GUI for create Package header elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JScrollPane;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ GUI for create Package header elements of spd file
+  
+ @since PackageEditor 1.0
+**/
+public class PackagePkgHeader extends JFrame implements ActionListener {
+    private static String Separator = "::";
+
+    private DefaultListModel listItem = new DefaultListModel();
+
+    private SpdFileContents sfc = null;
+
+    private JPanel jContentPane = null;
+
+    private JRadioButton jRadioButtonAdd = null;
+
+    private JRadioButton jRadioButtonSelect = null;
+
+    private JTextField jTextFieldAdd = null;
+
+    private JComboBox jComboBoxSelect = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JList jListLibraryClassDefinitions = null;
+
+    private JButton jButtonAdd = null;
+
+    private JButton jButtonRemove = null;
+
+    private JButton jButtonClearAll = null;
+
+    private JButton jButtonCancel = null;
+
+    private JButton jButtonOk = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextField = null;
+
+    private StarLabel starLabel = null;
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setTitle("Package Headers");
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+     This method initializes jRadioButtonAdd	
+     	
+     @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonAdd() {
+        if (jRadioButtonAdd == null) {
+            jRadioButtonAdd = new JRadioButton();
+            jRadioButtonAdd.setBounds(new java.awt.Rectangle(10, 35, 205, 20));
+            jRadioButtonAdd.setText("Add a new Module Type");
+            jRadioButtonAdd.setEnabled(false);
+            jRadioButtonAdd.addActionListener(this);
+            jRadioButtonAdd.setSelected(false);
+        }
+        return jRadioButtonAdd;
+    }
+
+    /**
+     This method initializes jRadioButtonSelect	
+     	
+     @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonSelect() {
+        if (jRadioButtonSelect == null) {
+            jRadioButtonSelect = new JRadioButton();
+            jRadioButtonSelect.setBounds(new java.awt.Rectangle(10, 10, 205, 20));
+            jRadioButtonSelect.setText("Select an existed Module Type");
+            jRadioButtonSelect.setActionCommand("Select an existed Module Type");
+            jRadioButtonSelect.addActionListener(this);
+            jRadioButtonSelect.setSelected(true);
+        }
+        return jRadioButtonSelect;
+    }
+
+    /**
+     This method initializes jTextFieldAdd	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAdd() {
+        if (jTextFieldAdd == null) {
+            jTextFieldAdd = new JTextField();
+            jTextFieldAdd.setBounds(new java.awt.Rectangle(220, 35, 260, 20));
+            jTextFieldAdd.setEditable(false);
+            jTextFieldAdd.setEnabled(false);
+        }
+        return jTextFieldAdd;
+    }
+
+    /**
+     This method initializes jComboBoxSelect	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxSelect() {
+        if (jComboBoxSelect == null) {
+            jComboBoxSelect = new JComboBox();
+            jComboBoxSelect.setBounds(new java.awt.Rectangle(220, 10, 260, 20));
+            jComboBoxSelect.setEnabled(true);
+        }
+        return jComboBoxSelect;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(10, 121, 350, 174));
+            jScrollPane.setViewportView(getJListLibraryClassDefinitions());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jListLibraryClassDefinitions	
+     	
+     @return javax.swing.JList	
+     **/
+    private JList getJListLibraryClassDefinitions() {
+        if (jListLibraryClassDefinitions == null) {
+            jListLibraryClassDefinitions = new JList(listItem);
+        }
+        return jListLibraryClassDefinitions;
+    }
+
+    /**
+     This method initializes jButtonAdd	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonAdd() {
+        if (jButtonAdd == null) {
+            jButtonAdd = new JButton();
+            jButtonAdd.setBounds(new java.awt.Rectangle(375, 132, 90, 20));
+            jButtonAdd.setText("Add");
+            jButtonAdd.addActionListener(this);
+        }
+        return jButtonAdd;
+    }
+
+    /**
+     This method initializes jButtonRemove	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonRemove() {
+        if (jButtonRemove == null) {
+            jButtonRemove = new JButton();
+            jButtonRemove.setBounds(new java.awt.Rectangle(375, 230, 90, 20));
+            jButtonRemove.setText("Remove");
+            jButtonRemove.addActionListener(this);
+        }
+        return jButtonRemove;
+    }
+
+    /**
+     This method initializes jButtonRemoveAll	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonClearAll() {
+        if (jButtonClearAll == null) {
+            jButtonClearAll = new JButton();
+            jButtonClearAll.setBounds(new java.awt.Rectangle(375, 260, 90, 20));
+            jButtonClearAll.setText("Clear All");
+            jButtonClearAll.addActionListener(this);
+        }
+        return jButtonClearAll;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setPreferredSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.setLocation(new java.awt.Point(390, 305));
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setSize(new java.awt.Dimension(90, 20));
+            jButtonOk.setText("OK");
+            jButtonOk.setLocation(new java.awt.Point(290, 305));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public PackagePkgHeader(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.sfc = sfc;
+    }
+
+    /**
+     Start the window at the center of screen
+     *
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     *
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    //	private void init(LibraryClassDefinitionsDocument.LibraryClassDefinitions inLibraryClassDefinitions) {
+    //		init();
+    //		this.setLibraryClassDefinitions(inLibraryClassDefinitions);
+    //		int intLibraryCount = this.libraryClassDefinitions.getLibraryClassArray().length;
+    //		if (intLibraryCount > 0) {
+    //			for (int index = 0; index < intLibraryCount; index++) {
+    //				listItem.addElement(this.libraryClassDefinitions.getLibraryClassArray(index).getUsage().toString() + 
+    //									this.Separator + 
+    //									this.libraryClassDefinitions.getLibraryClassArray(index).getStringValue());
+    //				this.libraryClassDefinitions.getLibraryClassArray();
+    //			}
+    //		}
+    //	}
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setContentPane(getJContentPane());
+        this.setTitle("Library Class Declarations");
+        this.setBounds(new java.awt.Rectangle(0, 0, 500, 370));
+        this.centerWindow();
+        initFrame();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            starLabel = new StarLabel();
+            starLabel.setBounds(new java.awt.Rectangle(5, 85, 10, 20));
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(14, 85, 201, 22));
+            jLabel.setText("Include Header for Selected Type");
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJRadioButtonAdd(), null);
+            jContentPane.add(getJRadioButtonSelect(), null);
+            jContentPane.add(getJTextFieldAdd(), null);
+            jContentPane.add(getJComboBoxSelect(), null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonAdd(), null);
+            jContentPane.add(getJButtonRemove(), null);
+            jContentPane.add(getJButtonClearAll(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJTextField(), null);
+            jContentPane.add(starLabel, null);
+        }
+        return jContentPane;
+    }
+
+    private void initFrame() {
+        jComboBoxSelect.addItem("BASE");
+        jComboBoxSelect.addItem("SEC");
+        jComboBoxSelect.addItem("PEI_CORE");
+        jComboBoxSelect.addItem("PEIM");
+        jComboBoxSelect.addItem("DXE_CORE");
+        jComboBoxSelect.addItem("DXE_DRIVER");
+        jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
+        jComboBoxSelect.addItem("DXE_SAL_DRIVER");
+        jComboBoxSelect.addItem("DXE_SMM_DRIVER");
+        jComboBoxSelect.addItem("TOOLS");
+        jComboBoxSelect.addItem("UEFI_DRIVER");
+        jComboBoxSelect.addItem("UEFI_APPLICATION");
+        jComboBoxSelect.addItem("USER_DEFINED");
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jButtonAdd) {
+            String strLibClass = "";
+
+            if (jRadioButtonAdd.isSelected()) {
+                strLibClass = jTextFieldAdd.getText();
+            }
+            if (jRadioButtonSelect.isSelected()) {
+                strLibClass = jComboBoxSelect.getSelectedItem().toString();
+            }
+
+            listItem.addElement(jTextField.getText() + Separator + strLibClass);
+        }
+
+        if (arg0.getSource() == jButtonRemove) {
+            int intSelected[] = jListLibraryClassDefinitions.getSelectedIndices();
+            if (intSelected.length > 0) {
+                for (int index = intSelected.length - 1; index > -1; index--) {
+                    listItem.removeElementAt(intSelected[index]);
+                }
+            }
+            jListLibraryClassDefinitions.getSelectionModel().clearSelection();
+        }
+
+        if (arg0.getSource() == jButtonClearAll) {
+            listItem.removeAllElements();
+        }
+
+        if (arg0.getSource() == jRadioButtonAdd) {
+            if (jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(false);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonAdd.setSelected(true);
+                jTextFieldAdd.setEnabled(true);
+                jComboBoxSelect.setEnabled(false);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonSelect) {
+            if (jRadioButtonSelect.isSelected()) {
+                jRadioButtonAdd.setSelected(false);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+            if (!jRadioButtonSelect.isSelected() && !jRadioButtonAdd.isSelected()) {
+                jRadioButtonSelect.setSelected(true);
+                jTextFieldAdd.setEnabled(false);
+                jComboBoxSelect.setEnabled(true);
+            }
+        }
+    }
+
+    private void save() {
+        try {
+            int intLibraryCount = listItem.getSize();
+
+            if (intLibraryCount > 0) {
+
+                for (int index = 0; index < intLibraryCount; index++) {
+                    String strAll = listItem.get(index).toString();
+                    String strInclude = strAll.substring(0, strAll.indexOf(Separator));
+                    String strType = strAll.substring(strAll.indexOf(Separator) + Separator.length());
+                    sfc.genSpdModuleHeaders(strType, strInclude, null, null, null, null, null, null);
+                }
+            } else {
+
+            }
+
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+
+    /**
+     This method initializes jTextField	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(221, 86, 257, 21));
+        }
+        return jTextField;
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePpi.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePpi.java
new file mode 100644
index 0000000000..7b62d804e5
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagePpi.java
@@ -0,0 +1,41 @@
+/** @file
+  Java class PackagePpi is GUI for create Ppi definition elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+/**
+ GUI derived from PackageProtocols class, override save() method
+  
+ @since PackageEditor 1.0
+**/
+public class PackagePpi extends PackageProtocols {
+
+    private SpdFileContents sfc = null;
+
+    public PackagePpi(SpdFileContents sfc) {
+        super(sfc);
+        // TODO Auto-generated constructor stub
+        this.sfc = sfc;
+    }
+
+    /**
+      add ppi definitions from GUI to SpdFileContents object passed in.
+     **/
+    protected void save() {
+        try {
+            sfc.genSpdPpiDeclarations(getJTextField().getText(), getJTextFieldC_Name().getText(),
+                                      getJTextFieldGuid().getText(), null);
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageProtocols.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageProtocols.java
new file mode 100644
index 0000000000..d99d18b4e6
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackageProtocols.java
@@ -0,0 +1,377 @@
+/** @file
+  Java class PackageProtocols is GUI for create Protocol definition elements of spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JComboBox;
+import javax.swing.JRadioButton;
+import javax.swing.JFrame;
+
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ GUI for create Protocol definition elements of spd file.
+  
+ @since PackageEditor 1.0
+**/
+public class PackageProtocols extends JFrame implements ActionListener {
+
+    private int location = -1;
+
+    private SpdFileContents sfc = null;
+
+    private JPanel jContentPane = null;
+
+    private JLabel jLabelC_Name = null;
+
+    private JTextField jTextFieldC_Name = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelFeatureFlag = null;
+
+    private JTextField jTextFieldFeatureFlag = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JLabel jLabelEnableFeature = null;
+
+    private JRadioButton jRadioButtonEnableFeature = null;
+
+    private JRadioButton jRadioButtonDisableFeature = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel starLabel = null;
+
+    private JLabel jLabel = null;
+
+    private JTextField jTextField = null;
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+     This method initializes jTextFieldProtocolName	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldProtocolName() {
+        if (jTextFieldC_Name == null) {
+            jTextFieldC_Name = new JTextField();
+            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+        }
+        return jTextFieldC_Name;
+    }
+
+    /**
+     This method initializes jTextFieldGuid	
+     	
+     @return javax.swing.JTextField	
+     **/
+    public JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldFeatureFlag	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldFeatureFlag() {
+        if (jTextFieldFeatureFlag == null) {
+            jTextFieldFeatureFlag = new JTextField();
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+            jTextFieldFeatureFlag.setEnabled(false);
+        }
+        return jTextFieldFeatureFlag;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 190, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButton1	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 190, 90, 20));
+            jButtonCancel.setPreferredSize(new Dimension(90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jRadioButtonEnableFeature	
+     	
+     @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonEnableFeature() {
+        if (jRadioButtonEnableFeature == null) {
+            jRadioButtonEnableFeature = new JRadioButton();
+            jRadioButtonEnableFeature.setText("Enable");
+            jRadioButtonEnableFeature.setBounds(new java.awt.Rectangle(160, 110, 90, 20));
+            jRadioButtonEnableFeature.setEnabled(false);
+            jRadioButtonEnableFeature.addActionListener(this);
+            jRadioButtonEnableFeature.setSelected(true);
+        }
+        return jRadioButtonEnableFeature;
+    }
+
+    /**
+     This method initializes jRadioButtonDisableFeature	
+     	
+     @return javax.swing.JRadioButton	
+     **/
+    private JRadioButton getJRadioButtonDisableFeature() {
+        if (jRadioButtonDisableFeature == null) {
+            jRadioButtonDisableFeature = new JRadioButton();
+            jRadioButtonDisableFeature.setText("Disable");
+            jRadioButtonDisableFeature.setEnabled(false);
+            jRadioButtonDisableFeature.setBounds(new java.awt.Rectangle(320, 110, 90, 20));
+            jRadioButtonDisableFeature.addActionListener(this);
+        }
+        return jRadioButtonDisableFeature;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public PackageProtocols(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.setVisible(true);
+        this.sfc = sfc;
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 250);
+        this.setName("JFrame");
+        this.setContentPane(getJContentPane());
+        this.setTitle("Add Protocols");
+        this.centerWindow();
+        //this.getRootPane().setDefaultButton(jButtonOk);
+        initFrame();
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(16, 10, 138, 16));
+            jLabel.setText("Name");
+            starLabel = new StarLabel();
+            starLabel.setBounds(new java.awt.Rectangle(0, 9, 10, 20));
+            jLabelEnableFeature = new JLabel();
+            jLabelEnableFeature.setText("Enable Feature");
+            jLabelEnableFeature.setEnabled(false);
+            jLabelEnableFeature.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
+            jLabelFeatureFlag = new JLabel();
+            jLabelFeatureFlag.setText("Feature Flag");
+            jLabelFeatureFlag.setEnabled(false);
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setText("Guid");
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelC_Name = new JLabel();
+            jLabelC_Name.setText("C_Name");
+            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(jLabelC_Name, null);
+            jContentPane.add(getJTextFieldProtocolName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelFeatureFlag, null);
+            jContentPane.add(getJTextFieldFeatureFlag(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(jLabelEnableFeature, null);
+            jContentPane.add(getJRadioButtonEnableFeature(), null);
+            jContentPane.add(getJRadioButtonDisableFeature(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setBounds(new java.awt.Rectangle(0, 35, 10, 20));
+
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(starLabel, null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJTextField(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes protocol usage type
+     
+     **/
+    private void initFrame() {
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+
+            this.save();
+            this.dispose();
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+        }
+
+        if (arg0.getSource() == jRadioButtonEnableFeature) {
+            if (jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jRadioButtonDisableFeature) {
+            if (jRadioButtonDisableFeature.isSelected()) {
+                jRadioButtonEnableFeature.setSelected(false);
+            }
+            if (!jRadioButtonDisableFeature.isSelected() && !jRadioButtonEnableFeature.isSelected()) {
+                jRadioButtonDisableFeature.setSelected(true);
+            }
+        }
+
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    protected void save() {
+        try {
+            sfc.genSpdProtocolDeclarations(jTextField.getText(), jTextFieldC_Name.getText(), jTextFieldGuid.getText(),
+                                           null);
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+
+    /**
+     This method initializes jTextField	
+     	
+     @return javax.swing.JTextField	
+     **/
+    public JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(160, 8, 319, 23));
+        }
+        return jTextField;
+    }
+
+    public JTextField getJTextFieldC_Name() {
+        return jTextFieldC_Name;
+    }
+
+    public void setJTextFieldC_Name(JTextField textFieldC_Name) {
+        jTextFieldC_Name = textFieldC_Name;
+    }
+
+    public void setJTextField(JTextField textField) {
+        jTextField = textField;
+    }
+
+    public void setJTextFieldGuid(JTextField textFieldGuid) {
+        jTextFieldGuid = textFieldGuid;
+    }
+} //  @jve:decl-index=0:visual-constraint="10,10"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagingMain.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagingMain.java
new file mode 100644
index 0000000000..bca1108045
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PackagingMain.java
@@ -0,0 +1,309 @@
+/** @file
+  Java class PackagingMain is top level GUI for PackageEditor.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import java.awt.FlowLayout;
+import javax.swing.JButton;
+import java.awt.GridLayout;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.jar.JarOutputStream;
+
+/**
+ GUI for show various GUI wizards for create, update spd file; install, remove package;
+ create distributable package file.
+  
+ @since PackageEditor 1.0
+**/
+public class PackagingMain extends JFrame {
+
+    static JFrame frame;
+
+    private JPanel jContentPane = null;
+
+    private JButton jButton = null;
+
+    private JButton jButton1 = null;
+
+    private JButton jButton2 = null;
+
+    private JButton jButton3 = null;
+
+    private JButton jButton4 = null;
+
+    private JButton jButton5 = null;
+
+    private JFrame pThis = null;
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setEnabled(true);
+            jButton.setText("Exit");
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    pThis.dispose();
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+     This method initializes jButton1	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setText("Create an Installable Package");
+            jButton1.setEnabled(true);
+            jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    File theFile = null;
+                    JFileChooser chooser = new JFileChooser();
+                    //
+                    // select the directory that contains files to be distribute
+                    //
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        try {
+                            theFile = chooser.getSelectedFile();
+                            //
+                            // find the FDPManifest.xml file that should exist 
+                            // in the root directory of package 
+                            //
+                            String[] list = theFile.list();
+                            boolean manifestExists = false;
+                            for (int i = 0; i < list.length; i++) {
+                                if (list[i].equals("FDPManifest.xml")) {
+                                    manifestExists = true;
+                                    break;
+                                }
+                            }
+                            if (!manifestExists) {
+                                JOptionPane.showMessageDialog(frame,
+                                                              "Please Put the FDPManifest.xml File under the Directory You Selected!");
+                                return;
+                            }
+                            //
+                            // create the distribute package .fdp file in the same directory with 
+                            // the package root directory selected above.
+                            //
+                            JarOutputStream jos = new JarOutputStream(new FileOutputStream(theFile.getPath() + ".fdp"));
+                            CreateFdp.create(theFile, jos, theFile.getPath());
+                            jos.close();
+                            JOptionPane.showMessageDialog(frame,
+                                                          "FDP File Created Successfully!");
+          
+                            
+                        } catch (Exception ee) {
+                            System.out.println(ee.toString());
+                        } 
+                    } else {
+                        return;
+                    }
+                }
+            });
+        }
+        return jButton1;
+    }
+
+    /**
+     This method initializes jButton2	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setText("Remove Package");
+            jButton2.setEnabled(true);
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new GuiPkgUninstall(), pThis);
+                }
+            });
+        }
+        return jButton2;
+    }
+
+    /**
+     This method initializes jButton3	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton3() {
+        if (jButton3 == null) {
+            jButton3 = new JButton();
+            jButton3.setText("Install Package");
+            jButton3.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new GuiPkgInstall(), pThis);
+                }
+            });
+        }
+        return jButton3;
+    }
+
+    /**
+     This method initializes jButton4	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton4() {
+        if (jButton4 == null) {
+            jButton4 = new JButton();
+            jButton4.setText("Update Package Description File");
+            jButton4.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    File theFile = null;
+                    JFileChooser chooser = new JFileChooser();
+                    //
+                    // select the spd file to be updated first
+                    //
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileFilter(new PkgFileFilter("spd"));
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        try {
+                            theFile = chooser.getSelectedFile();
+                            if (!theFile.isFile()) {
+                                JOptionPane.showMessageDialog(frame, "Please Select one Spd File!");
+                                return;
+                            }
+
+                        } catch (Exception ee) {
+                            System.out.println(ee.toString());
+                        }
+                    } else {
+                        return;
+                    }
+                    //
+                    // create a SpdFileContents for this file and pass it to GUI
+                    //
+                    SpdFileContents sfc = new SpdFileContents(theFile);
+                    ModalFrameUtil.showAsModal(new UpdateAction(sfc), pThis);
+                }
+            });
+        }
+        return jButton4;
+    }
+
+    /**
+     This method initializes jButton5	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton5() {
+        if (jButton5 == null) {
+            jButton5 = new JButton();
+            jButton5.setText("Create Package Description File");
+            jButton5.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    SpdFileContents sfc = new SpdFileContents();
+                    ModalFrameUtil.showAsModal(new PackageAction(sfc), pThis);
+                }
+            });
+        }
+        return jButton5;
+    }
+
+    /**
+     Main for all package editor
+     
+     @param args
+     **/
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+        new PackagingMain().setVisible(true);
+    }
+
+    /**
+     This is the default constructor
+     **/
+    public PackagingMain() {
+        super();
+        initialize();
+        pThis = this;
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(300, 357);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Packaging");
+        this.setContentPane(getJContentPane());
+        this.centerWindow();
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            GridLayout gridLayout = new GridLayout();
+            gridLayout.setRows(6);
+            gridLayout.setColumns(1);
+            jContentPane = new JPanel();
+            jContentPane.setLayout(gridLayout);
+            jContentPane.add(getJButton5(), null);
+            jContentPane.add(getJButton4(), null);
+            jContentPane.add(getJButton3(), null);
+            jContentPane.add(getJButton2(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="125,31"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/PkgInstallTypeChooser.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PkgInstallTypeChooser.java
new file mode 100644
index 0000000000..099c55ae40
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/PkgInstallTypeChooser.java
@@ -0,0 +1,373 @@
+/** @file
+  Java class PkgInstallTypeChooser is GUI for upgrade package installation.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.io.File;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Vector;
+
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JDialog;
+import javax.swing.JRadioButton;
+import javax.swing.JButton;
+
+import org.tianocore.PackageListDocument;
+import javax.swing.JList;
+import javax.swing.JTextField;
+import javax.swing.JScrollPane;
+
+/**
+ GUI for speicial circumstances of package installation.
+  
+ @since PackageEditor 1.0
+**/
+public class PkgInstallTypeChooser extends JFrame implements MouseListener {
+
+    final static long serialVersionUID = 0;
+
+    static JFrame frame;
+
+    private JPanel jContentPane = null;
+
+    private JRadioButton jRadioButton = null;
+
+    private JRadioButton jRadioButton1 = null;
+
+    private JButton jButton = null;
+
+    private JButton jButton1 = null;
+
+    private String pn = null;
+
+    ///
+    /// list of package info from db file
+    ///
+    private List<PackageListDocument.PackageList.Package> dd = null;
+
+    private String wk = null;
+
+    private JList jList = null;
+    
+    private JScrollPane jScrollPane = null;
+
+    private JTextField jTextField = null;
+
+    private JButton jButton2 = null;
+
+    private JFileChooser chooser = null;
+
+    /**
+      This is the default constructor
+     **/
+    public PkgInstallTypeChooser(String pkgName, String wkSpace, List<PackageListDocument.PackageList.Package> destDir) {
+        super();
+        pn = pkgName;
+        dd = destDir;
+        wk = wkSpace;
+        initialize();
+    }
+
+    /**
+      This method initializes this
+      
+      @return void
+     **/
+    private void initialize() {
+        this.setSize(359, 328);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Chooser Installation Type");
+        this.setContentPane(getJContentPane());
+        this.centerWindow();
+        this.insertList();
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+      Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     initialize jList with package info. from db file
+    **/
+    private void insertList() {
+
+        Vector<String> v = new Vector<String>();
+
+        ListIterator lpi = dd.listIterator();
+        while (lpi.hasNext()) {
+            PackageListDocument.PackageList.Package p = (PackageListDocument.PackageList.Package) lpi.next();
+            v.addElement(p.getPackageNameArray(0).getStringValue() + " " + p.getVersionArray(0) + " "
+                         + p.getGuidArray(0).getStringValue());
+        }
+        jList.setListData(v);
+    }
+
+    /**
+      This method initializes jContentPane
+      
+      @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJRadioButton(), null);
+            jContentPane.add(getJRadioButton1(), null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJTextField(), null);
+            jContentPane.add(getJButton2(), null);
+        }
+        return jContentPane;
+    }
+
+ 
+    private JRadioButton getJRadioButton() {
+        if (jRadioButton == null) {
+            jRadioButton = new JRadioButton();
+            jRadioButton.setBounds(new java.awt.Rectangle(17, 39, 186, 21));
+            jRadioButton.setSelected(true);
+            jRadioButton.setText("Reinstall Existing Package");
+            jRadioButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (jRadioButton.isSelected()) {
+                        jRadioButton1.setSelected(false);
+                        jButton2.setEnabled(false);
+                        jTextField.setEnabled(false);
+                        jList.setEnabled(true);
+                        return;
+                    }
+                    if (jRadioButton1.isSelected()) {
+                        jRadioButton.setSelected(true);
+                        jRadioButton1.setSelected(false);
+                        jList.setEnabled(true);
+                        return;
+                    }
+
+                }
+            });
+        }
+        return jRadioButton;
+    }
+
+    private JRadioButton getJRadioButton1() {
+        if (jRadioButton1 == null) {
+            jRadioButton1 = new JRadioButton();
+            jRadioButton1.setBounds(new java.awt.Rectangle(17, 155, 176, 21));
+            jRadioButton1.setText("Install to Directory");
+            jRadioButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (jRadioButton1.isSelected()) {
+                        jRadioButton.setSelected(false);
+                        jList.setEnabled(false);
+                        jButton2.setEnabled(true);
+                        jTextField.setEnabled(true);
+                        return;
+                    }
+                    if (jRadioButton.isSelected()) {
+                        jRadioButton1.setSelected(true);
+                        jRadioButton.setSelected(false);
+                        jButton2.setEnabled(true);
+                        jTextField.setEnabled(true);
+                        return;
+                    }
+                }
+            });
+        }
+        return jRadioButton1;
+    }
+
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setPreferredSize(new java.awt.Dimension(34, 20));
+            jButton.setSize(new java.awt.Dimension(76, 20));
+            jButton.setText("Ok");
+            jButton.setLocation(new java.awt.Point(141, 241));
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    try {
+                        int i = -1;
+                        //
+                        // user selects replace existing package
+                        //
+                        if (jRadioButton.isSelected()) {
+                            int j = jList.getSelectedIndex();
+                            if (j == -1) {
+                                JOptionPane.showMessageDialog(JOptionPane.getRootFrame(),
+                                                              "Please Select One Package to Replace!");
+                                return;
+                            }
+                            //
+                            // the sequence of jList is the same with List
+                            //
+                            String destDir = dd.get(j).getPathArray(0).getStringValue();
+                            ForceInstallPkg f = new ForceInstallPkg(pn, wk);
+                            //
+                            // record the package info. to be replaced
+                            //
+                            f.setOldVersion(dd.get(j).getVersionArray(0));
+                            f.setOldGuid(dd.get(j).getGuidArray(0).getStringValue());
+                            i = f.install(wk + System.getProperty("file.separator") + destDir);
+                        } else {
+                            //
+                            // user selects install to another directory
+                            //
+                            File f = new File(wk + System.getProperty("file.separator") + FrameworkPkg.dbConfigFile);
+                            if (new DbFileContents(f).checkDir(jTextField.getText().substring(wk.length() + 1)) != 0) {
+                                throw new DirSame();
+                            }
+                            i = new ForceInstallPkg(pn, wk).install(jTextField.getText());
+                        }
+                        if (i == 0) {
+                            JOptionPane.showMessageDialog(JOptionPane.getRootFrame(), "Package " + pn
+                                                                                      + " Installed Successfully!");
+                        }
+                    } catch (DirSame ds) {
+                        System.out.println(ds.toString());
+                        JOptionPane.showMessageDialog(frame,
+                                                      "Another Package Exists There, Please Select Another Directory!");
+                    } catch (Exception ee) {
+                        System.out.println(ee.toString());
+                    }
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+     * This method initializes jButton1	
+     * 	
+     * @return javax.swing.JButton	
+     */
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setBounds(new java.awt.Rectangle(238, 241, 78, 20));
+            jButton1.setText("Cancel");
+            jButton1.setPreferredSize(new java.awt.Dimension(34, 20));
+            jButton1.addMouseListener(this);
+        }
+        return jButton1;
+    }
+
+    public void mouseClicked(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+        this.dispose();
+    }
+
+    public void mouseEntered(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseExited(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mousePressed(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    public void mouseReleased(MouseEvent arg0) {
+        // TODO Auto-generated method stub
+
+    }
+
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(22, 68, 318, 58));
+            jScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPane.setViewportView(getJList());
+        }
+        return jScrollPane;
+    }
+   
+    private JList getJList() {
+        if (jList == null) {
+            jList = new JList();
+            
+          jList.setBounds(new java.awt.Rectangle(22, 68, 318, 58));
+
+        }
+        return jList;
+    }
+
+    /**
+     * This method initializes jTextField	
+     * 	
+     * @return javax.swing.JTextField	
+     */
+    private JTextField getJTextField() {
+        if (jTextField == null) {
+            jTextField = new JTextField();
+            jTextField.setBounds(new java.awt.Rectangle(22, 184, 224, 20));
+            jTextField.setEnabled(false);
+            jTextField.setText(wk);
+        }
+        return jTextField;
+    }
+
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setLocation(new java.awt.Point(259, 183));
+            jButton2.setText("Browse");
+            jButton2.setEnabled(false);
+            jButton2.setSize(new java.awt.Dimension(81, 20));
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    if (chooser == null) {
+                        chooser = new JFileChooser(wk);
+                    }
+                    chooser.setMultiSelectionEnabled(false);
+                    chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+
+                    int retval = chooser.showOpenDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        jTextField.setText(chooser.getSelectedFile().getPath());
+
+                    }
+
+                }
+            });
+        }
+        return jButton2;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="134,45"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
new file mode 100644
index 0000000000..b6e573a1fd
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
@@ -0,0 +1,1282 @@
+/** @file
+  Java class SpdFileContents is used to parse spd xml file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.ListIterator;
+
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.apache.xmlbeans.XmlCursor;
+
+import org.tianocore.AbstractDocument;
+import org.tianocore.GuidDeclarationsDocument;
+import org.tianocore.GuidDocument;
+import org.tianocore.IncludeHeaderDocument;
+import org.tianocore.LibraryClassDeclarationDocument;
+import org.tianocore.LibraryClassDeclarationsDocument;
+import org.tianocore.LibraryClassDocument;
+import org.tianocore.LibraryUsage;
+import org.tianocore.LicenseDocument;
+import org.tianocore.ModuleTypeDef;
+import org.tianocore.MsaFilesDocument;
+import org.tianocore.OutputDirectoryDocument;
+import org.tianocore.PackageDependenciesDocument;
+import org.tianocore.PackageHeadersDocument;
+import org.tianocore.PackageNameDocument;
+import org.tianocore.PackageSurfaceAreaDocument;
+import org.tianocore.PackageType;
+import org.tianocore.PackageUsage;
+import org.tianocore.PcdDataTypes;
+import org.tianocore.PcdDefinitionsDocument;
+import org.tianocore.PcdItemTypes;
+import org.tianocore.PpiDeclarationsDocument;
+import org.tianocore.ProtocolDeclarationsDocument;
+import org.tianocore.SpdHeaderDocument;
+import org.tianocore.SpecificationDocument;
+import org.tianocore.GuidDeclarationsDocument.GuidDeclarations;
+
+/**
+ This class processes spd file contents such as add remove xml elements.
+  
+ @since PackageEditor 1.0
+**/
+public class SpdFileContents {
+
+    private File file = null;
+
+    private PackageSurfaceAreaDocument psad = null;
+
+    private PackageSurfaceAreaDocument.PackageSurfaceArea psaRoot = null;
+
+    private SpdHeaderDocument.SpdHeader spdHdr = null;
+
+    private PackageNameDocument.PackageName spdHdrPkgName = null;
+
+    private GuidDocument.Guid spdHdrGuid = null;
+
+    private AbstractDocument.Abstract spdHdrAbs = null;
+
+    private LicenseDocument.License spdHdrLicense = null;
+
+    private SpecificationDocument.Specification spdHdrSpec = null;
+
+    private OutputDirectoryDocument.OutputDirectory spdHdrOutDir = null;
+
+    private LibraryClassDeclarationsDocument.LibraryClassDeclarations spdLibClassDeclarations = null;
+
+    private PackageDependenciesDocument.PackageDependencies spdPkgDeps = null;
+
+    private MsaFilesDocument.MsaFiles spdMsaFiles = null;
+
+    private PackageHeadersDocument.PackageHeaders spdModHdrs = null;
+
+    private GuidDeclarationsDocument.GuidDeclarations spdGuidDeclarations = null;
+
+    private ProtocolDeclarationsDocument.ProtocolDeclarations spdProtocolDeclarations = null;
+
+    private PpiDeclarationsDocument.PpiDeclarations spdPpiDeclarations = null;
+
+    private PcdDefinitionsDocument.PcdDefinitions spdPcdDefinitions = null;
+
+    /**
+     Constructor to create a new spd file
+    **/
+    public SpdFileContents() {
+
+        psad = PackageSurfaceAreaDocument.Factory.newInstance();
+        psaRoot = psad.addNewPackageSurfaceArea();
+
+    }
+
+    /**
+     Constructor based on an existing spd file
+     
+     @param f Existing spd file
+    **/
+    public SpdFileContents(File f) {
+        try {
+            psad = PackageSurfaceAreaDocument.Factory.parse(f);
+            psaRoot = psad.getPackageSurfaceArea();
+            file = f;
+        } catch (Exception e) {
+            System.out.println(e.toString());
+        }
+    }
+
+    /**
+     Remove existing pcd definitions elements using XmlCursor
+    **/
+    public void removeSpdPcdDefinition() {
+        XmlObject o = psaRoot.getPcdDefinitions();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing ppi declarations using XmlCursor
+    **/
+    public void removeSpdPpiDeclaration() {
+        XmlObject o = psaRoot.getPpiDeclarations();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing protocols declarations using XmlCursor
+    **/
+    public void removeSpdProtocolDeclaration() {
+        XmlObject o = psaRoot.getProtocolDeclarations();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing GUID declarations using XmlCursor
+    **/
+    public void removeSpdGuidDeclaration() {
+        XmlObject o = psaRoot.getGuidDeclarations();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing spd package header using XmlCursor
+    **/
+    public void removeSpdPkgHeader() {
+        XmlObject o = psaRoot.getPackageHeaders();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing msa files using XmlCursor
+    **/
+    public void removeSpdMsaFile() {
+        XmlObject o = psaRoot.getMsaFiles();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+    }
+
+    /**
+     Remove existing library class declarations using XmlCursor
+    **/
+    public void removeSpdLibClass() {
+        XmlObject o = psaRoot.getLibraryClassDeclarations();
+        if (o == null)
+            return;
+        XmlCursor cursor = o.newCursor();
+        cursor.removeXml();
+
+    }
+
+    /**
+     Get spd file header contents into String array
+     
+     @param s Caller allocated String array
+    **/
+    public void getSpdHdrDetails(String[] s) {
+        if (getSpdHdr() == null) {
+            spdHdr = psaRoot.addNewSpdHeader();
+        }
+        s[0] = getSpdHdrPkgName().getStringValue();
+        s[1] = getSpdHdrGuid().getStringValue();
+        s[2] = getSpdHdrVer();
+        s[3] = getSpdHdrAbs().getStringValue();
+        s[4] = getSpdHdr().getDescription();
+        s[5] = getSpdHdr().getCopyright();
+        s[6] = getSpdHdrLicense().getStringValue();
+        s[7] = getSpdHdr().getCreated();
+        s[8] = getSpdHdr().getURL();
+        if (getSpdHdr().getPackageType() != null) {
+            s[9] = getSpdHdr().getPackageType().toString();
+        }
+        //
+        // convert boolean to String by adding empty String ""
+        //
+        s[10] = getSpdHdr().getReadOnly() + "";
+        s[11] = getSpdHdr().getReadOnly() + "";
+    }
+
+    /**
+     Get the number of library class declarations from the size of List
+     
+     @return int
+    **/
+    public int getSpdLibClassDeclarationCount() {
+        if (psaRoot.getLibraryClassDeclarations() == null
+            || psaRoot.getLibraryClassDeclarations().getLibraryClassDeclarationList() == null) {
+            return 0;
+        }
+        return psaRoot.getLibraryClassDeclarations().getLibraryClassDeclarationList().size();
+    }
+
+    /**
+     Get available library class declaration into String array
+     @param libClass Caller allocated two-dimentional String array
+    **/
+    public void getSpdLibClassDeclarations(String[][] libClass) {
+        List<LibraryClassDeclarationDocument.LibraryClassDeclaration> l = psaRoot.getLibraryClassDeclarations()
+                                                                                 .getLibraryClassDeclarationList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            LibraryClassDeclarationDocument.LibraryClassDeclaration lcd = (LibraryClassDeclarationDocument.LibraryClassDeclaration) li
+                                                                                                                                      .next();
+            if (lcd.getLibraryClass() != null) {
+                libClass[i][0] = lcd.getLibraryClass().getStringValue();
+            }
+            if (lcd.getIncludeHeader() != null) {
+                libClass[i][1] = lcd.getIncludeHeader().getStringValue();
+            }
+
+            i++;
+        }
+
+    }
+    
+    /**
+    Get the number of Msa files from the size of List
+    
+    @return int
+   **/
+    public int getSpdMsaFileCount() {
+        if (psaRoot.getMsaFiles() == null || psaRoot.getMsaFiles().getMsaFileList() == null) {
+            return 0;
+        }
+        return psaRoot.getMsaFiles().getMsaFileList().size();
+    }
+    
+    /**
+    Get available Msa file into String array
+    
+    @param msaFile Caller allocated two-dimentional String array
+   **/
+    public void getSpdMsaFiles(String[][] msaFile) {
+        List<MsaFilesDocument.MsaFiles.MsaFile> l = psaRoot.getMsaFiles().getMsaFileList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            MsaFilesDocument.MsaFiles.MsaFile m = (MsaFilesDocument.MsaFiles.MsaFile) li.next();
+            if (m.getFilename() != null) {
+                msaFile[i][0] = m.getFilename().getStringValue();
+            }
+
+            i++;
+        }
+    }
+
+    /**
+    Get the number of include header files in PackageHeaders from the size of List
+    
+    @return int
+   **/
+    public int getSpdPackageHeaderCount() {
+        if (psaRoot.getPackageHeaders() == null || psaRoot.getPackageHeaders().getIncludeHeaderList() == null) {
+            return 0;
+        }
+        return psaRoot.getPackageHeaders().getIncludeHeaderList().size();
+    }
+
+    /**
+    Get available package header contents into String array
+    
+    @param pkgHeader Caller allocated two-dimentional String array
+   **/
+    public void getSpdPackageHeaders(String[][] pkgHeader) {
+        List<IncludeHeaderDocument.IncludeHeader> l = psaRoot.getPackageHeaders().getIncludeHeaderList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            IncludeHeaderDocument.IncludeHeader ih = (IncludeHeaderDocument.IncludeHeader) li.next();
+            if (ih.getModuleType() != null) {
+                pkgHeader[i][0] = ih.getModuleType().toString();
+            }
+
+            pkgHeader[i][1] = ih.getStringValue();
+            i++;
+        }
+    }
+
+    /**
+    Get the number of GUID declarations from the size of List
+    
+    @return int
+   **/
+    public int getSpdGuidDeclarationCount() {
+        if (psaRoot.getGuidDeclarations() == null || psaRoot.getGuidDeclarations().getEntryList() == null) {
+            return 0;
+        }
+        return psaRoot.getGuidDeclarations().getEntryList().size();
+    }
+
+    /**
+    Get available Guid declaration contents into String array
+    
+    @param guid Caller allocated two-dimentional String array
+   **/
+    public void getSpdGuidDeclarations(String[][] guid) {
+        List<GuidDeclarationsDocument.GuidDeclarations.Entry> l = psaRoot.getGuidDeclarations().getEntryList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            GuidDeclarationsDocument.GuidDeclarations.Entry e = (GuidDeclarationsDocument.GuidDeclarations.Entry) li
+                                                                                                                    .next();
+            guid[i][0] = e.getName();
+            guid[i][1] = e.getCName();
+            if (e.getGuid() != null) {
+                guid[i][2] = e.getGuid().getStringValue();
+            }
+            i++;
+        }
+    }
+
+    /**
+    Get the number of protocol declarations from the size of List
+    
+    @return int
+   **/
+    public int getSpdProtocolDeclarationCount() {
+        if (psaRoot.getProtocolDeclarations() == null || psaRoot.getProtocolDeclarations().getEntryList() == null) {
+            return 0;
+        }
+        return psaRoot.getProtocolDeclarations().getEntryList().size();
+    }
+
+    /**
+    Get available protocol declaration contents into String array
+    
+    @param protocol Caller allocated two-dimentional String array
+   **/
+    public void getSpdProtocolDeclarations(String[][] protocol) {
+        List<ProtocolDeclarationsDocument.ProtocolDeclarations.Entry> l = psaRoot.getProtocolDeclarations()
+                                                                                 .getEntryList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            ProtocolDeclarationsDocument.ProtocolDeclarations.Entry e = (ProtocolDeclarationsDocument.ProtocolDeclarations.Entry) li
+                                                                                                                                    .next();
+            protocol[i][0] = e.getName();
+            protocol[i][1] = e.getCName();
+            if (e.getGuid() != null) {
+                protocol[i][2] = e.getGuid().getStringValue();
+            }
+            i++;
+        }
+    }
+
+    /**
+    Get the number of Ppi declarations from the size of List
+    
+    @return int
+   **/
+    public int getSpdPpiDeclarationCount() {
+        if (psaRoot.getPpiDeclarations() == null || psaRoot.getPpiDeclarations().getEntryList() == null) {
+            return 0;
+        }
+        return psaRoot.getPpiDeclarations().getEntryList().size();
+    }
+
+    /**
+    Get available Ppi declaration contents into String array
+    
+    @param ppi Caller allocated two-dimentional String array
+   **/
+    public void getSpdPpiDeclarations(String[][] ppi) {
+        List<PpiDeclarationsDocument.PpiDeclarations.Entry> l = psaRoot.getPpiDeclarations().getEntryList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            PpiDeclarationsDocument.PpiDeclarations.Entry e = (PpiDeclarationsDocument.PpiDeclarations.Entry) li.next();
+            ppi[i][0] = e.getName();
+            ppi[i][1] = e.getCName();
+            if (e.getGuid() != null) {
+                ppi[i][2] = e.getGuid().getStringValue();
+            }
+
+            i++;
+        }
+    }
+
+    /**
+    Get the number of Pcd definitions from the size of List
+    
+    @return int
+   **/
+    public int getSpdPcdDefinitionCount() {
+        if (psaRoot.getPcdDefinitions() == null || psaRoot.getPcdDefinitions().getPcdEntryList() == null) {
+            return 0;
+        }
+        return psaRoot.getPcdDefinitions().getPcdEntryList().size();
+    }
+
+    /**
+    Get available Pcd definition contents into String array
+    
+    @param pcd Caller allocated two-dimentional String array
+   **/
+    public void getSpdPcdDefinitions(String[][] pcd) {
+        List<PcdDefinitionsDocument.PcdDefinitions.PcdEntry> l = psaRoot.getPcdDefinitions().getPcdEntryList();
+        int i = 0;
+        ListIterator li = l.listIterator();
+        while (li.hasNext()) {
+            PcdDefinitionsDocument.PcdDefinitions.PcdEntry e = (PcdDefinitionsDocument.PcdDefinitions.PcdEntry) li
+                                                                                                                  .next();
+            if (e.getItemType() != null) {
+                pcd[i][0] = e.getItemType().toString();
+            }
+
+            pcd[i][1] = e.getCName();
+            pcd[i][2] = e.getToken();
+            if (e.getDatumType() != null) {
+                pcd[i][3] = e.getDatumType().toString();
+            }
+
+            if (e.getDefaultValue() != null) {
+                pcd[i][4] = e.getDefaultValue().toString();
+            }
+
+            i++;
+        }
+    }
+
+    /**
+     Save the processed xml contents to file
+     
+     @param spdFile The file to save xml contents
+     @throws IOException Exceptions during file operation
+    **/
+    public void saveAs(File spdFile) throws IOException {
+
+        XmlOptions options = new XmlOptions();
+
+        options.setCharacterEncoding("UTF-8");
+        options.setSavePrettyPrint();
+        options.setSavePrettyPrintIndent(2);
+        try {
+            psad.save(spdFile, options);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     Generate SpdHeader contents using parameters passed in.
+     
+     @param pkgName PackageName 
+     @param pkgGuid Guid
+     @param pkgVer Version
+     @param pkgAbs Abstract
+     @param pkgDes Description
+     @param pkgCpRight Copyright
+     @param pkgLicense License
+     @param pkgCreateDate Created
+     @param pkgUpdateDate Updated
+     @param pkgURL URL
+     @param pkgType PackageType
+     @param pkgRdOnly ReadOnly
+     @param pkgRePkg RePackage
+     @param pkgSpec Reserved
+     @param pkgOutDir Reserved
+    **/
+    public void genSpdHeader(String pkgName, String pkgGuid, String pkgVer, String pkgAbs, String pkgDes,
+                             String pkgCpRight, String pkgLicense, String pkgCreateDate, String pkgUpdateDate,
+                             String pkgURL, String pkgType, String pkgRdOnly, String pkgRePkg, String pkgSpec,
+                             String pkgOutDir) {
+        if (getSpdHdr() == null) {
+            spdHdr = psaRoot.addNewSpdHeader();
+        }
+
+        setSpdHdrPkgName(pkgName);
+        setSpdHdrGuid(pkgGuid);
+        setSpdHdrVer(pkgVer);
+        setSpdHdrAbs(pkgAbs);
+        setSpdHdrDes(pkgDes);
+        setSpdHdrCpRit(pkgCpRight);
+        setSpdHdrLicense(pkgLicense);
+        setSpdHdrCreateDate(pkgCreateDate);
+        setSpdHdrUpdateDate(pkgUpdateDate);
+        setSpdHdrURL(pkgURL);
+        setSpdHdrPkgType(pkgType);
+        setSpdHdrRdOnly(pkgRdOnly);
+        setSpdHdrRePkg(pkgRePkg);
+        setSpdHdrSpec(pkgSpec);
+        setSpdHdrOutDir(pkgOutDir);
+    }
+
+    /**
+     Generate library class declaration element using parameters passed in
+     
+     @param libClassBaseName LibraryClass element value
+     @param libClassUsage Reserved
+     @param incHdrFileName IncludeHeader element value
+     @param incHdrAttribGuid Reserved
+     @param incHdrAttribArch Reserved
+     @param incHdrAttribPath Reserved
+     @param incHdrAttribClass Reserved
+     @param incHdrAttribVer Reserved
+     @param incHdrAttribOverrideID Reserved
+     @param incHdrAttribModuleType Reserved
+    **/
+    public void genSpdLibClassDeclarations(String libClassBaseName, String libClassUsage, String incHdrFileName,
+                                           String incHdrAttribGuid, String incHdrAttribArch, String incHdrAttribPath,
+                                           String incHdrAttribClass, String incHdrAttribVer,
+                                           String incHdrAttribOverrideID, String incHdrAttribModuleType) {
+        if (getSpdLibClassDeclarations() == null) {
+            spdLibClassDeclarations = psaRoot.addNewLibraryClassDeclarations();
+        }
+        //
+        // add contents under LibraryClassDeclarations tag 
+        //
+        setSpdLibClassDeclaration(libClassBaseName, libClassUsage, incHdrFileName, incHdrAttribGuid, incHdrAttribArch,
+                                  incHdrAttribPath, incHdrAttribClass, incHdrAttribVer, incHdrAttribOverrideID,
+                                  incHdrAttribModuleType, spdLibClassDeclarations);
+    }
+
+    /**
+     Set library class declaration contents under parent tag
+     
+     @param clsName LibraryClass element value
+     @param clsUsage Reserved
+     @param hdrFile IncludeHeader element value
+     @param hdrAttribGuid Reserved
+     @param hdrAttribArch Reserved
+     @param hdrAttribPath Reserved
+     @param hdrAttribClass Reserved
+     @param hdrAttribVer Reserved
+     @param hdrAttribOverID Reserved
+     @param hdrAttribModType Reserved
+     @param parent The tag under which library class declaration goes to
+    **/
+    public void setSpdLibClassDeclaration(String clsName, String clsUsage, String hdrFile, String hdrAttribGuid,
+                                          String hdrAttribArch, String hdrAttribPath, String hdrAttribClass,
+                                          String hdrAttribVer, String hdrAttribOverID, String hdrAttribModType,
+                                          XmlObject parent) {
+
+        LibraryClassDeclarationDocument.LibraryClassDeclaration lcd = ((LibraryClassDeclarationsDocument.LibraryClassDeclarations) parent)
+                                                                                                                                          .addNewLibraryClassDeclaration();
+
+        setSpdLibraryClass(clsName, clsUsage, lcd);
+
+        setSpdIncludeHeader(null, hdrFile, hdrAttribGuid, hdrAttribArch, hdrAttribPath, hdrAttribClass, hdrAttribVer,
+                            hdrAttribOverID, lcd);
+    }
+
+    /**
+     Set the contents of LibraryClass under parent element
+     
+     @param clsName LibraryClass element value 
+     @param clsUsage Reserved
+     @param parent The tag under which library class declaration goes to
+    **/
+    public void setSpdLibraryClass(String clsName, String clsUsage, XmlObject parent) {
+        LibraryClassDocument.LibraryClass lc = ((LibraryClassDeclarationDocument.LibraryClassDeclaration) parent)
+                                                                                                                 .addNewLibraryClass();
+        lc.setStringValue(clsName);
+    }
+
+    /**
+     Set contents of IncludeHeader under parent element
+     
+     @param modType Reserved
+     @param hdrFile IncludeHeader element value
+     @param hdrAttribGuid Reserved
+     @param hdrAttribArch Reserved
+     @param hdrAttribPath Reserved
+     @param hdrAttribClass Reserved
+     @param hdrAttribVer Reserved
+     @param hdrAttribOverID Reserved
+     @param parent The tag under which library class declaration goes to
+    **/
+    public void setSpdIncludeHeader(String modType, String hdrFile, String hdrAttribGuid, String hdrAttribArch,
+                                    String hdrAttribPath, String hdrAttribClass, String hdrAttribVer,
+                                    String hdrAttribOverID, XmlObject parent) {
+        IncludeHeaderDocument.IncludeHeader ih = null;
+        if (parent instanceof LibraryClassDeclarationDocument.LibraryClassDeclaration) {
+            ih = ((LibraryClassDeclarationDocument.LibraryClassDeclaration) parent).addNewIncludeHeader();
+        } else if (parent instanceof PackageHeadersDocument.PackageHeaders) {
+            ih = ((PackageHeadersDocument.PackageHeaders) parent).addNewIncludeHeader();
+        } else {
+            return;
+        }
+
+        ih.setStringValue(hdrFile);
+        if (hdrAttribGuid != null) {
+            ih.setGuid(hdrAttribGuid);
+        }
+        if (hdrAttribPath != null) {
+            ih.setPath(hdrAttribPath);
+        }
+        if (hdrAttribClass != null) {
+            ih.setClass1(hdrAttribClass);
+        }
+        if (hdrAttribVer != null) {
+            ih.setVersion(hdrAttribVer);
+        }
+        if (hdrAttribOverID != null) {
+            ih.setOverrideID(Integer.parseInt(hdrAttribOverID));
+        }
+        if (modType != null) {
+            ih.setModuleType(ModuleTypeDef.Enum.forString(modType));
+
+        }
+
+    }
+
+    /**
+     Reserved method
+     
+     @param pkgDepPkgName
+     @param pkgDepPkgAttribGuid
+     @param pkgDepPkgAttribVer
+     @param pkgDepPkgAttribType
+     @param pkgDepPkgAttribUsage
+     @param pkgDepPkgAttribInstallDate
+     @param pkgDepPkgAttribUpdateDate
+     @param pkgDepPkgAttribPath
+    **/
+    public void genSpdPackageDependencies(String pkgDepPkgName, String pkgDepPkgAttribGuid, String pkgDepPkgAttribVer,
+                                          String pkgDepPkgAttribType, String pkgDepPkgAttribUsage,
+                                          String pkgDepPkgAttribInstallDate, String pkgDepPkgAttribUpdateDate,
+                                          String pkgDepPkgAttribPath) {
+        if (spdPkgDeps == null) {
+            spdPkgDeps = psaRoot.addNewPackageDependencies();
+        }
+
+        setSpdPackageName(pkgDepPkgName, pkgDepPkgAttribGuid, pkgDepPkgAttribVer, pkgDepPkgAttribType,
+                          pkgDepPkgAttribUsage, pkgDepPkgAttribInstallDate, pkgDepPkgAttribUpdateDate,
+                          pkgDepPkgAttribPath, spdPkgDeps);
+    }
+
+    /**
+     Reserved method
+     
+     @param pkgName
+     @param pkgAttribGuid
+     @param pkgAttribVer
+     @param pkgAttribType
+     @param pkgAttribUsage
+     @param pkgAttribInstallDate
+     @param pkgAttribUpdateDate
+     @param pkgAttribPath
+     @param parent
+    **/
+    public void setSpdPackageName(String pkgName, String pkgAttribGuid, String pkgAttribVer, String pkgAttribType,
+                                  String pkgAttribUsage, String pkgAttribInstallDate, String pkgAttribUpdateDate,
+                                  String pkgAttribPath, XmlObject parent) {
+
+        PackageNameDocument.PackageName pn = ((PackageDependenciesDocument.PackageDependencies) parent)
+                                                                                                       .addNewPackageName();
+        pn.setStringValue(pkgName);
+        pn.setPackageType(PackageType.Enum.forString(pkgAttribType));
+        pn.setUsage(PackageUsage.Enum.forString(pkgAttribUsage));
+        pn.setUpdatedDate(pkgAttribUpdateDate);
+    }
+
+    /**
+     Generate MsaFile element.
+     
+     @param msaFileName MsaFile element value
+     @param archType Reserved
+    **/
+    public void genSpdMsaFiles(String msaFileName, String archType) {
+        if (getSpdMsaFiles() == null) {
+            spdMsaFiles = psaRoot.addNewMsaFiles();
+        }
+        setSpdMsaFile(msaFileName, spdMsaFiles);
+        
+    }
+
+    /**
+     Set MsaFile contents under parent element.
+     
+     @param msaFileName MsaFile element value
+     @param parent Element under which MsaFile goes to
+    **/
+    public void setSpdMsaFile(String msaFileName, XmlObject parent) {
+
+        ((MsaFilesDocument.MsaFiles) parent).addNewMsaFile().addNewFilename().setStringValue(msaFileName);
+    }
+
+    /**
+     Generate PackageHeader element using parameters passed in.
+     
+     @param ModHdrModType ModuleType attribute of IncludeHeader element
+     @param hdrFile IncludeHeader element value
+     @param hdrAttribGuid Reserved
+     @param hdrAttribArch Reserved
+     @param hdrAttribPath Reserved
+     @param hdrAttribClass Reserved
+     @param hdrAttribVer Reserved
+     @param hdrAttribOverID Reserved
+    **/
+    public void genSpdModuleHeaders(String ModHdrModType, String hdrFile, String hdrAttribGuid, String hdrAttribArch,
+                                    String hdrAttribPath, String hdrAttribClass, String hdrAttribVer,
+                                    String hdrAttribOverID) {
+        if (getSpdModHdrs() == null) {
+            spdModHdrs = psaRoot.addNewPackageHeaders();
+        }
+
+        //
+        // add IncludeHeader under PackageHeaders element
+        //
+        setSpdIncludeHeader(ModHdrModType, hdrFile, hdrAttribGuid, hdrAttribArch, hdrAttribPath, hdrAttribClass,
+                            hdrAttribVer, hdrAttribOverID, spdModHdrs);
+    }
+
+    /**
+     Generate GUID declaration element using parameters passed in.
+     
+     @param guidDeclEntryName Name attribute of Entry element
+     @param guidDeclCName CName element value
+     @param guidDeclGuid Guid element value
+     @param guidDeclFeatureFlag Reserved
+    **/
+    public void genSpdGuidDeclarations(String guidDeclEntryName, String guidDeclCName, String guidDeclGuid,
+                                       String guidDeclFeatureFlag) {
+        if (getSpdGuidDeclarations() == null) {
+            spdGuidDeclarations = psaRoot.addNewGuidDeclarations();
+        }
+
+        setSpdEntry(guidDeclEntryName, guidDeclCName, guidDeclGuid, guidDeclFeatureFlag, spdGuidDeclarations);
+    }
+
+    /**
+    Generate protocol declaration element using parameters passed in.
+    
+    @param protocolDeclEntryName Name attribute of Entry element
+    @param protocolDeclCName CName element value
+    @param protocolDeclGuid Guid element value
+    @param protocolDeclFeatureFlag Reserved
+   **/
+    public void genSpdProtocolDeclarations(String protocolDeclEntryName, String protocolDeclCName,
+                                           String protocolDeclGuid, String protocolDeclFeatureFlag) {
+        if (getSpdProtocolDeclarations() == null) {
+            spdProtocolDeclarations = psaRoot.addNewProtocolDeclarations();
+        }
+
+        setSpdEntry(protocolDeclEntryName, protocolDeclCName, protocolDeclGuid, protocolDeclFeatureFlag,
+                    spdProtocolDeclarations);
+    }
+
+    /**
+    Generate PPI declaration element using parameters passed in.
+    
+    @param ppiDeclEntryName Name attribute of Entry element
+    @param ppiDeclCName CName element value
+    @param ppiDeclGuid Guid element value
+    @param ppiDeclFeatureFlag Reserved
+   **/
+    public void genSpdPpiDeclarations(String ppiDeclEntryName, String ppiDeclCName, String ppiDeclGuid,
+                                      String ppiDeclFeatureFlag) {
+        if (getSpdPpiDeclarations() == null) {
+            spdPpiDeclarations = psaRoot.addNewPpiDeclarations();
+        }
+
+        setSpdEntry(ppiDeclEntryName, ppiDeclCName, ppiDeclGuid, ppiDeclFeatureFlag, spdPpiDeclarations);
+    }
+
+    /**
+     Set Entry contents using parameters passed in
+     
+     @param entryName Name attribute of Entry element
+     @param cName CName element value
+     @param guid Guid element value
+     @param featureFlag Reserved
+     @param parent The tag under which Entry element goes to
+    **/
+    public void setSpdEntry(String entryName, String cName, String guid, String featureFlag, XmlObject parent) {
+
+        if (parent instanceof GuidDeclarationsDocument.GuidDeclarations) {
+            GuidDeclarationsDocument.GuidDeclarations.Entry e = ((GuidDeclarations) parent).addNewEntry();
+            e.setName(entryName);
+            e.setCName(cName);
+            e.addNewGuid().setStringValue(guid);
+            if (featureFlag != null) {
+                e.addNewFeatureFlag().setStringValue(featureFlag);
+            }
+            return;
+        }
+        if (parent instanceof ProtocolDeclarationsDocument.ProtocolDeclarations) {
+            ProtocolDeclarationsDocument.ProtocolDeclarations.Entry pe = ((ProtocolDeclarationsDocument.ProtocolDeclarations) parent)
+                                                                                                                                     .addNewEntry();
+            pe.setName(entryName);
+            pe.setCName(cName);
+            pe.addNewGuid().setStringValue(guid);
+            if (featureFlag != null) {
+                pe.addNewFeatureFlag().setStringValue(featureFlag);
+            }
+            return;
+        }
+        if (parent instanceof PpiDeclarationsDocument.PpiDeclarations) {
+            PpiDeclarationsDocument.PpiDeclarations.Entry ppe = ((PpiDeclarationsDocument.PpiDeclarations) parent)
+                                                                                                                  .addNewEntry();
+            ppe.setName(entryName);
+            ppe.setCName(cName);
+            ppe.addNewGuid().setStringValue(guid);
+            if (featureFlag != null) {
+                ppe.addNewFeatureFlag().setStringValue(featureFlag);
+            }
+            return;
+        }
+
+        return;
+
+    }
+
+    /**
+     Generate Pcd definition using parameters passed in
+     
+     @param pcdItemTypes ItemType attribute of PcdEntry element
+     @param cName C_Name element value
+     @param token Token element value
+     @param dataType DatumType element value
+     @param skuEnable Reserved
+     @param sku Reserved
+     @param maxSku Reserved
+     @param hiiEnable Reserved
+     @param varGuid Reserved
+     @param varName Reserved
+     @param defaultString DefaultString element value
+    **/
+    public void genSpdPcdDefinitions(String pcdItemTypes, String cName, String token, String dataType,
+                                     String skuEnable, String sku, String maxSku, String hiiEnable, String varGuid,
+                                     String varName, String defaultString) {
+        if (getSpdPcdDefinitions() == null) {
+            spdPcdDefinitions = psaRoot.addNewPcdDefinitions();
+        }
+
+        setSpdPcdEntry(pcdItemTypes, cName, token, dataType, skuEnable, sku, maxSku, hiiEnable, varGuid, varName,
+                       defaultString, spdPcdDefinitions);
+    }
+
+    /**
+     Set Pcd entry contents under parent tag
+     
+     @param pcdItemTypes ItemType attribute of PcdEntry element
+     @param cName C_Name element value
+     @param token Token element value
+     @param dataType DatumType element value
+     @param skuEnable Reserved
+     @param sku Reserved
+     @param maxSku Reserved
+     @param hiiEnable Reserved
+     @param varGuid Reserved
+     @param varName Reserved
+     @param defaultString DefaultString element value
+     @param parent Tag under which PcdEntry goes to
+    **/
+    public void setSpdPcdEntry(String pcdItemTypes, String cName, String token, String dataType, String skuEnable,
+                               String sku, String maxSku, String hiiEnable, String varGuid, String varName,
+                               String defaultString, XmlObject parent) {
+
+        PcdDefinitionsDocument.PcdDefinitions.PcdEntry pe = ((PcdDefinitionsDocument.PcdDefinitions) parent)
+                                                                                                            .addNewPcdEntry();
+        pe.setItemType(PcdItemTypes.Enum.forString(pcdItemTypes));
+        pe.setCName(cName);
+        pe.setToken(token);
+        pe.setDatumType(PcdDataTypes.Enum.forString(dataType));
+        pe.setDefaultValue(defaultString);
+        
+    }
+
+    /**
+     Get PpiDeclarations element
+     
+     @return PpiDeclarationsDocument.PpiDeclarations
+    **/
+    public PpiDeclarationsDocument.PpiDeclarations getSpdPpiDeclarations() {
+        if (spdPpiDeclarations == null) {
+            spdPpiDeclarations = psaRoot.getPpiDeclarations();
+        }
+        return spdPpiDeclarations;
+    }
+
+    /**
+    Get ProtocolDeclarations element
+    
+    @return ProtocolDeclarationsDocument.ProtocolDeclarations
+    **/
+    public ProtocolDeclarationsDocument.ProtocolDeclarations getSpdProtocolDeclarations() {
+        if (spdProtocolDeclarations == null) {
+            spdProtocolDeclarations = psaRoot.getProtocolDeclarations();
+        }
+        return spdProtocolDeclarations;
+    }
+
+    /**
+    Get GuidDeclarations element
+    
+    @return GuidDeclarationsDocument.GuidDeclarations
+    **/
+    public GuidDeclarationsDocument.GuidDeclarations getSpdGuidDeclarations() {
+        if (spdGuidDeclarations == null) {
+            spdGuidDeclarations = psaRoot.getGuidDeclarations();
+        }
+        return spdGuidDeclarations;
+    }
+
+    /**
+     Get PcdDefinitions element
+     
+     @return PcdDefinitionsDocument.PcdDefinitions
+    **/
+    public PcdDefinitionsDocument.PcdDefinitions getSpdPcdDefinitions() {
+        if (spdPcdDefinitions == null) {
+            spdPcdDefinitions = psaRoot.getPcdDefinitions();
+        }
+        return spdPcdDefinitions;
+    }
+
+    /**
+     Get PackageHeaders element
+     
+     @return PackageHeadersDocument.PackageHeaders
+    **/
+    public PackageHeadersDocument.PackageHeaders getSpdModHdrs() {
+        if (spdModHdrs == null) {
+            spdModHdrs = psaRoot.getPackageHeaders();
+        }
+        return spdModHdrs;
+    }
+
+    /**
+     Get MsaFiles element
+     
+     @return MsaFilesDocument.MsaFiles
+    **/
+    public MsaFilesDocument.MsaFiles getSpdMsaFiles() {
+        if (spdMsaFiles == null) {
+            spdMsaFiles = psaRoot.getMsaFiles();
+        }
+        return spdMsaFiles;
+    }
+
+    /**
+     Get LibraryClassDeclarations element
+     
+     @return LibraryClassDeclarationsDocument.LibraryClassDeclarations
+    **/
+    public LibraryClassDeclarationsDocument.LibraryClassDeclarations getSpdLibClassDeclarations() {
+        if (spdLibClassDeclarations == null) {
+            spdLibClassDeclarations = psaRoot.getLibraryClassDeclarations();
+        }
+        return spdLibClassDeclarations;
+    }
+
+    /**
+     Get SpdHeader element
+     
+     @return SpdHeaderDocument.SpdHeader
+    **/
+    public SpdHeaderDocument.SpdHeader getSpdHdr() {
+        if (spdHdr == null) {
+            spdHdr = psaRoot.getSpdHeader();
+        }
+        return spdHdr;
+    }
+
+    /**
+     Get Abstract element under tag SpdHeader
+     
+     @return AbstractDocument.Abstract
+    **/
+    public AbstractDocument.Abstract getSpdHdrAbs() {
+        if (spdHdrAbs == null) {
+            spdHdrAbs = getSpdHdr().getAbstract();
+        }
+        return spdHdrAbs;
+    }
+
+    /**
+     Set value to Abstract element
+     
+     @param abs The value set to Abstract element
+    **/
+    public void setSpdHdrAbs(String abs) {
+
+        if (getSpdHdrAbs() != null) {
+            getSpdHdrAbs().setStringValue(abs);
+        } else {
+            spdHdrAbs = getSpdHdr().addNewAbstract();
+            spdHdrAbs.setStringValue(abs);
+        }
+    }
+
+    /**
+     Set value to Copyright element
+     
+     @param cpRit The value set to Copyright element
+    **/
+    public void setSpdHdrCpRit(String cpRit) {
+
+        getSpdHdr().setCopyright(cpRit);
+
+    }
+
+    /**
+     Set value to Created element
+     
+     @param createDate The value set to Created element
+    **/
+    public void setSpdHdrCreateDate(String createDate) {
+
+        getSpdHdr().setCreated(createDate);
+
+    }
+
+    /**
+     Set value to Description element
+     
+     @param des The value set to Description element
+    **/
+    public void setSpdHdrDes(String des) {
+        getSpdHdr().setDescription(des);
+    }
+
+    /**
+     Get Guid element under SpdHdr
+     
+     @return GuidDocument.Guid
+    **/
+    public GuidDocument.Guid getSpdHdrGuid() {
+        if (spdHdrGuid == null) {
+            spdHdrGuid = getSpdHdr().getGuid();
+        }
+        return spdHdrGuid;
+    }
+
+    /**
+     Set value to Guid element
+     
+     @param guid The value set to Guid element
+    **/
+    public void setSpdHdrGuid(String guid) {
+        if (getSpdHdrGuid() != null) {
+            getSpdHdrGuid().setStringValue(guid);
+        } else {
+            spdHdrGuid = getSpdHdr().addNewGuid();
+            spdHdrGuid.setStringValue(guid);
+        }
+    }
+
+    /**
+    Get Version element under SpdHdr
+    
+    @return String
+   **/
+    public String getSpdHdrVer() {
+        if (spdHdr != null)
+            return spdHdr.getVersion();
+        else
+            return null;
+    }
+
+    /**
+    Set value to Version element
+    
+    @param ver The value set to Version element
+   **/
+    public void setSpdHdrVer(String ver) {
+        if (spdHdr != null) {
+            spdHdr.setVersion(ver);
+        }
+
+    }
+
+    /**
+    Get License element under SpdHdr
+    
+    @return LicenseDocument.License
+   **/
+    public LicenseDocument.License getSpdHdrLicense() {
+        if (spdHdrLicense == null) {
+            spdHdrLicense = getSpdHdr().getLicense();
+        }
+        return spdHdrLicense;
+    }
+
+    /**
+    Set value to License element
+    
+    @param license The value set to License element
+   **/
+    public void setSpdHdrLicense(String license) {
+        if (getSpdHdrLicense() != null) {
+            getSpdHdrLicense().setStringValue(license);
+        } else {
+            spdHdrLicense = getSpdHdr().addNewLicense();
+            spdHdrLicense.setStringValue(license);
+        }
+    }
+
+    /**
+     Reserved method
+     
+     @return
+    **/
+    public OutputDirectoryDocument.OutputDirectory getSpdHdrOutDir() {
+        return spdHdrOutDir;
+    }
+
+    /**
+     Reserved method
+     
+     @param outdir
+    **/
+    public void setSpdHdrOutDir(String outdir) {
+        if (outdir == null) {
+            return;
+        }
+        if (getSpdHdrOutDir() != null) {
+            getSpdHdrOutDir().setStringValue(outdir);
+        } else {
+            spdHdrOutDir = getSpdHdr().addNewOutputDirectory();
+            spdHdrOutDir.setStringValue(outdir);
+        }
+    }
+
+    /**
+    Get PackageName element under SpdHdr
+    
+    @return PackageNameDocument.PackageName
+   **/
+    public PackageNameDocument.PackageName getSpdHdrPkgName() {
+        if (spdHdrPkgName == null) {
+            spdHdrPkgName = getSpdHdr().getPackageName();
+        }
+        return spdHdrPkgName;
+    }
+
+    /**
+    Set value to PackageName element
+    
+    @param pkgName The value set to PackageName element
+   **/
+    public void setSpdHdrPkgName(String pkgName) {
+
+        if (getSpdHdrPkgName() != null) {
+            getSpdHdrPkgName().setStringValue(pkgName);
+        } else {
+            spdHdrPkgName = getSpdHdr().addNewPackageName();
+            spdHdrPkgName.setStringValue(pkgName);
+        }
+    }
+
+    /**
+    Reserved method
+    
+    @return SpecificationDocument.Specification
+   **/
+    public SpecificationDocument.Specification getSpdHdrSpec() {
+        return spdHdrSpec;
+    }
+
+    /**
+    Reserved method
+    
+    @param spec 
+   **/
+    public void setSpdHdrSpec(String spec) {
+        if (spec == null) {
+            return;
+        }
+        if (getSpdHdrSpec() != null) {
+            getSpdHdrSpec().setStringValue(spec);
+        } else {
+            spdHdrSpec = getSpdHdr().addNewSpecification();
+            spdHdrSpec.setStringValue(spec);
+        }
+    }
+
+    /**
+    Set value to PackageType element
+    
+    @param pkgType The value set to PackageType element
+   **/
+    public void setSpdHdrPkgType(String pkgType) {
+        getSpdHdr().setPackageType(PackageType.Enum.forString(pkgType));
+    }
+
+    /**
+    Set value to ReadOnly element
+    
+    @param rdOnly The value set to ReadOnly element
+   **/
+    public void setSpdHdrRdOnly(String rdOnly) {
+
+        getSpdHdr().setReadOnly(new Boolean(rdOnly));
+    }
+
+    /**
+    Set value to RePackage element
+    
+    @param rePkg The value set to RePackage element
+   **/
+    public void setSpdHdrRePkg(String rePkg) {
+
+        getSpdHdr().setRePackage(new Boolean(rePkg));
+    }
+
+    /**
+    Set value to Updated element
+    
+    @param updateDate The value set to Updated element
+   **/
+    public void setSpdHdrUpdateDate(String updateDate) {
+        getSpdHdr().setUpdated(updateDate);
+    }
+
+    /**
+    Set value to URL element
+    
+    @param url The value set to URL element
+   **/
+    public void setSpdHdrURL(String url) {
+        getSpdHdr().setURL(url);
+    }
+
+    /**
+     Get xml file
+     
+     @return File
+    **/
+    public File getFile() {
+        return file;
+    }
+
+    /**
+     Set file
+     
+     @param file File with xml format
+    **/
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+}
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateAction.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateAction.java
new file mode 100644
index 0000000000..a7ff0160e4
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateAction.java
@@ -0,0 +1,328 @@
+/** @file
+  Java class UpdateAction is GUI for update spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Toolkit;
+
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import java.awt.GridLayout;
+import java.io.File;
+
+import javax.swing.JButton;
+
+/**
+GUI for update spd file
+ 
+@since PackageEditor 1.0
+**/
+public class UpdateAction extends JFrame {
+
+    static JFrame frame;
+
+    private JPanel jContentPane = null;
+
+    private JButton jButton = null;
+
+    private JButton jButton1 = null;
+
+    private JButton jButton2 = null;
+
+    private JButton jButton3 = null;
+
+    private JButton jButton4 = null;
+
+    private JButton jButton5 = null;
+
+    private JButton jButton6 = null;
+
+    private JButton jButton7 = null;
+
+    private SpdFileContents sfc = null;
+
+    private JFrame pThis = null;  //  @jve:decl-index=0:visual-constraint="322,10"
+
+    private JButton jButton8 = null;
+    
+    private JButton jButton9 = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdateAction(SpdFileContents sfc) {
+        super();
+        initialize();
+        this.sfc = sfc;
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(300, 333);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setContentPane(getJContentPane());
+        this.setTitle("Please Choose an Action");
+        this.centerWindow();
+        this.pThis = this;
+        pThis.setSize(new java.awt.Dimension(316,399));
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            GridLayout gridLayout = new GridLayout();
+            gridLayout.setRows(10);
+            gridLayout.setColumns(1);
+            jContentPane = new JPanel();
+            jContentPane.setLayout(gridLayout);
+            jContentPane.add(getJButton8(), null);
+            jContentPane.add(getJButton7(), null);
+            jContentPane.add(getJButton6(), null);
+            jContentPane.add(getJButton5(), null);
+            jContentPane.add(getJButton4(), null);
+            jContentPane.add(getJButton3(), null);
+            jContentPane.add(getJButton2(), null);
+            jContentPane.add(getJButton1(), null);
+            jContentPane.add(getJButton(), null);
+            jContentPane.add(getJButton9(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setText("Save");
+            jButton.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    JFileChooser chooser = new JFileChooser(sfc.getFile());
+                    chooser.setMultiSelectionEnabled(false);
+
+                    int retval = chooser.showSaveDialog(frame);
+                    if (retval == JFileChooser.APPROVE_OPTION) {
+                        try {
+                            File theFile = chooser.getSelectedFile();
+                            if (theFile.exists()) {
+                                int retVal = JOptionPane.showConfirmDialog(frame, "Are you sure to replace the exising one?", "File Exists",
+                                                                           JOptionPane.YES_NO_OPTION);
+                                if (retVal == JOptionPane.NO_OPTION) {
+                                    return;
+                                } 
+                            }
+                            sfc.saveAs(theFile);
+
+                        } catch (Exception ee) {
+                            System.out.println(ee.toString());
+                        }
+//                        pThis.dispose();
+                    }
+
+                }
+            });
+        }
+        return jButton;
+    }
+
+    /**
+     This method initializes jButton1	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton1() {
+        if (jButton1 == null) {
+            jButton1 = new JButton();
+            jButton1.setText("Update PCD Information");
+            jButton1.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdatePCD(sfc), pThis);
+                }
+            });
+        }
+        return jButton1;
+    }
+
+    /**
+     This method initializes jButton2	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton2() {
+        if (jButton2 == null) {
+            jButton2 = new JButton();
+            jButton2.setText("Update PPI Declarations");
+            jButton2.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdatePpi(sfc), pThis);
+                }
+            });
+        }
+        return jButton2;
+    }
+
+    /**
+     This method initializes jButton3	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton3() {
+        if (jButton3 == null) {
+            jButton3 = new JButton();
+            jButton3.setText("Update Protocol Declarations");
+            jButton3.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdateProtocols(sfc), pThis);
+                }
+            });
+        }
+        return jButton3;
+    }
+
+    /**
+     This method initializes jButton4	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton4() {
+        if (jButton4 == null) {
+            jButton4 = new JButton();
+            jButton4.setText("Update GUID Declarations");
+            jButton4.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdateGuids(sfc), pThis);
+                }
+            });
+        }
+        return jButton4;
+    }
+
+    /**
+     This method initializes jButton5	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton5() {
+        if (jButton5 == null) {
+            jButton5 = new JButton();
+            jButton5.setText("Update Package Headers");
+            jButton5.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdatePkgHeader(sfc), pThis);
+                }
+            });
+        }
+        return jButton5;
+    }
+
+    /**
+     This method initializes jButton6	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton6() {
+        if (jButton6 == null) {
+            jButton6 = new JButton();
+            jButton6.setText("Update MSA Files");
+            jButton6.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdateMsaFile(sfc), pThis);
+                }
+            });
+        }
+        return jButton6;
+    }
+
+    /**
+     This method initializes jButton7	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton7() {
+        if (jButton7 == null) {
+            jButton7 = new JButton();
+            jButton7.setText("Update Library Classes");
+            jButton7.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdateLibraryClass(sfc), pThis);
+                }
+            });
+        }
+        return jButton7;
+    }
+
+    /**
+     This method initializes jButton8	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton8() {
+        if (jButton8 == null) {
+            jButton8 = new JButton();
+            jButton8.setText("Update SPD Header");
+            jButton8.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    ModalFrameUtil.showAsModal(new UpdateNew(sfc), pThis);
+                }
+            });
+        }
+        return jButton8;
+    }
+
+    private JButton getJButton9() {
+        if (jButton9 == null) {
+            jButton9 = new JButton();
+            jButton9.setText("Done");
+            jButton9.addMouseListener(new java.awt.event.MouseAdapter() {
+                public void mouseClicked(java.awt.event.MouseEvent e) {
+                    
+                        pThis.dispose();
+               
+                }
+            });
+        }
+        return jButton9;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="104,41"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java
new file mode 100644
index 0000000000..294549c9c1
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java
@@ -0,0 +1,226 @@
+/** @file
+  Java class UpdateGuids is GUI for update GUID declarations in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update GUID declarations in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdateGuids extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdateGuids(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButton) {
+            String[] o = { "", "", "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update GUID Declarations");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("Name");
+            model.addColumn("C_Name");
+            model.addColumn("GUID");
+            if (sfc.getSpdGuidDeclarationCount() == 0) {
+                return jTable;
+            }
+            //
+            // initialize table using SpdFileContents object
+            //
+            String[][] saa = new String[sfc.getSpdGuidDeclarationCount()][3];
+            sfc.getSpdGuidDeclarations(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+     Remove original GUID declarations before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdGuidDeclaration();
+        int rowCount = model.getRowCount();
+        int i = 0;
+
+        while (i < rowCount) {
+            String name = null;
+            if (model.getValueAt(i, 0) != null) {
+                name = model.getValueAt(i, 0).toString();
+            }
+            String cName = null;
+            if (model.getValueAt(i, 1) != null) {
+                cName = model.getValueAt(i, 1).toString();
+            }
+            String guid = null;
+            if (model.getValueAt(i, 2) != null) {
+                guid = model.getValueAt(i, 2).toString();
+            }
+            sfc.genSpdGuidDeclarations(name, cName, guid, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(219, 487, 78, 18));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java
new file mode 100644
index 0000000000..8abca63b7f
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateLibraryClass.java
@@ -0,0 +1,221 @@
+/** @file
+  Java class UpdateLibraryClass is GUI for update library class in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update library class in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdateLibraryClass extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdateLibraryClass(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+
+        if (arg0.getSource() == jButton) {
+            String[] o = { "", "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update Library Class Declarations");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("LibraryClass");
+            model.addColumn("IncludeHeader");
+            if (sfc.getSpdLibClassDeclarationCount() == 0) {
+                return jTable;
+            }
+            //
+            // initialize table using SpdFileContents object
+            //
+            String[][] saa = new String[sfc.getSpdLibClassDeclarationCount()][2];
+            sfc.getSpdLibClassDeclarations(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+    Remove original library classes before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdLibClass();
+        int rowCount = model.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String libClass = null;
+            if (model.getValueAt(i, 0) != null) {
+                libClass = model.getValueAt(i, 0).toString();
+            }
+            String headerFile = null;
+            if (model.getValueAt(i, 1) != null) {
+                headerFile = model.getValueAt(i, 1).toString();
+            }
+            sfc.genSpdLibClassDeclarations(libClass, null, headerFile, null, null, null, null, null, null, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(221, 486, 79, 19));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java
new file mode 100644
index 0000000000..d06b24fdae
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateMsaFile.java
@@ -0,0 +1,217 @@
+/** @file
+  Java class UpdateLibraryClass is GUI for msa files in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ GUI for msa files in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdateMsaFile extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdateMsaFile(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButton) {
+            String[] o = { "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update MSA Files");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("MSA File");
+
+            if (sfc.getSpdMsaFileCount() == 0) {
+                return jTable;
+            }
+            //
+            // initialize table using SpdFileContents object
+            //
+            String[][] saa = new String[sfc.getSpdMsaFileCount()][1];
+            sfc.getSpdMsaFiles(saa);            
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+        }
+        return jTable;
+    }
+
+    /**
+    Remove original Msa files before saving updated ones
+    **/
+    protected void save() {
+
+        sfc.removeSpdMsaFile();
+        int rowCount = jTable.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String msaFile = null;
+            if (jTable.getValueAt(i, 0) != null) {
+                msaFile = jTable.getValueAt(i, 0).toString();
+            }
+            sfc.genSpdMsaFiles(msaFile, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(219, 486, 79, 19));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="11,7"
+
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateNew.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateNew.java
new file mode 100644
index 0000000000..46ba748784
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateNew.java
@@ -0,0 +1,573 @@
+/** @file
+  Java class UpdateNew is GUI for SpdHeader in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import java.awt.Dimension;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+
+import javax.swing.JComboBox;
+
+import org.tianocore.common.Tools;
+import org.tianocore.packaging.common.ui.StarLabel;
+
+/**
+ GUI for update SpdHeader contents
+  
+ @since PackageEditor 1.0
+**/
+public class UpdateNew extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null; //  @jve:decl-index=0:visual-constraint="128,4"
+
+    private JLabel jLabelBaseName = null;
+
+    private JTextField jTextFieldBaseName = null;
+
+    private JLabel jLabelGuid = null;
+
+    private JTextField jTextFieldGuid = null;
+
+    private JLabel jLabelVersion = null;
+
+    private JTextField jTextFieldVersion = null;
+
+    private JButton jButtonGenerateGuid = null;
+
+    private JLabel jLabelLicense = null;
+
+    private JTextArea jTextAreaLicense = null;
+
+    private JLabel jLabelCopyright = null;
+
+    private JTextArea jTextAreaCopyright = null;
+
+    private JLabel jLabelDescription = null;
+
+    private JTextArea jTextAreaDescription = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private JScrollPane jScrollPaneLicense = null;
+
+    private JScrollPane jScrollPaneCopyright = null;
+
+    private JScrollPane jScrollPaneDescription = null;
+
+    private JLabel jLabelAbstract = null;
+
+    private JTextField jTextFieldAbstract = null;
+
+    private JLabel jLabelModuleType = null;
+
+    private JLabel jLabelCompontentType = null;
+
+    private JComboBox jComboBox1 = null;
+
+    private JComboBox jComboBoxModuleType = null;
+
+    private StarLabel jStarLabel1 = null;
+
+    private StarLabel jStarLabel2 = null;
+
+    private StarLabel jStarLabel3 = null;
+
+    private StarLabel jStarLabel4 = null;
+
+    private StarLabel jStarLabel5 = null;
+
+    private StarLabel jStarLabel6 = null;
+
+    private StarLabel jStarLabel7 = null;
+
+    private StarLabel jStarLabel8 = null;
+
+    private JLabel jLabelURL = null;
+
+    private JTextField jTextFieldAbstractURL = null;
+
+    private JLabel jLabel = null;
+
+    private JComboBox jComboBox = null;
+
+    private SpdFileContents sfc = null;
+
+    private String createTime = null;
+
+    /**
+     This method initializes this
+     
+     **/
+    private void initialize() {
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+
+    }
+
+    /**
+     This method initializes jTextFieldBaseName	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldBaseName() {
+        if (jTextFieldBaseName == null) {
+            jTextFieldBaseName = new JTextField();
+            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+        }
+        return jTextFieldBaseName;
+    }
+
+    /**
+     This method initializes jTextFieldGuid	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldGuid() {
+        if (jTextFieldGuid == null) {
+            jTextFieldGuid = new JTextField();
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+        }
+        return jTextFieldGuid;
+    }
+
+    /**
+     This method initializes jTextFieldVersion	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldVersion() {
+        if (jTextFieldVersion == null) {
+            jTextFieldVersion = new JTextField();
+            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+        }
+        return jTextFieldVersion;
+    }
+
+    /**
+     This method initializes jButtonGenerateGuid	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonGenerateGuid() {
+        if (jButtonGenerateGuid == null) {
+            jButtonGenerateGuid = new JButton();
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+            jButtonGenerateGuid.setText("GEN");
+            jButtonGenerateGuid.addActionListener(this);
+        }
+        return jButtonGenerateGuid;
+    }
+
+    /**
+     This method initializes jTextAreaLicense	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaLicense() {
+        if (jTextAreaLicense == null) {
+            jTextAreaLicense = new JTextArea();
+            jTextAreaLicense.setText("");
+            jTextAreaLicense.setLineWrap(true);
+        }
+        return jTextAreaLicense;
+    }
+
+    /**
+     This method initializes jTextAreaCopyright	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaCopyright() {
+        if (jTextAreaCopyright == null) {
+            jTextAreaCopyright = new JTextArea();
+            jTextAreaCopyright.setLineWrap(true);
+        }
+        return jTextAreaCopyright;
+    }
+
+    /**
+     This method initializes jTextAreaDescription	
+     	
+     @return javax.swing.JTextArea	
+     **/
+    private JTextArea getJTextAreaDescription() {
+        if (jTextAreaDescription == null) {
+            jTextAreaDescription = new JTextArea();
+            jTextAreaDescription.setLineWrap(true);
+        }
+        return jTextAreaDescription;
+    }
+
+    /**
+     This method initializes jButtonNext	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("OK");
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 481, 90, 20));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 481, 90, 20));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPaneLicense() {
+        if (jScrollPaneLicense == null) {
+            jScrollPaneLicense = new JScrollPane();
+            jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80));
+            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+            jScrollPaneLicense.setViewportView(getJTextAreaLicense());
+        }
+        return jScrollPaneLicense;
+    }
+
+    /**
+     This method initializes jScrollPane1	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPaneCopyright() {
+        if (jScrollPaneCopyright == null) {
+            jScrollPaneCopyright = new JScrollPane();
+            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160,170,320,26));
+            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
+            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+        return jScrollPaneCopyright;
+    }
+
+    /**
+     This method initializes jScrollPane2	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPaneDescription() {
+        if (jScrollPaneDescription == null) {
+            jScrollPaneDescription = new JScrollPane();
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 322, 320, 80));
+            jScrollPaneDescription.setViewportView(getJTextAreaDescription());
+            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        }
+        return jScrollPaneDescription;
+    }
+
+    /**
+     This method initializes jTextFieldAbstract	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAbstract() {
+        if (jTextFieldAbstract == null) {
+            jTextFieldAbstract = new JTextField();
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(161,216,318,73));
+        }
+        return jTextFieldAbstract;
+    }
+
+    /**
+     This method initializes jComboBoxCompontentType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBox1() {
+        if (jComboBox1 == null) {
+            jComboBox1 = new JComboBox();
+            jComboBox1.setBounds(new java.awt.Rectangle(160, 465, 91, 20));
+        }
+        return jComboBox1;
+    }
+
+    /**
+     This method initializes jComboBoxModuleType	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBoxModuleType() {
+        if (jComboBoxModuleType == null) {
+            jComboBoxModuleType = new JComboBox();
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 440, 91, 20));
+        }
+        return jComboBoxModuleType;
+    }
+
+    /**
+     This method initializes jTextFieldAbstractURL	
+     	
+     @return javax.swing.JTextField	
+     **/
+    private JTextField getJTextFieldAbstractURL() {
+        if (jTextFieldAbstractURL == null) {
+            jTextFieldAbstractURL = new JTextField();
+            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(159, 414, 320, 20));
+        }
+        return jTextFieldAbstractURL;
+    }
+
+    public UpdateNew(SpdFileContents sfc) {
+        super();
+        initialize();
+        init();
+        this.setVisible(true);
+        this.sfc = sfc;
+        initShow();
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow(int intWidth, int intHeight) {
+        Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+        this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);
+    }
+
+    /**
+     Start the window at the center of screen
+     
+     **/
+    protected void centerWindow() {
+        centerWindow(this.getSize().width, this.getSize().height);
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void init() {
+        this.setSize(500, 560);
+        this.setContentPane(getJContentPane());
+        this.setTitle("SPD File Header");
+        this.centerWindow();
+        //this.getRootPane().setDefaultButton(jButtonOk);
+        initFrame();
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jLabel = new JLabel();
+            jLabel.setBounds(new java.awt.Rectangle(15, 490, 140, 21));
+            jLabel.setText("Re-Package");
+            jLabelURL = new JLabel();
+            jLabelURL.setBounds(new java.awt.Rectangle(16, 414, 25, 20));
+            jLabelURL.setText("URL");
+            jLabelCompontentType = new JLabel();
+            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 465, 140, 20));
+            jLabelCompontentType.setText("Read Only");
+            jLabelModuleType = new JLabel();
+            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 440, 140, 20));
+            jLabelModuleType.setText("Package Type");
+            jLabelAbstract = new JLabel();
+            jLabelAbstract.setBounds(new java.awt.Rectangle(17,216,140,20));
+            jLabelAbstract.setText("Abstract");
+            jLabelDescription = new JLabel();
+            jLabelDescription.setText("Description");
+            jLabelDescription.setBounds(new java.awt.Rectangle(16, 325, 140, 20));
+            jLabelCopyright = new JLabel();
+            jLabelCopyright.setText("Copyright");
+            jLabelCopyright.setBounds(new java.awt.Rectangle(15, 171, 140, 20));
+            jLabelLicense = new JLabel();
+            jLabelLicense.setText("License");
+            jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
+            jLabelVersion = new JLabel();
+            jLabelVersion.setText("Version");
+            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
+            jLabelGuid = new JLabel();
+            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));
+            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+            jLabelGuid.setText("Guid");
+            jLabelBaseName = new JLabel();
+            jLabelBaseName.setText("Package Name");
+            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.setLocation(new java.awt.Point(0, 0));
+            jContentPane.setSize(new java.awt.Dimension(500, 524));
+            jContentPane.add(jLabelBaseName, null);
+            jContentPane.add(getJTextFieldBaseName(), null);
+            jContentPane.add(jLabelGuid, null);
+            jContentPane.add(getJTextFieldGuid(), null);
+            jContentPane.add(jLabelVersion, null);
+            jContentPane.add(getJTextFieldVersion(), null);
+            jContentPane.add(getJButtonGenerateGuid(), null);
+            jContentPane.add(jLabelLicense, null);
+            jContentPane.add(jLabelCopyright, null);
+            jContentPane.add(jLabelDescription, null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPaneLicense(), null);
+            jContentPane.add(getJScrollPaneCopyright(), null);
+            jContentPane.add(getJScrollPaneDescription(), null);
+            jContentPane.add(jLabelAbstract, null);
+            jContentPane.add(getJTextFieldAbstract(), null);
+            jContentPane.add(jLabelModuleType, null);
+            jContentPane.add(jLabelCompontentType, null);
+            jContentPane.add(getJComboBox1(), null);
+            jContentPane.add(getJComboBoxModuleType(), null);
+
+            jStarLabel1 = new StarLabel();
+            jStarLabel1.setLocation(new java.awt.Point(0, 10));
+            jStarLabel2 = new StarLabel();
+            jStarLabel2.setLocation(new java.awt.Point(0, 35));
+            jStarLabel3 = new StarLabel();
+            jStarLabel3.setLocation(new java.awt.Point(0, 60));
+            jStarLabel4 = new StarLabel();
+            jStarLabel4.setLocation(new java.awt.Point(0, 85));
+            jStarLabel5 = new StarLabel();
+            jStarLabel5.setLocation(new java.awt.Point(0, 171));
+            jStarLabel6 = new StarLabel();
+            jStarLabel6.setLocation(new java.awt.Point(1, 325));
+            jStarLabel7 = new StarLabel();
+            jStarLabel7.setLocation(new java.awt.Point(2,216));
+            jStarLabel8 = new StarLabel();
+            jStarLabel8.setLocation(new java.awt.Point(0, 440));
+
+            jContentPane.add(jStarLabel1, null);
+            jContentPane.add(jStarLabel2, null);
+            jContentPane.add(jStarLabel3, null);
+            jContentPane.add(jStarLabel4, null);
+            jContentPane.add(jStarLabel5, null);
+            jContentPane.add(jStarLabel6, null);
+            jContentPane.add(jStarLabel7, null);
+            jContentPane.add(jStarLabel8, null);
+            jContentPane.add(jLabelURL, null);
+            jContentPane.add(getJTextFieldAbstractURL(), null);
+            jContentPane.add(jLabel, null);
+            jContentPane.add(getJComboBox(), null);
+        }
+        return jContentPane;
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonGenerateGuid) {
+            jTextFieldGuid.setText(Tools.generateUuidString());
+        }
+    }
+
+    /**
+     Save all components of Msa Header, update time modified.
+     
+     **/
+    private void save() {
+        //		sfc.removeSpdHdr();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        Date date = new Date();
+        sfc.genSpdHeader(jTextFieldBaseName.getText(), jTextFieldGuid.getText(), jTextFieldVersion.getText(),
+                         jTextFieldAbstract.getText(), jTextAreaDescription.getText(), jTextAreaCopyright.getText(),
+                         jTextAreaLicense.getText(), createTime, format.format(date), jTextFieldAbstractURL.getText(),
+                         jComboBoxModuleType.getSelectedItem().toString(), jComboBox1.getSelectedItem().toString(),
+                         jComboBox.getSelectedItem().toString(), null, null);
+        //		ModalFrameUtil.showAsModal(new PackageAction(sfc), pThis);
+    }
+
+    /**
+     This method initializes module type and compontent type
+     
+     **/
+    private void initFrame() {
+        jComboBoxModuleType.addItem("SOURCE");
+        jComboBoxModuleType.addItem("BINARY");
+        jComboBoxModuleType.addItem("MIXED");
+
+        jComboBox1.addItem("true");
+        jComboBox1.addItem("false");
+
+        jComboBox.addItem("false");
+        jComboBox.addItem("true");
+
+    }
+
+    /**
+     Display original SpdHeader contents during init
+    **/
+    private void initShow() {
+        String[] s = new String[12];
+
+        sfc.getSpdHdrDetails(s);
+        jTextFieldBaseName.setText(s[0]);
+        jTextFieldGuid.setText(s[1]);
+        jTextFieldVersion.setText(s[2]);
+        jTextFieldAbstract.setText(s[3]);
+        jTextAreaDescription.setText(s[4]);
+        jTextAreaCopyright.setText(s[5]);
+        jTextAreaLicense.setText(s[6]);
+        createTime = s[7];
+        jTextFieldAbstractURL.setText(s[8]);
+        jComboBoxModuleType.setSelectedItem(s[9]);
+        jComboBox1.setSelectedIndex(s[10].equals("true") ? 0 : 1);
+        jComboBox.setSelectedIndex(s[11].equals("true") ? 0 : 1);
+
+    }
+
+    /**
+     This method initializes jComboBox	
+     	
+     @return javax.swing.JComboBox	
+     **/
+    private JComboBox getJComboBox() {
+        if (jComboBox == null) {
+            jComboBox = new JComboBox();
+            jComboBox.setBounds(new java.awt.Rectangle(160, 490, 90, 20));
+        }
+        return jComboBox;
+    }
+
+} //  @jve:decl-index=0:visual-constraint="38,-22"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java
new file mode 100644
index 0000000000..61b48d4aa5
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePCD.java
@@ -0,0 +1,256 @@
+/** @file
+  Java class UpdatePCD is GUI for update PCD definitions in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update PCD definitions in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdatePCD extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private String[][] saa = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdatePCD(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButton) {
+            String[] o = { "FEATURE_FLAG", "", "", "UINT8", "0" };
+            model.addRow(o);
+        }
+
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(916, 486);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update PCD Definitions");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+    Remove original Pcd definitions before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdPcdDefinition();
+        int rowCount = model.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String cName = null;
+            if (model.getValueAt(i, 1) != null) {
+                cName = model.getValueAt(i, 1).toString();
+            }
+            String token = null;
+            if (model.getValueAt(i, 2) != null) {
+                token = model.getValueAt(i, 2).toString();
+            }
+            String defaultVal = null;
+            if (model.getValueAt(i, 4) != null) {
+                defaultVal = model.getValueAt(i, 4).toString();
+            }
+            sfc.genSpdPcdDefinitions(model.getValueAt(i, 0).toString(), cName, token,
+                                     model.getValueAt(i, 3).toString(), null, null, null, null, null, null, defaultVal);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(605, 404));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(712, 404));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+            jScrollPane.setBounds(new java.awt.Rectangle(51, 62, 782, 304));
+            jScrollPane.setViewportView(getJTable2());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable2() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("ItemType");
+            model.addColumn("C_Name");
+            model.addColumn("Token");
+            model.addColumn("DataType");
+            model.addColumn("DefaultValue");
+            //
+            // Using combobox to display ItemType in table
+            //
+            JComboBox jComboBoxItemType = new JComboBox();
+            jComboBoxItemType.addItem("FEATURE_FLAG");
+            jComboBoxItemType.addItem("FIXED_AT_BUILD");
+            jComboBoxItemType.addItem("PATCHABLE_IN_MODULE");
+            jComboBoxItemType.addItem("DYNAMIC");
+            jComboBoxItemType.addItem("DYNAMIC_EX");
+            TableColumn itemTypeColumn = jTable.getColumnModel().getColumn(0);
+            itemTypeColumn.setCellEditor(new DefaultCellEditor(jComboBoxItemType));
+            //
+            // Using combobox to display data type in table
+            //
+            JComboBox jComboBoxDataType = new JComboBox();
+            jComboBoxDataType.addItem("UINT8");
+            jComboBoxDataType.addItem("UINT16");
+            jComboBoxDataType.addItem("UINT32");
+            jComboBoxDataType.addItem("UINT64");
+            jComboBoxDataType.addItem("VOID*");
+            jComboBoxDataType.addItem("BOOLEAN");
+            TableColumn dataTypeColumn = jTable.getColumnModel().getColumn(3);
+            dataTypeColumn.setCellEditor(new DefaultCellEditor(jComboBoxDataType));
+
+            if (sfc.getSpdPcdDefinitionCount() == 0) {
+
+                return jTable;
+            }
+            saa = new String[sfc.getSpdPcdDefinitionCount()][5];
+            sfc.getSpdPcdDefinitions(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(499, 404, 77, 20));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java
new file mode 100644
index 0000000000..cccc323ee8
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePkgHeader.java
@@ -0,0 +1,236 @@
+/** @file
+  Java class UpdatePkgHeader is GUI for update Package Header in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update Package Header in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdatePkgHeader extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdatePkgHeader(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+
+        if (arg0.getSource() == jButton) {
+            String[] o = { "BASE", "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update Package Headers");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("ModuleType");
+            model.addColumn("IncludeHeader");
+            //
+            // Using combobox to display ModuleType in table
+            //
+            TableColumn typeColumn = jTable.getColumnModel().getColumn(0);
+            JComboBox jComboBoxSelect = new JComboBox();
+            jComboBoxSelect.addItem("BASE");
+            jComboBoxSelect.addItem("SEC");
+            jComboBoxSelect.addItem("PEI_CORE");
+            jComboBoxSelect.addItem("PEIM");
+            jComboBoxSelect.addItem("DXE_CORE");
+            jComboBoxSelect.addItem("DXE_DRIVER");
+            jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
+            jComboBoxSelect.addItem("DXE_SAL_DRIVER");
+            jComboBoxSelect.addItem("DXE_SMM_DRIVER");
+            jComboBoxSelect.addItem("TOOLS");
+            jComboBoxSelect.addItem("UEFI_DRIVER");
+            jComboBoxSelect.addItem("UEFI_APPLICATION");
+            jComboBoxSelect.addItem("USER_DEFINED");
+            typeColumn.setCellEditor(new DefaultCellEditor(jComboBoxSelect));
+
+            if (sfc.getSpdPackageHeaderCount() == 0) {
+                return jTable;
+            }
+            String[][] saa = new String[sfc.getSpdPackageHeaderCount()][2];
+            sfc.getSpdPackageHeaders(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+    Remove original package headers before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdPkgHeader();
+        int rowCount = model.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String headFile = null;
+            if (model.getValueAt(i, 1) != null) {
+                headFile = model.getValueAt(i, 1).toString();
+            }
+            sfc.genSpdModuleHeaders(model.getValueAt(i, 0).toString(), headFile, null, null, null, null, null, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(220, 486, 85, 20));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java
new file mode 100644
index 0000000000..da1dc686fd
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdatePpi.java
@@ -0,0 +1,226 @@
+/** @file
+  Java class UpdatePpi is GUI for update Ppi declarations in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update Ppi declarations in spd file.
+  
+ @since PackageEditor 1.0
+**/
+public class UpdatePpi extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdatePpi(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+
+        if (arg0.getSource() == jButton) {
+            String[] o = { "", "", "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update PPI Declarations");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("Name");
+            model.addColumn("C_Name");
+            model.addColumn("GUID");
+            //
+            // initialize table using SpdFileContents object
+            //
+            if (sfc.getSpdPpiDeclarationCount() == 0) {
+                return jTable;
+            }
+            String[][] saa = new String[sfc.getSpdPpiDeclarationCount()][3];
+            sfc.getSpdPpiDeclarations(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+    Remove original ppi declarations before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdPpiDeclaration();
+        int rowCount = model.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String name = null;
+            if (model.getValueAt(i, 0) != null) {
+                name = model.getValueAt(i, 0).toString();
+            }
+            String cName = null;
+            if (model.getValueAt(i, 1) != null) {
+                cName = model.getValueAt(i, 1).toString();
+            }
+            String guid = null;
+            if (model.getValueAt(i, 2) != null) {
+                guid = model.getValueAt(i, 2).toString();
+            }
+            sfc.genSpdPpiDeclarations(name, cName, guid, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(224, 488, 72, 18));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java
new file mode 100644
index 0000000000..614cf82d60
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateProtocols.java
@@ -0,0 +1,226 @@
+/** @file
+  Java class UpdateProtocols is GUI for update protocol declarations in spd file.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging;
+
+import javax.swing.JPanel;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.*;
+
+import org.tianocore.common.Tools;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+
+/**
+ GUI for update protocol declarations in spd file
+  
+ @since PackageEditor 1.0
+**/
+public class UpdateProtocols extends JFrame implements ActionListener {
+
+    private JPanel jContentPane = null;
+
+    private JScrollPane jScrollPane = null;
+
+    private JTable jTable = null;
+
+    private SpdFileContents sfc = null;
+
+    private JButton jButtonOk = null;
+
+    private JButton jButtonCancel = null;
+
+    private DefaultTableModel model = null;
+
+    private JButton jButton = null;
+
+    /**
+     This is the default constructor
+     **/
+    public UpdateProtocols(SpdFileContents sfc) {
+        super();
+        this.sfc = sfc;
+        initialize();
+
+    }
+
+    public void actionPerformed(ActionEvent arg0) {
+        if (arg0.getSource() == jButtonOk) {
+            this.save();
+            this.dispose();
+
+        }
+        if (arg0.getSource() == jButtonCancel) {
+            this.dispose();
+
+        }
+
+        if (arg0.getSource() == jButton) {
+            String[] o = { "", "", "" };
+            model.addRow(o);
+        }
+    }
+
+    /**
+     This method initializes this
+     
+     @return void
+     **/
+    private void initialize() {
+        this.setSize(604, 553);
+        this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        this.setTitle("Update Protocol Declarations");
+        this.setContentPane(getJContentPane());
+    }
+
+    /**
+     This method initializes jContentPane
+     
+     @return javax.swing.JPanel
+     **/
+    private JPanel getJContentPane() {
+        if (jContentPane == null) {
+            jContentPane = new JPanel();
+            jContentPane.setLayout(null);
+            jContentPane.add(getJScrollPane(), null);
+            jContentPane.add(getJButtonOk(), null);
+            jContentPane.add(getJButtonCancel(), null);
+            jContentPane.add(getJButton(), null);
+        }
+        return jContentPane;
+    }
+
+    /**
+     This method initializes jScrollPane	
+     	
+     @return javax.swing.JScrollPane	
+     **/
+    private JScrollPane getJScrollPane() {
+        if (jScrollPane == null) {
+            jScrollPane = new JScrollPane();
+            jScrollPane.setBounds(new java.awt.Rectangle(38, 45, 453, 419));
+            jScrollPane.setViewportView(getJTable());
+        }
+        return jScrollPane;
+    }
+
+    /**
+     This method initializes jTable	
+     	
+     @return javax.swing.JTable	
+     **/
+    private JTable getJTable() {
+        if (jTable == null) {
+            model = new DefaultTableModel();
+            jTable = new JTable(model);
+            jTable.setRowHeight(20);
+            model.addColumn("Name");
+            model.addColumn("C_Name");
+            model.addColumn("GUID");
+            //
+            // initialize table using SpdFileContents object
+            //
+            if (sfc.getSpdProtocolDeclarationCount() == 0) {
+                return jTable;
+            }
+            String[][] saa = new String[sfc.getSpdProtocolDeclarationCount()][3];
+            sfc.getSpdProtocolDeclarations(saa);
+            int i = 0;
+            while (i < saa.length) {
+                model.addRow(saa[i]);
+                i++;
+            }
+
+        }
+        return jTable;
+    }
+
+    /**
+    Remove original protocol declarations before saving updated ones
+    **/
+    protected void save() {
+        sfc.removeSpdProtocolDeclaration();
+        int rowCount = model.getRowCount();
+        int i = 0;
+        while (i < rowCount) {
+            String name = null;
+            if (model.getValueAt(i, 0) != null) {
+                name = model.getValueAt(i, 0).toString();
+            }
+            String cName = null;
+            if (model.getValueAt(i, 1) != null) {
+                cName = model.getValueAt(i, 1).toString();
+            }
+            String guid = null;
+            if (model.getValueAt(i, 2) != null) {
+                guid = model.getValueAt(i, 2).toString();
+            }
+            sfc.genSpdProtocolDeclarations(name, cName, guid, null);
+            i++;
+        }
+    }
+
+    /**
+     This method initializes jButtonOk	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonOk() {
+        if (jButtonOk == null) {
+            jButtonOk = new JButton();
+            jButtonOk.setText("Ok");
+            jButtonOk.setSize(new java.awt.Dimension(84, 20));
+            jButtonOk.setLocation(new java.awt.Point(316, 486));
+            jButtonOk.addActionListener(this);
+        }
+        return jButtonOk;
+    }
+
+    /**
+     This method initializes jButtonCancel	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButtonCancel() {
+        if (jButtonCancel == null) {
+            jButtonCancel = new JButton();
+            jButtonCancel.setText("Cancel");
+            jButtonCancel.setSize(new java.awt.Dimension(82, 20));
+            jButtonCancel.setLocation(new java.awt.Point(411, 486));
+            jButtonCancel.addActionListener(this);
+        }
+        return jButtonCancel;
+    }
+
+    /**
+     This method initializes jButton	
+     	
+     @return javax.swing.JButton	
+     **/
+    private JButton getJButton() {
+        if (jButton == null) {
+            jButton = new JButton();
+            jButton.setBounds(new java.awt.Rectangle(232, 486, 71, 19));
+            jButton.setText("Insert");
+            jButton.addActionListener(this);
+        }
+        return jButton;
+    }
+} //  @jve:decl-index=0:visual-constraint="11,7"
diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/common/ui/StarLabel.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/common/ui/StarLabel.java
new file mode 100644
index 0000000000..ad19472e5d
--- /dev/null
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/common/ui/StarLabel.java
@@ -0,0 +1,41 @@
+/** @file
+  Java class StarLabel is used to create star label.
+ 
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+**/
+package org.tianocore.packaging.common.ui;
+
+import javax.swing.JLabel;
+
+/**
+ Derived from JLabel class to have a red star on it.
+  
+ @since PackageEditor 1.0
+**/
+public class StarLabel extends JLabel{
+	/**
+	 * This is the default constructor
+	 */
+	public StarLabel() {
+		super();
+		init();
+	}
+	
+	/**
+	 Create a label with red star * appear on it
+	**/
+	private void init() {
+		this.setText("*");
+		this.setSize(new java.awt.Dimension(10,20));
+		this.setForeground(java.awt.Color.red);
+		this.setFont(new java.awt.Font("DialogInput", java.awt.Font.BOLD, 14));
+		this.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+	}
+}
diff --git a/Tools/Source/Prototype/Auto.java b/Tools/Source/Prototype/Auto.java
new file mode 100644
index 0000000000..07d609406e
--- /dev/null
+++ b/Tools/Source/Prototype/Auto.java
@@ -0,0 +1,8 @@
+import java.util.*;
+
+public class Auto
+{
+  public static void main(String args[]) 
+  {
+  }
+}
diff --git a/Tools/Source/Prototype/Component.java b/Tools/Source/Prototype/Component.java
new file mode 100644
index 0000000000..4e4e3a178c
--- /dev/null
+++ b/Tools/Source/Prototype/Component.java
@@ -0,0 +1,43 @@
+import java.util.*;
+
+public class Component extends Module
+{
+  Component()
+  {
+  }
+  Component(String n)
+  {
+    name=n;
+  }
+  String name;
+
+  // These are the libs we want to build with.
+  public Set<LibInst> buildLibs;
+
+  public String name() { return name; }
+
+  public boolean autoBuild()
+  {
+    // buildLibs must contain a list of libInstances. We need to check that
+    // These libs meet certain criterea.
+    if(!duplicateLibClasses(buildLibs).isEmpty())
+    {
+      // Error: The lib instance implement the same lib twice.
+      return false;
+    }
+    if(! libClassesProduced(buildLibs).containsAll(consumesLibClasses))
+    {
+      // We can not cover the libclasses consumed with these instances.
+      return false;
+    }
+    getConstructorOrder(buildLibs);
+    getDestructorOrder(buildLibs);
+
+    // Get PPI, Protocol, GUID, PCDs from the lib instances. These are all simple unions of
+    // the corresponding sets in the modules. There is no ordering needed.
+    // TODO
+
+    return true;
+  }
+
+}
diff --git a/Tools/Source/Prototype/DAG.java b/Tools/Source/Prototype/DAG.java
new file mode 100644
index 0000000000..1edad27887
--- /dev/null
+++ b/Tools/Source/Prototype/DAG.java
@@ -0,0 +1,176 @@
+import java.util.*;
+
+// A directed Acyclic Graph class. The main purpose is to provide a set of nodes
+// and the dependency relations between them.  Then ask for a topological sort of
+// the nodes.
+
+public class DAG<Node>
+{
+  // Constructor.
+  DAG()
+  {
+    children = new HashMap<Node,Set<Node>>();
+  }
+
+  public Set<Node> nodes() { return children.keySet(); }
+  public Set<Node> children(Node parent) { return children.get(parent); }
+
+  // Add the relations from a compatible DAG to this one.
+  public void add(DAG<Node> newDag)
+  {
+    for(Node parent : newDag.children.keySet())
+    {
+      children.put(parent, newDag.children(parent));
+    }
+  }
+
+  // The central data structure is a one-to-many map. Each node is 
+  // treated as a parent. It is mapped to a list of its children. Leaf
+  // nodes are also treated as parents and map to an empty list of
+  // children.
+  Map<Node,Set<Node>> children;
+
+  public void remove(Collection<Node> nodes)
+  {
+    // Remove it as a parent
+    for(Node node : nodes)
+    {
+      children.remove(node);
+    }
+
+    for(Set<Node> childlist : children.values())
+    {
+      // Remove it as a child
+      childlist.removeAll(nodes);
+    }
+  }
+
+  // Remove every occurrence of node from the DAG.
+  public void remove(Node node)
+  {
+    // Remove it as a parent
+    children.remove(node);
+
+    for(Set<Node> childlist : children.values())
+    {
+      // Remove it as a child
+      childlist.remove(node);
+    }
+  }
+
+  // Return true iff parent is a direct parent of child.
+  public boolean directDepends(Node parent, Node child)
+  {
+    return children.containsKey(parent) ? 
+           children(parent).contains(child) :
+           false;
+  }
+
+  // Return true iff parent is a direct or indirect parent of child.
+  // This is the transitive closure of the dependency relation.
+  public boolean depends(Node parent, Node child)
+  {
+    if(!children.containsKey(parent))
+    {
+      return false;
+    }
+    if( directDepends(parent, child) )
+    {
+      return true;
+    }
+    else
+    {
+      for(Node descendent : children(parent) )
+      {
+        // Recursively call depends() to compute the transitive closure of
+        // the relation.
+        if(depends(descendent, child))
+        {
+          return true;
+        }
+      }
+      return false;
+    } 
+  }
+
+  // Add a parent child relation to the dag. Fail if there is already
+  // a dependency from the child to the parent. This implies a cycle.
+  // Our invariant is that the DAG must never contain a cycle. That
+  // way it lives up to its name.
+  public void add(Node parent, Node child)
+  {
+    if(depends(child, parent))
+    {
+      System.out.format("Error: There is a cycle from %s to %s.\n", parent, child);
+      return;
+    }
+    if(children.containsKey(parent))
+    {
+      children(parent).add(child);
+    }
+    else
+    {
+      Set<Node> cs = new HashSet<Node>();
+      cs.add(child);
+      children.put(parent, cs);
+    }
+    if(!children.containsKey(child))
+    {
+      children.put(child,new HashSet<Node>());
+    }
+  }
+
+  // Perform a topological sort on the DAG.
+  public List<Node> sort()
+  {
+    // Make an ordered list to hold the topo sort.
+    List<Node> sorted = new LinkedList<Node>();
+
+    // We add the leaves to the beginning of the list until
+    // the sorted list contains all the nodes in the DAG.
+    while(!sorted.containsAll(nodes()))
+    {
+      // Ignoring the ones we have found, what are the leaves of this
+      // DAG?
+      Set<Node> leaves = leaves(sorted);
+      // Put the new leaves at the beginning of the list.
+      sorted.addAll(0, leaves);
+    }
+    return sorted;
+  }
+
+  // Return the set of nodes that have no children. Pretend
+  // the nodes in the exclude list are not present.
+  public Set<Node> leaves(Collection<Node> exclude)
+  {
+    Set<Node> leaves=new HashSet<Node>();
+    for(Node parent : children.keySet())
+    {
+      if(exclude.contains(parent))
+      {
+        continue;
+      }
+      // If the children of parent are a subset of the exclude set,
+      // then parent is a leaf.
+      if(exclude.containsAll(children(parent)))
+      {
+        leaves.add(parent);
+      }
+    }
+    return leaves;
+  }
+
+  // Return the set of nodes that have no children.
+  public Set<Node> leaves()
+  {
+    Set<Node> leaves=new HashSet<Node>();
+    for(Node parent : children.keySet())
+    {
+      if( children(parent).isEmpty())
+      {
+        leaves.add(parent);
+      }
+    }
+    return leaves;
+  }
+}
diff --git a/Tools/Source/Prototype/Database.java b/Tools/Source/Prototype/Database.java
new file mode 100644
index 0000000000..bc0a7b0c44
--- /dev/null
+++ b/Tools/Source/Prototype/Database.java
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class Database
+{
+  Database()
+  {
+  }
+  Database(String n)
+  {
+    name=n;
+  }
+  public String name;
+  Map<String,Set<Package>> packages;
+}
diff --git a/Tools/Source/Prototype/GuidDecl.java b/Tools/Source/Prototype/GuidDecl.java
new file mode 100644
index 0000000000..7aa928f9ed
--- /dev/null
+++ b/Tools/Source/Prototype/GuidDecl.java
@@ -0,0 +1,16 @@
+import java.util.*;
+
+public class GuidDecl
+{
+  GuidDecl()
+  {
+  }
+  GuidDecl(String n)
+  {
+    name=n;
+  }
+  public String name;
+  public String cName;
+  public String guid;
+  public String name() { return name; }
+}
diff --git a/Tools/Source/Prototype/LibClass.java b/Tools/Source/Prototype/LibClass.java
new file mode 100644
index 0000000000..c49f7ddb36
--- /dev/null
+++ b/Tools/Source/Prototype/LibClass.java
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class LibClass
+{
+  LibClass()
+  {
+  }
+  LibClass(String n)
+  {
+    name=n;
+  }
+  String name;
+  public String name() { return name; }
+}
diff --git a/Tools/Source/Prototype/LibInst.java b/Tools/Source/Prototype/LibInst.java
new file mode 100644
index 0000000000..3e4dac32f3
--- /dev/null
+++ b/Tools/Source/Prototype/LibInst.java
@@ -0,0 +1,22 @@
+import java.util.*;
+
+public class LibInst extends Module
+{
+  LibInst()
+  {
+  }
+  LibInst(String n)
+  {
+    name=n;
+  }
+
+  public Set<LibClass> producesLibClasses;
+
+  public String constructorName, destructorName;
+
+  public boolean autoBuild()
+  {
+    // A simple compile, without link.
+    return true;
+  }
+}
diff --git a/Tools/Source/Prototype/Module.java b/Tools/Source/Prototype/Module.java
new file mode 100644
index 0000000000..79557f4de2
--- /dev/null
+++ b/Tools/Source/Prototype/Module.java
@@ -0,0 +1,178 @@
+import java.util.*;
+
+public class Module
+{
+  Module()
+  {
+  }
+  Module(String n)
+  {
+    name=n;
+  }
+  String name;
+
+  public String name() { return name; }
+
+  public Set<LibClass> consumesLibClasses;
+
+  // The set of packages that this module depends upon.
+  Set<Package> packageDepends;
+  public Set<Package> packageDeps() { return packageDepends; }
+
+  public boolean autoBuild()
+  {
+    // This should be implemented in the derived class.
+    return true;
+  }
+
+  // Make sure that each class in this set of libclasses is declared in one
+  // of the packages that this module depends on.
+  public boolean validateLibClasses(Set<LibClass> classes)
+  {
+    for(LibClass lc : classes)
+    {
+      // Assume we will not find it.
+      boolean found = false;
+
+      for(Package p : packageDepends)
+      {
+        if(p.libClassDecls.contains(lc))
+        {
+          found=true;
+          break;
+        }
+      }
+      if(found == false)
+      {
+        // Error: This LibClass is not found in any of our Packages.
+        return false;
+      }
+    }
+    // Well, we never came up empty handed, so it looks good.
+    return true;
+  }
+
+  public Set<LibClass> libClassesProduced(Collection<LibInst> instances)
+  {
+    // given a set of lib instances, what is the set of lib classes produced?
+
+    Set<LibClass> classes = new HashSet<LibClass>();
+
+    for(LibInst li : instances)
+    {
+      classes.addAll(li.producesLibClasses);
+    }
+    return classes;
+  }
+
+  // Search the given set of lib instance to see if, among them, they
+  // produce the same LibClass more than once.
+  public Set<LibClass> duplicateLibClasses(Set<LibInst> libs)
+  {
+    // Return true iff each class produced is produced only once.
+
+    List<LibClass> classes = new LinkedList<LibClass>();
+    Set<LibClass> dups = new HashSet<LibClass>();
+
+    for(LibInst li : libs)
+    {
+      classes.addAll(li.producesLibClasses);
+    }
+
+    for(LibClass c : classes)
+    {
+      for(LibClass inner : classes)
+      {
+        if(c.equals(inner))
+        {
+          dups.add(c);
+        }
+      }
+    }
+    return dups;
+  }
+
+  public Set<LibInst> getProducers(LibClass lc, Set<LibInst> libs)
+  {
+    // Return the subset of the given libs that produce this LibClass.
+
+    Set<LibInst> producers = new HashSet<LibInst>();
+
+    for(LibInst li : libs)
+    {
+      if(li.producesLibClasses.contains(lc))
+      {
+        producers.add(li);
+      }
+    }
+    return producers;
+  }
+ 
+  // 
+  // The central dependency relationship between library instances is as follows.
+  // A LibInst "A" depends upon LibInst "B" if, and only if, there exists a LibClass
+  // "C" such that A consumes C and B produces C. This is the partial order over which 
+  // we construct a Directed Acyclic Graph (DAG). The DAG can be used to detect
+  // cycles in the depends relation (which are illegal) and it can be used to implement a
+  // topological sort which is a total ordering over LibInstances. This total order on 
+  // lib instances is what is needed in order to call the constructors and destructors
+  // in the proper sequence.
+  //
+  public DAG<LibInst> makeDAG(Set<LibInst> libs)
+  {
+    DAG<LibInst> dag = new DAG<LibInst>();
+
+    if(duplicateLibClasses(libs).size()>0)
+    {
+      System.out.format("Error: The library instances implement at least one "
+        + "library class more than once.\n");
+    }
+
+    for(LibInst consumer : libs)
+    {
+      // Find all the producers for each LC that li consumes. 
+      for(LibClass lc : consumer.consumesLibClasses )
+      {
+        Set<LibInst> producers = getProducers(lc, libs);
+        if(producers.isEmpty())
+        {
+          System.out.format("Error: Unmet dependency libclass:%s .", lc.name() );
+          return null;
+        }
+
+        // There is exactly one lib inst that produces this class.
+        LibInst producer = producers.iterator().next();
+
+        // Now we are ready to add the dependency to the dag. It will flag  
+        // circular dependencies for us.
+        dag.add(consumer, producer);
+      }
+    }
+    return dag;
+  }
+
+  // As you evaluate each node in the graph (starting with the module node), you
+  // must call the constructors for all the child nodes before you call the
+  // constructor for the current node.   
+  public List<LibInst> getConstructorOrder(Set<LibInst> libs)
+  {
+    List<LibInst> rev = new LinkedList<LibInst>();
+
+    for(LibInst li : getDestructorOrder(libs))
+      rev.add(0, li);    
+
+    return rev;
+  }
+
+  // The destructor order is exactly the reverese of the constructor order.
+  // As you evaluate each node in the graph (starting with the module node), you
+  // must call the destructor for the all the parent nodes before calling the
+  // destructors for the current node, and then call the destructors for all the
+  // child nodes. 
+  public List<LibInst> getDestructorOrder(Set<LibInst> libs)
+  {
+    DAG<LibInst> dag = makeDAG(libs);
+
+    return dag.sort();
+  }
+}
diff --git a/Tools/Source/Prototype/Package.java b/Tools/Source/Prototype/Package.java
new file mode 100644
index 0000000000..dac0802d6c
--- /dev/null
+++ b/Tools/Source/Prototype/Package.java
@@ -0,0 +1,44 @@
+import java.util.*;
+
+public class Package
+{
+  Package()
+  {
+  }
+  Package(String n)
+  {
+    name=n;
+  }
+  public String name;
+
+  public Set<LibClass>     libClassDecls;
+  public Set<GuidDecl>     guidDecls;
+  public Set<PpiDecl>      ppiDecls;
+  public Set<ProtocolDecl> protocolDecls;
+  public Set<Module>       modules;
+  public Set<Package>      depends;
+
+  public void genBuild()
+  {
+    for(Module m : modules)
+    {
+      m.autoBuild();
+    }
+  }
+
+  // Figure out what this package depends on based on what the modules 
+  // depend on.
+  public void calculateDependencies()
+  {
+    depends = new HashSet<Package>();
+    for(Module m : modules)
+    {
+      depends.addAll(m.packageDeps());
+    }
+  }
+
+  public void makeJar(String name) {};
+
+  public void addModule(Module m) {};
+  public void removeModule(Module m) {};
+}
diff --git a/Tools/Source/Prototype/PpiDecl.java b/Tools/Source/Prototype/PpiDecl.java
new file mode 100644
index 0000000000..581fb13f76
--- /dev/null
+++ b/Tools/Source/Prototype/PpiDecl.java
@@ -0,0 +1,16 @@
+import java.util.*;
+
+public class PpiDecl
+{
+  PpiDecl()
+  {
+  }
+  PpiDecl(String n)
+  {
+    name=n;
+  }
+  public String name;
+  public String cName;
+  public String guid;
+  public String name() { return name; }
+}
diff --git a/Tools/Source/Prototype/ProtocolDecl.java b/Tools/Source/Prototype/ProtocolDecl.java
new file mode 100644
index 0000000000..62a45e6fef
--- /dev/null
+++ b/Tools/Source/Prototype/ProtocolDecl.java
@@ -0,0 +1,16 @@
+import java.util.*;
+
+public class ProtocolDecl
+{
+  ProtocolDecl()
+  {
+  }
+  ProtocolDecl(String n)
+  {
+    name=n;
+  }
+  public String name;
+  public String cName;
+  public String guid;
+  public String name() { return name; }
+}
diff --git a/Tools/Source/Prototype/TSort.java b/Tools/Source/Prototype/TSort.java
new file mode 100644
index 0000000000..88765e17fc
--- /dev/null
+++ b/Tools/Source/Prototype/TSort.java
@@ -0,0 +1,24 @@
+import java.util.*;
+
+public class TSort
+{
+  public static void main(String args[]) 
+  {
+    DAG<String> dag = new DAG<String>();
+    int i;
+
+    if(args.length % 2==1)
+    {
+      System.out.println("Error: Odd number of elements");
+      return;
+    }
+    for(i=0; i< args.length/2; i++)
+    {
+      dag.add(args[i*2], args[i*2+1]);
+      // System.out.println(pair.left);
+      // System.out.println(pair.right);
+    }
+    System.out.println(dag.sort().toString());
+    System.out.println(dag.sort().toString());
+  }
+}
diff --git a/Tools/Source/Prototype/build.xml b/Tools/Source/Prototype/build.xml
new file mode 100644
index 0000000000..de4cde9248
--- /dev/null
+++ b/Tools/Source/Prototype/build.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="proto" default="all">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <target name="all">
+    <javac srcdir=".">
+      <compilerarg value="-Xlint"/>
+    </javac>
+    <jar destfile="Prototype.jar"
+      basedir="."
+      includes="*.class"
+      excludes="**/Not this one.class"
+    />
+  </target>
+
+  <target name="clean"/>
+  <target name="cleanall"/>
+</project>
diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
new file mode 100644
index 0000000000..415958a4d7
--- /dev/null
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="all" basedir="." name="SurfaceArea">
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env" />
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib">
+      <include name="*.jar"/>
+    </fileset>
+    <pathelement path = "${env.CLASSPATH}"/>
+  </path>
+
+  <target name="init">
+    <uptodate targetfile="${WORKSPACE}/Tools/Jars/SurfaceArea.jar" property="jar.newer">
+      <srcfiles dir="${WORKSPACE}/Tools/XMLSchema" includes="*.xsd"/>
+    </uptodate>
+  </target>
+
+  <!--
+    Generate SurfaceArea.jar and source code 
+    -->
+  <target name="SurfaceArea.jar" depends="init">
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">
+      <classpath refid="classpath"/>
+      <arg value="-javasource"/>
+      <arg value="1.5"/>
+      <arg value="-dl"/>
+      <arg value="-out"/>
+      <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
+    </java>
+  </target>
+  
+  <target name="SurfaceArea.java" depends="init">
+    <antcall target="SurfaceArea.java.clean"/>
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">
+      <classpath refid="classpath"/>
+      <arg value="-javasource"/>
+      <arg value="1.5"/>
+      <arg value="-dl"/>
+      <arg value="-srconly"/>
+      <arg value="-src"/>
+      <arg value="${WORKSPACE}/Tools/Source/SurfaceArea"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
+    </java>
+  </target>
+  
+  <target name="SurfaceArea" depends="init" unless="jar.newer">
+    <antcall target="SurfaceArea.java.clean"/>
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">
+      <classpath refid="classpath"/>
+      <arg value="-javasource"/>
+      <arg value="1.5"/>
+      <arg value="-dl"/>
+      <arg value="-src"/>
+      <arg value="${WORKSPACE}/Tools/Source/SurfaceArea"/>
+      <arg value="-out"/>
+      <arg value="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/FDPManifest.xsd"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsdconfig"/>
+    </java>
+  </target>
+  
+  <target name="SurfaceArea.java.clean">
+    <delete includeemptydirs="true">
+      <fileset dir="${WORKSPACE}/Tools/Source/SurfaceArea" includes="**/*" excludes="build.xml"/>
+    </delete>
+  </target>
+
+  <target name="SurfaceArea.jar.clean">
+  </target>
+  
+  <!--
+    Surface Area Description file validation
+    -->
+  <target name="validate">
+    <echo message="Validating ... ${SURFACE_AREA_FILE}"/>
+    <!--
+      java -classpath %cp% org.apache.xmlbeans.impl.tool.InstanceValidator %*
+    -->
+    <copy file="${SURFACE_AREA_FILE}" tofile="${SURFACE_AREA_FILE}.xml"/>
+    <java classname="org.apache.xmlbeans.impl.tool.InstanceValidator" 
+      outputproperty="XMLBEANS_OUTPUT" >
+          
+      <classpath refid="classpath"/>
+      <arg value="-dl"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
+      <arg value="${SURFACE_AREA_FILE}.xml"/>
+      
+    </java>   
+
+    <delete file="${SURFACE_AREA_FILE}.xml" quiet="true"/>
+    <echo message="Result ... ${XMLBEANS_OUTPUT}"/>
+  </target>
+  
+  <!--
+    beautify xml file
+    -->
+  <target name="pretty">
+    <echo message="Beautify ... ${SURFACE_AREA_FILE}"/>
+    <!--
+      java -classpath %cp% org.apache.xmlbeans.impl.tool.PrettyPrinter %*
+    -->
+    <java classname="org.apache.xmlbeans.impl.tool.PrettyPrinter" 
+      errorproperty="XMLBEANS_OUTPUT"
+      output="${SURFACE_AREA_FILE}">
+          
+      <classpath refid="classpath"/>
+      <arg value="-indent"/>
+      <arg value="2"/>
+      <arg value="${SURFACE_AREA_FILE}"/>
+      
+    </java>
+
+    <if>
+      <equals arg1="${XMLBEANS_OUTPUT}" arg2=""/>
+      <then>
+        <echo message="Result ... DONE"/>
+      </then>
+      <else>
+        <echo message="Result ... ${XMLBEANS_OUTPUT}"/>
+      </else>
+    </if>
+  </target>
+
+  <!--
+    generate Surface Area template file from schema
+    -->
+  <target name="generate">
+    <echo message="Generating ... ${SURFACE_AREA_FILE}"/>
+    <!--
+      java -classpath %cp% org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator %*
+    -->
+    <java classname="org.apache.xmlbeans.impl.xsd2inst.SchemaInstanceGenerator" fork="true"
+      errorproperty="XMLBEANS_OUTPUT" 
+      output="${SURFACE_AREA_FILE}.tmp">
+          
+      <classpath refid="classpath"/>
+      <arg value="-dl"/>
+      <arg value="${WORKSPACE}/Tools/XMLSchema/SurfaceArea.xsd"/>
+      <arg value="-name"/>
+      <arg value="${SURFACE_AREA_ELEMENT}"/>
+      
+    </java>
+
+    <concat destfile="${SURFACE_AREA_FILE}">
+      <header trimleading="yes" filtering="no"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>]]>
+      </header>
+      <fileset file="${SURFACE_AREA_FILE}.tmp"/>
+    </concat>
+    
+    <delete file="${SURFACE_AREA_FILE}.tmp" deleteonexit="true" quiet="true"/>
+    <if>
+      <equals arg1="${XMLBEANS_OUTPUT}" arg2=""/>
+      <then>
+        <echo message="Result ... DONE"/>
+      </then>
+      <else>
+        <echo message="Result ... ${XMLBEANS_OUTPUT}"/>
+      </else>
+    </if>
+  </target>
+
+  <target name="clean" depends="SurfaceArea.java.clean">
+  </target>
+
+  <target name="cleanall" depends="SurfaceArea.jar.clean">
+    <if>
+      <available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
+      <then>
+        <echo message="You must manually remove the file: ${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
+        <echo message="Java has already loaded the file, and cannot remove it within ANT!"/>
+      </then>
+    </if>
+  </target>
+
+  <target name="all" depends="SurfaceArea">
+  </target>
+
+  <target name="install" depends="SurfaceArea.jar">
+  </target>
+
+</project>  
diff --git a/Tools/Source/TianoTools/Common/CommonLib.c b/Tools/Source/TianoTools/Common/CommonLib.c
new file mode 100644
index 0000000000..e2b12b4d27
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/CommonLib.c
@@ -0,0 +1,495 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  CommonLib.c
+
+Abstract:
+
+  Common Library Functions
+ 
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "CommonLib.h"
+
+VOID
+PeiZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+/*++
+
+Routine Description:
+
+  Set Buffer to zero for Size bytes.
+
+Arguments:
+
+  Buffer  - Memory to set.
+
+  Size    - Number of bytes to set
+
+Returns:
+
+  None
+
+--*/
+{
+  INT8  *Ptr;
+
+  Ptr = Buffer;
+  while (Size--) {
+    *(Ptr++) = 0;
+  }
+}
+
+VOID
+PeiCopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+/*++
+
+Routine Description:
+
+  Copy Length bytes from Source to Destination.
+
+Arguments:
+
+  Destination - Target of copy
+
+  Source      - Place to copy from
+
+  Length      - Number of bytes to copy
+
+Returns:
+
+  None
+
+--*/
+{
+  CHAR8 *Destination8;
+  CHAR8 *Source8;
+
+  Destination8  = Destination;
+  Source8       = Source;
+  while (Length--) {
+    *(Destination8++) = *(Source8++);
+  }
+}
+
+VOID
+ZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+{
+  PeiZeroMem (Buffer, Size);
+}
+
+VOID
+CopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+{
+  PeiCopyMem (Destination, Source, Length);
+}
+
+INTN
+CompareGuid (
+  IN EFI_GUID     *Guid1,
+  IN EFI_GUID     *Guid2
+  )
+/*++
+
+Routine Description:
+
+  Compares to GUIDs
+
+Arguments:
+
+  Guid1 - guid to compare
+  Guid2 - guid to compare
+
+Returns:
+  =  0  if Guid1 == Guid2
+  != 0  if Guid1 != Guid2 
+
+--*/
+{
+  INT32 *g1;
+  INT32 *g2;
+  INT32 r;
+
+  //
+  // Compare 32 bits at a time
+  //
+  g1  = (INT32 *) Guid1;
+  g2  = (INT32 *) Guid2;
+
+  r   = g1[0] - g2[0];
+  r |= g1[1] - g2[1];
+  r |= g1[2] - g2[2];
+  r |= g1[3] - g2[3];
+
+  return r;
+}
+
+EFI_STATUS
+GetFileImage (
+  IN CHAR8    *InputFileName,
+  OUT CHAR8   **InputFileImage,
+  OUT UINT32  *BytesRead
+  )
+/*++
+
+Routine Description:
+
+  This function opens a file and reads it into a memory buffer.  The function 
+  will allocate the memory buffer and returns the size of the buffer.
+
+Arguments:
+
+  InputFileName     The name of the file to read.
+  InputFileImage    A pointer to the memory buffer.
+  BytesRead         The size of the memory buffer.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              An error occurred.
+  EFI_OUT_OF_RESOURCES     No resource to complete operations.
+
+--*/
+{
+  FILE    *InputFile;
+  UINT32  FileSize;
+
+  //
+  // Verify input parameters.
+  //
+  if (InputFileName == NULL || strlen (InputFileName) == 0 || InputFileImage == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Open the file and copy contents into a memory buffer.
+  //
+  //
+  // Open the file
+  //
+  InputFile = fopen (InputFileName, "rb");
+  if (InputFile == NULL) {
+    printf ("ERROR: Could not open input file \"%s\".\n", InputFileName);
+    return EFI_ABORTED;
+  }
+  //
+  // Go to the end so that we can determine the file size
+  //
+  if (fseek (InputFile, 0, SEEK_END)) {
+    printf ("ERROR: System error reading input file \"%s\".\n", InputFileName);
+    fclose (InputFile);
+    return EFI_ABORTED;
+  }
+  //
+  // Get the file size
+  //
+  FileSize = ftell (InputFile);
+  if (FileSize == -1) {
+    printf ("ERROR: System error parsing input file \"%s\".\n", InputFileName);
+    fclose (InputFile);
+    return EFI_ABORTED;
+  }
+  //
+  // Allocate a buffer
+  //
+  *InputFileImage = malloc (FileSize);
+  if (*InputFileImage == NULL) {
+    fclose (InputFile);
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Reset to the beginning of the file
+  //
+  if (fseek (InputFile, 0, SEEK_SET)) {
+    printf ("ERROR: System error reading input file \"%s\".\n", InputFileName);
+    fclose (InputFile);
+    free (*InputFileImage);
+    *InputFileImage = NULL;
+    return EFI_ABORTED;
+  }
+  //
+  // Read all of the file contents.
+  //
+  *BytesRead = fread (*InputFileImage, sizeof (UINT8), FileSize, InputFile);
+  if (*BytesRead != sizeof (UINT8) * FileSize) {
+    printf ("ERROR: Reading file \"%s\"%i.\n", InputFileName);
+    fclose (InputFile);
+    free (*InputFileImage);
+    *InputFileImage = NULL;
+    return EFI_ABORTED;
+  }
+  //
+  // Close the file
+  //
+  fclose (InputFile);
+
+  return EFI_SUCCESS;
+}
+
+UINT8
+CalculateChecksum8 (
+  IN UINT8        *Buffer,
+  IN UINTN        Size
+  )
+/*++
+  
+Routine Description:
+
+  This function calculates the value needed for a valid UINT8 checksum
+
+Arguments:
+
+  Buffer      Pointer to buffer containing byte data of component.
+  Size        Size of the buffer
+
+Returns:
+
+  The 8 bit checksum value needed.
+
+--*/
+{
+  return (UINT8) (0x100 - CalculateSum8 (Buffer, Size));
+}
+
+UINT8
+CalculateSum8 (
+  IN UINT8  *Buffer,
+  IN UINT32 Size
+  )
+/*++
+  
+Routine Description::
+
+  This function calculates the UINT8 sum for the requested region.
+
+Arguments:
+
+  Buffer      Pointer to buffer containing byte data of component.
+  Size        Size of the buffer
+
+Returns:
+
+  The 8 bit checksum value needed.
+
+--*/
+{
+  UINTN Index;
+  UINT8 Sum;
+
+  Sum = 0;
+
+  //
+  // Perform the byte sum for buffer
+  //
+  for (Index = 0; Index < Size; Index++) {
+    Sum = (UINT8) (Sum + Buffer[Index]);
+  }
+
+  return Sum;
+}
+
+UINT16
+CalculateChecksum16 (
+  IN UINT16       *Buffer,
+  IN UINTN        Size
+  )
+/*++
+  
+Routine Description::
+
+  This function calculates the value needed for a valid UINT16 checksum
+
+Arguments:
+
+  Buffer      Pointer to buffer containing byte data of component.
+  Size        Size of the buffer
+
+Returns:
+
+  The 16 bit checksum value needed.
+
+--*/
+{
+  return (UINT16) (0x10000 - CalculateSum16 (Buffer, Size));
+}
+
+UINT16
+CalculateSum16 (
+  IN UINT16       *Buffer,
+  IN UINTN        Size
+  )
+/*++
+  
+Routine Description:
+
+  This function calculates the UINT16 sum for the requested region.
+
+Arguments:
+
+  Buffer      Pointer to buffer containing byte data of component.
+  Size        Size of the buffer
+
+Returns:
+
+  The 16 bit checksum
+
+--*/
+{
+  UINTN   Index;
+  UINT16  Sum;
+
+  Sum = 0;
+
+  //
+  // Perform the word sum for buffer
+  //
+  for (Index = 0; Index < Size; Index++) {
+    Sum = (UINT16) (Sum + Buffer[Index]);
+  }
+
+  return (UINT16) Sum;
+}
+
+EFI_STATUS
+PrintGuid (
+  IN EFI_GUID *Guid
+  )
+/*++
+
+Routine Description:
+
+  This function prints a GUID to STDOUT.
+
+Arguments:
+
+  Guid    Pointer to a GUID to print.
+
+Returns:
+
+  EFI_SUCCESS             The GUID was printed.
+  EFI_INVALID_PARAMETER   The input was NULL.
+
+--*/
+{
+  if (Guid == NULL) {
+    printf ("ERROR: PrintGuid called with a NULL value.\n");
+    return EFI_INVALID_PARAMETER;
+  }
+
+  printf (
+    "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x\n",
+    Guid->Data1,
+    Guid->Data2,
+    Guid->Data3,
+    Guid->Data4[0],
+    Guid->Data4[1],
+    Guid->Data4[2],
+    Guid->Data4[3],
+    Guid->Data4[4],
+    Guid->Data4[5],
+    Guid->Data4[6],
+    Guid->Data4[7]
+    );
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+PrintGuidToBuffer (
+  IN EFI_GUID     *Guid,
+  IN OUT UINT8    *Buffer,
+  IN UINT32       BufferLen,
+  IN BOOLEAN      Uppercase
+  )
+/*++
+
+Routine Description:
+
+  This function prints a GUID to a buffer
+
+Arguments:
+
+  Guid      - Pointer to a GUID to print.
+  Buffer    - Pointer to a user-provided buffer to print to
+  BufferLen - Size of the Buffer
+  Uppercase - If use upper case.
+
+Returns:
+
+  EFI_SUCCESS             The GUID was printed.
+  EFI_INVALID_PARAMETER   The input was NULL.
+  EFI_BUFFER_TOO_SMALL    The input buffer was not big enough
+  
+--*/
+{
+  if (Guid == NULL) {
+    printf ("ERROR: PrintGuidToBuffer() called with a NULL value\n");
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (BufferLen < PRINTED_GUID_BUFFER_SIZE) {
+    printf ("ERORR: PrintGuidToBuffer() called with invalid buffer size\n");
+    return EFI_BUFFER_TOO_SMALL;
+  }
+
+  if (Uppercase) {
+    sprintf (
+      Buffer,
+      "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+      Guid->Data1,
+      Guid->Data2,
+      Guid->Data3,
+      Guid->Data4[0],
+      Guid->Data4[1],
+      Guid->Data4[2],
+      Guid->Data4[3],
+      Guid->Data4[4],
+      Guid->Data4[5],
+      Guid->Data4[6],
+      Guid->Data4[7]
+      );
+  } else {
+    sprintf (
+      Buffer,
+      "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+      Guid->Data1,
+      Guid->Data2,
+      Guid->Data3,
+      Guid->Data4[0],
+      Guid->Data4[1],
+      Guid->Data4[2],
+      Guid->Data4[3],
+      Guid->Data4[4],
+      Guid->Data4[5],
+      Guid->Data4[6],
+      Guid->Data4[7]
+      );
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/CommonLib.h b/Tools/Source/TianoTools/Common/CommonLib.h
new file mode 100644
index 0000000000..7bc233134d
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/CommonLib.h
@@ -0,0 +1,131 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  CommonLib.h
+
+Abstract:
+
+  Common library assistance routines.
+
+--*/
+
+#ifndef _EFI_COMMON_LIB_H
+#define _EFI_COMMON_LIB_H
+
+/*
+#include "TianoCommon.h"
+#include "TianoCommon.h"
+#include "PeiHob.h"
+*/
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _MAX_PATH
+#define _MAX_PATH 500
+#endif
+
+#define PRINTED_GUID_BUFFER_SIZE  37  // including null-termination
+//
+// Function declarations
+//
+VOID
+PeiZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+;
+
+VOID
+PeiCopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+;
+
+VOID
+ZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+;
+
+VOID
+CopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+;
+
+INTN
+CompareGuid (
+  IN EFI_GUID     *Guid1,
+  IN EFI_GUID     *Guid2
+  )
+;
+
+EFI_STATUS
+GetFileImage (
+  IN CHAR8    *InputFileName,
+  OUT CHAR8   **InputFileImage,
+  OUT UINT32  *BytesRead
+  )
+;
+
+UINT8
+CalculateChecksum8 (
+  IN UINT8        *Buffer,
+  IN UINTN        Size
+  )
+;
+
+UINT8
+CalculateSum8 (
+  IN UINT8        *Buffer,
+  IN UINTN        Size
+  )
+;
+
+UINT16
+CalculateChecksum16 (
+  IN UINT16       *Buffer,
+  IN UINTN        Size
+  )
+;
+
+UINT16
+CalculateSum16 (
+  IN UINT16       *Buffer,
+  IN UINTN        Size
+  )
+;
+
+EFI_STATUS
+PrintGuid (
+  IN EFI_GUID                     *Guid
+  )
+;
+
+#define PRINTED_GUID_BUFFER_SIZE  37  // including null-termination
+EFI_STATUS
+PrintGuidToBuffer (
+  IN EFI_GUID     *Guid,
+  IN OUT UINT8    *Buffer,
+  IN UINT32       BufferLen,
+  IN BOOLEAN      Uppercase
+  )
+;
+
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/Crc32.c b/Tools/Source/TianoTools/Common/Crc32.c
new file mode 100644
index 0000000000..4ae5eb486b
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/Crc32.c
@@ -0,0 +1,326 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  crc32.c
+
+Abstract:
+
+  CalcuateCrc32 routine.
+  
+--*/
+
+#include <stdlib.h>
+#include "Crc32.h"
+
+UINT32  mCrcTable[256] = {
+  0x00000000,
+  0x77073096,
+  0xEE0E612C,
+  0x990951BA,
+  0x076DC419,
+  0x706AF48F,
+  0xE963A535,
+  0x9E6495A3,
+  0x0EDB8832,
+  0x79DCB8A4,
+  0xE0D5E91E,
+  0x97D2D988,
+  0x09B64C2B,
+  0x7EB17CBD,
+  0xE7B82D07,
+  0x90BF1D91,
+  0x1DB71064,
+  0x6AB020F2,
+  0xF3B97148,
+  0x84BE41DE,
+  0x1ADAD47D,
+  0x6DDDE4EB,
+  0xF4D4B551,
+  0x83D385C7,
+  0x136C9856,
+  0x646BA8C0,
+  0xFD62F97A,
+  0x8A65C9EC,
+  0x14015C4F,
+  0x63066CD9,
+  0xFA0F3D63,
+  0x8D080DF5,
+  0x3B6E20C8,
+  0x4C69105E,
+  0xD56041E4,
+  0xA2677172,
+  0x3C03E4D1,
+  0x4B04D447,
+  0xD20D85FD,
+  0xA50AB56B,
+  0x35B5A8FA,
+  0x42B2986C,
+  0xDBBBC9D6,
+  0xACBCF940,
+  0x32D86CE3,
+  0x45DF5C75,
+  0xDCD60DCF,
+  0xABD13D59,
+  0x26D930AC,
+  0x51DE003A,
+  0xC8D75180,
+  0xBFD06116,
+  0x21B4F4B5,
+  0x56B3C423,
+  0xCFBA9599,
+  0xB8BDA50F,
+  0x2802B89E,
+  0x5F058808,
+  0xC60CD9B2,
+  0xB10BE924,
+  0x2F6F7C87,
+  0x58684C11,
+  0xC1611DAB,
+  0xB6662D3D,
+  0x76DC4190,
+  0x01DB7106,
+  0x98D220BC,
+  0xEFD5102A,
+  0x71B18589,
+  0x06B6B51F,
+  0x9FBFE4A5,
+  0xE8B8D433,
+  0x7807C9A2,
+  0x0F00F934,
+  0x9609A88E,
+  0xE10E9818,
+  0x7F6A0DBB,
+  0x086D3D2D,
+  0x91646C97,
+  0xE6635C01,
+  0x6B6B51F4,
+  0x1C6C6162,
+  0x856530D8,
+  0xF262004E,
+  0x6C0695ED,
+  0x1B01A57B,
+  0x8208F4C1,
+  0xF50FC457,
+  0x65B0D9C6,
+  0x12B7E950,
+  0x8BBEB8EA,
+  0xFCB9887C,
+  0x62DD1DDF,
+  0x15DA2D49,
+  0x8CD37CF3,
+  0xFBD44C65,
+  0x4DB26158,
+  0x3AB551CE,
+  0xA3BC0074,
+  0xD4BB30E2,
+  0x4ADFA541,
+  0x3DD895D7,
+  0xA4D1C46D,
+  0xD3D6F4FB,
+  0x4369E96A,
+  0x346ED9FC,
+  0xAD678846,
+  0xDA60B8D0,
+  0x44042D73,
+  0x33031DE5,
+  0xAA0A4C5F,
+  0xDD0D7CC9,
+  0x5005713C,
+  0x270241AA,
+  0xBE0B1010,
+  0xC90C2086,
+  0x5768B525,
+  0x206F85B3,
+  0xB966D409,
+  0xCE61E49F,
+  0x5EDEF90E,
+  0x29D9C998,
+  0xB0D09822,
+  0xC7D7A8B4,
+  0x59B33D17,
+  0x2EB40D81,
+  0xB7BD5C3B,
+  0xC0BA6CAD,
+  0xEDB88320,
+  0x9ABFB3B6,
+  0x03B6E20C,
+  0x74B1D29A,
+  0xEAD54739,
+  0x9DD277AF,
+  0x04DB2615,
+  0x73DC1683,
+  0xE3630B12,
+  0x94643B84,
+  0x0D6D6A3E,
+  0x7A6A5AA8,
+  0xE40ECF0B,
+  0x9309FF9D,
+  0x0A00AE27,
+  0x7D079EB1,
+  0xF00F9344,
+  0x8708A3D2,
+  0x1E01F268,
+  0x6906C2FE,
+  0xF762575D,
+  0x806567CB,
+  0x196C3671,
+  0x6E6B06E7,
+  0xFED41B76,
+  0x89D32BE0,
+  0x10DA7A5A,
+  0x67DD4ACC,
+  0xF9B9DF6F,
+  0x8EBEEFF9,
+  0x17B7BE43,
+  0x60B08ED5,
+  0xD6D6A3E8,
+  0xA1D1937E,
+  0x38D8C2C4,
+  0x4FDFF252,
+  0xD1BB67F1,
+  0xA6BC5767,
+  0x3FB506DD,
+  0x48B2364B,
+  0xD80D2BDA,
+  0xAF0A1B4C,
+  0x36034AF6,
+  0x41047A60,
+  0xDF60EFC3,
+  0xA867DF55,
+  0x316E8EEF,
+  0x4669BE79,
+  0xCB61B38C,
+  0xBC66831A,
+  0x256FD2A0,
+  0x5268E236,
+  0xCC0C7795,
+  0xBB0B4703,
+  0x220216B9,
+  0x5505262F,
+  0xC5BA3BBE,
+  0xB2BD0B28,
+  0x2BB45A92,
+  0x5CB36A04,
+  0xC2D7FFA7,
+  0xB5D0CF31,
+  0x2CD99E8B,
+  0x5BDEAE1D,
+  0x9B64C2B0,
+  0xEC63F226,
+  0x756AA39C,
+  0x026D930A,
+  0x9C0906A9,
+  0xEB0E363F,
+  0x72076785,
+  0x05005713,
+  0x95BF4A82,
+  0xE2B87A14,
+  0x7BB12BAE,
+  0x0CB61B38,
+  0x92D28E9B,
+  0xE5D5BE0D,
+  0x7CDCEFB7,
+  0x0BDBDF21,
+  0x86D3D2D4,
+  0xF1D4E242,
+  0x68DDB3F8,
+  0x1FDA836E,
+  0x81BE16CD,
+  0xF6B9265B,
+  0x6FB077E1,
+  0x18B74777,
+  0x88085AE6,
+  0xFF0F6A70,
+  0x66063BCA,
+  0x11010B5C,
+  0x8F659EFF,
+  0xF862AE69,
+  0x616BFFD3,
+  0x166CCF45,
+  0xA00AE278,
+  0xD70DD2EE,
+  0x4E048354,
+  0x3903B3C2,
+  0xA7672661,
+  0xD06016F7,
+  0x4969474D,
+  0x3E6E77DB,
+  0xAED16A4A,
+  0xD9D65ADC,
+  0x40DF0B66,
+  0x37D83BF0,
+  0xA9BCAE53,
+  0xDEBB9EC5,
+  0x47B2CF7F,
+  0x30B5FFE9,
+  0xBDBDF21C,
+  0xCABAC28A,
+  0x53B39330,
+  0x24B4A3A6,
+  0xBAD03605,
+  0xCDD70693,
+  0x54DE5729,
+  0x23D967BF,
+  0xB3667A2E,
+  0xC4614AB8,
+  0x5D681B02,
+  0x2A6F2B94,
+  0xB40BBE37,
+  0xC30C8EA1,
+  0x5A05DF1B,
+  0x2D02EF8D
+};
+
+EFI_STATUS
+CalculateCrc32 (
+  IN  UINT8                             *Data,
+  IN  UINTN                             DataSize,
+  IN OUT UINT32                         *CrcOut
+  )
+/*++
+
+Routine Description:
+
+  The CalculateCrc32 routine.
+
+Arguments:
+
+  Data        - The buffer contaning the data to be processed
+  DataSize    - The size of data to be processed
+  CrcOut      - A pointer to the caller allocated UINT32 that on
+                contains the CRC32 checksum of Data
+
+Returns:
+
+  EFI_SUCCESS               - Calculation is successful.
+  EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0
+
+--*/
+{
+  UINT32  Crc;
+  UINTN   Index;
+  UINT8   *Ptr;
+
+  if ((DataSize == 0) || (Data == NULL) || (CrcOut == NULL)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Crc = 0xffffffff;
+  for (Index = 0, Ptr = Data; Index < DataSize; Index++, Ptr++) {
+    Crc = (Crc >> 8) ^ mCrcTable[(UINT8) Crc ^ *Ptr];
+  }
+
+  *CrcOut = Crc ^ 0xffffffff;
+
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/Crc32.h b/Tools/Source/TianoTools/Common/Crc32.h
new file mode 100644
index 0000000000..0d24004fba
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/Crc32.h
@@ -0,0 +1,57 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Crc32.h
+
+Abstract:
+
+  Header file for CalcuateCrc32 routine
+  
+--*/
+
+/*
+#include "TianoCommon.h"
+*/
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _CRC32_H
+#define _CRC32_H
+EFI_STATUS
+CalculateCrc32 (
+  IN  UINT8                             *Data,
+  IN  UINTN                             DataSize,
+  IN OUT UINT32                         *CrcOut
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The CalculateCrc32 routine.
+
+Arguments:
+
+  Data        - The buffer contaning the data to be processed
+  DataSize    - The size of data to be processed
+  CrcOut      - A pointer to the caller allocated UINT32 that on
+                contains the CRC32 checksum of Data
+
+Returns:
+
+  EFI_SUCCESS               - Calculation is successful.
+  EFI_INVALID_PARAMETER     - Data / CrcOut = NULL, or DataSize = 0
+
+--*/
+#endif
diff --git a/Tools/Source/TianoTools/Common/EfiCompress.c b/Tools/Source/TianoTools/Common/EfiCompress.c
new file mode 100644
index 0000000000..0a60a46d4b
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiCompress.c
@@ -0,0 +1,1745 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EfiCompress.c
+
+Abstract:
+
+  Compression routine. The compression algorithm is a mixture of
+  LZ77 and Huffman coding. LZ77 transforms the source data into a
+  sequence of Original Characters and Pointers to repeated strings.
+  This sequence is further divided into Blocks and Huffman codings
+  are applied to each Block.
+
+--*/
+
+/*
+#include "TianoCommon.h"
+*/
+#include "EfiCompress.h"
+
+//
+// Macro Definitions
+//
+typedef INT32 NODE;
+#define UINT8_BIT     8
+#define THRESHOLD     3
+#define INIT_CRC      0
+#define WNDBIT        19
+#define WNDSIZ        (1U << WNDBIT)
+#define MAXMATCH      256
+#define BLKSIZ        (1U << 14)  // 16 * 1024U
+#define PERC_FLAG     0x80000000U
+#define CODE_BIT      16
+#define NIL           0
+#define MAX_HASH_VAL  (3 * WNDSIZ + (WNDSIZ / 512 + 1) * UINT8_MAX)
+#define HASH(p, c)    ((p) + ((c) << (WNDBIT - 9)) + WNDSIZ * 2)
+#define CRCPOLY       0xA001
+#define UPDATE_CRC(c) mCrc = mCrcTable[(mCrc ^ (c)) & 0xFF] ^ (mCrc >> UINT8_BIT)
+
+//
+// C: the Char&Len Set; P: the Position Set; T: the exTra Set
+//
+#define NC    (UINT8_MAX + MAXMATCH + 2 - THRESHOLD)
+#define CBIT  9
+#define NP    (WNDBIT + 1)
+#define PBIT  5
+#define NT    (CODE_BIT + 3)
+#define TBIT  5
+#if NT > NP
+#define NPT NT
+#else
+#define NPT NP
+#endif
+//
+// Function Prototypes
+//
+STATIC VOID PutDword(IN UINT32 Data);
+
+STATIC
+EFI_STATUS
+AllocateMemory (
+  VOID
+  );
+
+STATIC
+VOID
+FreeMemory (
+  VOID
+  );
+
+STATIC
+VOID
+InitSlide (
+  VOID
+  );
+
+STATIC
+NODE
+Child (
+  IN NODE   NodeQ,
+  IN UINT8  CharC
+  );
+
+STATIC
+VOID
+MakeChild (
+  IN NODE  NodeQ,
+  IN UINT8 CharC,
+  IN NODE  NodeR
+  );
+
+STATIC
+VOID
+Split (
+  IN NODE Old
+  );
+
+STATIC
+VOID
+InsertNode (
+  VOID
+  );
+
+STATIC
+VOID
+DeleteNode (
+  VOID
+  );
+
+STATIC
+VOID
+GetNextMatch (
+  VOID
+  );
+
+STATIC
+EFI_STATUS
+Encode (
+  VOID
+  );
+
+STATIC
+VOID
+CountTFreq (
+  VOID
+  );
+
+STATIC
+VOID
+WritePTLen (
+  IN INT32 Number,
+  IN INT32 nbit,
+  IN INT32 Special
+  );
+
+STATIC
+VOID
+WriteCLen (
+  VOID
+  );
+
+STATIC
+VOID
+EncodeC (
+  IN INT32 Value
+  );
+
+STATIC
+VOID
+EncodeP (
+  IN UINT32 Value
+  );
+
+STATIC
+VOID
+SendBlock (
+  VOID
+  );
+
+STATIC
+VOID
+Output (
+  IN UINT32 c,
+  IN UINT32 p
+  );
+
+STATIC
+VOID
+HufEncodeStart (
+  VOID
+  );
+
+STATIC
+VOID
+HufEncodeEnd (
+  VOID
+  );
+
+STATIC
+VOID
+MakeCrcTable (
+  VOID
+  );
+
+STATIC
+VOID
+PutBits (
+  IN INT32  Number,
+  IN UINT32 Value
+  );
+
+STATIC
+INT32
+FreadCrc (
+  OUT UINT8 *Pointer,
+  IN  INT32 Number
+  );
+
+STATIC
+VOID
+InitPutBits (
+  VOID
+  );
+
+STATIC
+VOID
+CountLen (
+  IN INT32 Index
+  );
+
+STATIC
+VOID
+MakeLen (
+  IN INT32 Root
+  );
+
+STATIC
+VOID
+DownHeap (
+  IN INT32 Index
+  );
+
+STATIC
+VOID
+MakeCode (
+  IN  INT32       Number,
+  IN  UINT8 Len[  ],
+  OUT UINT16 Code[]
+  );
+
+STATIC
+INT32
+MakeTree (
+  IN  INT32            NParm,
+  IN  UINT16  FreqParm[],
+  OUT UINT8   LenParm[ ],
+  OUT UINT16  CodeParm[]
+  );
+
+//
+//  Global Variables
+//
+static UINT8  *mSrc, *mDst, *mSrcUpperLimit, *mDstUpperLimit;
+
+static UINT8  *mLevel, *mText, *mChildCount, *mBuf, mCLen[NC], mPTLen[NPT], *mLen;
+static INT16  mHeap[NC + 1];
+static INT32  mRemainder, mMatchLen, mBitCount, mHeapSize, mN;
+static UINT32 mBufSiz = 0, mOutputPos, mOutputMask, mSubBitBuf, mCrc;
+static UINT32 mCompSize, mOrigSize;
+
+static UINT16 *mFreq, *mSortPtr, mLenCnt[17], mLeft[2 * NC - 1], mRight[2 * NC - 1], mCrcTable[UINT8_MAX + 1],
+  mCFreq[2 * NC - 1], mCTable[4096], mCCode[NC], mPFreq[2 * NP - 1], mPTCode[NPT], mTFreq[2 * NT - 1];
+
+static NODE   mPos, mMatchPos, mAvail, *mPosition, *mParent, *mPrev, *mNext = NULL;
+
+//
+// functions
+//
+EFI_STATUS
+Compress (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  )
+/*++
+
+Routine Description:
+
+  The main compression routine.
+
+Arguments:
+
+  SrcBuffer   - The buffer storing the source data
+  SrcSize     - The size of source data
+  DstBuffer   - The buffer to store the compressed data
+  DstSize     - On input, the size of DstBuffer; On output,
+                the size of the actual compressed data.
+
+Returns:
+
+  EFI_BUFFER_TOO_SMALL  - The DstBuffer is too small. In this case,
+                DstSize contains the size needed.
+  EFI_SUCCESS           - Compression is successful.
+  EFI_OUT_OF_RESOURCES  - No resource to complete function.
+
+--*/
+{
+  EFI_STATUS  Status;
+
+  //
+  // Initializations
+  //
+  mBufSiz         = 0;
+  mBuf            = NULL;
+  mText           = NULL;
+  mLevel          = NULL;
+  mChildCount     = NULL;
+  mPosition       = NULL;
+  mParent         = NULL;
+  mPrev           = NULL;
+  mNext           = NULL;
+
+  mSrc            = SrcBuffer;
+  mSrcUpperLimit  = mSrc + SrcSize;
+  mDst            = DstBuffer;
+  mDstUpperLimit  = mDst +*DstSize;
+
+  PutDword (0L);
+  PutDword (0L);
+
+  MakeCrcTable ();
+
+  mOrigSize             = mCompSize = 0;
+  mCrc                  = INIT_CRC;
+
+  //
+  // Compress it
+  //
+  Status = Encode ();
+  if (EFI_ERROR (Status)) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Null terminate the compressed data
+  //
+  if (mDst < mDstUpperLimit) {
+    *mDst++ = 0;
+  }
+  //
+  // Fill in compressed size and original size
+  //
+  mDst = DstBuffer;
+  PutDword (mCompSize + 1);
+  PutDword (mOrigSize);
+
+  //
+  // Return
+  //
+  if (mCompSize + 1 + 8 > *DstSize) {
+    *DstSize = mCompSize + 1 + 8;
+    return EFI_BUFFER_TOO_SMALL;
+  } else {
+    *DstSize = mCompSize + 1 + 8;
+    return EFI_SUCCESS;
+  }
+
+}
+
+STATIC
+VOID
+PutDword (
+  IN UINT32 Data
+  )
+/*++
+
+Routine Description:
+
+  Put a dword to output stream
+  
+Arguments:
+
+  Data    - the dword to put
+  
+Returns: (VOID)
+  
+--*/
+{
+  if (mDst < mDstUpperLimit) {
+    *mDst++ = (UINT8) (((UINT8) (Data)) & 0xff);
+  }
+
+  if (mDst < mDstUpperLimit) {
+    *mDst++ = (UINT8) (((UINT8) (Data >> 0x08)) & 0xff);
+  }
+
+  if (mDst < mDstUpperLimit) {
+    *mDst++ = (UINT8) (((UINT8) (Data >> 0x10)) & 0xff);
+  }
+
+  if (mDst < mDstUpperLimit) {
+    *mDst++ = (UINT8) (((UINT8) (Data >> 0x18)) & 0xff);
+  }
+}
+
+STATIC
+EFI_STATUS
+AllocateMemory (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Allocate memory spaces for data structures used in compression process
+  
+Argements: 
+  VOID
+
+Returns:
+
+  EFI_SUCCESS           - Memory is allocated successfully
+  EFI_OUT_OF_RESOURCES  - Allocation fails
+
+--*/
+{
+  UINT32  Index;
+
+  mText = malloc (WNDSIZ * 2 + MAXMATCH);
+  for (Index = 0; Index < WNDSIZ * 2 + MAXMATCH; Index++) {
+    mText[Index] = 0;
+  }
+
+  mLevel      = malloc ((WNDSIZ + UINT8_MAX + 1) * sizeof (*mLevel));
+  mChildCount = malloc ((WNDSIZ + UINT8_MAX + 1) * sizeof (*mChildCount));
+  mPosition   = malloc ((WNDSIZ + UINT8_MAX + 1) * sizeof (*mPosition));
+  mParent     = malloc (WNDSIZ * 2 * sizeof (*mParent));
+  mPrev       = malloc (WNDSIZ * 2 * sizeof (*mPrev));
+  mNext       = malloc ((MAX_HASH_VAL + 1) * sizeof (*mNext));
+
+  mBufSiz     = BLKSIZ;
+  mBuf        = malloc (mBufSiz);
+  while (mBuf == NULL) {
+    mBufSiz = (mBufSiz / 10U) * 9U;
+    if (mBufSiz < 4 * 1024U) {
+      return EFI_OUT_OF_RESOURCES;
+    }
+
+    mBuf = malloc (mBufSiz);
+  }
+
+  mBuf[0] = 0;
+
+  return EFI_SUCCESS;
+}
+
+VOID
+FreeMemory (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Called when compression is completed to free memory previously allocated.
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  if (mText != NULL) {
+    free (mText);
+  }
+
+  if (mLevel != NULL) {
+    free (mLevel);
+  }
+
+  if (mChildCount != NULL) {
+    free (mChildCount);
+  }
+
+  if (mPosition != NULL) {
+    free (mPosition);
+  }
+
+  if (mParent != NULL) {
+    free (mParent);
+  }
+
+  if (mPrev != NULL) {
+    free (mPrev);
+  }
+
+  if (mNext != NULL) {
+    free (mNext);
+  }
+
+  if (mBuf != NULL) {
+    free (mBuf);
+  }
+
+  return ;
+}
+
+STATIC
+VOID
+InitSlide (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Initialize String Info Log data structures
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  NODE  Index;
+
+  for (Index = WNDSIZ; Index <= WNDSIZ + UINT8_MAX; Index++) {
+    mLevel[Index]     = 1;
+    mPosition[Index]  = NIL;  /* sentinel */
+  }
+
+  for (Index = WNDSIZ; Index < WNDSIZ * 2; Index++) {
+    mParent[Index] = NIL;
+  }
+
+  mAvail = 1;
+  for (Index = 1; Index < WNDSIZ - 1; Index++) {
+    mNext[Index] = (NODE) (Index + 1);
+  }
+
+  mNext[WNDSIZ - 1] = NIL;
+  for (Index = WNDSIZ * 2; Index <= MAX_HASH_VAL; Index++) {
+    mNext[Index] = NIL;
+  }
+}
+
+STATIC
+NODE
+Child (
+  IN NODE  NodeQ,
+  IN UINT8 CharC
+  )
+/*++
+
+Routine Description:
+
+  Find child node given the parent node and the edge character
+  
+Arguments:
+
+  NodeQ       - the parent node
+  CharC       - the edge character
+  
+Returns:
+
+  The child node (NIL if not found)  
+  
+--*/
+{
+  NODE  NodeR;
+
+  NodeR = mNext[HASH (NodeQ, CharC)];
+  //
+  // sentinel
+  //
+  mParent[NIL] = NodeQ;
+  while (mParent[NodeR] != NodeQ) {
+    NodeR = mNext[NodeR];
+  }
+
+  return NodeR;
+}
+
+STATIC
+VOID
+MakeChild (
+  IN NODE  Parent,
+  IN UINT8 CharC,
+  IN NODE  Child
+  )
+/*++
+
+Routine Description:
+
+  Create a new child for a given parent node.
+  
+Arguments:
+
+  Parent       - the parent node
+  CharC   - the edge character
+  Child       - the child node
+  
+Returns: (VOID)
+
+--*/
+{
+  NODE  Node1;
+  NODE  Node2;
+
+  Node1           = (NODE) HASH (Parent, CharC);
+  Node2           = mNext[Node1];
+  mNext[Node1]    = Child;
+  mNext[Child]    = Node2;
+  mPrev[Node2]    = Child;
+  mPrev[Child]    = Node1;
+  mParent[Child]  = Parent;
+  mChildCount[Parent]++;
+}
+
+STATIC
+VOID
+Split (
+  NODE Old
+  )
+/*++
+
+Routine Description:
+
+  Split a node.
+  
+Arguments:
+
+  Old     - the node to split
+  
+Returns: (VOID)
+
+--*/
+{
+  NODE  New;
+  NODE  TempNode;
+
+  New               = mAvail;
+  mAvail            = mNext[New];
+  mChildCount[New]  = 0;
+  TempNode          = mPrev[Old];
+  mPrev[New]        = TempNode;
+  mNext[TempNode]   = New;
+  TempNode          = mNext[Old];
+  mNext[New]        = TempNode;
+  mPrev[TempNode]   = New;
+  mParent[New]      = mParent[Old];
+  mLevel[New]       = (UINT8) mMatchLen;
+  mPosition[New]    = mPos;
+  MakeChild (New, mText[mMatchPos + mMatchLen], Old);
+  MakeChild (New, mText[mPos + mMatchLen], mPos);
+}
+
+STATIC
+VOID
+InsertNode (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Insert string info for current position into the String Info Log
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  NODE  NodeQ;
+  NODE  NodeR;
+  NODE  Index2;
+  NODE  NodeT;
+  UINT8 CharC;
+  UINT8 *t1;
+  UINT8 *t2;
+
+  if (mMatchLen >= 4) {
+    //
+    // We have just got a long match, the target tree
+    // can be located by MatchPos + 1. Travese the tree
+    // from bottom up to get to a proper starting point.
+    // The usage of PERC_FLAG ensures proper node deletion
+    // in DeleteNode() later.
+    //
+    mMatchLen--;
+    NodeR = (NODE) ((mMatchPos + 1) | WNDSIZ);
+    NodeQ = mParent[NodeR];
+    while (NodeQ == NIL) {
+      NodeR = mNext[NodeR];
+      NodeQ = mParent[NodeR];
+    }
+
+    while (mLevel[NodeQ] >= mMatchLen) {
+      NodeR = NodeQ;
+      NodeQ = mParent[NodeQ];
+    }
+
+    NodeT = NodeQ;
+    while (mPosition[NodeT] < 0) {
+      mPosition[NodeT]  = mPos;
+      NodeT             = mParent[NodeT];
+    }
+
+    if (NodeT < WNDSIZ) {
+      mPosition[NodeT] = (NODE) (mPos | (UINT32) PERC_FLAG);
+    }
+  } else {
+    //
+    // Locate the target tree
+    //
+    NodeQ = (NODE) (mText[mPos] + WNDSIZ);
+    CharC = mText[mPos + 1];
+    NodeR = Child (NodeQ, CharC);
+    if (NodeR == NIL) {
+      MakeChild (NodeQ, CharC, mPos);
+      mMatchLen = 1;
+      return ;
+    }
+
+    mMatchLen = 2;
+  }
+  //
+  // Traverse down the tree to find a match.
+  // Update Position value along the route.
+  // Node split or creation is involved.
+  //
+  for (;;) {
+    if (NodeR >= WNDSIZ) {
+      Index2    = MAXMATCH;
+      mMatchPos = NodeR;
+    } else {
+      Index2    = mLevel[NodeR];
+      mMatchPos = (NODE) (mPosition[NodeR] & (UINT32)~PERC_FLAG);
+    }
+
+    if (mMatchPos >= mPos) {
+      mMatchPos -= WNDSIZ;
+    }
+
+    t1  = &mText[mPos + mMatchLen];
+    t2  = &mText[mMatchPos + mMatchLen];
+    while (mMatchLen < Index2) {
+      if (*t1 != *t2) {
+        Split (NodeR);
+        return ;
+      }
+
+      mMatchLen++;
+      t1++;
+      t2++;
+    }
+
+    if (mMatchLen >= MAXMATCH) {
+      break;
+    }
+
+    mPosition[NodeR]  = mPos;
+    NodeQ             = NodeR;
+    NodeR             = Child (NodeQ, *t1);
+    if (NodeR == NIL) {
+      MakeChild (NodeQ, *t1, mPos);
+      return ;
+    }
+
+    mMatchLen++;
+  }
+
+  NodeT           = mPrev[NodeR];
+  mPrev[mPos]     = NodeT;
+  mNext[NodeT]    = mPos;
+  NodeT           = mNext[NodeR];
+  mNext[mPos]     = NodeT;
+  mPrev[NodeT]    = mPos;
+  mParent[mPos]   = NodeQ;
+  mParent[NodeR]  = NIL;
+
+  //
+  // Special usage of 'next'
+  //
+  mNext[NodeR] = mPos;
+
+}
+
+STATIC
+VOID
+DeleteNode (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Delete outdated string info. (The Usage of PERC_FLAG
+  ensures a clean deletion)
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  NODE  NodeQ;
+  NODE  NodeR;
+  NODE  NodeS;
+  NODE  NodeT;
+  NODE  NodeU;
+
+  if (mParent[mPos] == NIL) {
+    return ;
+  }
+
+  NodeR         = mPrev[mPos];
+  NodeS         = mNext[mPos];
+  mNext[NodeR]  = NodeS;
+  mPrev[NodeS]  = NodeR;
+  NodeR         = mParent[mPos];
+  mParent[mPos] = NIL;
+  if (NodeR >= WNDSIZ) {
+    return ;
+  }
+
+  mChildCount[NodeR]--;
+  if (mChildCount[NodeR] > 1) {
+    return ;
+  }
+
+  NodeT = (NODE) (mPosition[NodeR] & (UINT32)~PERC_FLAG);
+  if (NodeT >= mPos) {
+    NodeT -= WNDSIZ;
+  }
+
+  NodeS = NodeT;
+  NodeQ = mParent[NodeR];
+  NodeU = mPosition[NodeQ];
+  while (NodeU & (UINT32) PERC_FLAG) {
+    NodeU &= (UINT32)~PERC_FLAG;
+    if (NodeU >= mPos) {
+      NodeU -= WNDSIZ;
+    }
+
+    if (NodeU > NodeS) {
+      NodeS = NodeU;
+    }
+
+    mPosition[NodeQ]  = (NODE) (NodeS | WNDSIZ);
+    NodeQ             = mParent[NodeQ];
+    NodeU             = mPosition[NodeQ];
+  }
+
+  if (NodeQ < WNDSIZ) {
+    if (NodeU >= mPos) {
+      NodeU -= WNDSIZ;
+    }
+
+    if (NodeU > NodeS) {
+      NodeS = NodeU;
+    }
+
+    mPosition[NodeQ] = (NODE) (NodeS | WNDSIZ | (UINT32) PERC_FLAG);
+  }
+
+  NodeS           = Child (NodeR, mText[NodeT + mLevel[NodeR]]);
+  NodeT           = mPrev[NodeS];
+  NodeU           = mNext[NodeS];
+  mNext[NodeT]    = NodeU;
+  mPrev[NodeU]    = NodeT;
+  NodeT           = mPrev[NodeR];
+  mNext[NodeT]    = NodeS;
+  mPrev[NodeS]    = NodeT;
+  NodeT           = mNext[NodeR];
+  mPrev[NodeT]    = NodeS;
+  mNext[NodeS]    = NodeT;
+  mParent[NodeS]  = mParent[NodeR];
+  mParent[NodeR]  = NIL;
+  mNext[NodeR]    = mAvail;
+  mAvail          = NodeR;
+}
+
+STATIC
+VOID
+GetNextMatch (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Advance the current position (read in new data if needed).
+  Delete outdated string info. Find a match string for current position.
+
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  INT32 Number;
+
+  mRemainder--;
+  mPos++;
+  if (mPos == WNDSIZ * 2) {
+    memmove (&mText[0], &mText[WNDSIZ], WNDSIZ + MAXMATCH);
+    Number = FreadCrc (&mText[WNDSIZ + MAXMATCH], WNDSIZ);
+    mRemainder += Number;
+    mPos = WNDSIZ;
+  }
+
+  DeleteNode ();
+  InsertNode ();
+}
+
+STATIC
+EFI_STATUS
+Encode (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  The main controlling routine for compression process.
+
+Arguments: (VOID)
+
+Returns:
+  
+  EFI_SUCCESS           - The compression is successful
+  EFI_OUT_0F_RESOURCES  - Not enough memory for compression process
+
+--*/
+{
+  EFI_STATUS  Status;
+  INT32       LastMatchLen;
+  NODE        LastMatchPos;
+
+  Status = AllocateMemory ();
+  if (EFI_ERROR (Status)) {
+    FreeMemory ();
+    return Status;
+  }
+
+  InitSlide ();
+
+  HufEncodeStart ();
+
+  mRemainder  = FreadCrc (&mText[WNDSIZ], WNDSIZ + MAXMATCH);
+
+  mMatchLen   = 0;
+  mPos        = WNDSIZ;
+  InsertNode ();
+  if (mMatchLen > mRemainder) {
+    mMatchLen = mRemainder;
+  }
+
+  while (mRemainder > 0) {
+    LastMatchLen  = mMatchLen;
+    LastMatchPos  = mMatchPos;
+    GetNextMatch ();
+    if (mMatchLen > mRemainder) {
+      mMatchLen = mRemainder;
+    }
+
+    if (mMatchLen > LastMatchLen || LastMatchLen < THRESHOLD) {
+      //
+      // Not enough benefits are gained by outputting a pointer,
+      // so just output the original character
+      //
+      Output (mText[mPos - 1], 0);
+
+    } else {
+
+      if (LastMatchLen == THRESHOLD) {
+        if (((mPos - LastMatchPos - 2) & (WNDSIZ - 1)) > (1U << 11)) {
+          Output (mText[mPos - 1], 0);
+          continue;
+        }
+      }
+      //
+      // Outputting a pointer is beneficial enough, do it.
+      //
+      Output (
+        LastMatchLen + (UINT8_MAX + 1 - THRESHOLD),
+        (mPos - LastMatchPos - 2) & (WNDSIZ - 1)
+        );
+      LastMatchLen--;
+      while (LastMatchLen > 0) {
+        GetNextMatch ();
+        LastMatchLen--;
+      }
+
+      if (mMatchLen > mRemainder) {
+        mMatchLen = mRemainder;
+      }
+    }
+  }
+
+  HufEncodeEnd ();
+  FreeMemory ();
+  return EFI_SUCCESS;
+}
+
+STATIC
+VOID
+CountTFreq (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Count the frequencies for the Extra Set
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  INT32 Index;
+  INT32 Index3;
+  INT32 Number;
+  INT32 Count;
+
+  for (Index = 0; Index < NT; Index++) {
+    mTFreq[Index] = 0;
+  }
+
+  Number = NC;
+  while (Number > 0 && mCLen[Number - 1] == 0) {
+    Number--;
+  }
+
+  Index = 0;
+  while (Index < Number) {
+    Index3 = mCLen[Index++];
+    if (Index3 == 0) {
+      Count = 1;
+      while (Index < Number && mCLen[Index] == 0) {
+        Index++;
+        Count++;
+      }
+
+      if (Count <= 2) {
+        mTFreq[0] = (UINT16) (mTFreq[0] + Count);
+      } else if (Count <= 18) {
+        mTFreq[1]++;
+      } else if (Count == 19) {
+        mTFreq[0]++;
+        mTFreq[1]++;
+      } else {
+        mTFreq[2]++;
+      }
+    } else {
+      mTFreq[Index3 + 2]++;
+    }
+  }
+}
+
+STATIC
+VOID
+WritePTLen (
+  IN INT32 Number,
+  IN INT32 nbit,
+  IN INT32 Special
+  )
+/*++
+
+Routine Description:
+
+  Outputs the code length array for the Extra Set or the Position Set.
+  
+Arguments:
+
+  Number       - the number of symbols
+  nbit    - the number of bits needed to represent 'n'
+  Special - the special symbol that needs to be take care of
+  
+Returns: (VOID)
+
+--*/
+{
+  INT32 Index;
+  INT32 Index3;
+
+  while (Number > 0 && mPTLen[Number - 1] == 0) {
+    Number--;
+  }
+
+  PutBits (nbit, Number);
+  Index = 0;
+  while (Index < Number) {
+    Index3 = mPTLen[Index++];
+    if (Index3 <= 6) {
+      PutBits (3, Index3);
+    } else {
+      PutBits (Index3 - 3, (1U << (Index3 - 3)) - 2);
+    }
+
+    if (Index == Special) {
+      while (Index < 6 && mPTLen[Index] == 0) {
+        Index++;
+      }
+
+      PutBits (2, (Index - 3) & 3);
+    }
+  }
+}
+
+STATIC
+VOID
+WriteCLen (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Outputs the code length array for Char&Length Set
+  
+Arguments: (VOID)
+
+Returns: (VOID)
+
+--*/
+{
+  INT32 Index;
+  INT32 Index3;
+  INT32 Number;
+  INT32 Count;
+
+  Number = NC;
+  while (Number > 0 && mCLen[Number - 1] == 0) {
+    Number--;
+  }
+
+  PutBits (CBIT, Number);
+  Index = 0;
+  while (Index < Number) {
+    Index3 = mCLen[Index++];
+    if (Index3 == 0) {
+      Count = 1;
+      while (Index < Number && mCLen[Index] == 0) {
+        Index++;
+        Count++;
+      }
+
+      if (Count <= 2) {
+        for (Index3 = 0; Index3 < Count; Index3++) {
+          PutBits (mPTLen[0], mPTCode[0]);
+        }
+      } else if (Count <= 18) {
+        PutBits (mPTLen[1], mPTCode[1]);
+        PutBits (4, Count - 3);
+      } else if (Count == 19) {
+        PutBits (mPTLen[0], mPTCode[0]);
+        PutBits (mPTLen[1], mPTCode[1]);
+        PutBits (4, 15);
+      } else {
+        PutBits (mPTLen[2], mPTCode[2]);
+        PutBits (CBIT, Count - 20);
+      }
+    } else {
+      PutBits (mPTLen[Index3 + 2], mPTCode[Index3 + 2]);
+    }
+  }
+}
+
+STATIC
+VOID
+EncodeC (
+  IN INT32 Value
+  )
+{
+  PutBits (mCLen[Value], mCCode[Value]);
+}
+
+STATIC
+VOID
+EncodeP (
+  IN UINT32 Value
+  )
+{
+  UINT32  Index;
+  UINT32  NodeQ;
+
+  Index = 0;
+  NodeQ = Value;
+  while (NodeQ) {
+    NodeQ >>= 1;
+    Index++;
+  }
+
+  PutBits (mPTLen[Index], mPTCode[Index]);
+  if (Index > 1) {
+    PutBits (Index - 1, Value & (0xFFFFFFFFU >> (32 - Index + 1)));
+  }
+}
+
+STATIC
+VOID
+SendBlock (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Huffman code the block and output it.
+  
+Arguments: 
+  (VOID)
+
+Returns: 
+  (VOID)
+
+--*/
+{
+  UINT32  Index;
+  UINT32  Index2;
+  UINT32  Index3;
+  UINT32  Flags;
+  UINT32  Root;
+  UINT32  Pos;
+  UINT32  Size;
+  Flags = 0;
+
+  Root  = MakeTree (NC, mCFreq, mCLen, mCCode);
+  Size  = mCFreq[Root];
+  PutBits (16, Size);
+  if (Root >= NC) {
+    CountTFreq ();
+    Root = MakeTree (NT, mTFreq, mPTLen, mPTCode);
+    if (Root >= NT) {
+      WritePTLen (NT, TBIT, 3);
+    } else {
+      PutBits (TBIT, 0);
+      PutBits (TBIT, Root);
+    }
+
+    WriteCLen ();
+  } else {
+    PutBits (TBIT, 0);
+    PutBits (TBIT, 0);
+    PutBits (CBIT, 0);
+    PutBits (CBIT, Root);
+  }
+
+  Root = MakeTree (NP, mPFreq, mPTLen, mPTCode);
+  if (Root >= NP) {
+    WritePTLen (NP, PBIT, -1);
+  } else {
+    PutBits (PBIT, 0);
+    PutBits (PBIT, Root);
+  }
+
+  Pos = 0;
+  for (Index = 0; Index < Size; Index++) {
+    if (Index % UINT8_BIT == 0) {
+      Flags = mBuf[Pos++];
+    } else {
+      Flags <<= 1;
+    }
+
+    if (Flags & (1U << (UINT8_BIT - 1))) {
+      EncodeC (mBuf[Pos++] + (1U << UINT8_BIT));
+      Index3 = mBuf[Pos++];
+      for (Index2 = 0; Index2 < 3; Index2++) {
+        Index3 <<= UINT8_BIT;
+        Index3 += mBuf[Pos++];
+      }
+
+      EncodeP (Index3);
+    } else {
+      EncodeC (mBuf[Pos++]);
+    }
+  }
+
+  for (Index = 0; Index < NC; Index++) {
+    mCFreq[Index] = 0;
+  }
+
+  for (Index = 0; Index < NP; Index++) {
+    mPFreq[Index] = 0;
+  }
+}
+
+STATIC
+VOID
+Output (
+  IN UINT32 CharC,
+  IN UINT32 Pos
+  )
+/*++
+
+Routine Description:
+
+  Outputs an Original Character or a Pointer
+
+Arguments:
+
+  CharC     - The original character or the 'String Length' element of a Pointer
+  Pos     - The 'Position' field of a Pointer
+
+Returns: (VOID)
+
+--*/
+{
+  static UINT32 CPos;
+
+  if ((mOutputMask >>= 1) == 0) {
+    mOutputMask = 1U << (UINT8_BIT - 1);
+    //
+    // Check the buffer overflow per outputing UINT8_BIT symbols
+    // which is an Original Character or a Pointer. The biggest
+    // symbol is a Pointer which occupies 5 bytes.
+    //
+    if (mOutputPos >= mBufSiz - 5 * UINT8_BIT) {
+      SendBlock ();
+      mOutputPos = 0;
+    }
+
+    CPos        = mOutputPos++;
+    mBuf[CPos]  = 0;
+  }
+
+  mBuf[mOutputPos++] = (UINT8) CharC;
+  mCFreq[CharC]++;
+  if (CharC >= (1U << UINT8_BIT)) {
+    mBuf[CPos] |= mOutputMask;
+    mBuf[mOutputPos++]  = (UINT8) (Pos >> 24);
+    mBuf[mOutputPos++]  = (UINT8) (Pos >> 16);
+    mBuf[mOutputPos++]  = (UINT8) (Pos >> (UINT8_BIT));
+    mBuf[mOutputPos++]  = (UINT8) Pos;
+    CharC               = 0;
+    while (Pos) {
+      Pos >>= 1;
+      CharC++;
+    }
+
+    mPFreq[CharC]++;
+  }
+}
+
+STATIC
+VOID
+HufEncodeStart (
+  VOID
+  )
+{
+  INT32 Index;
+
+  for (Index = 0; Index < NC; Index++) {
+    mCFreq[Index] = 0;
+  }
+
+  for (Index = 0; Index < NP; Index++) {
+    mPFreq[Index] = 0;
+  }
+
+  mOutputPos = mOutputMask = 0;
+  InitPutBits ();
+  return ;
+}
+
+STATIC
+VOID
+HufEncodeEnd (
+  VOID
+  )
+{
+  SendBlock ();
+
+  //
+  // Flush remaining bits
+  //
+  PutBits (UINT8_BIT - 1, 0);
+
+  return ;
+}
+
+STATIC
+VOID
+MakeCrcTable (
+  VOID
+  )
+{
+  UINT32  Index;
+  UINT32  Index2;
+  UINT32  Temp;
+
+  for (Index = 0; Index <= UINT8_MAX; Index++) {
+    Temp = Index;
+    for (Index2 = 0; Index2 < UINT8_BIT; Index2++) {
+      if (Temp & 1) {
+        Temp = (Temp >> 1) ^ CRCPOLY;
+      } else {
+        Temp >>= 1;
+      }
+    }
+
+    mCrcTable[Index] = (UINT16) Temp;
+  }
+}
+
+STATIC
+VOID
+PutBits (
+  IN INT32  Number,
+  IN UINT32 Value
+  )
+/*++
+
+Routine Description:
+
+  Outputs rightmost n bits of x
+
+Arguments:
+
+  Number   - the rightmost n bits of the data is used
+  x   - the data 
+
+Returns: (VOID)
+
+--*/
+{
+  UINT8 Temp;
+
+  while (Number >= mBitCount) {
+    //
+    // Number -= mBitCount should never equal to 32
+    //
+    Temp = (UINT8) (mSubBitBuf | (Value >> (Number -= mBitCount)));
+    if (mDst < mDstUpperLimit) {
+      *mDst++ = Temp;
+    }
+
+    mCompSize++;
+    mSubBitBuf  = 0;
+    mBitCount   = UINT8_BIT;
+  }
+
+  mSubBitBuf |= Value << (mBitCount -= Number);
+}
+
+STATIC
+INT32
+FreadCrc (
+  OUT UINT8 *Pointer,
+  IN  INT32 Number
+  )
+/*++
+
+Routine Description:
+
+  Read in source data
+  
+Arguments:
+
+  Pointer   - the buffer to hold the data
+  Number   - number of bytes to read
+
+Returns:
+
+  number of bytes actually read
+  
+--*/
+{
+  INT32 Index;
+
+  for (Index = 0; mSrc < mSrcUpperLimit && Index < Number; Index++) {
+    *Pointer++ = *mSrc++;
+  }
+
+  Number = Index;
+
+  Pointer -= Number;
+  mOrigSize += Number;
+  Index--;
+  while (Index >= 0) {
+    UPDATE_CRC (*Pointer++);
+    Index--;
+  }
+
+  return Number;
+}
+
+STATIC
+VOID
+InitPutBits (
+  VOID
+  )
+{
+  mBitCount   = UINT8_BIT;
+  mSubBitBuf  = 0;
+}
+
+STATIC
+VOID
+CountLen (
+  IN INT32 Index
+  )
+/*++
+
+Routine Description:
+
+  Count the number of each code length for a Huffman tree.
+  
+Arguments:
+
+  Index   - the top node
+  
+Returns: (VOID)
+
+--*/
+{
+  static INT32  Depth = 0;
+
+  if (Index < mN) {
+    mLenCnt[(Depth < 16) ? Depth : 16]++;
+  } else {
+    Depth++;
+    CountLen (mLeft[Index]);
+    CountLen (mRight[Index]);
+    Depth--;
+  }
+}
+
+STATIC
+VOID
+MakeLen (
+  IN INT32 Root
+  )
+/*++
+
+Routine Description:
+
+  Create code length array for a Huffman tree
+  
+Arguments:
+
+  Root   - the root of the tree
+  
+Returns:
+
+  VOID
+
+--*/
+{
+  INT32   Index;
+  INT32   Index3;
+  UINT32  Cum;
+
+  for (Index = 0; Index <= 16; Index++) {
+    mLenCnt[Index] = 0;
+  }
+
+  CountLen (Root);
+
+  //
+  // Adjust the length count array so that
+  // no code will be generated longer than its designated length
+  //
+  Cum = 0;
+  for (Index = 16; Index > 0; Index--) {
+    Cum += mLenCnt[Index] << (16 - Index);
+  }
+
+  while (Cum != (1U << 16)) {
+    mLenCnt[16]--;
+    for (Index = 15; Index > 0; Index--) {
+      if (mLenCnt[Index] != 0) {
+        mLenCnt[Index]--;
+        mLenCnt[Index + 1] += 2;
+        break;
+      }
+    }
+
+    Cum--;
+  }
+
+  for (Index = 16; Index > 0; Index--) {
+    Index3 = mLenCnt[Index];
+    Index3--;
+    while (Index3 >= 0) {
+      mLen[*mSortPtr++] = (UINT8) Index;
+      Index3--;
+    }
+  }
+}
+
+STATIC
+VOID
+DownHeap (
+  IN INT32 Index
+  )
+{
+  INT32 Index2;
+  INT32 Index3;
+
+  //
+  // priority queue: send Index-th entry down heap
+  //
+  Index3  = mHeap[Index];
+  Index2  = 2 * Index;
+  while (Index2 <= mHeapSize) {
+    if (Index2 < mHeapSize && mFreq[mHeap[Index2]] > mFreq[mHeap[Index2 + 1]]) {
+      Index2++;
+    }
+
+    if (mFreq[Index3] <= mFreq[mHeap[Index2]]) {
+      break;
+    }
+
+    mHeap[Index]  = mHeap[Index2];
+    Index         = Index2;
+    Index2        = 2 * Index;
+  }
+
+  mHeap[Index] = (INT16) Index3;
+}
+
+STATIC
+VOID
+MakeCode (
+  IN  INT32       Number,
+  IN  UINT8 Len[  ],
+  OUT UINT16 Code[]
+  )
+/*++
+
+Routine Description:
+
+  Assign code to each symbol based on the code length array
+  
+Arguments:
+
+  Number     - number of symbols
+  Len   - the code length array
+  Code  - stores codes for each symbol
+
+Returns: (VOID)
+
+--*/
+{
+  INT32   Index;
+  UINT16  Start[18];
+
+  Start[1] = 0;
+  for (Index = 1; Index <= 16; Index++) {
+    Start[Index + 1] = (UINT16) ((Start[Index] + mLenCnt[Index]) << 1);
+  }
+
+  for (Index = 0; Index < Number; Index++) {
+    Code[Index] = Start[Len[Index]]++;
+  }
+}
+
+STATIC
+INT32
+MakeTree (
+  IN  INT32            NParm,
+  IN  UINT16  FreqParm[],
+  OUT UINT8   LenParm[ ],
+  OUT UINT16  CodeParm[]
+  )
+/*++
+
+Routine Description:
+
+  Generates Huffman codes given a frequency distribution of symbols
+  
+Arguments:
+
+  NParm    - number of symbols
+  FreqParm - frequency of each symbol
+  LenParm  - code length for each symbol
+  CodeParm - code for each symbol
+  
+Returns:
+
+  Root of the Huffman tree.
+  
+--*/
+{
+  INT32 Index;
+  INT32 Index2;
+  INT32 Index3;
+  INT32 Avail;
+
+  //
+  // make tree, calculate len[], return root
+  //
+  mN        = NParm;
+  mFreq     = FreqParm;
+  mLen      = LenParm;
+  Avail     = mN;
+  mHeapSize = 0;
+  mHeap[1]  = 0;
+  for (Index = 0; Index < mN; Index++) {
+    mLen[Index] = 0;
+    if (mFreq[Index]) {
+      mHeapSize++;
+      mHeap[mHeapSize] = (INT16) Index;
+    }
+  }
+
+  if (mHeapSize < 2) {
+    CodeParm[mHeap[1]] = 0;
+    return mHeap[1];
+  }
+
+  for (Index = mHeapSize / 2; Index >= 1; Index--) {
+    //
+    // make priority queue
+    //
+    DownHeap (Index);
+  }
+
+  mSortPtr = CodeParm;
+  do {
+    Index = mHeap[1];
+    if (Index < mN) {
+      *mSortPtr++ = (UINT16) Index;
+    }
+
+    mHeap[1] = mHeap[mHeapSize--];
+    DownHeap (1);
+    Index2 = mHeap[1];
+    if (Index2 < mN) {
+      *mSortPtr++ = (UINT16) Index2;
+    }
+
+    Index3        = Avail++;
+    mFreq[Index3] = (UINT16) (mFreq[Index] + mFreq[Index2]);
+    mHeap[1]      = (INT16) Index3;
+    DownHeap (1);
+    mLeft[Index3]   = (UINT16) Index;
+    mRight[Index3]  = (UINT16) Index2;
+  } while (mHeapSize > 1);
+
+  mSortPtr = CodeParm;
+  MakeLen (Index3);
+  MakeCode (NParm, LenParm, CodeParm);
+
+  //
+  // return root
+  //
+  return Index3;
+}
diff --git a/Tools/Source/TianoTools/Common/EfiCompress.h b/Tools/Source/TianoTools/Common/EfiCompress.h
new file mode 100644
index 0000000000..a129f2cc33
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiCompress.h
@@ -0,0 +1,68 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EfiCompress.h
+
+Abstract:
+
+  Header file for compression routine
+  
+--*/
+
+#include <string.h>
+#include <stdlib.h>
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _EFICOMPRESS_H
+#define _EFICOMPRESS_H
+EFI_STATUS
+Compress (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The compression routine.
+
+Arguments:
+
+  SrcBuffer   - The buffer storing the source data
+  SrcSize     - The size of source data
+  DstBuffer   - The buffer to store the compressed data
+  DstSize     - On input, the size of DstBuffer; On output,
+                the size of the actual compressed data.
+
+Returns:
+
+  EFI_BUFFER_TOO_SMALL  - The DstBuffer is too small. In this case,
+                DstSize contains the size needed.
+  EFI_SUCCESS           - Compression is successful.
+
+--*/
+typedef
+EFI_STATUS
+(*COMPRESS_FUNCTION) (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  );
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h b/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
new file mode 100644
index 0000000000..4953e42b52
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiCustomizedCompress.h
@@ -0,0 +1,141 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  EfiCustomizedCompress.h
+
+Abstract:
+
+  Header file for Customized compression routine
+  
+--*/
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _EFICUSTOMIZEDCOMPRESS_H
+#define _EFICUSTOMIZEDCOMPRESS_H
+EFI_STATUS
+SetCustomizedCompressionType (
+  IN  CHAR8   *Type
+  )
+;
+
+/*++
+
+Routine Description:
+
+The implementation of Customized SetCompressionType().
+
+Arguments:
+  Type        - The type if compression.
+    
+Returns:
+    
+  EFI_SUCCESS           - The type has been set.
+  EFI_UNSUPPORTED       - This type is unsupported.
+
+    
+--*/
+EFI_STATUS
+CustomizedGetInfo (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The implementation of Customized GetInfo().
+
+Arguments:
+
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+EFI_STATUS
+CustomizedDecompress (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The implementation of Customized Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+EFI_STATUS
+CustomizedCompress (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The Customized compression routine.
+
+Arguments:
+
+  SrcBuffer   - The buffer storing the source data
+  SrcSize     - The size of source data
+  DstBuffer   - The buffer to store the compressed data
+  DstSize     - On input, the size of DstBuffer; On output,
+                the size of the actual compressed data.
+
+Returns:
+
+  EFI_BUFFER_TOO_SMALL  - The DstBuffer is too small. In this case,
+                          DstSize contains the size needed.
+  EFI_SUCCESS           - Compression is successful.
+
+--*/
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/EfiDecompress.c b/Tools/Source/TianoTools/Common/EfiDecompress.c
new file mode 100644
index 0000000000..288c42579e
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiDecompress.c
@@ -0,0 +1,790 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  EfiDecompress.c
+
+Abstract:
+
+  Decompressor. Algorithm Ported from OPSD code (Decomp.asm)
+  
+--*/
+
+#include "EfiDecompress.h"
+
+//
+// Decompression algorithm begins here
+//
+#define BITBUFSIZ 32
+#define MAXMATCH  256
+#define THRESHOLD 3
+#define CODE_BIT  16
+#define BAD_TABLE - 1
+
+//
+// C: Char&Len Set; P: Position Set; T: exTra Set
+//
+#define NC    (0xff + MAXMATCH + 2 - THRESHOLD)
+#define CBIT  9
+#define PBIT  5
+#define TBIT  5
+#define MAXNP ((1U << PBIT) - 1)
+#define NT    (CODE_BIT + 3)
+#if NT > MAXNP
+#define NPT NT
+#else
+#define NPT MAXNP
+#endif
+
+typedef struct {
+  UINT8   *mSrcBase;  // Starting address of compressed data
+  UINT8   *mDstBase;  // Starting address of decompressed data
+  UINT32  mOutBuf;
+  UINT32  mInBuf;
+
+  UINT16  mBitCount;
+  UINT32  mBitBuf;
+  UINT32  mSubBitBuf;
+  UINT16  mBlockSize;
+  UINT32  mCompSize;
+  UINT32  mOrigSize;
+
+  UINT16  mBadTableFlag;
+
+  UINT16  mLeft[2 * NC - 1];
+  UINT16  mRight[2 * NC - 1];
+  UINT8   mCLen[NC];
+  UINT8   mPTLen[NPT];
+  UINT16  mCTable[4096];
+  UINT16  mPTTable[256];
+} SCRATCH_DATA;
+
+STATIC
+VOID
+FillBuf (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfBits
+  )
+/*++
+
+Routine Description:
+
+  Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.
+
+Arguments:
+
+  Sd        - The global scratch data
+  NumOfBit  - The number of bits to shift and read.
+
+Returns: (VOID)
+
+--*/
+{
+  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+
+  while (NumOfBits > Sd->mBitCount) {
+
+    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+
+    if (Sd->mCompSize > 0) {
+      //
+      // Get 1 byte into SubBitBuf
+      //
+      Sd->mCompSize--;
+      Sd->mSubBitBuf  = 0;
+      Sd->mSubBitBuf  = Sd->mSrcBase[Sd->mInBuf++];
+      Sd->mBitCount   = 8;
+
+    } else {
+      //
+      // No more bits from the source, just pad zero bit.
+      //
+      Sd->mSubBitBuf  = 0;
+      Sd->mBitCount   = 8;
+
+    }
+  }
+
+  Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);
+  Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;
+}
+
+STATIC
+UINT32
+GetBits (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfBits
+  )
+/*++
+
+Routine Description:
+
+  Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent 
+  NumOfBits of bits from source. Returns NumOfBits of bits that are 
+  popped out.
+
+Arguments:
+
+  Sd            - The global scratch data.
+  NumOfBits     - The number of bits to pop and read.
+
+Returns:
+
+  The bits that are popped out.
+
+--*/
+{
+  UINT32  OutBits;
+
+  OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));
+
+  FillBuf (Sd, NumOfBits);
+
+  return OutBits;
+}
+
+STATIC
+UINT16
+MakeTable (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfChar,
+  IN  UINT8         *BitLen,
+  IN  UINT16        TableBits,
+  OUT UINT16        *Table
+  )
+/*++
+
+Routine Description:
+
+  Creates Huffman Code mapping table according to code length array.
+
+Arguments:
+
+  Sd        - The global scratch data
+  NumOfChar - Number of symbols in the symbol set
+  BitLen    - Code length array
+  TableBits - The width of the mapping table
+  Table     - The table
+  
+Returns:
+  
+  0         - OK.
+  BAD_TABLE - The table is corrupted.
+
+--*/
+{
+  UINT16  Count[17];
+  UINT16  Weight[17];
+  UINT16  Start[18];
+  UINT16  *Pointer;
+  UINT16  Index3;
+  UINT16  Index;
+  UINT16  Len;
+  UINT16  Char;
+  UINT16  JuBits;
+  UINT16  Avail;
+  UINT16  NextCode;
+  UINT16  Mask;
+
+  for (Index = 1; Index <= 16; Index++) {
+    Count[Index] = 0;
+  }
+
+  for (Index = 0; Index < NumOfChar; Index++) {
+    Count[BitLen[Index]]++;
+  }
+
+  Start[1] = 0;
+
+  for (Index = 1; Index <= 16; Index++) {
+    Start[Index + 1] = (UINT16) (Start[Index] + (Count[Index] << (16 - Index)));
+  }
+
+  if (Start[17] != 0) {
+    /*(1U << 16)*/
+    return (UINT16) BAD_TABLE;
+  }
+
+  JuBits = (UINT16) (16 - TableBits);
+
+  for (Index = 1; Index <= TableBits; Index++) {
+    Start[Index] >>= JuBits;
+    Weight[Index] = (UINT16) (1U << (TableBits - Index));
+  }
+
+  while (Index <= 16) {
+    Weight[Index++] = (UINT16) (1U << (16 - Index));
+  }
+
+  Index = (UINT16) (Start[TableBits + 1] >> JuBits);
+
+  if (Index != 0) {
+    Index3 = (UINT16) (1U << TableBits);
+    while (Index != Index3) {
+      Table[Index++] = 0;
+    }
+  }
+
+  Avail = NumOfChar;
+  Mask  = (UINT16) (1U << (15 - TableBits));
+
+  for (Char = 0; Char < NumOfChar; Char++) {
+
+    Len = BitLen[Char];
+    if (Len == 0) {
+      continue;
+    }
+
+    NextCode = (UINT16) (Start[Len] + Weight[Len]);
+
+    if (Len <= TableBits) {
+
+      for (Index = Start[Len]; Index < NextCode; Index++) {
+        Table[Index] = Char;
+      }
+
+    } else {
+
+      Index3  = Start[Len];
+      Pointer = &Table[Index3 >> JuBits];
+      Index   = (UINT16) (Len - TableBits);
+
+      while (Index != 0) {
+        if (*Pointer == 0) {
+          Sd->mRight[Avail]                     = Sd->mLeft[Avail] = 0;
+          *Pointer = Avail++;
+        }
+
+        if (Index3 & Mask) {
+          Pointer = &Sd->mRight[*Pointer];
+        } else {
+          Pointer = &Sd->mLeft[*Pointer];
+        }
+
+        Index3 <<= 1;
+        Index--;
+      }
+
+      *Pointer = Char;
+
+    }
+
+    Start[Len] = NextCode;
+  }
+  //
+  // Succeeds
+  //
+  return 0;
+}
+
+STATIC
+UINT32
+DecodeP (
+  IN  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decodes a position value.
+
+Arguments:
+
+  Sd      - the global scratch data
+
+Returns:
+
+  The position value decoded.
+
+--*/
+{
+  UINT16  Val;
+  UINT32  Mask;
+  UINT32  Pos;
+
+  Val = Sd->mPTTable[Sd->mBitBuf >> (BITBUFSIZ - 8)];
+
+  if (Val >= MAXNP) {
+    Mask = 1U << (BITBUFSIZ - 1 - 8);
+
+    do {
+
+      if (Sd->mBitBuf & Mask) {
+        Val = Sd->mRight[Val];
+      } else {
+        Val = Sd->mLeft[Val];
+      }
+
+      Mask >>= 1;
+    } while (Val >= MAXNP);
+  }
+  //
+  // Advance what we have read
+  //
+  FillBuf (Sd, Sd->mPTLen[Val]);
+
+  Pos = Val;
+  if (Val > 1) {
+    Pos = (UINT32) ((1U << (Val - 1)) + GetBits (Sd, (UINT16) (Val - 1)));
+  }
+
+  return Pos;
+}
+
+STATIC
+UINT16
+ReadPTLen (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        nn,
+  IN  UINT16        nbit,
+  IN  UINT16        Special
+  )
+/*++
+
+Routine Description:
+
+  Reads code lengths for the Extra Set or the Position Set
+
+Arguments:
+
+  Sd        - The global scratch data
+  nn        - Number of symbols
+  nbit      - Number of bits needed to represent nn
+  Special   - The special symbol that needs to be taken care of 
+
+Returns:
+
+  0         - OK.
+  BAD_TABLE - Table is corrupted.
+
+--*/
+{
+  UINT16  Number;
+  UINT16  CharC;
+  UINT16  Index;
+  UINT32  Mask;
+
+  Number = (UINT16) GetBits (Sd, nbit);
+
+  if (Number == 0) {
+    CharC = (UINT16) GetBits (Sd, nbit);
+
+    for (Index = 0; Index < 256; Index++) {
+      Sd->mPTTable[Index] = CharC;
+    }
+
+    for (Index = 0; Index < nn; Index++) {
+      Sd->mPTLen[Index] = 0;
+    }
+
+    return 0;
+  }
+
+  Index = 0;
+
+  while (Index < Number) {
+
+    CharC = (UINT16) (Sd->mBitBuf >> (BITBUFSIZ - 3));
+
+    if (CharC == 7) {
+      Mask = 1U << (BITBUFSIZ - 1 - 3);
+      while (Mask & Sd->mBitBuf) {
+        Mask >>= 1;
+        CharC += 1;
+      }
+    }
+
+    FillBuf (Sd, (UINT16) ((CharC < 7) ? 3 : CharC - 3));
+
+    Sd->mPTLen[Index++] = (UINT8) CharC;
+
+    if (Index == Special) {
+      CharC = (UINT16) GetBits (Sd, 2);
+      CharC--;
+      while ((INT16) (CharC) >= 0) {
+        Sd->mPTLen[Index++] = 0;
+        CharC--;
+      }
+    }
+  }
+
+  while (Index < nn) {
+    Sd->mPTLen[Index++] = 0;
+  }
+
+  return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);
+}
+
+STATIC
+VOID
+ReadCLen (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Reads code lengths for Char&Len Set.
+
+Arguments:
+
+  Sd    - the global scratch data
+
+Returns: (VOID)
+
+--*/
+{
+  UINT16  Number;
+  UINT16  CharC;
+  UINT16  Index;
+  UINT32  Mask;
+
+  Number = (UINT16) GetBits (Sd, CBIT);
+
+  if (Number == 0) {
+    CharC = (UINT16) GetBits (Sd, CBIT);
+
+    for (Index = 0; Index < NC; Index++) {
+      Sd->mCLen[Index] = 0;
+    }
+
+    for (Index = 0; Index < 4096; Index++) {
+      Sd->mCTable[Index] = CharC;
+    }
+
+    return ;
+  }
+
+  Index = 0;
+  while (Index < Number) {
+
+    CharC = Sd->mPTTable[Sd->mBitBuf >> (BITBUFSIZ - 8)];
+    if (CharC >= NT) {
+      Mask = 1U << (BITBUFSIZ - 1 - 8);
+
+      do {
+
+        if (Mask & Sd->mBitBuf) {
+          CharC = Sd->mRight[CharC];
+        } else {
+          CharC = Sd->mLeft[CharC];
+        }
+
+        Mask >>= 1;
+
+      } while (CharC >= NT);
+    }
+    //
+    // Advance what we have read
+    //
+    FillBuf (Sd, Sd->mPTLen[CharC]);
+
+    if (CharC <= 2) {
+
+      if (CharC == 0) {
+        CharC = 1;
+      } else if (CharC == 1) {
+        CharC = (UINT16) (GetBits (Sd, 4) + 3);
+      } else if (CharC == 2) {
+        CharC = (UINT16) (GetBits (Sd, CBIT) + 20);
+      }
+
+      CharC--;
+      while ((INT16) (CharC) >= 0) {
+        Sd->mCLen[Index++] = 0;
+        CharC--;
+      }
+
+    } else {
+
+      Sd->mCLen[Index++] = (UINT8) (CharC - 2);
+
+    }
+  }
+
+  while (Index < NC) {
+    Sd->mCLen[Index++] = 0;
+  }
+
+  MakeTable (Sd, NC, Sd->mCLen, 12, Sd->mCTable);
+
+  return ;
+}
+
+STATIC
+UINT16
+DecodeC (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decode a character/length value.
+
+Arguments:
+
+  Sd    - The global scratch data.
+
+Returns:
+
+  The value decoded.
+
+--*/
+{
+  UINT16  Index2;
+  UINT32  Mask;
+
+  if (Sd->mBlockSize == 0) {
+    //
+    // Starting a new block
+    //
+    Sd->mBlockSize    = (UINT16) GetBits (Sd, 16);
+    Sd->mBadTableFlag = ReadPTLen (Sd, NT, TBIT, 3);
+    if (Sd->mBadTableFlag != 0) {
+      return 0;
+    }
+
+    ReadCLen (Sd);
+
+    Sd->mBadTableFlag = ReadPTLen (Sd, MAXNP, PBIT, (UINT16) (-1));
+    if (Sd->mBadTableFlag != 0) {
+      return 0;
+    }
+  }
+
+  Sd->mBlockSize--;
+  Index2 = Sd->mCTable[Sd->mBitBuf >> (BITBUFSIZ - 12)];
+
+  if (Index2 >= NC) {
+    Mask = 1U << (BITBUFSIZ - 1 - 12);
+
+    do {
+      if (Sd->mBitBuf & Mask) {
+        Index2 = Sd->mRight[Index2];
+      } else {
+        Index2 = Sd->mLeft[Index2];
+      }
+
+      Mask >>= 1;
+    } while (Index2 >= NC);
+  }
+  //
+  // Advance what we have read
+  //
+  FillBuf (Sd, Sd->mCLen[Index2]);
+
+  return Index2;
+}
+
+STATIC
+VOID
+Decode (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decode the source data and put the resulting data into the destination buffer.
+
+Arguments:
+
+  Sd            - The global scratch data
+
+Returns: (VOID)
+
+ --*/
+{
+  UINT16  BytesRemain;
+  UINT32  DataIdx;
+  UINT16  CharC;
+
+  BytesRemain = (UINT16) (-1);
+
+  DataIdx     = 0;
+
+  for (;;) {
+    CharC = DecodeC (Sd);
+    if (Sd->mBadTableFlag != 0) {
+      return ;
+    }
+
+    if (CharC < 256) {
+      //
+      // Process an Original character
+      //
+      Sd->mDstBase[Sd->mOutBuf++] = (UINT8) CharC;
+      if (Sd->mOutBuf >= Sd->mOrigSize) {
+        return ;
+      }
+
+    } else {
+      //
+      // Process a Pointer
+      //
+      CharC       = (UINT16) (CharC - (UINT8_MAX + 1 - THRESHOLD));
+
+      BytesRemain = CharC;
+
+      DataIdx     = Sd->mOutBuf - DecodeP (Sd) - 1;
+
+      BytesRemain--;
+      while ((INT16) (BytesRemain) >= 0) {
+        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];
+        if (Sd->mOutBuf >= Sd->mOrigSize) {
+          return ;
+        }
+
+        BytesRemain--;
+      }
+    }
+  }
+
+  return ;
+}
+
+EFI_STATUS
+GetInfo (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.GetInfo().
+
+Arguments:
+
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  UINT8 *Src;
+
+  *ScratchSize  = sizeof (SCRATCH_DATA);
+
+  Src           = Source;
+  if (SrcSize < 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *DstSize = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+Decompress (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  UINT32        Index;
+  UINT32        CompSize;
+  UINT32        OrigSize;
+  EFI_STATUS    Status;
+  SCRATCH_DATA  *Sd;
+  UINT8         *Src;
+  UINT8         *Dst;
+
+  Status  = EFI_SUCCESS;
+  Src     = Source;
+  Dst     = Destination;
+
+  if (ScratchSize < sizeof (SCRATCH_DATA)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Sd = (SCRATCH_DATA *) Scratch;
+
+  if (SrcSize < 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  CompSize  = Src[0] + (Src[1] << 8) + (Src[2] << 16) + (Src[3] << 24);
+  OrigSize  = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
+
+  if (SrcSize < CompSize + 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (DstSize != OrigSize) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Src = Src + 8;
+
+  for (Index = 0; Index < sizeof (SCRATCH_DATA); Index++) {
+    ((UINT8 *) Sd)[Index] = 0;
+  }
+
+  Sd->mSrcBase  = Src;
+  Sd->mDstBase  = Dst;
+  Sd->mCompSize = CompSize;
+  Sd->mOrigSize = OrigSize;
+
+  //
+  // Fill the first BITBUFSIZ bits
+  //
+  FillBuf (Sd, BITBUFSIZ);
+
+  //
+  // Decompress it
+  //
+  Decode (Sd);
+
+  if (Sd->mBadTableFlag != 0) {
+    //
+    // Something wrong with the source
+    //
+    Status = EFI_INVALID_PARAMETER;
+  }
+
+  return Status;
+}
diff --git a/Tools/Source/TianoTools/Common/EfiDecompress.h b/Tools/Source/TianoTools/Common/EfiDecompress.h
new file mode 100644
index 0000000000..c5004a74a9
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiDecompress.h
@@ -0,0 +1,105 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  EfiDecompress.h
+
+Abstract:
+
+  Header file for compression routine
+  
+--*/
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _EFI_DECOMPRESS_H
+#define _EFI_DECOMPRESS_H
+EFI_STATUS
+GetInfo (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  );
+
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.GetInfo().
+
+Arguments:
+
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+EFI_STATUS
+Decompress (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize
+  )
+;
+
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+typedef
+EFI_STATUS
+(*GETINFO_FUNCTION) (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  );
+
+typedef
+EFI_STATUS
+(*DECOMPRESS_FUNCTION) (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize
+  );
+#endif
diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
new file mode 100644
index 0000000000..6312c17250
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.c
@@ -0,0 +1,758 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  EfiUtilityMsgs.c
+  
+Abstract:
+
+  EFI tools utility functions to display warning, error, and informational
+  messages.
+  
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+
+/*
+#include "Tiano.h"
+*/
+#include "EfiUtilityMsgs.h"
+
+#define MAX_LINE_LEN  200
+
+//
+// Declare module globals for keeping track of the the utility's
+// name and other settings.
+//
+static STATUS mStatus                 = STATUS_SUCCESS;
+static CHAR8  mUtilityName[50]        = { 0 };
+static UINT32 mDebugMsgMask           = 0;
+static CHAR8  *mSourceFileName        = NULL;
+static UINT32 mSourceFileLineNum      = 0;
+static UINT32 mErrorCount             = 0;
+static UINT32 mWarningCount           = 0;
+static UINT32 mMaxErrors              = 0;
+static UINT32 mMaxWarnings            = 0;
+static UINT32 mMaxWarningsPlusErrors  = 0;
+static INT8   mPrintLimitsSet         = 0;
+
+static
+void
+PrintMessage (
+  CHAR8   *Type,
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  va_list List
+  );
+
+static
+void
+PrintLimitExceeded (
+  VOID
+  );
+
+void
+Error (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Prints an error message.
+  
+Arguments:
+  All arguments are optional, though the printed message may be useless if
+  at least something valid is not specified.
+  
+  FileName - name of the file or application. If not specified, then the
+             utilty name (as set by the utility calling SetUtilityName()
+             earlier) is used. Otherwise "Unknown utility" is used.
+  
+  LineNumber - the line number of error, typically used by parsers. If the
+               utility is not a parser, then 0 should be specified. Otherwise
+               the FileName and LineNumber info can be used to cause
+               MS Visual Studio to jump to the error.
+               
+  MessageCode - an application-specific error code that can be referenced in
+              other documentation. 
+
+  Text        - the text in question, typically used by parsers.
+  
+  MsgFmt - the format string for the error message. Can contain formatting
+           controls for use with the varargs.
+           
+Returns:
+  None.
+  
+Notes:
+  We print the following (similar to the Warn() and Debug() 
+  W
+  Typical error/warning message format:
+
+  bin\VfrCompile.cpp(330) : error C2660: 'AddVfrDataStructField' : function does not take 2 parameters
+
+  BUGBUG -- these three utility functions are almost identical, and
+  should be modified to share code.
+
+  Visual Studio does not find error messages with:
+  
+     " error :"
+     " error 1:"
+     " error c1:"
+     " error 1000:"
+     " error c100:"
+
+  It does find:
+     " error c1000:"     
+--*/
+{
+  va_list List;
+  //
+  // If limits have been set, then check that we have not exceeded them
+  //
+  if (mPrintLimitsSet) {
+    //
+    // See if we've exceeded our total count
+    //
+    if (mMaxWarningsPlusErrors != 0) {
+      if (mErrorCount + mWarningCount > mMaxWarningsPlusErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+    //
+    // See if we've exceeded our error count
+    //
+    if (mMaxErrors != 0) {
+      if (mErrorCount > mMaxErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+  }
+
+  mErrorCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("error", FileName, LineNumber, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_ERROR) {
+    mStatus = STATUS_ERROR;
+  }
+}
+
+void
+ParserError (
+  UINT32  MessageCode,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a parser error, using the source file name and line number
+  set by a previous call to SetParserPosition().
+
+Arguments:
+  MessageCode   - application-specific error code
+  Text          - text to print in the error message
+  MsgFmt        - format string to print at the end of the error message
+
+Returns:
+  NA
+
+--*/
+{
+  va_list List;
+  //
+  // If limits have been set, then check them
+  //
+  if (mPrintLimitsSet) {
+    //
+    // See if we've exceeded our total count
+    //
+    if (mMaxWarningsPlusErrors != 0) {
+      if (mErrorCount + mWarningCount > mMaxWarningsPlusErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+    //
+    // See if we've exceeded our error count
+    //
+    if (mMaxErrors != 0) {
+      if (mErrorCount > mMaxErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+  }
+
+  mErrorCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("error", mSourceFileName, mSourceFileLineNum, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_ERROR) {
+    mStatus = STATUS_ERROR;
+  }
+}
+
+void
+ParserWarning (
+  UINT32  ErrorCode,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a parser warning, using the source file name and line number
+  set by a previous call to SetParserPosition().
+
+Arguments:
+  ErrorCode     - application-specific error code
+  OffendingText - text to print in the warning message
+  MsgFmt        - format string to print at the end of the warning message
+
+Returns:
+  NA
+
+--*/
+{
+  va_list List;
+  //
+  // If limits have been set, then check them
+  //
+  if (mPrintLimitsSet) {
+    //
+    // See if we've exceeded our total count
+    //
+    if (mMaxWarningsPlusErrors != 0) {
+      if (mErrorCount + mWarningCount > mMaxWarningsPlusErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+    //
+    // See if we've exceeded our warning count
+    //
+    if (mMaxWarnings != 0) {
+      if (mWarningCount > mMaxWarnings) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+  }
+
+  mWarningCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("warning", mSourceFileName, mSourceFileLineNum, ErrorCode, OffendingText, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_WARNING) {
+    mStatus = STATUS_WARNING;
+  }
+}
+
+void
+Warning (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a warning message.
+
+Arguments:
+  FileName    - name of the file where the warning was detected, or the name
+                of the application that detected the warning
+  
+  LineNumber  - the line number where the warning was detected (parsers).
+                0 should be specified if the utility is not a parser.
+               
+  MessageCode - an application-specific warning code that can be referenced in
+                other documentation. 
+
+  Text        - the text in question (parsers)
+  
+  MsgFmt      - the format string for the warning message. Can contain formatting
+                controls for use with varargs.
+           
+Returns:
+  None.
+
+--*/
+{
+  va_list List;
+  //
+  // If limits have been set, then check them
+  //
+  if (mPrintLimitsSet) {
+    //
+    // See if we've exceeded our total count
+    //
+    if (mMaxWarningsPlusErrors != 0) {
+      if (mErrorCount + mWarningCount > mMaxWarningsPlusErrors) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+    //
+    // See if we've exceeded our warning count
+    //
+    if (mMaxWarnings != 0) {
+      if (mWarningCount > mMaxWarnings) {
+        PrintLimitExceeded ();
+        return ;
+      }
+    }
+  }
+
+  mWarningCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("warning", FileName, LineNumber, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_WARNING) {
+    mStatus = STATUS_WARNING;
+  }
+}
+
+void
+DebugMsg (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MsgMask,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a warning message.
+
+Arguments:
+  FileName    - typically the name of the utility printing the debug message, but
+                can be the name of a file being parsed.
+  
+  LineNumber  - the line number in FileName (parsers) 
+               
+  MsgMask     - an application-specific bitmask that, in combination with mDebugMsgMask,
+                determines if the debug message gets printed.
+
+  Text        - the text in question (parsers)
+  
+  MsgFmt      - the format string for the debug message. Can contain formatting
+                controls for use with varargs.
+           
+Returns:
+  None.
+
+--*/
+{
+  va_list List;
+  //
+  // If the debug mask is not applicable, then do nothing.
+  //
+  if ((MsgMask != 0) && ((mDebugMsgMask & MsgMask) == 0)) {
+    return ;
+  }
+
+  va_start (List, MsgFmt);
+  PrintMessage ("debug", FileName, LineNumber, 0, Text, MsgFmt, List);
+  va_end (List);
+}
+
+static
+void
+PrintMessage (
+  CHAR8   *Type,
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  CHAR8   *Text,
+  CHAR8   *MsgFmt,
+  va_list List
+  )
+/*++
+
+Routine Description:
+  Worker routine for all the utility printing services. Prints the message in
+  a format that Visual Studio will find when scanning build outputs for
+  errors or warnings.
+
+Arguments:
+  Type        - "warning" or "error" string to insert into the message to be
+                printed. The first character of this string (converted to uppercase)
+                is used to preceed the MessageCode value in the output string.
+
+  FileName    - name of the file where the warning was detected, or the name
+                of the application that detected the warning
+  
+  LineNumber  - the line number where the warning was detected (parsers).
+                0 should be specified if the utility is not a parser.
+               
+  MessageCode - an application-specific warning code that can be referenced in
+                other documentation. 
+
+  Text        - part of the message to print
+  
+  MsgFmt      - the format string for the message. Can contain formatting
+                controls for use with varargs.
+  List        - the variable list.
+           
+Returns:
+  None.
+
+Notes:
+  If FileName == NULL then this utility will use the string passed into SetUtilityName(). 
+  
+  LineNumber is only used if the caller is a parser, in which case FileName refers to the
+  file being parsed.
+
+  Text and MsgFmt are both optional, though it would be of little use calling this function with
+  them both NULL.
+
+  Output will typically be of the form:
+    <FileName>(<LineNumber>) : <Type> <Type[0]><MessageCode>: <Text> : <MsgFmt>
+
+    Parser (LineNumber != 0)
+      VfrCompile.cpp(330) : error E2660: AddVfrDataStructField : function does not take 2 parameters
+    Generic utility (LineNumber == 0) 
+      UtilityName : error E1234 : Text string : MsgFmt string and args
+
+--*/
+{
+  CHAR8 Line[MAX_LINE_LEN];
+  CHAR8 Line2[MAX_LINE_LEN];
+  CHAR8 *Cptr;
+  //
+  // If given a filename, then add it (and the line number) to the string.
+  // If there's no filename, then use the program name if provided.
+  //
+  if (FileName != NULL) {
+    Cptr = FileName;
+  } else if (mUtilityName[0] != 0) {
+    Cptr = mUtilityName;
+  } else {
+    Cptr = "Unknown utility";
+  }
+
+  strcpy (Line, Cptr);
+  if (LineNumber != 0) {
+    sprintf (Line2, "(%d)", LineNumber);
+    strcat (Line, Line2);
+  }
+  //
+  // Have to print an error code or Visual Studio won't find the
+  // message for you. It has to be decimal digits too.
+  //
+  sprintf (Line2, " : %s %c%04d", Type, toupper (Type[0]), MessageCode);
+  strcat (Line, Line2);
+  fprintf (stdout, "%s", Line);
+  //
+  // If offending text was provided, then print it
+  //
+  if (Text != NULL) {
+    fprintf (stdout, ": %s ", Text);
+  }
+  //
+  // Print formatted message if provided
+  //
+  if (MsgFmt != NULL) {
+    vsprintf (Line2, MsgFmt, List);
+    fprintf (stdout, ": %s", Line2);
+  }
+
+  fprintf (stdout, "\n");
+}
+
+void
+ParserSetPosition (
+  CHAR8   *SourceFileName,
+  UINT32  LineNum
+  )
+/*++
+
+Routine Description:
+  Set the position in a file being parsed. This can be used to 
+  print error messages deeper down in a parser.
+
+Arguments:
+  SourceFileName - name of the source file being parsed
+  LineNum        - line number of the source file being parsed
+
+Returns:
+  NA
+
+--*/
+{
+  mSourceFileName     = SourceFileName;
+  mSourceFileLineNum  = LineNum;
+}
+
+void
+SetUtilityName (
+  CHAR8   *UtilityName
+  )
+/*++
+
+Routine Description:
+  All printed error/warning/debug messages follow the same format, and
+  typically will print a filename or utility name followed by the error
+  text. However if a filename is not passed to the print routines, then
+  they'll print the utility name if you call this function early in your
+  app to set the utility name.
+  
+Arguments:
+  UtilityName  -  name of the utility, which will be printed with all
+                  error/warning/debug messags.
+
+Returns:
+  NA
+  
+--*/
+{
+  //
+  // Save the name of the utility in our local variable. Make sure its
+  // length does not exceed our buffer.
+  //
+  if (UtilityName != NULL) {
+    if (strlen (UtilityName) >= sizeof (mUtilityName)) {
+      Error (UtilityName, 0, 0, "application error", "utility name length exceeds internal buffer size");
+      strncpy (mUtilityName, UtilityName, sizeof (mUtilityName) - 1);
+      mUtilityName[sizeof (mUtilityName) - 1] = 0;
+      return ;
+    } else {
+      strcpy (mUtilityName, UtilityName);
+    }
+  } else {
+    Error (NULL, 0, 0, "application error", "SetUtilityName() called with NULL utility name");
+  }
+}
+
+STATUS
+GetUtilityStatus (
+  VOID
+  )
+/*++
+
+Routine Description:
+  When you call Error() or Warning(), this module keeps track of it and
+  sets a local mStatus to STATUS_ERROR or STATUS_WARNING. When the utility
+  exits, it can call this function to get the status and use it as a return
+  value.
+  
+Arguments:
+  None.
+
+Returns:
+  Worst-case status reported, as defined by which print function was called.
+  
+--*/
+{
+  return mStatus;
+}
+
+void
+SetDebugMsgMask (
+  UINT32  DebugMask
+  )
+/*++
+
+Routine Description:
+  Set the debug printing mask. This is used by the DebugMsg() function
+  to determine when/if a debug message should be printed.
+
+Arguments:
+  DebugMask  - bitmask, specific to the calling application
+
+Returns:
+  NA
+
+--*/
+{
+  mDebugMsgMask = DebugMask;
+}
+
+void
+SetPrintLimits (
+  UINT32  MaxErrors,
+  UINT32  MaxWarnings,
+  UINT32  MaxWarningsPlusErrors
+  )
+/*++
+
+Routine Description:
+  Set the limits of how many errors, warnings, and errors+warnings
+  we will print.
+
+Arguments:
+  MaxErrors       - maximum number of error messages to print
+  MaxWarnings     - maximum number of warning messages to print
+  MaxWarningsPlusErrors 
+                  - maximum number of errors+warnings to print
+
+Returns:
+  NA
+
+--*/
+{
+  mMaxErrors              = MaxErrors;
+  mMaxWarnings            = MaxWarnings;
+  mMaxWarningsPlusErrors  = MaxWarningsPlusErrors;
+  mPrintLimitsSet         = 1;
+}
+
+static
+void
+PrintLimitExceeded (
+  VOID
+  )
+{
+  static INT8 mPrintLimitExceeded = 0;
+  //
+  // If we've already printed the message, do nothing. Otherwise
+  // temporarily increase our print limits so we can pass one
+  // more message through.
+  //
+  if (mPrintLimitExceeded == 0) {
+    mPrintLimitExceeded++;
+    mMaxErrors++;
+    mMaxWarnings++;
+    mMaxWarningsPlusErrors++;
+    Error (NULL, 0, 0, "error/warning print limit exceeded", NULL);
+    mMaxErrors--;
+    mMaxWarnings--;
+    mMaxWarningsPlusErrors--;
+  }
+}
+
+#if 0
+void
+TestUtilityMessages (
+  VOID
+  )
+{
+  char *ArgStr = "ArgString";
+  int  ArgInt;
+
+  ArgInt  = 0x12345678;
+  //
+  // Test without setting utility name
+  //
+  fprintf (stdout, "* Testing without setting utility name\n");
+  fprintf (stdout, "** Test debug message not printed\n");
+  DebugMsg (NULL, 0, 0x00000001, NULL, NULL);
+  fprintf (stdout, "** Test warning with two strings and two args\n");
+  Warning (NULL, 0, 1234, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+  fprintf (stdout, "** Test error with two strings and two args\n");
+  Warning (NULL, 0, 1234, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+  fprintf (stdout, "** Test parser warning with nothing\n");
+  ParserWarning (0, NULL, NULL);
+  fprintf (stdout, "** Test parser error with nothing\n");
+  ParserError (0, NULL, NULL);
+  //
+  // Test with utility name set now
+  //
+  fprintf (stdout, "** Testingin with utility name set\n");
+  SetUtilityName ("MyUtilityName");
+  //
+  // Test debug prints
+  //
+  SetDebugMsgMask (2);
+  fprintf (stdout, "** Test debug message with one string\n");
+  DebugMsg (NULL, 0, 0x00000002, "Text1", NULL);
+  fprintf (stdout, "** Test debug message with one string\n");
+  DebugMsg (NULL, 0, 0x00000002, NULL, "Text2");
+  fprintf (stdout, "** Test debug message with two strings\n");
+  DebugMsg (NULL, 0, 0x00000002, "Text1", "Text2");
+  fprintf (stdout, "** Test debug message with two strings and two args\n");
+  DebugMsg (NULL, 0, 0x00000002, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+  //
+  // Test warning prints
+  //
+  fprintf (stdout, "** Test warning with no strings\n");
+  Warning (NULL, 0, 1234, NULL, NULL);
+  fprintf (stdout, "** Test warning with one string\n");
+  Warning (NULL, 0, 1234, "Text1", NULL);
+  fprintf (stdout, "** Test warning with one string\n");
+  Warning (NULL, 0, 1234, NULL, "Text2");
+  fprintf (stdout, "** Test warning with two strings and two args\n");
+  Warning (NULL, 0, 1234, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+  //
+  // Test error prints
+  //
+  fprintf (stdout, "** Test error with no strings\n");
+  Error (NULL, 0, 1234, NULL, NULL);
+  fprintf (stdout, "** Test error with one string\n");
+  Error (NULL, 0, 1234, "Text1", NULL);
+  fprintf (stdout, "** Test error with one string\n");
+  Error (NULL, 0, 1234, NULL, "Text2");
+  fprintf (stdout, "** Test error with two strings and two args\n");
+  Error (NULL, 0, 1234, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+  //
+  // Test parser prints
+  //
+  fprintf (stdout, "** Test parser errors\n");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserError (1234, NULL, NULL);
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserError (1234, "Text1", NULL);
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserError (1234, NULL, "Text2");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserError (1234, "Text1", "Text2");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserError (1234, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+
+  fprintf (stdout, "** Test parser warnings\n");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserWarning (4321, NULL, NULL);
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserWarning (4321, "Text1", NULL);
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserWarning (4321, NULL, "Text2");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserWarning (4321, "Text1", "Text2");
+  ParserSetPosition (__FILE__, __LINE__ + 1);
+  ParserWarning (4321, "Text1", "Text2 %s 0x%X", ArgStr, ArgInt);
+}
+#endif
diff --git a/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
new file mode 100644
index 0000000000..777cacf771
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/EfiUtilityMsgs.h
@@ -0,0 +1,138 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EfiUtilityMsgs.h
+
+Abstract:
+
+  Defines and prototypes for common EFI utility error and debug messages.
+  
+--*/
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _EFI_UTILITY_MSGS_H_
+#define _EFI_UTILITY_MSGS_H_
+
+//
+// Status codes returned by EFI utility programs and functions
+//
+#define STATUS_SUCCESS  0
+#define STATUS_WARNING  1
+#define STATUS_ERROR    2
+#define VOID void 
+
+typedef int STATUS;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+//
+// When we call Error() or Warning(), the module keeps track of the worst
+// case reported. GetUtilityStatus() will get the worst-case results, which
+// can be used as the return value from the app.
+//
+STATUS
+GetUtilityStatus (
+  void
+  );
+
+//
+// If someone prints an error message and didn't specify a source file name,
+// then we print the utility name instead. However they must tell us the
+// utility name early on via this function.
+//
+void
+SetUtilityName (
+  CHAR8 *ProgramName
+  )
+;
+
+void
+Error (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  ErrorCode,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+;
+
+void
+Warning (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  ErrorCode,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+;
+
+void
+DebugMsg (
+  CHAR8   *FileName,
+  UINT32  LineNumber,
+  UINT32  MsgLevel,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+;
+
+void
+SetDebugMsgMask (
+  UINT32    MsgMask
+  )
+;
+
+void
+ParserSetPosition (
+  CHAR8   *SourceFileName,
+  UINT32  LineNum
+  )
+;
+
+void
+ParserError (
+  UINT32  ErrorCode,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+;
+
+void
+ParserWarning (
+  UINT32  ErrorCode,
+  CHAR8   *OffendingText,
+  CHAR8   *MsgFmt,
+  ...
+  )
+;
+
+void
+SetPrintLimits (
+  UINT32  NumErrors,
+  UINT32  NumWarnings,
+  UINT32  NumWarningsPlusErrors
+  )
+;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // #ifndef _EFI_UTILITY_MSGS_H_
diff --git a/Tools/Source/TianoTools/Common/FvLib.c b/Tools/Source/TianoTools/Common/FvLib.c
new file mode 100644
index 0000000000..9bfd84346d
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/FvLib.c
@@ -0,0 +1,788 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  FvLib.c
+
+Abstract:
+
+  These functions assist in parsing and manipulating a Firmware Volume.
+
+--*/
+
+//
+// Include files
+//
+#include "FvLib.h"
+#include "CommonLib.h"
+#include "EfiUtilityMsgs.h"
+#include "MultiPhase.h"
+/*
+#include <CommonBuild.h>
+*/
+
+/*
+#include EFI_GUID_DEFINITION (FirmwareFileSystem)
+*/
+
+//
+// Module global variables
+//
+EFI_FIRMWARE_VOLUME_HEADER  *mFvHeader  = NULL;
+UINT32                      mFvLength   = 0;
+
+//
+// External function implementations
+//
+EFI_STATUS
+InitializeFvLib (
+  IN VOID                         *Fv,
+  IN UINT32                       FvLength
+  )
+/*++
+
+Routine Description:
+
+  This initializes the FV lib with a pointer to the FV and length.  It does not
+  verify the FV in any way.
+
+Arguments:
+
+  Fv            Buffer containing the FV.
+  FvLength      Length of the FV
+    
+Returns:
+ 
+  EFI_SUCCESS             Function Completed successfully.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+
+--*/
+{
+  //
+  // Verify input arguments
+  //
+  if (Fv == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  mFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) Fv;
+  mFvLength = FvLength;
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetFvHeader (
+  OUT EFI_FIRMWARE_VOLUME_HEADER  **FvHeader,
+  OUT UINT32                      *FvLength
+  )
+/*++
+
+Routine Description:
+
+  This function returns a pointer to the current FV and the size.
+
+Arguments:
+
+  FvHeader      Pointer to the FV buffer.
+  FvLength      Length of the FV
+    
+Returns:
+ 
+  EFI_SUCCESS             Function Completed successfully.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+  EFI_ABORTED             The library needs to be initialized.
+
+--*/
+{
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify input arguments
+  //
+  if (FvHeader == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *FvHeader = mFvHeader;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetNextFile (
+  IN EFI_FFS_FILE_HEADER          *CurrentFile,
+  OUT EFI_FFS_FILE_HEADER         **NextFile
+  )
+/*++
+
+Routine Description:
+
+  This function returns the next file.  If the current file is NULL, it returns
+  the first file in the FV.  If the function returns EFI_SUCCESS and the file 
+  pointer is NULL, then there are no more files in the FV.
+
+Arguments:
+
+  CurrentFile   Pointer to the current file, must be within the current FV.
+  NextFile      Pointer to the next file in the FV.
+    
+Returns:
+ 
+  EFI_SUCCESS             Function completed successfully.
+  EFI_INVALID_PARAMETER   A required parameter was NULL or is out of range.
+  EFI_ABORTED             The library needs to be initialized.
+
+--*/
+{
+  EFI_STATUS  Status;
+
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify input arguments
+  //
+  if (NextFile == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Verify FV header
+  //
+  Status = VerifyFv (mFvHeader);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Get first file
+  //
+  if (CurrentFile == NULL) {
+    CurrentFile = (EFI_FFS_FILE_HEADER *) ((UINTN) mFvHeader + mFvHeader->HeaderLength);
+
+    //
+    // Verify file is valid
+    //
+    Status = VerifyFfsFile (CurrentFile);
+    if (EFI_ERROR (Status)) {
+      //
+      // no files in this FV
+      //
+      *NextFile = NULL;
+      return EFI_SUCCESS;
+    } else {
+      //
+      // Verify file is in this FV.
+      //
+      if ((UINTN) CurrentFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FFS_FILE_HEADER)) {
+        *NextFile = NULL;
+        return EFI_SUCCESS;
+      }
+
+      *NextFile = CurrentFile;
+      return EFI_SUCCESS;
+    }
+  }
+  //
+  // Verify current file is in range
+  //
+  if (((UINTN) CurrentFile < (UINTN) mFvHeader + sizeof (EFI_FIRMWARE_VOLUME_HEADER)) ||
+      ((UINTN) CurrentFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FIRMWARE_VOLUME_HEADER))
+      ) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Get next file, compensate for 8 byte alignment if necessary.
+  //
+  *NextFile = (EFI_FFS_FILE_HEADER *) (((UINTN) CurrentFile + GetLength (CurrentFile->Size) + 0x07) & (-1 << 3));
+
+  //
+  // Verify file is in this FV.
+  //
+  if ((UINTN) *NextFile >= (UINTN) mFvHeader + mFvLength - sizeof (EFI_FFS_FILE_HEADER)) {
+    *NextFile = NULL;
+    return EFI_SUCCESS;
+  }
+  //
+  // Verify file is valid
+  //
+  Status = VerifyFfsFile (*NextFile);
+  if (EFI_ERROR (Status)) {
+    //
+    // no more files in this FV
+    //
+    *NextFile = NULL;
+    return EFI_SUCCESS;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetFileByName (
+  IN EFI_GUID                     *FileName,
+  OUT EFI_FFS_FILE_HEADER         **File
+  )
+/*++
+
+Routine Description:
+
+  Find a file by name.  The function will return NULL if the file is not found.
+
+Arguments:
+
+  FileName    The GUID file name of the file to search for.
+  File        Return pointer.  In the case of an error, contents are undefined.
+
+Returns:
+
+  EFI_SUCCESS             The function completed successfully.
+  EFI_ABORTED             An error was encountered.
+  EFI_INVALID_PARAMETER   One of the parameters was NULL.
+
+--*/
+{
+  EFI_FFS_FILE_HEADER *CurrentFile;
+  EFI_STATUS          Status;
+
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify input parameters
+  //
+  if (FileName == NULL || File == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Verify FV header
+  //
+  Status = VerifyFv (mFvHeader);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Get the first file
+  //
+  Status = GetNextFile (NULL, &CurrentFile);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "error parsing the FV", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // Loop as long as we have a valid file
+  //
+  while (CurrentFile) {
+    if (!CompareGuid (&CurrentFile->Name, FileName)) {
+      *File = CurrentFile;
+      return EFI_SUCCESS;
+    }
+
+    Status = GetNextFile (CurrentFile, &CurrentFile);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "error parsing the FV", NULL);
+      return EFI_ABORTED;
+    }
+  }
+  //
+  // File not found in this FV.
+  //
+  *File = NULL;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetFileByType (
+  IN EFI_FV_FILETYPE              FileType,
+  IN UINTN                        Instance,
+  OUT EFI_FFS_FILE_HEADER         **File
+  )
+/*++
+
+Routine Description:
+
+  Find a file by type and instance.  An instance of 1 is the first instance.
+  The function will return NULL if a matching file cannot be found.
+  File type EFI_FV_FILETYPE_ALL means any file type is valid.
+
+Arguments:
+
+  FileType    Type of file to search for.
+  Instance    Instace of the file type to return.
+  File        Return pointer.  In the case of an error, contents are undefined.
+
+Returns:
+
+  EFI_SUCCESS             The function completed successfully.
+  EFI_ABORTED             An error was encountered.
+  EFI_INVALID_PARAMETER   One of the parameters was NULL.
+
+--*/
+{
+  EFI_FFS_FILE_HEADER *CurrentFile;
+  EFI_STATUS          Status;
+  UINTN               FileCount;
+
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify input parameters
+  //
+  if (File == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Verify FV header
+  //
+  Status = VerifyFv (mFvHeader);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Initialize the number of matching files found.
+  //
+  FileCount = 0;
+
+  //
+  // Get the first file
+  //
+  Status = GetNextFile (NULL, &CurrentFile);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "error parsing FV", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // Loop as long as we have a valid file
+  //
+  while (CurrentFile) {
+    if (FileType == EFI_FV_FILETYPE_ALL || CurrentFile->Type == FileType) {
+      FileCount++;
+    }
+
+    if (FileCount == Instance) {
+      *File = CurrentFile;
+      return EFI_SUCCESS;
+    }
+
+    Status = GetNextFile (CurrentFile, &CurrentFile);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "error parsing the FV", NULL);
+      return EFI_ABORTED;
+    }
+  }
+
+  *File = NULL;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetSectionByType (
+  IN EFI_FFS_FILE_HEADER          *File,
+  IN EFI_SECTION_TYPE             SectionType,
+  IN UINTN                        Instance,
+  OUT EFI_FILE_SECTION_POINTER    *Section
+  )
+/*++
+
+Routine Description:
+
+  Find a section in a file by type and instance.  An instance of 1 is the first 
+  instance.  The function will return NULL if a matching section cannot be found.
+  The function will not handle encapsulating sections.
+
+Arguments:
+
+  File        The file to search.
+  SectionType Type of file to search for.
+  Instance    Instace of the section to return.
+  Section     Return pointer.  In the case of an error, contents are undefined.
+
+Returns:
+
+  EFI_SUCCESS             The function completed successfully.
+  EFI_ABORTED             An error was encountered.
+  EFI_INVALID_PARAMETER   One of the parameters was NULL.
+  EFI_NOT_FOUND           No found.
+--*/
+{
+  EFI_FILE_SECTION_POINTER  CurrentSection;
+  EFI_STATUS                Status;
+  UINTN                     SectionCount;
+
+  //
+  // Verify input parameters
+  //
+  if (File == NULL || Instance == 0) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Verify FFS header
+  //
+  Status = VerifyFfsFile (File);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "invalid FFS file", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // Initialize the number of matching sections found.
+  //
+  SectionCount = 0;
+
+  //
+  // Get the first section
+  //
+  CurrentSection.CommonHeader = (EFI_COMMON_SECTION_HEADER *) ((UINTN) File + sizeof (EFI_FFS_FILE_HEADER));
+
+  //
+  // Loop as long as we have a valid file
+  //
+  while ((UINTN) CurrentSection.CommonHeader < (UINTN) File + GetLength (File->Size)) {
+    if (CurrentSection.CommonHeader->Type == SectionType) {
+      SectionCount++;
+    }
+
+    if (SectionCount == Instance) {
+      *Section = CurrentSection;
+      return EFI_SUCCESS;
+    }
+    //
+    // Find next section (including compensating for alignment issues.
+    //
+    CurrentSection.CommonHeader = (EFI_COMMON_SECTION_HEADER *) ((((UINTN) CurrentSection.CommonHeader) + GetLength (CurrentSection.CommonHeader->Size) + 0x03) & (-1 << 2));
+  }
+  //
+  // Section not found
+  //
+  (*Section).Code16Section = NULL;
+  return EFI_NOT_FOUND;
+}
+//
+// will not parse compressed sections
+//
+EFI_STATUS
+VerifyFv (
+  IN EFI_FIRMWARE_VOLUME_HEADER   *FvHeader
+  )
+/*++
+
+Routine Description:
+
+  Verify the current pointer points to a valid FV header.
+
+Arguments:
+
+  FvHeader     Pointer to an alleged FV file.
+
+Returns:
+
+  EFI_SUCCESS             The FV header is valid.
+  EFI_VOLUME_CORRUPTED    The FV header is not valid.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+  EFI_ABORTED             Operation aborted.
+
+--*/
+{
+  UINT16  Checksum;
+
+  //
+  // Verify input parameters
+  //
+  if (FvHeader == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (FvHeader->Signature != EFI_FVH_SIGNATURE) {
+    Error (NULL, 0, 0, "invalid FV header signature", NULL);
+    return EFI_VOLUME_CORRUPTED;
+  }
+  //
+  // Verify header checksum
+  //
+  Checksum = CalculateSum16 ((UINT16 *) FvHeader, FvHeader->HeaderLength / sizeof (UINT16));
+
+  if (Checksum != 0) {
+    Error (NULL, 0, 0, "invalid FV header checksum", NULL);
+    return EFI_ABORTED;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+VerifyFfsFile (
+  IN EFI_FFS_FILE_HEADER  *FfsHeader
+  )
+/*++
+
+Routine Description:
+
+  Verify the current pointer points to a FFS file header.
+
+Arguments:
+
+  FfsHeader     Pointer to an alleged FFS file.
+
+Returns:
+
+  EFI_SUCCESS           The Ffs header is valid.
+  EFI_NOT_FOUND         This "file" is the beginning of free space.
+  EFI_VOLUME_CORRUPTED  The Ffs header is not valid.
+  EFI_ABORTED           The erase polarity is not known.
+
+--*/
+{
+  BOOLEAN             ErasePolarity;
+  EFI_STATUS          Status;
+  EFI_FFS_FILE_HEADER BlankHeader;
+  UINT8               Checksum;
+  UINT32              FileLength;
+  UINT32              OccupiedFileLength;
+  EFI_FFS_FILE_TAIL   *Tail;
+  UINT8               SavedChecksum;
+  UINT8               SavedState;
+  UINT8               FileGuidString[80];
+  UINT32              TailSize;
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify FV header
+  //
+  Status = VerifyFv (mFvHeader);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Get the erase polarity.
+  //
+  Status = GetErasePolarity (&ErasePolarity);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Check if we have free space
+  //
+  if (ErasePolarity) {
+    memset (&BlankHeader, -1, sizeof (EFI_FFS_FILE_HEADER));
+  } else {
+    memset (&BlankHeader, 0, sizeof (EFI_FFS_FILE_HEADER));
+  }
+
+  if (memcmp (&BlankHeader, FfsHeader, sizeof (EFI_FFS_FILE_HEADER)) == 0) {
+    return EFI_NOT_FOUND;
+  }
+  //
+  // Convert the GUID to a string so we can at least report which file
+  // if we find an error.
+  //
+  PrintGuidToBuffer (&FfsHeader->Name, FileGuidString, sizeof (FileGuidString), TRUE);
+  if (FfsHeader->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+    TailSize = sizeof (EFI_FFS_FILE_TAIL);
+  } else {
+    TailSize = 0;
+  }
+  //
+  // Verify file header checksum
+  //
+  SavedState = FfsHeader->State;
+  FfsHeader->State = 0;
+  SavedChecksum = FfsHeader->IntegrityCheck.Checksum.File;
+  FfsHeader->IntegrityCheck.Checksum.File = 0;
+  Checksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER));
+  FfsHeader->State = SavedState;
+  FfsHeader->IntegrityCheck.Checksum.File = SavedChecksum;
+  if (Checksum != 0) {
+    Error (NULL, 0, 0, FileGuidString, "invalid FFS file header checksum");
+    return EFI_ABORTED;
+  }
+  //
+  // Verify file checksum
+  //
+  if (FfsHeader->Attributes & FFS_ATTRIB_CHECKSUM) {
+    //
+    // Verify file data checksum
+    //
+    FileLength          = GetLength (FfsHeader->Size);
+    OccupiedFileLength  = (FileLength + 0x07) & (-1 << 3);
+    Checksum            = CalculateSum8 ((UINT8 *) FfsHeader, FileLength - TailSize);
+    Checksum            = (UINT8) (Checksum - FfsHeader->State);
+    if (Checksum != 0) {
+      Error (NULL, 0, 0, FileGuidString, "invalid FFS file checksum");
+      return EFI_ABORTED;
+    }
+  } else {
+    //
+    // File does not have a checksum
+    // Verify contents are 0x5A as spec'd
+    //
+    if (FfsHeader->IntegrityCheck.Checksum.File != FFS_FIXED_CHECKSUM) {
+      Error (NULL, 0, 0, FileGuidString, "invalid fixed FFS file header checksum");
+      return EFI_ABORTED;
+    }
+  }
+  //
+  // Check if the tail is present and verify it if it is.
+  //
+  if (FfsHeader->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+    //
+    // Verify tail is complement of integrity check field in the header.
+    //
+    Tail = (EFI_FFS_FILE_TAIL *) ((UINTN) FfsHeader + GetLength (FfsHeader->Size) - sizeof (EFI_FFS_FILE_TAIL));
+    if (FfsHeader->IntegrityCheck.TailReference != (EFI_FFS_FILE_TAIL)~(*Tail)) {
+      Error (NULL, 0, 0, FileGuidString, "invalid FFS file tail");
+      return EFI_ABORTED;
+    }
+  }
+
+  return EFI_SUCCESS;
+}
+
+UINT32
+GetLength (
+  UINT8     *ThreeByteLength
+  )
+/*++
+
+Routine Description:
+
+  Converts a three byte length value into a UINT32.
+
+Arguments:
+
+  ThreeByteLength   Pointer to the first of the 3 byte length.
+
+Returns:
+
+  UINT32      Size of the section
+
+--*/
+{
+  UINT32  Length;
+
+  if (ThreeByteLength == NULL) {
+    return 0;
+  }
+
+  Length  = *((UINT32 *) ThreeByteLength);
+  Length  = Length & 0x00FFFFFF;
+
+  return Length;
+}
+
+EFI_STATUS
+GetErasePolarity (
+  OUT BOOLEAN   *ErasePolarity
+  )
+/*++
+
+Routine Description:
+
+  This function returns with the FV erase polarity.  If the erase polarity
+  for a bit is 1, the function return TRUE.
+
+Arguments:
+
+  ErasePolarity   A pointer to the erase polarity.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              Operation aborted.
+  
+--*/
+{
+  EFI_STATUS  Status;
+
+  //
+  // Verify library has been initialized.
+  //
+  if (mFvHeader == NULL || mFvLength == 0) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify FV header
+  //
+  Status = VerifyFv (mFvHeader);
+  if (EFI_ERROR (Status)) {
+    return EFI_ABORTED;
+  }
+  //
+  // Verify input parameters.
+  //
+  if (ErasePolarity == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (mFvHeader->Attributes & EFI_FVB_ERASE_POLARITY) {
+    *ErasePolarity = TRUE;
+  } else {
+    *ErasePolarity = FALSE;
+  }
+
+  return EFI_SUCCESS;
+}
+
+UINT8
+GetFileState (
+  IN BOOLEAN              ErasePolarity,
+  IN EFI_FFS_FILE_HEADER  *FfsHeader
+  )
+/*++
+
+Routine Description:
+
+  This function returns a the highest state bit in the FFS that is set.
+  It in no way validate the FFS file.
+
+Arguments:
+  
+  ErasePolarity The erase polarity for the file state bits.
+  FfsHeader     Pointer to a FFS file.
+
+Returns:
+
+  UINT8   The hightest set state of the file.
+
+--*/
+{
+  UINT8 FileState;
+  UINT8 HighestBit;
+
+  FileState = FfsHeader->State;
+
+  if (ErasePolarity) {
+    FileState = (UINT8)~FileState;
+  }
+
+  HighestBit = 0x80;
+  while (HighestBit != 0 && (HighestBit & FileState) == 0) {
+    HighestBit >>= 1;
+  }
+
+  return HighestBit;
+}
diff --git a/Tools/Source/TianoTools/Common/FvLib.h b/Tools/Source/TianoTools/Common/FvLib.h
new file mode 100644
index 0000000000..4a10a3d364
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/FvLib.h
@@ -0,0 +1,185 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  FvLib.h
+
+Abstract:
+
+  These functions assist in parsing and manipulating a Firmware Volume.
+
+--*/
+
+#ifndef _EFI_FV_LIB_H
+#define _EFI_FV_LIB_H
+
+//
+// Include files
+//
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <Common/EfiImage.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareFileSystem.h>
+#include <Common/FirmwareVolumeHeader.h>
+/*
+#include "TianoCommon.h"
+#include "EfiFirmwareVolumeHeader.h"
+#include "EfiFirmwareFileSystem.h"
+*/
+#include <string.h>
+
+EFI_STATUS
+InitializeFvLib (
+  IN VOID                         *Fv,
+  IN UINT32                       FvLength
+  )
+;
+
+EFI_STATUS
+GetFvHeader (
+  OUT EFI_FIRMWARE_VOLUME_HEADER  **FvHeader,
+  OUT UINT32                      *FvLength
+  )
+;
+
+EFI_STATUS
+GetNextFile (
+  IN EFI_FFS_FILE_HEADER          *CurrentFile,
+  OUT EFI_FFS_FILE_HEADER         **NextFile
+  )
+;
+
+EFI_STATUS
+GetFileByName (
+  IN EFI_GUID                     *FileName,
+  OUT EFI_FFS_FILE_HEADER         **File
+  )
+;
+
+EFI_STATUS
+GetFileByType (
+  IN EFI_FV_FILETYPE              FileType,
+  IN UINTN                        Instance,
+  OUT EFI_FFS_FILE_HEADER         **File
+  )
+;
+
+EFI_STATUS
+GetSectionByType (
+  IN EFI_FFS_FILE_HEADER          *File,
+  IN EFI_SECTION_TYPE             SectionType,
+  IN UINTN                        Instance,
+  OUT EFI_FILE_SECTION_POINTER    *Section
+  )
+;
+//
+// will not parse compressed sections
+//
+EFI_STATUS
+VerifyFv (
+  IN EFI_FIRMWARE_VOLUME_HEADER   *FvHeader
+  )
+;
+
+EFI_STATUS
+VerifyFfsFile (
+  IN EFI_FFS_FILE_HEADER          *FfsHeader
+  )
+;
+
+/*++
+
+Routine Description:
+
+  Verify the current pointer points to a FFS file header.
+
+Arguments:
+
+  FfsHeader     Pointer to an alleged FFS file.
+
+Returns:
+
+  EFI_SUCCESS           The Ffs header is valid.
+  EFI_NOT_FOUND         This "file" is the beginning of free space.
+  EFI_VOLUME_CORRUPTED  The Ffs header is not valid.
+
+--*/
+UINT32
+GetLength (
+  UINT8                           *ThreeByteLength
+  )
+;
+
+/*++
+
+Routine Description:
+
+  Converts a three byte length value into a UINT32.
+
+Arguments:
+
+  ThreeByteLength   Pointer to the first of the 3 byte length.
+
+Returns:
+
+  UINT32      Size of the section
+
+--*/
+EFI_STATUS
+GetErasePolarity (
+  OUT BOOLEAN   *ErasePolarity
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function returns with the FV erase polarity.  If the erase polarity
+  for a bit is 1, the function return TRUE.
+
+Arguments:
+
+  ErasePolarity   A pointer to the erase polarity.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+
+--*/
+UINT8
+GetFileState (
+  IN BOOLEAN              ErasePolarity,
+  IN EFI_FFS_FILE_HEADER  *FfsHeader
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function returns a the highest state bit in the FFS that is set.
+  It in no way validate the FFS file.
+
+Arguments:
+  
+  ErasePolarity The erase polarity for the file state bits.
+  FfsHeader     Pointer to a FFS file.
+
+Returns:
+
+  UINT8   The hightest set state of the file.
+
+--*/
+#endif
diff --git a/Tools/Source/TianoTools/Common/MyAlloc.c b/Tools/Source/TianoTools/Common/MyAlloc.c
new file mode 100644
index 0000000000..39fddf7428
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/MyAlloc.c
@@ -0,0 +1,516 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  MyAlloc.c
+
+Abstract:
+
+  File for memory allocation tracking functions.
+
+--*/
+
+#include "MyAlloc.h"
+
+#if USE_MYALLOC
+//
+// Get back to original alloc/free calls.
+//
+#undef malloc
+#undef calloc
+#undef realloc
+#undef free
+//
+// Start of allocation list.
+//
+static MY_ALLOC_STRUCT  *MyAllocData = NULL;
+
+//
+//
+//
+static UINT32           MyAllocHeadMagik  = MYALLOC_HEAD_MAGIK;
+static UINT32           MyAllocTailMagik  = MYALLOC_TAIL_MAGIK;
+
+//
+// ////////////////////////////////////////////////////////////////////////////
+//
+//
+VOID
+MyCheck (
+  BOOLEAN      Final,
+  UINT8        File[],
+  UINTN        Line
+  )
+// *++
+// Description:
+//
+//  Check for corruptions in the allocated memory chain.  If a corruption
+//  is detection program operation stops w/ an exit(1) call.
+//
+// Parameters:
+//
+//  Final := When FALSE, MyCheck() returns if the allocated memory chain
+//           has not been corrupted.  When TRUE, MyCheck() returns if there
+//           are no un-freed allocations.  If there are un-freed allocations,
+//           they are displayed and exit(1) is called.
+//
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  n/a
+//
+// --*/
+//
+{
+  MY_ALLOC_STRUCT *Tmp;
+
+  //
+  // Check parameters.
+  //
+  if (File == NULL || Line == 0) {
+    printf (
+      "\nMyCheck(Final=%u, File=%xh, Line=%u)"
+      "Invalid parameter(s).\n",
+      Final,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+
+  if (strlen (File) == 0) {
+    printf (
+      "\nMyCheck(Final=%u, File=%s, Line=%u)"
+      "Invalid parameter.\n",
+      Final,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Check structure contents.
+  //
+  for (Tmp = MyAllocData; Tmp != NULL; Tmp = Tmp->Next) {
+    if (memcmp(Tmp->Buffer, &MyAllocHeadMagik, sizeof MyAllocHeadMagik) ||
+        memcmp(&Tmp->Buffer[Tmp->Size + sizeof(UINT32)], &MyAllocTailMagik, sizeof MyAllocTailMagik)) {
+      break;
+    }
+  }
+  //
+  // If Tmp is not NULL, the structure is corrupt.
+  //
+  if (Tmp != NULL) {
+    printf (
+      "\nMyCheck(Final=%u, File=%s, Line=%u)""\nStructure corrupted!"
+      "\nFile=%s, Line=%u, nSize=%u, Head=%xh, Tail=%xh\n",
+      Final,
+      File,
+      Line,
+      Tmp->File,
+      Tmp->Line,
+      Tmp->Size,
+      *(UINT32 *) (Tmp->Buffer),
+      *(UINT32 *) (&Tmp->Buffer[Tmp->Size + sizeof (UINT32)])
+      );
+
+    exit (1);
+  }
+  //
+  // If Final is TRUE, display the state of the structure chain.
+  //
+  if (Final) {
+    if (MyAllocData != NULL) {
+      printf (
+        "\nMyCheck(Final=%u, File=%s, Line=%u)"
+        "\nSome allocated items have not been freed.\n",
+        Final,
+        File,
+        Line
+        );
+
+      for (Tmp = MyAllocData; Tmp != NULL; Tmp = Tmp->Next) {
+        printf (
+          "File=%s, Line=%u, nSize=%u, Head=%xh, Tail=%xh\n",
+          Tmp->File,
+          Tmp->Line,
+          Tmp->Size,
+          *(UINT32 *) (Tmp->Buffer),
+          *(UINT32 *) (&Tmp->Buffer[Tmp->Size + sizeof (UINT32)])
+          );
+      }
+    }
+  }
+}
+//
+// ////////////////////////////////////////////////////////////////////////////
+//
+//
+VOID *
+MyAlloc (
+  UINTN      Size,
+  UINT8 File[],
+  UINTN      Line
+  )
+// *++
+// Description:
+//
+//  Allocate a new link in the allocation chain along with enough storage
+//  for the File[] string, requested Size and alignment overhead.  If
+//  memory cannot be allocated or the allocation chain has been corrupted,
+//  exit(1) will be called.
+//
+// Parameters:
+//
+//  Size := Number of bytes (UINT8) requested by the called.
+//          Size cannot be zero.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  Pointer to the caller's buffer.
+//
+// --*/
+//
+{
+  MY_ALLOC_STRUCT *Tmp;
+  UINTN           Len;
+
+  //
+  // Check for invalid parameters.
+  //
+  if (Size == 0 || File == NULL || Line == 0) {
+    printf (
+      "\nMyAlloc(Size=%u, File=%xh, Line=%u)"
+      "\nInvalid parameter(s).\n",
+      Size,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+
+  Len = strlen (File);
+  if (Len == 0) {
+    printf (
+      "\nMyAlloc(Size=%u, File=%s, Line=%u)"
+      "\nInvalid parameter.\n",
+      Size,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Check the allocation list for corruption.
+  //
+  MyCheck (0, __FILE__, __LINE__);
+
+  //
+  // Allocate a new entry.
+  //
+  Tmp = calloc (
+          1,
+          sizeof (MY_ALLOC_STRUCT) + Len + 1 + sizeof (UINT64) + Size + (sizeof MyAllocHeadMagik) + (sizeof MyAllocTailMagik)
+          );
+
+  if (Tmp == NULL) {
+    printf (
+      "\nMyAlloc(Size=%u, File=%s, Line=%u)"
+      "\nOut of memory.\n",
+      Size,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Fill in the new entry.
+  //
+  Tmp->File = ((UINT8 *) Tmp) + sizeof (MY_ALLOC_STRUCT);
+  strcpy (Tmp->File, File);
+  Tmp->Line   = Line;
+  Tmp->Size   = Size;
+  Tmp->Buffer = (UINT8 *) (((UINTN) Tmp + Len + 9) &~7);
+
+  memcpy (Tmp->Buffer, &MyAllocHeadMagik, sizeof MyAllocHeadMagik);
+
+  memcpy (
+    &Tmp->Buffer[Size + sizeof (UINT32)],
+    &MyAllocTailMagik,
+    sizeof MyAllocTailMagik
+    );
+
+  Tmp->Next   = MyAllocData;
+  Tmp->Cksum  = (UINTN) Tmp + (UINTN) (Tmp->Next) + Tmp->Line + Tmp->Size + (UINTN) (Tmp->File) + (UINTN) (Tmp->Buffer);
+
+  MyAllocData = Tmp;
+
+  return Tmp->Buffer + sizeof (UINT32);
+}
+//
+// ////////////////////////////////////////////////////////////////////////////
+//
+//
+VOID *
+MyRealloc (
+  VOID       *Ptr,
+  UINTN      Size,
+  UINT8 File[],
+  UINTN      Line
+  )
+// *++
+// Description:
+//
+//  This does a MyAlloc(), memcpy() and MyFree().  There is no optimization
+//  for shrinking or expanding buffers.  An invalid parameter will cause
+//  MyRealloc() to fail with a call to exit(1).
+//
+// Parameters:
+//
+//  Ptr := Pointer to the caller's buffer to be re-allocated.
+//
+//  Size := Size of new buffer.  Size cannot be zero.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  Pointer to new caller's buffer.
+//
+// --*/
+//
+{
+  MY_ALLOC_STRUCT *Tmp;
+  VOID            *Buffer;
+
+  //
+  // Check for invalid parameter(s).
+  //
+  if (Size == 0 || File == NULL || Line == 0) {
+    printf (
+      "\nMyRealloc(Ptr=%xh, Size=%u, File=%xh, Line=%u)"
+      "\nInvalid parameter(s).\n",
+      Ptr,
+      Size,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+
+  if (strlen (File) == 0) {
+    printf (
+      "\nMyRealloc(Ptr=%xh, Size=%u, File=%s, Line=%u)"
+      "\nInvalid parameter.\n",
+      Ptr,
+      Size,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Find existing buffer in allocation list.
+  //
+  if (Ptr == NULL) {
+    Tmp = NULL;
+  } else if (&MyAllocData->Buffer[sizeof (UINT32)] == Ptr) {
+    Tmp = MyAllocData;
+  } else {
+    for (Tmp = MyAllocData;; Tmp = Tmp->Next) {
+      if (Tmp->Next == NULL) {
+        printf (
+          "\nMyRealloc(Ptr=%xh, Size=%u, File=%s, Line=%u)"
+          "\nCould not find buffer.\n",
+          Ptr,
+          Size,
+          File,
+          Line
+          );
+
+        exit (1);
+      }
+
+      Tmp = Tmp->Next;
+    }
+  }
+  //
+  // Allocate new buffer, copy old data, free old buffer.
+  //
+  Buffer = MyAlloc (Size, File, Line);
+
+  if (Buffer != NULL && Tmp != NULL) {
+    memcpy (
+      Buffer,
+      &Tmp->Buffer[sizeof (UINT32)],
+      ((Size <= Tmp->Size) ? Size : Tmp->Size)
+      );
+
+    MyFree (Ptr, __FILE__, __LINE__);
+  }
+
+  return Buffer;
+}
+//
+// ////////////////////////////////////////////////////////////////////////////
+//
+//
+VOID
+MyFree (
+  VOID       *Ptr,
+  UINT8 File[],
+  UINTN      Line
+  )
+// *++
+// Description:
+//
+//  Release a previously allocated buffer.  Invalid parameters will cause
+//  MyFree() to fail with an exit(1) call.
+//
+// Parameters:
+//
+//  Ptr := Pointer to the caller's buffer to be freed.
+//         A NULL pointer will be ignored.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  n/a
+//
+// --*/
+//
+{
+  MY_ALLOC_STRUCT *Tmp;
+  MY_ALLOC_STRUCT *Tmp2;
+
+  //
+  // Check for invalid parameter(s).
+  //
+  if (File == NULL || Line == 0) {
+    printf (
+      "\nMyFree(Ptr=%xh, File=%xh, Line=%u)"
+      "\nInvalid parameter(s).\n",
+      Ptr,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+
+  if (strlen (File) == 0) {
+    printf (
+      "\nMyFree(Ptr=%xh, File=%s, Line=%u)"
+      "\nInvalid parameter.\n",
+      Ptr,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Freeing NULL is always valid.
+  //
+  if (Ptr == NULL) {
+    return ;
+  }
+  //
+  // Fail if nothing is allocated.
+  //
+  if (MyAllocData == NULL) {
+    printf (
+      "\nMyFree(Ptr=%xh, File=%s, Line=%u)"
+      "\nCalled before memory allocated.\n",
+      Ptr,
+      File,
+      Line
+      );
+
+    exit (1);
+  }
+  //
+  // Check for corrupted allocation list.
+  //
+  MyCheck (0, __FILE__, __LINE__);
+
+  //
+  // Need special check for first item in list.
+  //
+  if (&MyAllocData->Buffer[sizeof (UINT32)] == Ptr) {
+    //
+    // Unlink first item in list.
+    //
+    Tmp         = MyAllocData;
+    MyAllocData = MyAllocData->Next;
+  } else {
+    //
+    // Walk list looking for matching item.
+    //
+    for (Tmp = MyAllocData;; Tmp = Tmp->Next) {
+      //
+      // Fail if end of list is reached.
+      //
+      if (Tmp->Next == NULL) {
+        printf (
+          "\nMyFree(Ptr=%xh, File=%s, Line=%u)\n"
+          "\nNot found.\n",
+          Ptr,
+          File,
+          Line
+          );
+
+        exit (1);
+      }
+      //
+      // Leave loop when match is found.
+      //
+      if (&Tmp->Next->Buffer[sizeof (UINT32)] == Ptr) {
+        break;
+      }
+    }
+    //
+    // Unlink item from list.
+    //
+    Tmp2      = Tmp->Next;
+    Tmp->Next = Tmp->Next->Next;
+    Tmp       = Tmp2;
+  }
+  //
+  // Release item.
+  //
+  free (Tmp);
+}
+
+#endif /* USE_MYALLOC */
+
+/* eof - MyAlloc.c */
diff --git a/Tools/Source/TianoTools/Common/MyAlloc.h b/Tools/Source/TianoTools/Common/MyAlloc.h
new file mode 100644
index 0000000000..d766682ea1
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/MyAlloc.h
@@ -0,0 +1,225 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  MyAlloc.h
+
+Abstract:
+
+  Header file for memory allocation tracking functions.
+
+--*/
+
+#ifndef _MYALLOC_H_
+#define _MYALLOC_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <Base.h>
+
+/*
+#include "Tiano.h"
+*/
+
+//
+// Default operation is to use the memory allocation tracking functions.
+// To over-ride add "#define USE_MYALLOC 0" to your program header and/or
+// source files as needed.  Or, just do not include this header file in
+// your project.
+//
+#ifndef USE_MYALLOC
+#define USE_MYALLOC 1
+#endif
+
+#if USE_MYALLOC
+//
+// Replace C library allocation routines with MyAlloc routines.
+//
+#define malloc(size)        MyAlloc ((size), __FILE__, __LINE__)
+#define calloc(count, size) MyAlloc ((count) * (size), __FILE__, __LINE__)
+#define realloc(ptr, size)  MyRealloc ((ptr), (size), __FILE__, __LINE__)
+#define free(ptr)           MyFree ((ptr), __FILE__, __LINE__)
+#define alloc_check(final)  MyCheck ((final), __FILE__, __LINE__)
+
+//
+// Structure for checking/tracking memory allocations.
+//
+typedef struct MyAllocStruct {
+  UINTN                 Cksum;
+  struct MyAllocStruct  *Next;
+  UINTN                 Line;
+  UINTN                 Size;
+  UINT8                 *File;
+  UINT8                 *Buffer;
+} MY_ALLOC_STRUCT;
+//
+// Cksum := (UINTN)This + (UINTN)Next + Line + Size + (UINTN)File +
+//          (UINTN)Buffer;
+//
+// Next := Pointer to next allocation structure in the list.
+//
+// Line := __LINE__
+//
+// Size := Size of allocation request.
+//
+// File := Pointer to __FILE__ string stored immediately following
+//         MY_ALLOC_STRUCT in memory.
+//
+// Buffer := Pointer to UINT32 aligned storage immediately following
+//           the NULL terminated __FILE__ string.  This is UINT32
+//           aligned because the underflow signature is 32-bits and
+//           this will place the first caller address on a 64-bit
+//           boundary.
+//
+//
+// Signatures used to check for buffer overflow/underflow conditions.
+//
+#define MYALLOC_HEAD_MAGIK  0xBADFACED
+#define MYALLOC_TAIL_MAGIK  0xDEADBEEF
+
+VOID
+MyCheck (
+  BOOLEAN      Final,
+  UINT8        File[],
+  UINTN        Line
+  )
+;
+//
+// *++
+// Description:
+//
+//  Check for corruptions in the allocated memory chain.  If a corruption
+//  is detection program operation stops w/ an exit(1) call.
+//
+// Parameters:
+//
+//  Final := When FALSE, MyCheck() returns if the allocated memory chain
+//           has not been corrupted.  When TRUE, MyCheck() returns if there
+//           are no un-freed allocations.  If there are un-freed allocations,
+//           they are displayed and exit(1) is called.
+//
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  n/a
+//
+// --*/
+//
+VOID  *
+MyAlloc (
+  UINTN      Size,
+  UINT8      File[],
+  UINTN      Line
+  )
+;
+//
+// *++
+// Description:
+//
+//  Allocate a new link in the allocation chain along with enough storage
+//  for the File[] string, requested Size and alignment overhead.  If
+//  memory cannot be allocated or the allocation chain has been corrupted,
+//  exit(1) will be called.
+//
+// Parameters:
+//
+//  Size := Number of bytes (UINT8) requested by the called.
+//          Size cannot be zero.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  Pointer to the caller's buffer.
+//
+// --*/
+//
+VOID  *
+MyRealloc (
+  VOID       *Ptr,
+  UINTN      Size,
+  UINT8      File[],
+  UINTN      Line
+  )
+;
+//
+// *++
+// Description:
+//
+//  This does a MyAlloc(), memcpy() and MyFree().  There is no optimization
+//  for shrinking or expanding buffers.  An invalid parameter will cause
+//  MyRealloc() to fail with a call to exit(1).
+//
+// Parameters:
+//
+//  Ptr := Pointer to the caller's buffer to be re-allocated.
+//         Ptr cannot be NULL.
+//
+//  Size := Size of new buffer.  Size cannot be zero.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  Pointer to new caller's buffer.
+//
+// --*/
+//
+VOID
+MyFree (
+  VOID       *Ptr,
+  UINT8      File[],
+  UINTN      Line
+  )
+;
+//
+// *++
+// Description:
+//
+//  Release a previously allocated buffer.  Invalid parameters will cause
+//  MyFree() to fail with an exit(1) call.
+//
+// Parameters:
+//
+//  Ptr := Pointer to the caller's buffer to be freed.
+//         A NULL pointer will be ignored.
+//
+//  File := Set to __FILE__ by macro expansion.
+//
+//  Line := Set to __LINE__ by macro expansion.
+//
+// Returns:
+//
+//  n/a
+//
+// --*/
+//
+#else /* USE_MYALLOC */
+
+//
+// Nothing to do when USE_MYALLOC is zero.
+//
+#define alloc_check(final)
+
+#endif /* USE_MYALLOC */
+#endif /* _MYALLOC_H_ */
+
+/* eof - MyAlloc.h */
diff --git a/Tools/Source/TianoTools/Common/ParseInf.c b/Tools/Source/TianoTools/Common/ParseInf.c
new file mode 100644
index 0000000000..989add7e9c
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/ParseInf.c
@@ -0,0 +1,630 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  ParseInf.c
+
+Abstract:
+
+  This contains some useful functions for parsing INF files.
+
+--*/
+
+#include "ParseInf.h"
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#ifndef _MAX_PATH
+#define _MAX_PATH 500
+#endif
+
+CHAR8 *
+ReadLine (
+  IN MEMORY_FILE    *InputFile,
+  IN OUT CHAR8      *InputBuffer,
+  IN UINTN          MaxLength
+  )
+/*++
+
+Routine Description:
+
+  This function reads a line, stripping any comments.
+  The function reads a string from the input stream argument and stores it in 
+  the input string. ReadLine reads characters from the current file position 
+  to and including the first newline character, to the end of the stream, or 
+  until the number of characters read is equal to MaxLength - 1, whichever 
+  comes first.  The newline character, if read, is replaced with a \0. 
+
+Arguments:
+
+  InputFile     Memory file image.
+  InputBuffer   Buffer to read into, must be _MAX_PATH size.
+  MaxLength     The maximum size of the input buffer.
+
+Returns:
+
+  NULL if error or EOF
+  InputBuffer otherwise
+
+--*/
+{
+  CHAR8 *CharPtr;
+  CHAR8 *EndOfLine;
+  UINTN CharsToCopy;
+
+  //
+  // Verify input parameters are not null
+  //
+  assert (InputBuffer);
+  assert (InputFile->FileImage);
+  assert (InputFile->Eof);
+  assert (InputFile->CurrentFilePointer);
+
+  //
+  // Check for end of file condition
+  //
+  if (InputFile->CurrentFilePointer >= InputFile->Eof) {
+    return NULL;
+  }
+  //
+  // Find the next newline char
+  //
+  EndOfLine = strchr (InputFile->CurrentFilePointer, '\n');
+
+  //
+  // Determine the number of characters to copy.
+  //
+  if (EndOfLine == 0) {
+    //
+    // If no newline found, copy to the end of the file.
+    //
+    CharsToCopy = InputFile->Eof - InputFile->CurrentFilePointer;
+  } else if (EndOfLine >= InputFile->Eof) {
+    //
+    // If the newline found was beyond the end of file, copy to the eof.
+    //
+    CharsToCopy = InputFile->Eof - InputFile->CurrentFilePointer;
+  } else {
+    //
+    // Newline found in the file.
+    //
+    CharsToCopy = EndOfLine - InputFile->CurrentFilePointer;
+  }
+  //
+  // If the end of line is too big for the current buffer, set it to the max
+  // size of the buffer (leaving room for the \0.
+  //
+  if (CharsToCopy > MaxLength - 1) {
+    CharsToCopy = MaxLength - 1;
+  }
+  //
+  // Copy the line.
+  //
+  memcpy (InputBuffer, InputFile->CurrentFilePointer, CharsToCopy);
+
+  //
+  // Add the null termination over the 0x0D
+  //
+  InputBuffer[CharsToCopy - 1] = '\0';
+
+  //
+  // Increment the current file pointer (include the 0x0A)
+  //
+  InputFile->CurrentFilePointer += CharsToCopy + 1;
+
+  //
+  // Strip any comments
+  //
+  CharPtr = strstr (InputBuffer, "//");
+  if (CharPtr != 0) {
+    CharPtr[0] = 0;
+  }
+  //
+  // Return the string
+  //
+  return InputBuffer;
+}
+
+BOOLEAN
+FindSection (
+  IN MEMORY_FILE    *InputFile,
+  IN CHAR8          *Section
+  )
+/*++
+
+Routine Description:
+
+  This function parses a file from the beginning to find a section.
+  The section string may be anywhere within a line.
+
+Arguments:
+
+  InputFile     Memory file image.
+  Section       Section to search for
+
+Returns:
+
+  FALSE if error or EOF
+  TRUE if section found
+
+--*/
+{
+  CHAR8 InputBuffer[_MAX_PATH];
+  CHAR8 *CurrentToken;
+
+  //
+  // Verify input is not NULL
+  //
+  assert (InputFile->FileImage);
+  assert (InputFile->Eof);
+  assert (InputFile->CurrentFilePointer);
+  assert (Section);
+
+  //
+  // Rewind to beginning of file
+  //
+  InputFile->CurrentFilePointer = InputFile->FileImage;
+
+  //
+  // Read lines until the section is found
+  //
+  while (InputFile->CurrentFilePointer < InputFile->Eof) {
+    //
+    // Read a line
+    //
+    ReadLine (InputFile, InputBuffer, _MAX_PATH);
+
+    //
+    // Check if the section is found
+    //
+    CurrentToken = strstr (InputBuffer, Section);
+    if (CurrentToken != NULL) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+EFI_STATUS
+FindToken (
+  IN MEMORY_FILE    *InputFile,
+  IN CHAR8          *Section,
+  IN CHAR8          *Token,
+  IN UINTN          Instance,
+  OUT CHAR8         *Value
+  )
+/*++
+
+Routine Description:
+
+  Finds a token value given the section and token to search for.
+
+Arguments:
+
+  InputFile Memory file image.
+  Section   The section to search for, a string within [].
+  Token     The token to search for, e.g. EFI_PEIM_RECOVERY, followed by an = in the INF file.
+  Instance  The instance of the token to search for.  Zero is the first instance.
+  Value     The string that holds the value following the =.  Must be _MAX_PATH in size.
+
+Returns:
+
+  EFI_SUCCESS             Value found.
+  EFI_ABORTED             Format error detected in INF file.
+  EFI_INVALID_PARAMETER   Input argument was null.
+  EFI_LOAD_ERROR          Error reading from the file.
+  EFI_NOT_FOUND           Section/Token/Value not found.
+
+--*/
+{
+  CHAR8   InputBuffer[_MAX_PATH];
+  CHAR8   *CurrentToken;
+  BOOLEAN ParseError;
+  BOOLEAN ReadError;
+  UINTN   Occurrance;
+
+  //
+  // Check input parameters
+  //
+  if (InputFile->FileImage == NULL ||
+      InputFile->Eof == NULL ||
+      InputFile->CurrentFilePointer == NULL ||
+      Section == NULL ||
+      strlen (Section) == 0 ||
+      Token == NULL ||
+      strlen (Token) == 0 ||
+      Value == NULL
+      ) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Initialize error codes
+  //
+  ParseError  = FALSE;
+  ReadError   = FALSE;
+
+  //
+  // Initialize our instance counter for the search token
+  //
+  Occurrance = 0;
+
+  if (FindSection (InputFile, Section)) {
+    //
+    // Found the desired section, find and read the desired token
+    //
+    do {
+      //
+      // Read a line from the file
+      //
+      if (ReadLine (InputFile, InputBuffer, _MAX_PATH) == NULL) {
+        //
+        // Error reading from input file
+        //
+        ReadError = TRUE;
+        break;
+      }
+      //
+      // Get the first non-whitespace string
+      //
+      CurrentToken = strtok (InputBuffer, " \t\n");
+      if (CurrentToken == NULL) {
+        //
+        // Whitespace line found (or comment) so continue
+        //
+        CurrentToken = InputBuffer;
+        continue;
+      }
+      //
+      // Make sure we have not reached the end of the current section
+      //
+      if (CurrentToken[0] == '[') {
+        break;
+      }
+      //
+      // Compare the current token with the desired token
+      //
+      if (strcmp (CurrentToken, Token) == 0) {
+        //
+        // Found it
+        //
+        //
+        // Check if it is the correct instance
+        //
+        if (Instance == Occurrance) {
+          //
+          // Copy the contents following the =
+          //
+          CurrentToken = strtok (NULL, "= \t\n");
+          if (CurrentToken == NULL) {
+            //
+            // Nothing found, parsing error
+            //
+            ParseError = TRUE;
+          } else {
+            //
+            // Copy the current token to the output value
+            //
+            strcpy (Value, CurrentToken);
+            return EFI_SUCCESS;
+          }
+        } else {
+          //
+          // Increment the occurrance found
+          //
+          Occurrance++;
+        }
+      }
+    } while (
+      !ParseError &&
+      !ReadError &&
+      InputFile->CurrentFilePointer < InputFile->Eof &&
+      CurrentToken[0] != '[' &&
+      Occurrance <= Instance
+    );
+  }
+  //
+  // Distinguish between read errors and INF file format errors.
+  //
+  if (ReadError) {
+    return EFI_LOAD_ERROR;
+  }
+
+  if (ParseError) {
+    return EFI_ABORTED;
+  }
+
+  return EFI_NOT_FOUND;
+}
+
+EFI_STATUS
+StringToGuid (
+  IN CHAR8      *AsciiGuidBuffer,
+  OUT EFI_GUID  *GuidBuffer
+  )
+/*++
+
+Routine Description: 
+
+  Converts a string to an EFI_GUID.  The string must be in the 
+  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx format.
+
+Arguments:  
+
+  AsciiGuidBuffer - pointer to ascii string
+  GuidBuffer      - pointer to destination Guid
+
+Returns:  
+
+  EFI_ABORTED             Could not convert the string
+  EFI_SUCCESS             The string was successfully converted
+  EFI_INVALID_PARAMETER   Input parameter is invalid.
+
+--*/
+{
+  INT32 Index;
+  UINTN Data1;
+  UINTN Data2;
+  UINTN Data3;
+  UINTN Data4[8];
+
+  if (AsciiGuidBuffer == NULL || GuidBuffer == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Scan the guid string into the buffer
+  //
+  Index = sscanf (
+            AsciiGuidBuffer,
+            "%08x-%04x-%04x-%02x%02x-%02hx%02hx%02hx%02hx%02hx%02hx",
+            &Data1,
+            &Data2,
+            &Data3,
+            &Data4[0],
+            &Data4[1],
+            &Data4[2],
+            &Data4[3],
+            &Data4[4],
+            &Data4[5],
+            &Data4[6],
+            &Data4[7]
+            );
+
+  //
+  // Verify the correct number of items were scanned.
+  //
+  if (Index != 11) {
+    printf ("ERROR: Malformed GUID \"%s\".\n\n", AsciiGuidBuffer);
+    return EFI_ABORTED;
+  }
+  //
+  // Copy the data into our GUID.
+  //
+  GuidBuffer->Data1     = (UINT32) Data1;
+  GuidBuffer->Data2     = (UINT16) Data2;
+  GuidBuffer->Data3     = (UINT16) Data3;
+  GuidBuffer->Data4[0]  = (UINT8) Data4[0];
+  GuidBuffer->Data4[1]  = (UINT8) Data4[1];
+  GuidBuffer->Data4[2]  = (UINT8) Data4[2];
+  GuidBuffer->Data4[3]  = (UINT8) Data4[3];
+  GuidBuffer->Data4[4]  = (UINT8) Data4[4];
+  GuidBuffer->Data4[5]  = (UINT8) Data4[5];
+  GuidBuffer->Data4[6]  = (UINT8) Data4[6];
+  GuidBuffer->Data4[7]  = (UINT8) Data4[7];
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AsciiStringToUint64 (
+  IN CONST CHAR8  *AsciiString,
+  IN BOOLEAN      IsHex,
+  OUT UINT64      *ReturnValue
+  )
+/*++
+
+Routine Description:
+
+  Converts a null terminated ascii string that represents a number into a 
+  UINT64 value.  A hex number may be preceeded by a 0x, but may not be 
+  succeeded by an h.  A number without 0x or 0X is considered to be base 10 
+  unless the IsHex input is true.
+
+Arguments:
+
+  AsciiString   The string to convert.
+  IsHex         Force the string to be treated as a hex number.
+  ReturnValue   The return value.
+
+Returns:
+
+  EFI_SUCCESS   Number successfully converted.
+  EFI_ABORTED   Invalid character encountered.
+
+--*/
+{
+  UINT8   Index;
+  UINT64  HexNumber;
+  CHAR8   CurrentChar;
+
+  //
+  // Initialize the result
+  //
+  HexNumber = 0;
+
+  //
+  // Add each character to the result
+  //
+  if (IsHex || (AsciiString[0] == '0' && (AsciiString[1] == 'x' || AsciiString[1] == 'X'))) {
+    //
+    // Verify string is a hex number
+    //
+    for (Index = 2; Index < strlen (AsciiString); Index++) {
+      if (isxdigit (AsciiString[Index]) == 0) {
+        return EFI_ABORTED;
+      }
+    }
+    //
+    // Convert the hex string.
+    //
+    for (Index = 2; AsciiString[Index] != '\0'; Index++) {
+      CurrentChar = AsciiString[Index];
+      HexNumber *= 16;
+      if (CurrentChar >= '0' && CurrentChar <= '9') {
+        HexNumber += CurrentChar - '0';
+      } else if (CurrentChar >= 'a' && CurrentChar <= 'f') {
+        HexNumber += CurrentChar - 'a' + 10;
+      } else if (CurrentChar >= 'A' && CurrentChar <= 'F') {
+        HexNumber += CurrentChar - 'A' + 10;
+      } else {
+        //
+        // Unrecognized character
+        //
+        return EFI_ABORTED;
+      }
+    }
+
+    *ReturnValue = HexNumber;
+  } else {
+    //
+    // Verify string is a number
+    //
+    for (Index = 0; Index < strlen (AsciiString); Index++) {
+      if (isdigit (AsciiString[Index]) == 0) {
+        return EFI_ABORTED;
+      }
+    }
+
+    *ReturnValue = atol (AsciiString);
+  }
+
+  return EFI_SUCCESS;
+};
+
+CHAR8 *
+ReadLineInStream (
+  IN FILE       *InputFile,
+  IN OUT CHAR8  *InputBuffer
+  )
+/*++
+
+Routine Description:
+
+  This function reads a line, stripping any comments.
+  // BUGBUG:  This is obsolete once genmake goes away...
+
+Arguments:
+
+  InputFile     Stream pointer.
+  InputBuffer   Buffer to read into, must be _MAX_PATH size.
+
+Returns:
+
+  NULL if error or EOF
+  InputBuffer otherwise
+
+--*/
+{
+  CHAR8 *CharPtr;
+
+  //
+  // Verify input parameters are not null
+  //
+  assert (InputFile);
+  assert (InputBuffer);
+
+  //
+  // Read a line
+  //
+  if (fgets (InputBuffer, _MAX_PATH, InputFile) == NULL) {
+    return NULL;
+  }
+  //
+  // Strip any comments
+  //
+  CharPtr = strstr (InputBuffer, "//");
+  if (CharPtr != 0) {
+    CharPtr[0] = 0;
+  }
+
+  CharPtr = strstr (InputBuffer, "#");
+  if (CharPtr != 0) {
+    CharPtr[0] = 0;
+  }
+  //
+  // Return the string
+  //
+  return InputBuffer;
+}
+
+BOOLEAN
+FindSectionInStream (
+  IN FILE       *InputFile,
+  IN CHAR8      *Section
+  )
+/*++
+
+Routine Description:
+
+  This function parses a stream file from the beginning to find a section.
+  The section string may be anywhere within a line.
+  // BUGBUG:  This is obsolete once genmake goes away...
+
+Arguments:
+
+  InputFile     Stream pointer.
+  Section       Section to search for
+
+Returns:
+
+  FALSE if error or EOF
+  TRUE if section found
+
+--*/
+{
+  CHAR8 InputBuffer[_MAX_PATH];
+  CHAR8 *CurrentToken;
+
+  //
+  // Verify input is not NULL
+  //
+  assert (InputFile);
+  assert (Section);
+
+  //
+  // Rewind to beginning of file
+  //
+  if (fseek (InputFile, 0, SEEK_SET) != 0) {
+    return FALSE;
+  }
+  //
+  // Read lines until the section is found
+  //
+  while (feof (InputFile) == 0) {
+    //
+    // Read a line
+    //
+    ReadLineInStream (InputFile, InputBuffer);
+
+    //
+    // Check if the section is found
+    //
+    CurrentToken = strstr (InputBuffer, Section);
+    if (CurrentToken != NULL) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
diff --git a/Tools/Source/TianoTools/Common/ParseInf.h b/Tools/Source/TianoTools/Common/ParseInf.h
new file mode 100644
index 0000000000..5691e53194
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/ParseInf.h
@@ -0,0 +1,235 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  ParseInf.h
+
+Abstract:
+
+  Header file for helper functions useful for parsing INF files.
+
+--*/
+
+#ifndef _EFI_PARSE_INF_H
+#define _EFI_PARSE_INF_H
+
+/* #include "TianoCommon.h" */
+#include <Base.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <UefiBaseTypes.h>
+
+//
+// Common data structures
+//
+typedef struct {
+  CHAR8 *FileImage;
+  CHAR8 *Eof;
+  CHAR8 *CurrentFilePointer;
+} MEMORY_FILE;
+
+//
+// Functions declarations
+//
+CHAR8 *
+ReadLine (
+  IN MEMORY_FILE    *InputFile,
+  IN OUT CHAR8      *InputBuffer,
+  IN UINT32         MaxLength
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function reads a line, stripping any comments.
+  The function reads a string from the input stream argument and stores it in 
+  the input string. ReadLine reads characters from the current file position 
+  to and including the first newline character, to the end of the stream, or 
+  until the number of characters read is equal to MaxLength - 1, whichever 
+  comes first.  The newline character, if read, is replaced with a \0. 
+
+Arguments:
+
+  InputFile     Memory file image.
+  InputBuffer   Buffer to read into, must be _MAX_PATH size.
+  MaxLength     The maximum size of the input buffer.
+
+Returns:
+
+  NULL if error or EOF
+  InputBuffer otherwise
+
+--*/
+BOOLEAN
+FindSection (
+  IN MEMORY_FILE    *InputFile,
+  IN CHAR8          *Section
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function parses a file from the beginning to find a section.
+  The section string may be anywhere within a line.
+
+Arguments:
+
+  InputFile     Memory file image.
+  Section       Section to search for
+
+Returns:
+
+  FALSE if error or EOF
+  TRUE if section found
+
+--*/
+EFI_STATUS
+FindToken (
+  IN MEMORY_FILE    *InputFile,
+  IN CHAR8          *Section,
+  IN CHAR8          *Token,
+  IN UINTN          Instance,
+  OUT CHAR8         *Value
+  )
+;
+
+/*++
+
+Routine Description:
+
+  Finds a token value given the section and token to search for.
+
+Arguments:
+
+  InputFile Memory file image.
+  Section   The section to search for, a string within [].
+  Token     The token to search for, e.g. EFI_PEIM_RECOVERY, followed by an = in the INF file.
+  Instance  The instance of the token to search for.  Zero is the first instance.
+  Value     The string that holds the value following the =.  Must be _MAX_PATH in size.
+
+Returns:
+
+  EFI_SUCCESS             Value found.
+  EFI_ABORTED             Format error detected in INF file.
+  EFI_INVALID_PARAMETER   Input argument was null.
+  EFI_LOAD_ERROR          Error reading from the file.
+  EFI_NOT_FOUND           Section/Token/Value not found.
+
+--*/
+EFI_STATUS
+StringToGuid (
+  IN CHAR8        *AsciiGuidBuffer,
+  OUT EFI_GUID    *GuidBuffer
+  )
+;
+
+/*++
+
+Routine Description: 
+
+  Converts a string to an EFI_GUID.  The string must be in the 
+  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx format.
+
+Arguments:  
+
+  GuidBuffer      - pointer to destination Guid
+  AsciiGuidBuffer - pointer to ascii string
+
+Returns:  
+
+  EFI_ABORTED    Could not convert the string
+  EFI_SUCCESS    The string was successfully converted
+
+--*/
+EFI_STATUS
+AsciiStringToUint64 (
+  IN CONST CHAR8  *AsciiString,
+  IN BOOLEAN      IsHex,
+  OUT UINT64      *ReturnValue
+  )
+;
+
+/*++
+
+Routine Description:
+
+  Converts a null terminated ascii string that represents a number into a 
+  UINT64 value.  A hex number may be preceeded by a 0x, but may not be 
+  succeeded by an h.  A number without 0x or 0X is considered to be base 10 
+  unless the IsHex input is true.
+
+Arguments:
+
+  AsciiString   The string to convert.
+  IsHex         Force the string to be treated as a hex number.
+  ReturnValue   The return value.
+
+Returns:
+
+  EFI_SUCCESS   Number successfully converted.
+  EFI_ABORTED   Invalid character encountered.
+
+--*/
+CHAR8 *
+ReadLineInStream (
+  IN FILE       *InputFile,
+  IN OUT CHAR8  *InputBuffer
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function reads a line, stripping any comments.
+
+Arguments:
+
+  InputFile     Stream pointer.
+  InputBuffer   Buffer to read into, must be _MAX_PATH size.
+
+Returns:
+
+  NULL if error or EOF
+  InputBuffer otherwise
+
+--*/
+BOOLEAN
+FindSectionInStream (
+  IN FILE       *InputFile,
+  IN CHAR8      *Section
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function parses a stream file from the beginning to find a section.
+  The section string may be anywhere within a line.
+
+Arguments:
+
+  InputFile     Stream pointer.
+  Section       Section to search for
+
+Returns:
+
+  FALSE if error or EOF
+  TRUE if section found
+
+--*/
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Debug.c b/Tools/Source/TianoTools/Common/PeiLib/Debug.c
new file mode 100644
index 0000000000..9094eb2802
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Debug.c
@@ -0,0 +1,131 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Debug.c
+
+Abstract:
+
+  Support for Debug primatives. 
+
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "EfiPrintLib.h"
+#include "EfiStatusCode.h"
+#include "EfiCommonLib.h"
+#include EFI_GUID_DEFINITION (StatusCodeCallerId)
+#include EFI_GUID_DEFINITION (StatusCodeDataTypeId)
+
+VOID
+PeiDebugAssert (
+  IN EFI_PEI_SERVICES   **PeiServices,
+  IN CHAR8              *FileName,
+  IN INTN               LineNumber,
+  IN CHAR8              *Description
+  )
+/*++
+
+Routine Description:
+
+  Worker function for ASSERT(). If Error Logging hub is loaded log ASSERT
+  information. If Error Logging hub is not loaded DEADLOOP ().
+  
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  FileName    - File name of failing routine.
+
+  LineNumber  - Line number of failing ASSERT().
+
+  Description - Description, usually the assertion,
+  
+Returns:
+  
+  None
+
+--*/
+{
+  UINT64  Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
+
+  EfiDebugAssertWorker (FileName, LineNumber, Description, sizeof (Buffer), Buffer);
+
+  //
+  // We choose NOT to use PEI_REPORT_STATUS_CODE here, because when debug is enable,
+  // we want get enough information if assert.
+  //
+  (**PeiServices).PeiReportStatusCode (
+                    PeiServices,
+                    (EFI_ERROR_CODE | EFI_ERROR_UNRECOVERED),
+                    (EFI_SOFTWARE_PEI_MODULE | EFI_SW_EC_ILLEGAL_SOFTWARE_STATE),
+                    0,
+                    &gEfiCallerIdGuid,
+                    (EFI_STATUS_CODE_DATA *) Buffer
+                    );
+
+  EFI_DEADLOOP ();
+}
+
+
+VOID
+PeiDebugPrint (
+  IN EFI_PEI_SERVICES   **PeiServices,
+  IN  UINTN             ErrorLevel,
+  IN  CHAR8             *Format,
+  ...
+  )
+/*++
+
+Routine Description:
+
+  Worker function for DEBUG(). If Error Logging hub is loaded log ASSERT
+  information. If Error Logging hub is not loaded do nothing.
+  
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  ErrorLevel - If error level is set do the debug print.
+
+  Format     - String to use for the print, followed by Print arguments.
+
+  ...        - Print arguments
+  
+Returns:
+  
+  None
+
+--*/
+{
+  VA_LIST Marker;
+  UINT64  Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE];
+
+  VA_START (Marker, Format);
+  EfiDebugVPrintWorker (ErrorLevel, Format, Marker, sizeof (Buffer), Buffer);
+
+  //
+  // We choose NOT to use PEI_REPORT_STATUS_CODE here, because when debug is enable,
+  // we want get enough information if assert.
+  //
+  (**PeiServices).PeiReportStatusCode (
+                    PeiServices,
+                    EFI_DEBUG_CODE,
+                    (EFI_SOFTWARE_PEI_MODULE | EFI_DC_UNSPECIFIED),
+                    0,
+                    &gEfiCallerIdGuid,
+                    (EFI_STATUS_CODE_DATA *) Buffer
+                    );
+
+  return ;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Decompress.c b/Tools/Source/TianoTools/Common/PeiLib/Decompress.c
new file mode 100644
index 0000000000..43446a37dd
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Decompress.c
@@ -0,0 +1,1104 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Decompress.c
+
+Abstract:
+
+  Decompressor. Algorithm Ported from OPSD code (Decomp.asm)
+  
+--*/
+
+#include "TianoCommon.h"
+#include EFI_PROTOCOL_DEFINITION (Decompress)
+#include EFI_PROTOCOL_DEFINITION (TianoDecompress)
+
+EFI_STATUS
+EFIAPI
+EfiGetInfo (
+  IN      EFI_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                    *Source,
+  IN      UINT32                  SrcSize,
+  OUT     UINT32                  *DstSize,
+  OUT     UINT32                  *ScratchSize
+  );
+
+EFI_STATUS
+EFIAPI
+EfiDecompress (
+  IN      EFI_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                    *Source,
+  IN      UINT32                  SrcSize,
+  IN OUT  VOID                    *Destination,
+  IN      UINT32                  DstSize,
+  IN OUT  VOID                    *Scratch,
+  IN      UINT32                  ScratchSize
+  );
+
+EFI_STATUS
+EFIAPI
+TianoGetInfo (
+  IN      EFI_TIANO_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                          *Source,
+  IN      UINT32                        SrcSize,
+  OUT     UINT32                        *DstSize,
+  OUT     UINT32                        *ScratchSize
+  );
+
+EFI_STATUS
+EFIAPI
+TianoDecompress (
+  IN      EFI_TIANO_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                          *Source,
+  IN      UINT32                        SrcSize,
+  IN OUT  VOID                          *Destination,
+  IN      UINT32                        DstSize,
+  IN OUT  VOID                          *Scratch,
+  IN      UINT32                        ScratchSize
+  );
+
+//
+// The protocol instance
+//
+
+EFI_DECOMPRESS_PROTOCOL       mEfiDecompress = {
+  EfiGetInfo,
+  EfiDecompress
+};
+
+EFI_TIANO_DECOMPRESS_PROTOCOL mTianoDecompress = {
+  TianoGetInfo,
+  TianoDecompress
+};
+
+EFI_STATUS
+InstallEfiDecompress (
+  IN OUT  EFI_DECOMPRESS_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Install EFI decompress protocol.
+
+Arguments:
+
+  This  - Pointer to get decompress protocol as output
+
+Returns:
+
+  EFI_SUCCESS - EFI decompress protocol successfully installed.
+
+--*/
+{
+  *This = &mEfiDecompress;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+InstallTianoDecompress (
+  EFI_TIANO_DECOMPRESS_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Install Tiano decompress protocol.
+
+Arguments:
+
+  This  - Pointer to get decompress protocol as output
+
+Returns:
+
+  EFI_SUCCESS - Tiano decompress protocol successfully installed.
+
+--*/
+{
+  *This = &mTianoDecompress;
+  return EFI_SUCCESS;
+}
+//
+// Decompression algorithm begins here
+//
+#define BITBUFSIZ 32
+#define MAXMATCH  256
+#define THRESHOLD 3
+#define CODE_BIT  16
+#define UINT8_MAX 0xff
+#define BAD_TABLE - 1
+
+//
+// C: Char&Len Set; P: Position Set; T: exTra Set
+//
+#define NC      (0xff + MAXMATCH + 2 - THRESHOLD)
+#define CBIT    9
+#define MAXPBIT 5
+#define TBIT    5
+#define MAXNP   ((1U << MAXPBIT) - 1)
+#define NT      (CODE_BIT + 3)
+#if NT > MAXNP
+#define NPT NT
+#else
+#define NPT MAXNP
+#endif
+
+typedef struct {
+  UINT8   *mSrcBase;  // Starting address of compressed data
+  UINT8   *mDstBase;  // Starting address of decompressed data
+  UINT32  mOutBuf;
+  UINT32  mInBuf;
+
+  UINT16  mBitCount;
+  UINT32  mBitBuf;
+  UINT32  mSubBitBuf;
+  UINT16  mBlockSize;
+  UINT32  mCompSize;
+  UINT32  mOrigSize;
+
+  UINT16  mBadTableFlag;
+
+  UINT16  mLeft[2 * NC - 1];
+  UINT16  mRight[2 * NC - 1];
+  UINT8   mCLen[NC];
+  UINT8   mPTLen[NPT];
+  UINT16  mCTable[4096];
+  UINT16  mPTTable[256];
+
+  //
+  // The length of the field 'Position Set Code Length Array Size' in Block Header.
+  // For EFI 1.1 de/compression algorithm, mPBit = 4
+  // For Tiano de/compression algorithm, mPBit = 5
+  //
+  UINT8   mPBit;
+} SCRATCH_DATA;
+
+STATIC
+VOID
+FillBuf (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfBits
+  )
+/*++
+
+Routine Description:
+
+  Shift mBitBuf NumOfBits left. Read in NumOfBits of bits from source.
+
+Arguments:
+
+  Sd        - The global scratch data
+  NumOfBits  - The number of bits to shift and read.
+
+Returns: (VOID)
+
+--*/
+{
+  Sd->mBitBuf = (UINT32) (Sd->mBitBuf << NumOfBits);
+
+  while (NumOfBits > Sd->mBitCount) {
+
+    Sd->mBitBuf |= (UINT32) (Sd->mSubBitBuf << (NumOfBits = (UINT16) (NumOfBits - Sd->mBitCount)));
+
+    if (Sd->mCompSize > 0) {
+      //
+      // Get 1 byte into SubBitBuf
+      //
+      Sd->mCompSize--;
+      Sd->mSubBitBuf  = 0;
+      Sd->mSubBitBuf  = Sd->mSrcBase[Sd->mInBuf++];
+      Sd->mBitCount   = 8;
+
+    } else {
+      //
+      // No more bits from the source, just pad zero bit.
+      //
+      Sd->mSubBitBuf  = 0;
+      Sd->mBitCount   = 8;
+
+    }
+  }
+
+  Sd->mBitCount = (UINT16) (Sd->mBitCount - NumOfBits);
+  Sd->mBitBuf |= Sd->mSubBitBuf >> Sd->mBitCount;
+}
+
+STATIC
+UINT32
+GetBits (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfBits
+  )
+/*++
+
+Routine Description:
+
+  Get NumOfBits of bits out from mBitBuf. Fill mBitBuf with subsequent 
+  NumOfBits of bits from source. Returns NumOfBits of bits that are 
+  popped out.
+
+Arguments:
+
+  Sd            - The global scratch data.
+  NumOfBits     - The number of bits to pop and read.
+
+Returns:
+
+  The bits that are popped out.
+
+--*/
+{
+  UINT32  OutBits;
+
+  OutBits = (UINT32) (Sd->mBitBuf >> (BITBUFSIZ - NumOfBits));
+
+  FillBuf (Sd, NumOfBits);
+
+  return OutBits;
+}
+
+STATIC
+UINT16
+MakeTable (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        NumOfChar,
+  IN  UINT8         *BitLen,
+  IN  UINT16        TableBits,
+  OUT UINT16        *Table
+  )
+/*++
+
+Routine Description:
+
+  Creates Huffman Code mapping table according to code length array.
+
+Arguments:
+
+  Sd        - The global scratch data
+  NumOfChar - Number of symbols in the symbol set
+  BitLen    - Code length array
+  TableBits - The width of the mapping table
+  Table     - The table
+  
+Returns:
+  
+  0         - OK.
+  BAD_TABLE - The table is corrupted.
+
+--*/
+{
+  UINT16  Count[17];
+  UINT16  Weight[17];
+  UINT16  Start[18];
+  UINT16  *Pointer;
+  UINT16  Index3;
+  UINT16  Index;
+  UINT16  Len;
+  UINT16  Char;
+  UINT16  JuBits;
+  UINT16  Avail;
+  UINT16  NextCode;
+  UINT16  Mask;
+
+  for (Index = 1; Index <= 16; Index++) {
+    Count[Index] = 0;
+  }
+
+  for (Index = 0; Index < NumOfChar; Index++) {
+    Count[BitLen[Index]]++;
+  }
+
+  Start[1] = 0;
+
+  for (Index = 1; Index <= 16; Index++) {
+    Start[Index + 1] = (UINT16) (Start[Index] + (Count[Index] << (16 - Index)));
+  }
+
+  if (Start[17] != 0) {
+    /*(1U << 16)*/
+    return (UINT16) BAD_TABLE;
+  }
+
+  JuBits = (UINT16) (16 - TableBits);
+
+  for (Index = 1; Index <= TableBits; Index++) {
+    Start[Index] >>= JuBits;
+    Weight[Index] = (UINT16) (1U << (TableBits - Index));
+  }
+
+  while (Index <= 16) {
+    Weight[Index++] = (UINT16) (1U << (16 - Index));
+  }
+
+  Index = (UINT16) (Start[TableBits + 1] >> JuBits);
+
+  if (Index != 0) {
+    Index3 = (UINT16) (1U << TableBits);
+    while (Index != Index3) {
+      Table[Index++] = 0;
+    }
+  }
+
+  Avail = NumOfChar;
+  Mask  = (UINT16) (1U << (15 - TableBits));
+
+  for (Char = 0; Char < NumOfChar; Char++) {
+
+    Len = BitLen[Char];
+    if (Len == 0) {
+      continue;
+    }
+
+    NextCode = (UINT16) (Start[Len] + Weight[Len]);
+
+    if (Len <= TableBits) {
+
+      for (Index = Start[Len]; Index < NextCode; Index++) {
+        Table[Index] = Char;
+      }
+
+    } else {
+
+      Index3  = Start[Len];
+      Pointer = &Table[Index3 >> JuBits];
+      Index   = (UINT16) (Len - TableBits);
+
+      while (Index != 0) {
+        if (*Pointer == 0) {
+          Sd->mRight[Avail]                     = Sd->mLeft[Avail] = 0;
+          *Pointer = Avail++;
+        }
+
+        if (Index3 & Mask) {
+          Pointer = &Sd->mRight[*Pointer];
+        } else {
+          Pointer = &Sd->mLeft[*Pointer];
+        }
+
+        Index3 <<= 1;
+        Index--;
+      }
+
+      *Pointer = Char;
+
+    }
+
+    Start[Len] = NextCode;
+  }
+  //
+  // Succeeds
+  //
+  return 0;
+}
+
+STATIC
+UINT32
+DecodeP (
+  IN  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decodes a position value.
+
+Arguments:
+
+  Sd      - the global scratch data
+
+Returns:
+
+  The position value decoded.
+
+--*/
+{
+  UINT16  Val;
+  UINT32  Mask;
+  UINT32  Pos;
+
+  Val = Sd->mPTTable[Sd->mBitBuf >> (BITBUFSIZ - 8)];
+
+  if (Val >= MAXNP) {
+    Mask = 1U << (BITBUFSIZ - 1 - 8);
+
+    do {
+
+      if (Sd->mBitBuf & Mask) {
+        Val = Sd->mRight[Val];
+      } else {
+        Val = Sd->mLeft[Val];
+      }
+
+      Mask >>= 1;
+    } while (Val >= MAXNP);
+  }
+  //
+  // Advance what we have read
+  //
+  FillBuf (Sd, Sd->mPTLen[Val]);
+
+  Pos = Val;
+  if (Val > 1) {
+    Pos = (UINT32) ((1U << (Val - 1)) + GetBits (Sd, (UINT16) (Val - 1)));
+  }
+
+  return Pos;
+}
+
+STATIC
+UINT16
+ReadPTLen (
+  IN  SCRATCH_DATA  *Sd,
+  IN  UINT16        nn,
+  IN  UINT16        nbit,
+  IN  UINT16        Special
+  )
+/*++
+
+Routine Description:
+
+  Reads code lengths for the Extra Set or the Position Set
+
+Arguments:
+
+  Sd        - The global scratch data
+  nn        - Number of symbols
+  nbit      - Number of bits needed to represent nn
+  Special   - The special symbol that needs to be taken care of 
+
+Returns:
+
+  0         - OK.
+  BAD_TABLE - Table is corrupted.
+
+--*/
+{
+  UINT16  Number;
+  UINT16  CharC;
+  UINT16  Index;
+  UINT32  Mask;
+
+  Number = (UINT16) GetBits (Sd, nbit);
+
+  if (Number == 0) {
+    CharC = (UINT16) GetBits (Sd, nbit);
+
+    for (Index = 0; Index < 256; Index++) {
+      Sd->mPTTable[Index] = CharC;
+    }
+
+    for (Index = 0; Index < nn; Index++) {
+      Sd->mPTLen[Index] = 0;
+    }
+
+    return 0;
+  }
+
+  Index = 0;
+
+  while (Index < Number) {
+
+    CharC = (UINT16) (Sd->mBitBuf >> (BITBUFSIZ - 3));
+
+    if (CharC == 7) {
+      Mask = 1U << (BITBUFSIZ - 1 - 3);
+      while (Mask & Sd->mBitBuf) {
+        Mask >>= 1;
+        CharC += 1;
+      }
+    }
+
+    FillBuf (Sd, (UINT16) ((CharC < 7) ? 3 : CharC - 3));
+
+    Sd->mPTLen[Index++] = (UINT8) CharC;
+
+    if (Index == Special) {
+      CharC = (UINT16) GetBits (Sd, 2);
+      while ((INT16) (--CharC) >= 0) {
+        Sd->mPTLen[Index++] = 0;
+      }
+    }
+  }
+
+  while (Index < nn) {
+    Sd->mPTLen[Index++] = 0;
+  }
+
+  return MakeTable (Sd, nn, Sd->mPTLen, 8, Sd->mPTTable);
+}
+
+STATIC
+VOID
+ReadCLen (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Reads code lengths for Char&Len Set.
+
+Arguments:
+
+  Sd    - the global scratch data
+
+Returns: (VOID)
+
+--*/
+{
+  UINT16  Number;
+  UINT16  CharC;
+  UINT16  Index;
+  UINT32  Mask;
+
+  Number = (UINT16) GetBits (Sd, CBIT);
+
+  if (Number == 0) {
+    CharC = (UINT16) GetBits (Sd, CBIT);
+
+    for (Index = 0; Index < NC; Index++) {
+      Sd->mCLen[Index] = 0;
+    }
+
+    for (Index = 0; Index < 4096; Index++) {
+      Sd->mCTable[Index] = CharC;
+    }
+
+    return ;
+  }
+
+  Index = 0;
+  while (Index < Number) {
+
+    CharC = Sd->mPTTable[Sd->mBitBuf >> (BITBUFSIZ - 8)];
+    if (CharC >= NT) {
+      Mask = 1U << (BITBUFSIZ - 1 - 8);
+
+      do {
+
+        if (Mask & Sd->mBitBuf) {
+          CharC = Sd->mRight[CharC];
+        } else {
+          CharC = Sd->mLeft[CharC];
+        }
+
+        Mask >>= 1;
+
+      } while (CharC >= NT);
+    }
+    //
+    // Advance what we have read
+    //
+    FillBuf (Sd, Sd->mPTLen[CharC]);
+
+    if (CharC <= 2) {
+
+      if (CharC == 0) {
+        CharC = 1;
+      } else if (CharC == 1) {
+        CharC = (UINT16) (GetBits (Sd, 4) + 3);
+      } else if (CharC == 2) {
+        CharC = (UINT16) (GetBits (Sd, CBIT) + 20);
+      }
+
+      while ((INT16) (--CharC) >= 0) {
+        Sd->mCLen[Index++] = 0;
+      }
+
+    } else {
+
+      Sd->mCLen[Index++] = (UINT8) (CharC - 2);
+
+    }
+  }
+
+  while (Index < NC) {
+    Sd->mCLen[Index++] = 0;
+  }
+
+  MakeTable (Sd, NC, Sd->mCLen, 12, Sd->mCTable);
+
+  return ;
+}
+
+STATIC
+UINT16
+DecodeC (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decode a character/length value.
+
+Arguments:
+
+  Sd    - The global scratch data.
+
+Returns:
+
+  The value decoded.
+
+--*/
+{
+  UINT16  Index2;
+  UINT32  Mask;
+
+  if (Sd->mBlockSize == 0) {
+    //
+    // Starting a new block
+    //
+    Sd->mBlockSize    = (UINT16) GetBits (Sd, 16);
+    Sd->mBadTableFlag = ReadPTLen (Sd, NT, TBIT, 3);
+    if (Sd->mBadTableFlag != 0) {
+      return 0;
+    }
+
+    ReadCLen (Sd);
+
+    Sd->mBadTableFlag = ReadPTLen (Sd, MAXNP, Sd->mPBit, (UINT16) (-1));
+    if (Sd->mBadTableFlag != 0) {
+      return 0;
+    }
+  }
+
+  Sd->mBlockSize--;
+  Index2 = Sd->mCTable[Sd->mBitBuf >> (BITBUFSIZ - 12)];
+
+  if (Index2 >= NC) {
+    Mask = 1U << (BITBUFSIZ - 1 - 12);
+
+    do {
+      if (Sd->mBitBuf & Mask) {
+        Index2 = Sd->mRight[Index2];
+      } else {
+        Index2 = Sd->mLeft[Index2];
+      }
+
+      Mask >>= 1;
+    } while (Index2 >= NC);
+  }
+  //
+  // Advance what we have read
+  //
+  FillBuf (Sd, Sd->mCLen[Index2]);
+
+  return Index2;
+}
+
+STATIC
+VOID
+Decode (
+  SCRATCH_DATA  *Sd
+  )
+/*++
+
+Routine Description:
+
+  Decode the source data and put the resulting data into the destination buffer.
+
+Arguments:
+
+  Sd            - The global scratch data
+
+Returns: (VOID)
+
+ --*/
+{
+  UINT16  BytesRemain;
+  UINT32  DataIdx;
+  UINT16  CharC;
+
+  BytesRemain = (UINT16) (-1);
+
+  DataIdx     = 0;
+
+  for (;;) {
+    CharC = DecodeC (Sd);
+    if (Sd->mBadTableFlag != 0) {
+      return ;
+    }
+
+    if (CharC < 256) {
+      //
+      // Process an Original character
+      //
+      if (Sd->mOutBuf >= Sd->mOrigSize) {
+        return ;
+      } else {
+        Sd->mDstBase[Sd->mOutBuf++] = (UINT8) CharC;
+      }
+
+    } else {
+      //
+      // Process a Pointer
+      //
+      CharC       = (UINT16) (CharC - (UINT8_MAX + 1 - THRESHOLD));
+
+      BytesRemain = CharC;
+
+      DataIdx     = Sd->mOutBuf - DecodeP (Sd) - 1;
+
+      BytesRemain--;
+      while ((INT16) (BytesRemain) >= 0) {
+        Sd->mDstBase[Sd->mOutBuf++] = Sd->mDstBase[DataIdx++];
+        if (Sd->mOutBuf >= Sd->mOrigSize) {
+          return ;
+        }
+
+        BytesRemain--;
+      }
+    }
+  }
+
+  return ;
+}
+
+EFI_STATUS
+GetInfo (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The internal implementation of *_DECOMPRESS_PROTOCOL.GetInfo().
+
+Arguments:
+
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  UINT8 *Src;
+
+  *ScratchSize  = sizeof (SCRATCH_DATA);
+
+  Src           = Source;
+  if (SrcSize < 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *DstSize = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+Decompress (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize,
+  IN      UINT8   Version
+  )
+/*++
+
+Routine Description:
+
+  The internal implementation of *_DECOMPRESS_PROTOCOL.Decompress().
+
+Arguments:
+
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+  Version     - The version of de/compression algorithm.
+                Version 1 for EFI 1.1 de/compression algorithm.
+                Version 2 for Tiano de/compression algorithm.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  UINT32        Index;
+  UINT32        CompSize;
+  UINT32        OrigSize;
+  EFI_STATUS    Status;
+  SCRATCH_DATA  *Sd;
+  UINT8         *Src;
+  UINT8         *Dst;
+
+  Status  = EFI_SUCCESS;
+  Src     = Source;
+  Dst     = Destination;
+
+  if (ScratchSize < sizeof (SCRATCH_DATA)) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Sd = (SCRATCH_DATA *) Scratch;
+
+  if (SrcSize < 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  CompSize  = Src[0] + (Src[1] << 8) + (Src[2] << 16) + (Src[3] << 24);
+  OrigSize  = Src[4] + (Src[5] << 8) + (Src[6] << 16) + (Src[7] << 24);
+
+  //
+  // If compressed file size is 0, return
+  //
+  if (OrigSize == 0) {
+    return Status;
+  }
+
+  if (SrcSize < CompSize + 8) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (DstSize != OrigSize) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Src = Src + 8;
+
+  for (Index = 0; Index < sizeof (SCRATCH_DATA); Index++) {
+    ((UINT8 *) Sd)[Index] = 0;
+  }
+  //
+  // The length of the field 'Position Set Code Length Array Size' in Block Header.
+  // For EFI 1.1 de/compression algorithm(Version 1), mPBit = 4
+  // For Tiano de/compression algorithm(Version 2), mPBit = 5
+  //
+  switch (Version) {
+  case 1:
+    Sd->mPBit = 4;
+    break;
+
+  case 2:
+    Sd->mPBit = 5;
+    break;
+
+  default:
+    //
+    // Currently, only have 2 versions
+    //
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Sd->mSrcBase  = Src;
+  Sd->mDstBase  = Dst;
+  Sd->mCompSize = CompSize;
+  Sd->mOrigSize = OrigSize;
+
+  //
+  // Fill the first BITBUFSIZ bits
+  //
+  FillBuf (Sd, BITBUFSIZ);
+
+  //
+  // Decompress it
+  //
+  Decode (Sd);
+
+  if (Sd->mBadTableFlag != 0) {
+    //
+    // Something wrong with the source
+    //
+    Status = EFI_INVALID_PARAMETER;
+  }
+
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+EfiGetInfo (
+  IN      EFI_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                    *Source,
+  IN      UINT32                  SrcSize,
+  OUT     UINT32                  *DstSize,
+  OUT     UINT32                  *ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.GetInfo().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  return GetInfo (
+          Source,
+          SrcSize,
+          DstSize,
+          ScratchSize
+          );
+}
+
+EFI_STATUS
+EFIAPI
+EfiDecompress (
+  IN      EFI_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                    *Source,
+  IN      UINT32                  SrcSize,
+  IN OUT  VOID                    *Destination,
+  IN      UINT32                  DstSize,
+  IN OUT  VOID                    *Scratch,
+  IN      UINT32                  ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_DECOMPRESS_PROTOCOL.Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  //
+  // For EFI 1.1 de/compression algorithm, the version is 1.
+  //
+  return Decompress (
+          Source,
+          SrcSize,
+          Destination,
+          DstSize,
+          Scratch,
+          ScratchSize,
+          1
+          );
+}
+
+EFI_STATUS
+EFIAPI
+TianoGetInfo (
+  IN      EFI_TIANO_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                          *Source,
+  IN      UINT32                        SrcSize,
+  OUT     UINT32                        *DstSize,
+  OUT     UINT32                        *ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_TIANO_DECOMPRESS_PROTOCOL.GetInfo().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  return GetInfo (
+          Source,
+          SrcSize,
+          DstSize,
+          ScratchSize
+          );
+}
+
+EFI_STATUS
+EFIAPI
+TianoDecompress (
+  IN      EFI_TIANO_DECOMPRESS_PROTOCOL *This,
+  IN      VOID                          *Source,
+  IN      UINT32                        SrcSize,
+  IN OUT  VOID                          *Destination,
+  IN      UINT32                        DstSize,
+  IN OUT  VOID                          *Scratch,
+  IN      UINT32                        ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of EFI_TIANO_DECOMPRESS_PROTOCOL.Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+
+--*/
+{
+  //
+  // For Tiano de/compression algorithm, the version is 2.
+  //
+  return Decompress (
+          Source,
+          SrcSize,
+          Destination,
+          DstSize,
+          Scratch,
+          ScratchSize,
+          2
+          );
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Hob/Hob.c b/Tools/Source/TianoTools/Common/PeiLib/Hob/Hob.c
new file mode 100644
index 0000000000..0f1ff5ffb8
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Hob/Hob.c
@@ -0,0 +1,495 @@
+
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  hob.c
+
+Abstract:
+
+  PEI Library Functions
+ 
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "peilib.h"
+#include EFI_GUID_DEFINITION (MemoryAllocationHob)
+
+
+EFI_STATUS
+PeiBuildHobModule (
+  IN EFI_PEI_SERVICES       **PeiServices,
+  IN EFI_GUID               *ModuleName,
+  IN EFI_PHYSICAL_ADDRESS   MemoryAllocationModule,
+  IN UINT64                 ModuleLength,
+  IN EFI_PHYSICAL_ADDRESS   EntryPoint
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for a loaded PE32 module
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+  ModuleName                - The GUID File Name of the module
+  MemoryAllocationModule    - The 64 bit physical address of the module
+  ModuleLength              - The length of the module in bytes
+  EntryPoint                - The 64 bit physical address of the entry point
+                              to the module
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS                        Status;  
+  EFI_HOB_MEMORY_ALLOCATION_MODULE  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_GUID_EXTENSION,
+                             sizeof (EFI_HOB_MEMORY_ALLOCATION_MODULE),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  Hob->MemoryAllocationHeader.Name = gEfiHobMemeryAllocModuleGuid;
+  Hob->MemoryAllocationHeader.MemoryBaseAddress = MemoryAllocationModule;
+  Hob->MemoryAllocationHeader.MemoryLength = ModuleLength;
+  Hob->MemoryAllocationHeader.MemoryType = EfiBootServicesCode;
+
+  Hob->ModuleName = *ModuleName;
+  Hob->EntryPoint = EntryPoint;
+
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobResourceDescriptor (
+  IN EFI_PEI_SERVICES             **PeiServices,
+  IN EFI_RESOURCE_TYPE            ResourceType,
+  IN EFI_RESOURCE_ATTRIBUTE_TYPE  ResourceAttribute,
+  IN EFI_PHYSICAL_ADDRESS         PhysicalStart,
+  IN UINT64                       NumberOfBytes
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB that describes a chunck of system memory
+
+Arguments:
+
+  PeiServices        - The PEI core services table.
+ 
+  ResourceType       - The type of resource described by this HOB
+
+  ResourceAttribute  - The resource attributes of the memory described by this HOB
+
+  PhysicalStart      - The 64 bit physical address of memory described by this HOB
+
+  NumberOfBytes      - The length of the memoty described by this HOB in bytes
+
+Returns:
+
+  EFI_SUCCESS     - Hob is successfully built.
+  Others          - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS                   Status; 
+  EFI_HOB_RESOURCE_DESCRIPTOR  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_RESOURCE_DESCRIPTOR,
+                             sizeof (EFI_HOB_RESOURCE_DESCRIPTOR),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  Hob->ResourceType      = ResourceType;
+  Hob->ResourceAttribute = ResourceAttribute;
+  Hob->PhysicalStart     = PhysicalStart;
+  Hob->ResourceLength    = NumberOfBytes;
+
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobGuid (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_GUID                    *Guid,
+  IN UINTN                       DataLength,
+  IN OUT VOID                    **Hob
+  )
+/*++
+
+Routine Description:
+
+  Builds a custom HOB that is tagged with a GUID for identification
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  Guid        - The GUID of the custome HOB type
+
+  DataLength  - The size of the data payload for the GUIDed HOB
+
+  Hob         - Pointer to the Hob
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS         Status;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_GUID_EXTENSION,
+                             (UINT16) (sizeof (EFI_HOB_GUID_TYPE) + DataLength),
+                             Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  ((EFI_HOB_GUID_TYPE *)(*Hob))->Name = *Guid;
+  
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobGuidData (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_GUID                    *Guid,
+  IN VOID                        *Data,
+  IN UINTN                       DataLength
+  )
+/*++
+
+Routine Description:
+
+  Builds a custom HOB that is tagged with a GUID for identification
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  Guid        - The GUID of the custome HOB type
+
+  Data        - The data to be copied into the GUIDed HOB data field.
+
+  DataLength  - The data field length.
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS         Status;
+  
+  EFI_HOB_GUID_TYPE  *Hob;
+
+  Status = PeiBuildHobGuid (
+             PeiServices,
+             Guid,
+             DataLength,
+             &Hob
+             );
+
+  if (EFI_ERROR (Status)) {
+    return Status;
+  } 
+
+  Hob++;
+  (*PeiServices)->CopyMem (Hob, Data, DataLength);
+  
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobFv (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length
+  )
+/*++
+
+Routine Description:
+
+  Builds a Firmware Volume HOB
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  BaseAddress - The base address of the Firmware Volume
+
+  Length      - The size of the Firmware Volume in bytes
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS               Status;  
+  EFI_HOB_FIRMWARE_VOLUME  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_FV,
+                             sizeof (EFI_HOB_FIRMWARE_VOLUME),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  Hob->BaseAddress = BaseAddress;
+  Hob->Length      = Length;
+
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobCpu (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN UINT8                       SizeOfMemorySpace,
+  IN UINT8                       SizeOfIoSpace
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the CPU
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  SizeOfMemorySpace         - Identifies the maximum 
+                              physical memory addressibility of the processor.
+
+  SizeOfIoSpace             - Identifies the maximum physical I/O addressibility 
+                              of the processor.
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS   Status;  
+  EFI_HOB_CPU  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_CPU,
+                             sizeof (EFI_HOB_CPU),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  Hob->SizeOfMemorySpace = SizeOfMemorySpace;
+  Hob->SizeOfIoSpace     = SizeOfIoSpace;
+
+  return EFI_SUCCESS;
+}
+
+
+
+EFI_STATUS
+PeiBuildHobStack (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the Stack
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the Stack
+
+  Length                    - The length of the stack in bytes
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS                       Status;  
+  EFI_HOB_MEMORY_ALLOCATION_STACK  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_MEMORY_ALLOCATION,
+                             sizeof (EFI_HOB_MEMORY_ALLOCATION_STACK),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+ 
+  Hob->AllocDescriptor.Name = gEfiHobMemeryAllocStackGuid;
+  Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;
+  Hob->AllocDescriptor.MemoryLength = Length;
+  Hob->AllocDescriptor.MemoryType = EfiConventionalMemory;
+
+  return EFI_SUCCESS;
+}
+
+
+
+EFI_STATUS
+PeiBuildHobBspStore (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length,
+  IN EFI_MEMORY_TYPE             MemoryType
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the bsp store
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the bsp
+
+  Length                    - The length of the bsp store in bytes
+
+  MemoryType                - Memory type
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS                           Status;  
+  EFI_HOB_MEMORY_ALLOCATION_BSP_STORE  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_MEMORY_ALLOCATION,
+                             sizeof (EFI_HOB_MEMORY_ALLOCATION_BSP_STORE),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+ 
+  Hob->AllocDescriptor.Name = gEfiHobMemeryAllocBspStoreGuid;
+  Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;
+  Hob->AllocDescriptor.MemoryLength = Length;
+  Hob->AllocDescriptor.MemoryType = MemoryType;
+
+  return EFI_SUCCESS;
+}
+
+
+EFI_STATUS
+PeiBuildHobMemoryAllocation (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length,
+  IN EFI_GUID                    *Name,
+  IN EFI_MEMORY_TYPE             MemoryType
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the memory allocation.
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the memory
+
+  Length                    - The length of the memory allocation in bytes
+
+  Name                      - Name for Hob
+
+  MemoryType                - Memory type
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+{
+  EFI_STATUS                 Status; 
+  EFI_HOB_MEMORY_ALLOCATION  *Hob;
+
+  Status = (*PeiServices)->CreateHob (
+                             PeiServices,
+                             EFI_HOB_TYPE_MEMORY_ALLOCATION,
+                             sizeof (EFI_HOB_MEMORY_ALLOCATION),
+                             &Hob
+                             );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  if (Name != NULL) {
+    Hob->AllocDescriptor.Name = *Name;
+  } else {
+    (*PeiServices)->SetMem(&(Hob->AllocDescriptor.Name), sizeof (EFI_GUID), 0);
+  }
+
+  Hob->AllocDescriptor.MemoryBaseAddress = BaseAddress;
+  Hob->AllocDescriptor.MemoryLength = Length;
+  Hob->AllocDescriptor.MemoryType = MemoryType;
+
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.c b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..09792818cc
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.c
@@ -0,0 +1,244 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.c
+
+Abstract:
+
+    Fixes Intel Itanium(TM) specific relocation types
+
+
+Revision History
+
+--*/
+
+#include "TianoCommon.h"
+#include "EfiImage.h"
+
+#define EXT_IMM64(Value, Address, Size, InstPos, ValPos)  \
+    Value |= (((UINT64)((*(Address) >> InstPos) & (((UINT64)1 << Size) - 1))) << ValPos)
+
+#define INS_IMM64(Value, Address, Size, InstPos, ValPos)  \
+    *(UINT32*)Address = (*(UINT32*)Address & ~(((1 << Size) - 1) << InstPos)) | \
+          ((UINT32)((((UINT64)Value >> ValPos) & (((UINT64)1 << Size) - 1))) << InstPos)
+
+#define IMM64_IMM7B_INST_WORD_X         3  
+#define IMM64_IMM7B_SIZE_X              7  
+#define IMM64_IMM7B_INST_WORD_POS_X     4  
+#define IMM64_IMM7B_VAL_POS_X           0  
+
+#define IMM64_IMM9D_INST_WORD_X         3  
+#define IMM64_IMM9D_SIZE_X              9  
+#define IMM64_IMM9D_INST_WORD_POS_X     18  
+#define IMM64_IMM9D_VAL_POS_X           7  
+
+#define IMM64_IMM5C_INST_WORD_X         3  
+#define IMM64_IMM5C_SIZE_X              5  
+#define IMM64_IMM5C_INST_WORD_POS_X     13  
+#define IMM64_IMM5C_VAL_POS_X           16  
+
+#define IMM64_IC_INST_WORD_X            3  
+#define IMM64_IC_SIZE_X                 1  
+#define IMM64_IC_INST_WORD_POS_X        12  
+#define IMM64_IC_VAL_POS_X              21  
+
+#define IMM64_IMM41a_INST_WORD_X        1  
+#define IMM64_IMM41a_SIZE_X             10  
+#define IMM64_IMM41a_INST_WORD_POS_X    14  
+#define IMM64_IMM41a_VAL_POS_X          22  
+
+#define IMM64_IMM41b_INST_WORD_X        1  
+#define IMM64_IMM41b_SIZE_X             8  
+#define IMM64_IMM41b_INST_WORD_POS_X    24  
+#define IMM64_IMM41b_VAL_POS_X          32  
+
+#define IMM64_IMM41c_INST_WORD_X        2  
+#define IMM64_IMM41c_SIZE_X             23  
+#define IMM64_IMM41c_INST_WORD_POS_X    0  
+#define IMM64_IMM41c_VAL_POS_X          40  
+
+#define IMM64_SIGN_INST_WORD_X          3  
+#define IMM64_SIGN_SIZE_X               1  
+#define IMM64_SIGN_INST_WORD_POS_X      27  
+#define IMM64_SIGN_VAL_POS_X            63  
+
+EFI_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup, 
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an Itanium-based specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  Status code
+
+--*/
+{
+  UINT64      *F64;
+  UINT64      FixupVal;
+
+  switch ((*Reloc) >> 12) {
+
+    case EFI_IMAGE_REL_BASED_DIR64:
+      F64 = (UINT64 *) Fixup;
+      *F64 = *F64 + (UINT64) Adjust;
+      if (*FixupData != NULL) {
+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
+        *(UINT64 *)(*FixupData) = *F64;
+        *FixupData = *FixupData + sizeof(UINT64);
+      }
+      break;
+
+    case EFI_IMAGE_REL_BASED_IA64_IMM64:
+
+      //
+      // Align it to bundle address before fixing up the
+      // 64-bit immediate value of the movl instruction.
+      //
+
+      Fixup = (CHAR8 *)((UINTN) Fixup & (UINTN) ~(15));
+      FixupVal = (UINT64)0;
+                       
+      // 
+      // Extract the lower 32 bits of IMM64 from bundle
+      //
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM7B_INST_WORD_X,
+                IMM64_IMM7B_SIZE_X,
+                IMM64_IMM7B_INST_WORD_POS_X,
+                IMM64_IMM7B_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM9D_INST_WORD_X,
+                IMM64_IMM9D_SIZE_X,
+                IMM64_IMM9D_INST_WORD_POS_X,
+                IMM64_IMM9D_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM5C_INST_WORD_X,
+                IMM64_IMM5C_SIZE_X,
+                IMM64_IMM5C_INST_WORD_POS_X,
+                IMM64_IMM5C_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IC_INST_WORD_X,
+                IMM64_IC_SIZE_X,
+                IMM64_IC_INST_WORD_POS_X,
+                IMM64_IC_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X,
+                IMM64_IMM41a_SIZE_X,
+                IMM64_IMM41a_INST_WORD_POS_X,
+                IMM64_IMM41a_VAL_POS_X
+                );
+                       
+      // 
+      // Update 64-bit address
+      //
+      FixupVal += Adjust;
+
+      // 
+      // Insert IMM64 into bundle
+      //
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM7B_INST_WORD_X),
+                IMM64_IMM7B_SIZE_X,
+                IMM64_IMM7B_INST_WORD_POS_X,
+                IMM64_IMM7B_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM9D_INST_WORD_X),
+                IMM64_IMM9D_SIZE_X,
+                IMM64_IMM9D_INST_WORD_POS_X,
+                IMM64_IMM9D_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM5C_INST_WORD_X),
+                IMM64_IMM5C_SIZE_X,
+                IMM64_IMM5C_INST_WORD_POS_X,
+                IMM64_IMM5C_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IC_INST_WORD_X),
+                IMM64_IC_SIZE_X,
+                IMM64_IC_INST_WORD_POS_X,
+                IMM64_IC_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X),
+                IMM64_IMM41a_SIZE_X,
+                IMM64_IMM41a_INST_WORD_POS_X,
+                IMM64_IMM41a_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41b_INST_WORD_X),
+                IMM64_IMM41b_SIZE_X,
+                IMM64_IMM41b_INST_WORD_POS_X,
+                IMM64_IMM41b_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41c_INST_WORD_X),
+                IMM64_IMM41c_SIZE_X,
+                IMM64_IMM41c_INST_WORD_POS_X,
+                IMM64_IMM41c_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_SIGN_INST_WORD_X),
+                IMM64_SIGN_SIZE_X,
+                IMM64_SIGN_INST_WORD_POS_X,
+                IMM64_SIGN_VAL_POS_X
+                );
+
+      F64 = (UINT64 *) Fixup;
+      if (*FixupData != NULL) {
+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
+        *(UINT64 *)(*FixupData) = *F64;
+        *FixupData = *FixupData + sizeof(UINT64);
+      }
+      break;
+
+    default:
+      return EFI_UNSUPPORTED;
+  }
+
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.h b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.h
new file mode 100644
index 0000000000..b79ead654a
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PeCoffLoaderEx.h
@@ -0,0 +1,67 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+    PeCoffLoaderEx.h
+
+Abstract:
+
+    Fixes Intel Itanium(TM) specific relocation types
+
+
+Revision History
+
+--*/
+
+#ifndef _PE_COFF_LOADER_EX_H_
+#define _PE_COFF_LOADER_EX_H_
+
+//
+// Define macro to determine if the machine type is supported.
+// Returns 0 if the machine is not supported, Not 0 otherwise.
+//
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
+  ((Machine) == EFI_IMAGE_MACHINE_IA64 || \
+   (Machine) == EFI_IMAGE_MACHINE_EBC)
+
+
+EFI_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup,
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an Itanium-based specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  Status code
+
+--*/
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/PerformancePrimitives.s b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PerformancePrimitives.s
new file mode 100644
index 0000000000..5814bb71b7
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/PerformancePrimitives.s
@@ -0,0 +1,61 @@
+//++
+// Copyright (c) 2004, Intel Corporation                                                         
+// All rights reserved. This program and the accompanying materials                          
+// are licensed and made available under the terms and conditions of the BSD License         
+// which accompanies this distribution.  The full text of the license may be found at        
+// http://opensource.org/licenses/bsd-license.php                                            
+//                                                                                           
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+// 
+//  Module Name:
+//
+//    PerformancePrimitives.s
+//
+//  Abstract:
+//
+//
+// Revision History:
+//
+//--
+
+.file  "PerformancePrimitives.s"
+
+#include  "IpfMacro.i"
+
+//-----------------------------------------------------------------------------
+//++
+// GetTimerValue
+//
+// Implementation of CPU-based time service
+//
+// On Entry :
+//    EFI_STATUS
+//    GetTimerValue (
+//      OUT UINT64    *TimerValue
+//    )
+//
+// Return Value: 
+//        r8  = Status
+//        r9  = 0
+//        r10 = 0
+//        r11 = 0
+// 
+// As per static calling conventions. 
+// 
+//--
+//---------------------------------------------------------------------------
+PROCEDURE_ENTRY (GetTimerValue)
+
+      NESTED_SETUP (1,8,0,0)
+      mov               r8 = ar.itc;;
+      st8               [r32]= r8
+      mov               r8 = r0
+      mov               r9 = r0
+      mov               r10 = r0
+      mov               r11 = r0
+      NESTED_RETURN
+
+PROCEDURE_EXIT (GetTimerValue)
+//---------------------------------------------------------------------------
+
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/SwitchStack.s b/Tools/Source/TianoTools/Common/PeiLib/Ipf/SwitchStack.s
new file mode 100644
index 0000000000..08ff773b27
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/SwitchStack.s
@@ -0,0 +1,122 @@
+//++
+// Copyright (c) 2004, Intel Corporation                                                         
+// All rights reserved. This program and the accompanying materials                          
+// are licensed and made available under the terms and conditions of the BSD License         
+// which accompanies this distribution.  The full text of the license may be found at        
+// http://opensource.org/licenses/bsd-license.php                                            
+//                                                                                           
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+// 
+// Module Name:
+//
+//  SwitchStack.s
+//
+// Abstract:
+//
+//  Contains an implementation of a stack switch for the Itanium-based architecture.
+//
+//
+//
+// Revision History:
+//
+//--
+
+  .file  "SwitchStack.s"
+
+#include  <asm.h>
+#include  <ia_64gen.h>
+
+// Define hardware RSE Configuration Register
+//
+// RS Configuration (RSC) bit field positions
+
+#define RSC_MODE       0
+#define RSC_PL         2
+#define RSC_BE         4
+// RSC bits 5-15 reserved
+#define RSC_MBZ0       5
+#define RSC_MBZ0_V     0x3ff
+#define RSC_LOADRS     16
+#define RSC_LOADRS_LEN 14
+// RSC bits 30-63 reserved
+#define RSC_MBZ1       30
+#define RSC_MBZ1_V     0x3ffffffffULL
+
+// RSC modes
+// Lazy
+#define RSC_MODE_LY (0x0)
+// Store intensive
+#define RSC_MODE_SI (0x1)
+// Load intensive
+#define RSC_MODE_LI (0x2)
+// Eager
+#define RSC_MODE_EA (0x3)
+
+// RSC Endian bit values
+#define RSC_BE_LITTLE 0
+#define RSC_BE_BIG    1
+
+// RSC while in kernel: enabled, little endian, pl = 0, eager mode
+#define RSC_KERNEL ((RSC_MODE_EA<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
+// Lazy RSC in kernel: enabled, little endian, pl = 0, lazy mode
+#define RSC_KERNEL_LAZ ((RSC_MODE_LY<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
+// RSE disabled: disabled, pl = 0, little endian, eager mode
+#define RSC_KERNEL_DISABLED ((RSC_MODE_LY<<RSC_MODE) | (RSC_BE_LITTLE<<RSC_BE))
+
+
+//VOID
+//SwitchStacks (
+//    VOID    *ContinuationFunction,
+//    UINTN   Parameter,
+//    UINTN   NewTopOfStack,
+//    UINTN   NewBSPStore OPTIONAL
+//)
+///*++
+//
+//Input Arguments
+//
+//  ContinuationFunction - This is a pointer to the PLABEL of the function that should  be called once the
+//        new stack has been created.  
+//  Parameter - The parameter to pass to the continuation function
+//  NewTopOfStack - This is the new top of the memory stack for ensuing code.  This is mandatory and
+//      should be non-zero
+//  NewBSPStore - This is the new BSP store for the ensuing code.  It is optional on IA-32 and mandatory on Itanium-based platform.
+//
+//--*/
+
+PROCEDURE_ENTRY(SwitchStacks)
+
+        mov        r16 = -0x10;;
+        and        r16 = r34, r16;;             // get new stack value in R16, 0 the last nibble.
+        mov        r15 = r35;;                  // Get new BspStore into R15
+        mov        r13 = r32;;                  // this is a pointer to the PLABEL of the continuation function.  
+        mov        r17 = r33;;                  // this is the parameter to pass to the continuation function
+
+        alloc       r11=0,0,0,0                 // Set 0-size frame
+        ;;
+        flushrs;;
+
+        mov         r21 = RSC_KERNEL_DISABLED   // for rse disable             
+        ;;
+        mov         ar.rsc = r21                // turn off RSE                
+
+        add         sp = r0, r16;;              // transfer to the EFI stack
+        mov         ar.bspstore = r15           // switch to EFI BSP        
+        invala                                  // change of ar.bspstore needs invala.     
+      
+        mov         r18 = RSC_KERNEL_LAZ        // RSC enabled, Lazy mode
+        ;;
+        mov         ar.rsc = r18                // turn rse on, in kernel mode     
+        ;;        
+        alloc       r11=0,0,1,0;;                 // alloc 0 outs going to ensuing DXE IPL service
+        mov         out0 = r17
+        ld8         r16 = [r13],8;;               // r16 = address of continuation function from the PLABEL
+        ld8         gp = [r13]                  // gp  = gp of continuation function from the PLABEL
+        mov         b6 = r16
+        ;;
+        br.call.sptk.few b0=b6;;                  // Call the continuation function
+        ;;
+PROCEDURE_EXIT(SwitchStacks)
+
+
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/asm.h b/Tools/Source/TianoTools/Common/PeiLib/Ipf/asm.h
new file mode 100644
index 0000000000..52ff4c0f86
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/asm.h
@@ -0,0 +1,35 @@
+//
+//
+// Copyright (c) 2004, Intel Corporation
+// All rights reserved. This program and the accompanying materials
+// are licensed and made available under the terms and conditions of the BSD License
+// which accompanies this distribution.  The full text of the license may be found at
+// http://opensource.org/licenses/bsd-license.php
+//
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+//
+// Module Name:
+//
+//   asm.h
+//
+// Abstract:
+//
+//   This module contains generic macros for an assembly writer.
+//
+//
+// Revision History
+//
+#ifndef _ASM_H
+#define _ASM_H
+
+#define TRUE  1
+#define FALSE 0
+#define PROCEDURE_ENTRY(name)   .##text;            \
+  .##type name, @function; \
+  .##proc name; \
+  name::
+
+#define PROCEDURE_EXIT(name)  .##endp name
+
+#endif // _ASM_H
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/efijump.h b/Tools/Source/TianoTools/Common/PeiLib/Ipf/efijump.h
new file mode 100644
index 0000000000..cec5364484
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/efijump.h
@@ -0,0 +1,112 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  EfiJump.h
+
+Abstract:
+
+  This is the Setjump/Longjump pair for an IA32 processor.
+
+--*/
+
+#ifndef _EFI_JUMP_H_
+#define _EFI_JUMP_H_
+
+#include EFI_GUID_DEFINITION (PeiTransferControl)
+
+//
+//  NOTE:Set/LongJump needs to have this buffer start
+//  at 16 byte boundary. Either fix the structure
+//  which call this buffer or fix inside SetJump/LongJump
+//  Choosing 1K buffer storage for now
+//
+typedef struct {
+  CHAR8 Buffer[1024];
+} EFI_JUMP_BUFFER;
+
+EFI_STATUS
+SetJump (
+  IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,
+  IN EFI_JUMP_BUFFER                    *Jump
+  )
+/*++
+
+Routine Description:
+
+  SetJump stores the current register set in the area pointed to
+by "save".  It returns zero.  Subsequent calls to "LongJump" will
+restore the registers and return non-zero to the same location.
+  On entry, r32 contains the pointer to the jmp_buffer
+  
+Arguments:
+  
+  This  - Calling context
+  Jump  - Jump buffer
+
+Returns:
+
+  Status code
+
+--*/
+;
+
+EFI_STATUS
+LongJump (
+  IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,
+  IN EFI_JUMP_BUFFER                    *Jump
+  )
+/*++
+
+Routine Description:
+
+  LongJump initializes the register set to the values saved by a
+previous 'SetJump' and jumps to the return location saved by that
+'SetJump'.  This has the effect of unwinding the stack and returning
+for a second time to the 'SetJump'.
+
+Arguments:
+
+  This  - Calling context
+  Jump  - Jump buffer
+
+Returns:
+
+  Status code
+
+--*/
+;
+
+VOID
+RtPioICacheFlush (
+  IN  VOID    *StartAddress,
+  IN  UINTN   SizeInBytes
+  )
+/*++
+
+Routine Description:
+
+  Flushing the CPU instruction cache.
+
+Arguments:
+
+  StartAddress  - Start address to flush
+  SizeInBytes   - Length in bytes to flush
+
+Returns:
+
+  None
+
+--*/
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/ia_64gen.h b/Tools/Source/TianoTools/Common/PeiLib/Ipf/ia_64gen.h
new file mode 100644
index 0000000000..5eca149d36
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/ia_64gen.h
@@ -0,0 +1,214 @@
+// 
+// 
+// 
+// Copyright (c) 2004, Intel Corporation                                                         
+// All rights reserved. This program and the accompanying materials                          
+// are licensed and made available under the terms and conditions of the BSD License         
+// which accompanies this distribution.  The full text of the license may be found at        
+// http://opensource.org/licenses/bsd-license.php                                            
+//                                                                                           
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+// 
+//Module Name: ia_64gen.h
+//
+//
+//Abstract:
+//
+//
+//
+//
+//Revision History
+//
+//
+#ifndef _IA64GEN_H
+#define _IA64GEN_H
+
+#define TT_UNAT           0
+#define C_PSR             0
+#define J_UNAT            0
+#define T_TYPE            0
+#define T_IPSR            0x8
+#define T_ISR             0x10
+#define T_IIP             0x18
+#define T_IFA             0x20
+#define T_IIPA            0x28
+#define T_IFS             0x30
+#define T_IIM             0x38
+#define T_RSC             0x40
+#define T_BSP             0x48
+#define T_BSPSTORE        0x50
+#define T_RNAT            0x58
+#define T_PFS             0x60
+#define T_KBSPSTORE       0x68
+#define T_UNAT            0x70
+#define T_CCV             0x78
+#define T_DCR             0x80
+#define T_PREDS           0x88
+#define T_NATS            0x90
+#define T_R1              0x98
+#define T_GP              0x98
+#define T_R2              0xa0
+#define T_R3              0xa8
+#define T_R4              0xb0
+#define T_R5              0xb8
+#define T_R6              0xc0
+#define T_R7              0xc8
+#define T_R8              0xd0
+#define T_R9              0xd8
+#define T_R10             0xe0
+#define T_R11             0xe8
+#define T_R12             0xf0
+#define T_SP              0xf0
+#define T_R13             0xf8
+#define T_R14             0x100
+#define T_R15             0x108
+#define T_R16             0x110
+#define T_R17             0x118
+#define T_R18             0x120
+#define T_R19             0x128
+#define T_R20             0x130
+#define T_R21             0x138
+#define T_R22             0x140
+#define T_R23             0x148
+#define T_R24             0x150
+#define T_R25             0x158
+#define T_R26             0x160
+#define T_R27             0x168
+#define T_R28             0x170
+#define T_R29             0x178
+#define T_R30             0x180
+#define T_R31             0x188
+#define T_F2              0x1f0
+#define T_F3              0x200
+#define T_F4              0x210
+#define T_F5              0x220
+#define T_F6              0x230
+#define T_F7              0x240
+#define T_F8              0x250
+#define T_F9              0x260
+#define T_F10             0x270
+#define T_F11             0x280
+#define T_F12             0x290
+#define T_F13             0x2a0
+#define T_F14             0x2b0
+#define T_F15             0x2c0
+#define T_F16             0x2d0
+#define T_F17             0x2e0
+#define T_F18             0x2f0
+#define T_F19             0x300
+#define T_F20             0x310
+#define T_F21             0x320
+#define T_F22             0x330
+#define T_F23             0x340
+#define T_F24             0x350
+#define T_F25             0x360
+#define T_F26             0x370
+#define T_F27             0x380
+#define T_F28             0x390
+#define T_F29             0x3a0
+#define T_F30             0x3b0
+#define T_F31             0x3c0
+#define T_FPSR            0x1e0
+#define T_B0              0x190
+#define T_B1              0x198
+#define T_B2              0x1a0
+#define T_B3              0x1a8
+#define T_B4              0x1b0
+#define T_B5              0x1b8
+#define T_B6              0x1c0
+#define T_B7              0x1c8
+#define T_EC              0x1d0
+#define T_LC              0x1d8
+#define J_NATS            0x8
+#define J_PFS             0x10
+#define J_BSP             0x18
+#define J_RNAT            0x20
+#define J_PREDS           0x28
+#define J_LC              0x30
+#define J_R4              0x38
+#define J_R5              0x40
+#define J_R6              0x48
+#define J_R7              0x50
+#define J_SP              0x58
+#define J_F2              0x60
+#define J_F3              0x70
+#define J_F4              0x80
+#define J_F5              0x90
+#define J_F16             0xa0
+#define J_F17             0xb0
+#define J_F18             0xc0
+#define J_F19             0xd0
+#define J_F20             0xe0
+#define J_F21             0xf0
+#define J_F22             0x100
+#define J_F23             0x110
+#define J_F24             0x120
+#define J_F25             0x130
+#define J_F26             0x140
+#define J_F27             0x150
+#define J_F28             0x160
+#define J_F29             0x170
+#define J_F30             0x180
+#define J_F31             0x190
+#define J_FPSR            0x1a0
+#define J_B0              0x1a8
+#define J_B1              0x1b0
+#define J_B2              0x1b8
+#define J_B3              0x1c0
+#define J_B4              0x1c8
+#define J_B5              0x1d0
+#define TRAP_FRAME_LENGTH 0x3d0
+#define C_UNAT            0x28
+#define C_NATS            0x30
+#define C_PFS             0x8
+#define C_BSPSTORE        0x10
+#define C_RNAT            0x18
+#define C_RSC             0x20
+#define C_PREDS           0x38
+#define C_LC              0x40
+#define C_DCR             0x48
+#define C_R1              0x50
+#define C_GP              0x50
+#define C_R4              0x58
+#define C_R5              0x60
+#define C_R6              0x68
+#define C_R7              0x70
+#define C_SP              0x78
+#define C_R13             0x80
+#define C_F2              0x90
+#define C_F3              0xa0
+#define C_F4              0xb0
+#define C_F5              0xc0
+#define C_F16             0xd0
+#define C_F17             0xe0
+#define C_F18             0xf0
+#define C_F19             0x100
+#define C_F20             0x110
+#define C_F21             0x120
+#define C_F22             0x130
+#define C_F23             0x140
+#define C_F24             0x150
+#define C_F25             0x160
+#define C_F26             0x170
+#define C_F27             0x180
+#define C_F28             0x190
+#define C_F29             0x1a0
+#define C_F30             0x1b0
+#define C_F31             0x1c0
+#define C_FPSR            0x1d0
+#define C_B0              0x1d8
+#define C_B1              0x1e0
+#define C_B2              0x1e8
+#define C_B3              0x1f0
+#define C_B4              0x1f8
+#define C_B5              0x200
+#define TT_R2             0x8
+#define TT_R3             0x10
+#define TT_R8             0x18
+#define TT_R9             0x20
+#define TT_R10            0x28
+#define TT_R11            0x30
+#define TT_R14            0x38
+
+#endif _IA64GEN_H
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/math.c b/Tools/Source/TianoTools/Common/PeiLib/Ipf/math.c
new file mode 100644
index 0000000000..860d1298e5
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/math.c
@@ -0,0 +1,139 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  math.c
+
+Abstract:
+
+  64-bit Math worker functions for Intel Itanium(TM) processors.
+
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "PeiLib.h"
+
+UINT64
+LShiftU64 (
+  IN UINT64   Operand,
+  IN UINTN    Count
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be left shifted by 32 bits and 
+  returns the shifted value.
+  Count is valid up 63. (Only Bits 0-5 is valid for Count)
+
+Arguments:
+
+  Operand - Value to be shifted
+  Count   - Number of times to shift left.
+ 
+Returns:
+
+  Value shifted left identified by the Count.
+
+--*/
+{
+  return Operand << Count;
+}
+
+UINT64
+RShiftU64 (
+  IN UINT64   Operand,
+  IN UINTN    Count
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be right shifted by 32 bits and returns the 
+  shifted value.
+  Count is valid up 63. (Only Bits 0-5 is valid for Count)
+
+Arguments:
+
+  Operand - Value to be shifted
+  Count   - Number of times to shift right.
+ 
+Returns:
+
+  Value shifted right identified by the Count.
+
+--*/
+{
+  return Operand >> Count;
+}
+
+UINT64
+MultU64x32 (
+  IN UINT64   Multiplicand,
+  IN UINTN    Multiplier
+  )
+/*++  
+  
+Routine Description:
+
+  This routine allows a 64 bit value to be multiplied with a 32 bit 
+  value returns 64bit result.
+  No checking if the result is greater than 64bits
+
+Arguments:
+
+  Multiplicand  - multiplicand
+  Multiplier    - multiplier
+
+Returns:
+
+  Multiplicand * Multiplier
+  
+--*/
+{
+  return Multiplicand * Multiplier;
+}
+
+UINT64
+DivU64x32 (
+  IN UINT64   Dividend,
+  IN UINTN    Divisor,
+  OUT UINTN   *Remainder OPTIONAL
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be divided with a 32 bit value returns 
+  64bit result and the Remainder.
+  N.B. only works for 31bit divisors!!
+
+Arguments:
+
+  Dividend  - dividend
+  Divisor   - divisor
+  Remainder - buffer for remainder
+ 
+Returns:
+
+  Dividend  / Divisor
+  Remainder = Dividend mod Divisor
+
+--*/
+{
+  if (Remainder) {
+    *Remainder = Dividend % Divisor;
+  }
+
+  return Dividend / Divisor;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/pioflush.s b/Tools/Source/TianoTools/Common/PeiLib/Ipf/pioflush.s
new file mode 100644
index 0000000000..e48a5e427d
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/pioflush.s
@@ -0,0 +1,106 @@
+//++
+// Copyright (c) 2004, Intel Corporation                                                         
+// All rights reserved. This program and the accompanying materials                          
+// are licensed and made available under the terms and conditions of the BSD License         
+// which accompanies this distribution.  The full text of the license may be found at        
+// http://opensource.org/licenses/bsd-license.php                                            
+//                                                                                           
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+// 
+//  Module Name:
+//
+//    pioflush.s 
+//
+//  Abstract:
+//
+//
+// Revision History:
+//
+//--
+
+  .file  "pioflush.c"
+  .radix  D
+  .section  .text,  "ax", "progbits"
+  .align 32
+  .section  .pdata,  "a", "progbits"
+  .align 4
+  .section  .xdata,  "a", "progbits"
+  .align 8
+  .section  .data,  "wa", "progbits"
+  .align 16
+  .section  .rdata,  "a", "progbits"
+  .align 16
+  .section  .bss,  "wa", "nobits"
+  .align 16
+  .section  .tls$,  "was", "progbits"
+  .align 16
+  .section  .sdata,  "was", "progbits"
+  .align 16
+  .section  .sbss,  "was", "nobits"
+  .align 16
+  .section  .srdata,  "as", "progbits"
+  .align 16
+  .section  .rdata,  "a", "progbits"
+  .align 16
+  .section  .rtcode,  "ax", "progbits"
+  .align 32
+  .type  RtPioICacheFlush#  ,@function 
+        .global RtPioICacheFlush#
+// Function compile flags: /Ogsy
+  .section  .rtcode
+
+// Begin code for function: RtPioICacheFlush:
+  .proc  RtPioICacheFlush#
+  .align 32
+RtPioICacheFlush:  
+// File e:\tmp\pioflush.c
+ {   .mii  //R-Addr: 0X00 
+  alloc  r3=2, 0, 0, 0            //11, 00000002H
+  cmp4.leu p0,p6=32, r33;;          //15, 00000020H
+  (p6)  mov  r33=32;;            //16, 00000020H
+ }
+ {   .mii  //R-Addr: 0X010 
+  nop.m   0
+  zxt4  r29=r33;;            //21
+  dep.z  r30=r29, 0, 5;;            //21, 00000005H
+ }
+ {   .mii  //R-Addr: 0X020 
+  cmp4.eq  p0,p7=r0, r30            //21
+  shr.u  r28=r29, 5;;            //19, 00000005H
+  (p7)  adds  r28=1, r28;;            //22, 00000001H
+ }
+ {   .mii  //R-Addr: 0X030 
+  nop.m   0
+  shl  r27=r28, 5;;            //25, 00000005H
+  zxt4  r26=r27;;            //25
+ }
+ {   .mfb  //R-Addr: 0X040 
+  add  r31=r26, r32            //25
+  nop.f   0
+  nop.b   0
+ }
+$L143:
+ {   .mii  //R-Addr: 0X050 
+  fc   r32              //27
+  adds  r32=32, r32;;            //28, 00000020H
+  cmp.ltu  p14,p15=r32, r31          //29
+ }
+ {   .mfb  //R-Addr: 0X060 
+  nop.m   0
+  nop.f   0
+  (p14)  br.cond.dptk.few $L143#;;          //29, 880000/120000
+ }
+ {   .mmi
+    sync.i;;
+    srlz.i
+    nop.i   0;;
+ }
+ {   .mfb  //R-Addr: 0X070 
+  nop.m   0
+  nop.f   0
+  br.ret.sptk.few b0;;            //31
+ }
+// End code for function:
+  .endp  RtPioICacheFlush#
+// END
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/processor.c b/Tools/Source/TianoTools/Common/PeiLib/Ipf/processor.c
new file mode 100644
index 0000000000..e6d5c40435
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/processor.c
@@ -0,0 +1,118 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    Processor.c
+
+Abstract:
+
+--*/
+
+#include "Tiano.h"
+#include "EfiJump.h"
+#include "PeiHob.h"
+#include EFI_GUID_DEFINITION (PeiFlushInstructionCache)
+#include EFI_GUID_DEFINITION (PeiTransferControl)
+
+EFI_STATUS
+WinNtFlushInstructionCacheFlush (
+  IN EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL   *This,
+  IN EFI_PHYSICAL_ADDRESS                       Start,
+  IN UINT64                                     Length
+  );
+
+EFI_PEI_TRANSFER_CONTROL_PROTOCOL         mTransferControl = {
+  SetJump,
+  LongJump,
+  sizeof (EFI_JUMP_BUFFER)
+};
+
+EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL  mFlushInstructionCache = {
+  WinNtFlushInstructionCacheFlush
+};
+
+EFI_STATUS
+InstallEfiPeiTransferControl (
+  IN OUT EFI_PEI_TRANSFER_CONTROL_PROTOCOL **This
+  )
+/*++
+
+Routine Description:
+
+  Installs the pointer to the transfer control mechanism
+
+Arguments:
+
+  This       - Pointer to transfer control mechanism.
+
+Returns:
+
+  EFI_SUCCESS     - Successfully installed.
+
+--*/
+{
+  *This = &mTransferControl;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+InstallEfiPeiFlushInstructionCache (
+  IN OUT EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Installs the pointer to the flush instruction cache mechanism
+
+Arguments:
+
+  This       - Pointer to flush instruction cache mechanism.
+
+Returns:
+
+  EFI_SUCCESS     - Successfully installed
+
+--*/
+{
+  *This = &mFlushInstructionCache;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+WinNtFlushInstructionCacheFlush (
+  IN EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL   *This,
+  IN EFI_PHYSICAL_ADDRESS                       Start,
+  IN UINT64                                     Length
+  )
+/*++
+
+Routine Description:
+
+  This routine would provide support for flushing the CPU instruction cache.
+
+Arguments:
+
+  This      - Pointer to CPU Architectural Protocol interface
+  Start     - Start adddress in memory to flush
+  Length    - Length of memory to flush
+
+Returns:
+
+  Status
+    EFI_SUCCESS
+
+--*/
+{
+  RtPioICacheFlush ((UINT8 *) Start, (UINTN) Length);
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Ipf/setjmp.s b/Tools/Source/TianoTools/Common/PeiLib/Ipf/setjmp.s
new file mode 100644
index 0000000000..4606437117
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Ipf/setjmp.s
@@ -0,0 +1,325 @@
+//++
+// Copyright (c) 2004, Intel Corporation                                                         
+// All rights reserved. This program and the accompanying materials                          
+// are licensed and made available under the terms and conditions of the BSD License         
+// which accompanies this distribution.  The full text of the license may be found at        
+// http://opensource.org/licenses/bsd-license.php                                            
+//                                                                                           
+// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+// 
+// Module Name:
+//
+//  setjmp.s
+//
+// Abstract:
+//
+//  Contains an implementation of setjmp and longjmp for the
+//  Itanium-based architecture.
+//
+//
+//
+// Revision History:
+//
+//--
+
+  .file  "setjmp.s"
+
+#include  <asm.h>
+#include  <ia_64gen.h>
+
+// int SetJump(struct jmp_buffer save)
+//
+//  Setup a non-local goto.
+//
+// Description:
+//
+//  SetJump stores the current register set in the area pointed to
+//  by "save".  It returns zero.  Subsequent calls to "LongJump" will
+//  restore the registers and return non-zero to the same location.
+//
+// On entry, r32 contains the pointer to the jmp_buffer
+//
+
+PROCEDURE_ENTRY(SetJump)
+  //
+  //  Make sure buffer is aligned at 16byte boundary
+  //
+  mov    r32 = r33        
+
+    add     r10 = -0x10,r0  ;;  // mask the lower 4 bits
+    and     r32 = r32, r10;; 
+    add     r32 = 0x10, r32;;   // move to next 16 byte boundary
+
+    add    r10 = J_PREDS, r32  // skip Unats & pfs save area
+  add    r11 = J_BSP, r32
+  //
+  //  save immediate context
+  //
+  mov    r2 = ar.bsp     // save backing store pointer
+  mov    r3 = pr         // save predicates
+  ;;
+  //
+  // save user Unat register
+  //
+  mov    r16 = ar.lc        // save loop count register
+  mov    r14 = ar.unat     // save user Unat register
+
+  st8    [r10] = r3, J_LC-J_PREDS
+  st8    [r11] = r2, J_R4-J_BSP
+  ;;
+  st8    [r10] = r16, J_R5-J_LC
+  st8    [r32] = r14, J_NATS  // Note: Unat at the 
+                    // beginning of the save area
+  mov    r15 = ar.pfs
+  ;;
+  //
+  //  save preserved general registers & NaT's
+  //
+  st8.spill  [r11] = r4, J_R6-J_R4
+  ;;
+  st8.spill  [r10] = r5, J_R7-J_R5 
+    ;;
+  st8.spill  [r11] = r6, J_SP-J_R6
+  ;;
+  st8.spill  [r10] = r7, J_F3-J_R7 
+    ;;
+  st8.spill  [r11] = sp, J_F2-J_SP
+  ;;
+  //
+  // save spilled Unat and pfs registers
+  //
+  mov    r2 = ar.unat       // save Unat register after spill
+  ;;
+  st8    [r32] = r2, J_PFS-J_NATS  // save unat for spilled regs
+  ;;
+  st8    [r32] = r15          // save pfs
+  //
+  //  save floating registers 
+  //
+  stf.spill  [r11] = f2, J_F4-J_F2
+  stf.spill  [r10] = f3, J_F5-J_F3 
+  ;;
+  stf.spill  [r11] = f4, J_F16-J_F4
+  stf.spill  [r10] = f5, J_F17-J_F5 
+  ;;
+  stf.spill  [r11] = f16, J_F18-J_F16
+  stf.spill  [r10] = f17, J_F19-J_F17 
+  ;;
+  stf.spill  [r11] = f18, J_F20-J_F18
+  stf.spill  [r10] = f19, J_F21-J_F19 
+  ;;
+  stf.spill  [r11] = f20, J_F22-J_F20
+  stf.spill  [r10] = f21, J_F23-J_F21 
+  ;;
+  stf.spill  [r11] = f22, J_F24-J_F22
+  stf.spill  [r10] = f23, J_F25-J_F23 
+  ;;
+  stf.spill  [r11] = f24, J_F26-J_F24
+  stf.spill  [r10] = f25, J_F27-J_F25 
+  ;;
+  stf.spill  [r11] = f26, J_F28-J_F26
+  stf.spill  [r10] = f27, J_F29-J_F27 
+  ;;
+  stf.spill  [r11] = f28, J_F30-J_F28
+  stf.spill  [r10] = f29, J_F31-J_F29 
+  ;;
+  stf.spill  [r11] = f30, J_FPSR-J_F30
+  stf.spill  [r10] = f31, J_B0-J_F31    // size of f31 + fpsr
+  //
+  // save FPSR register & branch registers
+  //
+  mov    r2 = ar.fpsr  // save fpsr register
+  mov    r3 = b0 
+  ;;
+  st8    [r11] = r2, J_B1-J_FPSR
+  st8    [r10] = r3, J_B2-J_B0
+  mov    r2 = b1
+  mov    r3 = b2 
+  ;;
+  st8    [r11] = r2, J_B3-J_B1
+  st8    [r10] = r3, J_B4-J_B2
+  mov    r2 = b3
+  mov    r3 = b4 
+  ;;
+  st8    [r11] = r2, J_B5-J_B3
+  st8    [r10] = r3
+  mov    r2 = b5 
+  ;;
+  st8    [r11] = r2
+  ;;
+  //
+  // return
+  //
+  mov    r8 = r0        // return 0 from setjmp
+  mov    ar.unat = r14  // restore unat
+  br.ret.sptk  b0
+
+PROCEDURE_EXIT(SetJump)
+
+
+//
+// void LongJump(struct jmp_buffer *)
+//
+//  Perform a non-local goto.
+//
+// Description:
+//
+//  LongJump initializes the register set to the values saved by a
+//  previous 'SetJump' and jumps to the return location saved by that
+//  'SetJump'.  This has the effect of unwinding the stack and returning
+//  for a second time to the 'SetJump'.
+//
+
+PROCEDURE_ENTRY(LongJump)
+  //
+  //  Make sure buffer is aligned at 16byte boundary
+  //
+  mov    r32 = r33        
+
+    add     r10 = -0x10,r0  ;;  // mask the lower 4 bits
+    and     r32 = r32, r10;; 
+    add     r32 = 0x10, r32;;   // move to next 16 byte boundary
+
+  //
+  // caching the return value as we do invala in the end
+  //
+///  mov    r8 = r33          // return value
+  mov    r8 = 1              // For now return hard coded 1
+
+  //
+  //  get immediate context
+  //
+  mov    r14 = ar.rsc    // get user RSC conf 
+  add    r10 = J_PFS, r32  // get address of pfs
+  add    r11 = J_NATS, r32
+  ;;
+  ld8    r15 = [r10], J_BSP-J_PFS  // get pfs
+  ld8    r2 = [r11], J_LC-J_NATS      // get unat for spilled regs
+  ;;
+  mov    ar.unat = r2
+  ;;
+  ld8    r16 = [r10], J_PREDS-J_BSP  // get backing store pointer
+  mov    ar.rsc = r0        // put RSE in enforced lazy 
+  mov    ar.pfs = r15
+  ;;
+  
+  //
+  // while returning from longjmp the BSPSTORE and BSP needs to be
+  // same and discard all the registers allocated after we did
+  // setjmp. Also, we need to generate the RNAT register since we
+  // did not flushed the RSE on setjmp.
+  //
+  mov    r17 = ar.bspstore  // get current BSPSTORE
+  ;;
+    cmp.ltu  p6,p7 = r17, r16  // is it less than BSP of 
+(p6)  br.spnt.few  .flush_rse
+  mov    r19 = ar.rnat    // get current RNAT
+  ;;
+  loadrs              // invalidate dirty regs
+  br.sptk.many  .restore_rnat    // restore RNAT
+
+.flush_rse:
+  flushrs
+  ;;
+  mov    r19 = ar.rnat    // get current RNAT
+  mov    r17 = r16      // current BSPSTORE
+  ;;
+.restore_rnat:
+  //
+  // check if RNAT is saved between saved BSP and curr BSPSTORE
+  //
+  dep    r18 = 1,r16,3,6   // get RNAT address
+  ;;
+  cmp.ltu  p8,p9 = r18, r17  // RNAT saved on RSE
+  ;;
+(p8)  ld8    r19 = [r18]    // get RNAT from RSE
+  ;;
+  mov    ar.bspstore = r16  // set new BSPSTORE  
+  ;;
+  mov    ar.rnat = r19    // restore RNAT
+  mov    ar.rsc = r14    // restore RSC conf
+
+
+  ld8    r3 = [r11], J_R4-J_LC    // get lc register
+  ld8    r2 = [r10], J_R5-J_PREDS   // get predicates
+  ;;
+  mov    pr = r2, -1
+  mov    ar.lc = r3
+  //
+  //  restore preserved general registers & NaT's
+  //
+  ld8.fill  r4 = [r11], J_R6-J_R4
+  ;;
+  ld8.fill  r5 = [r10], J_R7-J_R5 
+  ld8.fill  r6 = [r11], J_SP-J_R6
+  ;;
+  ld8.fill  r7 = [r10], J_F2-J_R7
+  ld8.fill  sp = [r11], J_F3-J_SP
+  ;;
+  //
+  //  restore floating registers 
+  //
+  ldf.fill  f2 = [r10], J_F4-J_F2
+  ldf.fill  f3 = [r11], J_F5-J_F3 
+  ;;
+  ldf.fill  f4 = [r10], J_F16-J_F4
+  ldf.fill  f5 = [r11], J_F17-J_F5 
+  ;;
+  ldf.fill  f16 = [r10], J_F18-J_F16
+  ldf.fill  f17 = [r11], J_F19-J_F17
+  ;;
+  ldf.fill  f18 = [r10], J_F20-J_F18
+  ldf.fill  f19 = [r11], J_F21-J_F19
+  ;;
+  ldf.fill  f20 = [r10], J_F22-J_F20
+  ldf.fill  f21 = [r11], J_F23-J_F21
+  ;;
+  ldf.fill  f22 = [r10], J_F24-J_F22
+  ldf.fill  f23 = [r11], J_F25-J_F23 
+  ;;
+  ldf.fill  f24 = [r10], J_F26-J_F24
+  ldf.fill  f25 = [r11], J_F27-J_F25
+  ;;
+  ldf.fill  f26 = [r10], J_F28-J_F26
+  ldf.fill  f27 = [r11], J_F29-J_F27
+  ;;
+  ldf.fill  f28 = [r10], J_F30-J_F28
+  ldf.fill  f29 = [r11], J_F31-J_F29 
+  ;;
+  ldf.fill  f30 = [r10], J_FPSR-J_F30
+  ldf.fill  f31 = [r11], J_B0-J_F31 ;;
+
+    //
+  // restore branch registers and fpsr
+  //
+  ld8    r16 = [r10], J_B1-J_FPSR  // get fpsr
+  ld8    r17 = [r11], J_B2-J_B0    // get return pointer
+  ;;
+  mov    ar.fpsr = r16
+  mov    b0 = r17
+  ld8    r2 = [r10], J_B3-J_B1
+  ld8    r3 = [r11], J_B4-J_B2
+  ;;
+  mov    b1 = r2
+  mov    b2 = r3
+  ld8    r2 = [r10], J_B5-J_B3
+  ld8    r3 = [r11]
+  ;;
+  mov    b3 = r2
+  mov    b4 = r3 
+  ld8    r2 = [r10]
+  ld8    r21 = [r32]      // get user unat
+  ;;
+  mov    b5 = r2
+  mov    ar.unat = r21
+
+  //
+  // invalidate ALAT
+  //
+  invala ;;
+
+  br.ret.sptk  b0
+PROCEDURE_EXIT(LongJump)
+
+
diff --git a/Tools/Source/TianoTools/Common/PeiLib/PeCoffLoader.c b/Tools/Source/TianoTools/Common/PeiLib/PeCoffLoader.c
new file mode 100644
index 0000000000..0e84319f69
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/PeCoffLoader.c
@@ -0,0 +1,1249 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  PeCoffLoader.c
+
+Abstract:
+
+  Tiano PE/COFF loader 
+
+Revision History
+
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "PeiLib.h"
+#include "PeCoffLoaderEx.h"
+
+#ifdef EFI_NT_EMULATOR
+#include "peilib.h"
+#include "EfiHobLib.h"
+#include EFI_PPI_DEFINITION (NtLoadAsDll)
+#endif
+
+STATIC
+EFI_STATUS
+PeCoffLoaderGetPeHeader (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  OUT    EFI_IMAGE_NT_HEADERS                  *PeHdr,
+  OUT    EFI_TE_IMAGE_HEADER                   *TeHdr
+  );
+
+STATIC
+EFI_STATUS
+PeCoffLoaderCheckImageType (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     EFI_IMAGE_NT_HEADERS                  *PeHdr,
+  IN     EFI_TE_IMAGE_HEADER                   *TeHdr
+  );
+
+STATIC
+VOID                            *
+PeCoffLoaderImageAddress (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     UINTN                                 Address
+  );
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderGetImageInfo (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  );
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderRelocateImage (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  );
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderLoadImage (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  );
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderUnloadImage (
+  IN EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext
+  );
+
+EFI_PEI_PE_COFF_LOADER_PROTOCOL mPeCoffLoader = {
+  PeCoffLoaderGetImageInfo,
+  PeCoffLoaderLoadImage,
+  PeCoffLoaderRelocateImage,
+  PeCoffLoaderUnloadImage
+};
+
+#ifdef EFI_NT_EMULATOR
+EFI_NT_LOAD_AS_DLL_PPI          *mPeCoffLoaderWinNtLoadAsDll = NULL;
+#endif
+
+EFI_STATUS
+InstallEfiPeiPeCoffLoader (
+  IN EFI_PEI_SERVICES                          **PeiServices,
+  IN OUT  EFI_PEI_PE_COFF_LOADER_PROTOCOL      **This,
+  IN EFI_PEI_PPI_DESCRIPTOR                    *ThisPpi
+  )
+/*++
+
+Routine Description:
+
+  Install PE/COFF loader PPI
+  
+Arguments:
+
+  PeiServices - General purpose services available to every PEIM
+
+  This        - Pointer to get Pei PE coff loader protocol as output
+  
+  ThisPpi     - Passed in as EFI_NT_LOAD_AS_DLL_PPI on NT_EMULATOR platform
+
+Returns:
+
+  EFI_SUCCESS
+
+--*/
+{
+  EFI_STATUS  Status;
+
+  Status = EFI_SUCCESS;
+
+#ifdef EFI_NT_EMULATOR
+  //
+  // For use by PEI Core and Modules
+  //
+  if (NULL != PeiServices) {
+    Status = (**PeiServices).LocatePpi (
+                              PeiServices,
+                              &gEfiNtLoadAsDllPpiGuid,
+                              0,
+                              NULL,
+                              &mPeCoffLoaderWinNtLoadAsDll
+                              );
+  } else {
+    //
+    // Now in SecMain or ERM usage, bind appropriately
+    //
+    PEI_ASSERT (PeiServices, (NULL != ThisPpi));
+
+    mPeCoffLoaderWinNtLoadAsDll = (EFI_NT_LOAD_AS_DLL_PPI *) ThisPpi;
+    PEI_ASSERT (PeiServices, (NULL != mPeCoffLoaderWinNtLoadAsDll));
+  }
+#endif
+
+  if (NULL != This) {
+    *This = &mPeCoffLoader;
+  }
+
+  return Status;
+}
+
+STATIC
+EFI_STATUS
+PeCoffLoaderGetPeHeader (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  OUT    EFI_IMAGE_NT_HEADERS                  *PeHdr,
+  OUT    EFI_TE_IMAGE_HEADER                   *TeHdr
+  )
+/*++
+
+Routine Description:
+
+  Retrieves the PE or TE Header from a PE/COFF or TE image
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  PeHdr         - The buffer in which to return the PE header
+  
+  TeHdr         - The buffer in which to return the TE header
+
+Returns:
+
+  EFI_SUCCESS if the PE or TE Header is read, 
+  Otherwise, the error status from reading the PE/COFF or TE image using the ImageRead function.
+
+--*/
+{
+  EFI_STATUS            Status;
+  EFI_IMAGE_DOS_HEADER  DosHdr;
+  UINTN                 Size;
+
+  ImageContext->IsTeImage = FALSE;
+  //
+  // Read the DOS image headers
+  //
+  Size = sizeof (EFI_IMAGE_DOS_HEADER);
+  Status = ImageContext->ImageRead (
+                          ImageContext->Handle,
+                          0,
+                          &Size,
+                          &DosHdr
+                          );
+  if (EFI_ERROR (Status)) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+    return Status;
+  }
+
+  ImageContext->PeCoffHeaderOffset = 0;
+  if (DosHdr.e_magic == EFI_IMAGE_DOS_SIGNATURE) {
+    //
+    // DOS image header is present, so read the PE header after the DOS image header
+    //
+    ImageContext->PeCoffHeaderOffset = DosHdr.e_lfanew;
+  }
+  //
+  // Read the PE/COFF Header
+  //
+  Size = sizeof (EFI_IMAGE_NT_HEADERS);
+  Status = ImageContext->ImageRead (
+                          ImageContext->Handle,
+                          ImageContext->PeCoffHeaderOffset,
+                          &Size,
+                          PeHdr
+                          );
+  if (EFI_ERROR (Status)) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+    return Status;
+  }
+  //
+  // Check the PE/COFF Header Signature. If not, then try to read a TE header
+  //
+  if (PeHdr->Signature != EFI_IMAGE_NT_SIGNATURE) {
+    Size = sizeof (EFI_TE_IMAGE_HEADER);
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &Size,
+                            TeHdr
+                            );
+    if (TeHdr->Signature != EFI_TE_IMAGE_HEADER_SIGNATURE) {
+      return EFI_UNSUPPORTED;
+    }
+
+    ImageContext->IsTeImage = TRUE;
+  }
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+EFI_STATUS
+PeCoffLoaderCheckImageType (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     EFI_IMAGE_NT_HEADERS                  *PeHdr,
+  IN     EFI_TE_IMAGE_HEADER                   *TeHdr
+  )
+/*++
+
+Routine Description:
+
+  Checks the PE or TE header of a PE/COFF or TE image to determine if it supported
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  PeHdr         - The buffer in which to return the PE header
+  
+  TeHdr         - The buffer in which to return the TE header
+
+Returns:
+
+  EFI_SUCCESS if the PE/COFF or TE image is supported
+  EFI_UNSUPPORTED of the PE/COFF or TE image is not supported.
+
+--*/
+{
+  //
+  // See if the machine type is supported.  We support a native machine type (IA-32/Itanium-based)
+  // and the machine type for the Virtual Machine.
+  //
+  if (ImageContext->IsTeImage == FALSE) {
+    ImageContext->Machine = PeHdr->FileHeader.Machine;
+  } else {
+    ImageContext->Machine = TeHdr->Machine;
+  }
+
+  if (!(EFI_IMAGE_MACHINE_TYPE_SUPPORTED (ImageContext->Machine))) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_MACHINE_TYPE;
+    return EFI_UNSUPPORTED;
+  }
+
+  //
+  // See if the image type is supported.  We support EFI Applications,
+  // EFI Boot Service Drivers, and EFI Runtime Drivers.
+  //
+  if (ImageContext->IsTeImage == FALSE) {
+    ImageContext->ImageType = PeHdr->OptionalHeader.Subsystem;
+  } else {
+    ImageContext->ImageType = (UINT16) (TeHdr->Subsystem);
+  }
+
+  switch (ImageContext->ImageType) {
+
+  case EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION:
+    ImageContext->ImageCodeMemoryType = EfiLoaderCode;
+    ImageContext->ImageDataMemoryType = EfiLoaderData;
+    break;
+
+  case EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
+    ImageContext->ImageCodeMemoryType = EfiBootServicesCode;
+    ImageContext->ImageDataMemoryType = EfiBootServicesData;
+    break;
+
+  case EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
+  case EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER:
+    ImageContext->ImageCodeMemoryType = EfiRuntimeServicesCode;
+    ImageContext->ImageDataMemoryType = EfiRuntimeServicesData;
+    break;
+
+  default:
+    ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_SUBSYSTEM;
+    return EFI_UNSUPPORTED;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderGetImageInfo (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Retrieves information on a PE/COFF image
+
+Arguments:
+
+  This         - Calling context
+  ImageContext - The context of the image being loaded
+
+Returns:
+
+  EFI_SUCCESS           - The information on the PE/COFF image was collected.
+  EFI_INVALID_PARAMETER - ImageContext is NULL.
+  EFI_UNSUPPORTED       - The PE/COFF image is not supported.
+  Otherwise             - The error status from reading the PE/COFF image using the
+                          ImageContext->ImageRead() function
+
+--*/
+{
+  EFI_STATUS                      Status;
+  EFI_IMAGE_NT_HEADERS            PeHdr;
+  EFI_TE_IMAGE_HEADER             TeHdr;
+  EFI_IMAGE_DATA_DIRECTORY        *DebugDirectoryEntry;
+  UINTN                           Size;
+  UINTN                           Index;
+  UINTN                           DebugDirectoryEntryRva;
+  UINTN                           DebugDirectoryEntryFileOffset;
+  UINTN                           SectionHeaderOffset;
+  EFI_IMAGE_SECTION_HEADER        SectionHeader;
+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY DebugEntry;
+
+  if (NULL == ImageContext) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Assume success
+  //
+  ImageContext->ImageError  = EFI_IMAGE_ERROR_SUCCESS;
+
+  Status                    = PeCoffLoaderGetPeHeader (ImageContext, &PeHdr, &TeHdr);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Verify machine type
+  //
+  Status = PeCoffLoaderCheckImageType (ImageContext, &PeHdr, &TeHdr);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Retrieve the base address of the image
+  //
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->ImageAddress = PeHdr.OptionalHeader.ImageBase;
+  } else {
+    ImageContext->ImageAddress = (EFI_PHYSICAL_ADDRESS) (TeHdr.ImageBase);
+  }
+  //
+  // Initialize the alternate destination address to 0 indicating that it
+  // should not be used.
+  //
+  ImageContext->DestinationAddress = 0;
+
+  //
+  // Initialize the codeview pointer.
+  //
+  ImageContext->CodeView    = NULL;
+  ImageContext->PdbPointer  = NULL;
+
+  //
+  // Three cases with regards to relocations:
+  // - Image has base relocs, RELOCS_STRIPPED==0    => image is relocatable
+  // - Image has no base relocs, RELOCS_STRIPPED==1 => Image is not relocatable
+  // - Image has no base relocs, RELOCS_STRIPPED==0 => Image is relocatable but
+  //   has no base relocs to apply
+  // Obviously having base relocations with RELOCS_STRIPPED==1 is invalid.
+  //
+  // Look at the file header to determine if relocations have been stripped, and
+  // save this info in the image context for later use.
+  //
+  if ((!(ImageContext->IsTeImage)) && ((PeHdr.FileHeader.Characteristics & EFI_IMAGE_FILE_RELOCS_STRIPPED) != 0)) {
+    ImageContext->RelocationsStripped = TRUE;
+  } else {
+    ImageContext->RelocationsStripped = FALSE;
+  }
+
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->ImageSize         = (UINT64) PeHdr.OptionalHeader.SizeOfImage;
+    ImageContext->SectionAlignment  = PeHdr.OptionalHeader.SectionAlignment;
+    ImageContext->SizeOfHeaders     = PeHdr.OptionalHeader.SizeOfHeaders;
+
+    //
+    // Modify ImageSize to contain .PDB file name if required and initialize
+    // PdbRVA field...
+    //
+    if (PeHdr.OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {
+      DebugDirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *) &(PeHdr.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
+
+      DebugDirectoryEntryRva = DebugDirectoryEntry->VirtualAddress;
+
+      //
+      // Determine the file offset of the debug directory...  This means we walk
+      // the sections to find which section contains the RVA of the debug
+      // directory
+      //
+      DebugDirectoryEntryFileOffset = 0;
+
+      SectionHeaderOffset = (UINTN)(
+                               ImageContext->PeCoffHeaderOffset +
+                               sizeof (UINT32) + 
+                               sizeof (EFI_IMAGE_FILE_HEADER) + 
+                               PeHdr.FileHeader.SizeOfOptionalHeader
+                               );
+
+      for (Index = 0; Index < PeHdr.FileHeader.NumberOfSections; Index++) {
+        //
+        // Read section header from file
+        //
+        Size = sizeof (EFI_IMAGE_SECTION_HEADER);
+        Status = ImageContext->ImageRead (
+                                 ImageContext->Handle,
+                                 SectionHeaderOffset,
+                                 &Size,
+                                 &SectionHeader
+                                 );
+        if (EFI_ERROR (Status)) {
+          ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+          return Status;
+        }
+
+        if (DebugDirectoryEntryRva >= SectionHeader.VirtualAddress &&
+            DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) {
+            DebugDirectoryEntryFileOffset =
+            DebugDirectoryEntryRva - SectionHeader.VirtualAddress + SectionHeader.PointerToRawData;
+          break;
+        }
+
+        SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
+      }
+
+      if (DebugDirectoryEntryFileOffset != 0) {
+        for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {
+          //
+          // Read next debug directory entry
+          //
+          Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
+          Status = ImageContext->ImageRead (
+                                   ImageContext->Handle,
+                                   DebugDirectoryEntryFileOffset,
+                                   &Size,
+                                   &DebugEntry
+                                   );
+          if (EFI_ERROR (Status)) {
+            ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+            return Status;
+          }
+
+          if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
+            ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));
+            if (DebugEntry.RVA == 0 && DebugEntry.FileOffset != 0) {
+              ImageContext->ImageSize += DebugEntry.SizeOfData;
+            }
+
+            return EFI_SUCCESS;
+          }
+        }
+      }
+    }
+  } else {
+    ImageContext->ImageSize         = 0;
+    ImageContext->SectionAlignment  = 4096;
+    ImageContext->SizeOfHeaders     = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN) TeHdr.BaseOfCode - (UINTN) TeHdr.StrippedSize;
+
+    DebugDirectoryEntry             = &TeHdr.DataDirectory[1];
+    DebugDirectoryEntryRva          = DebugDirectoryEntry->VirtualAddress;
+    SectionHeaderOffset             = (UINTN) (sizeof (EFI_TE_IMAGE_HEADER));
+
+    DebugDirectoryEntryFileOffset   = 0;
+
+    for (Index = 0; Index < TeHdr.NumberOfSections;) {
+      //
+      // Read section header from file
+      //
+      Size = sizeof (EFI_IMAGE_SECTION_HEADER);
+      Status = ImageContext->ImageRead (
+                               ImageContext->Handle,
+                               SectionHeaderOffset,
+                               &Size,
+                               &SectionHeader
+                               );
+      if (EFI_ERROR (Status)) {
+        ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+        return Status;
+      }
+
+      if (DebugDirectoryEntryRva >= SectionHeader.VirtualAddress &&
+          DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) {
+        DebugDirectoryEntryFileOffset = DebugDirectoryEntryRva -
+          SectionHeader.VirtualAddress +
+          SectionHeader.PointerToRawData +
+          sizeof (EFI_TE_IMAGE_HEADER) -
+          TeHdr.StrippedSize;
+
+        //
+        // File offset of the debug directory was found, if this is not the last
+        // section, then skip to the last section for calculating the image size.
+        //
+        if (Index < (UINTN) TeHdr.NumberOfSections - 1) {
+          SectionHeaderOffset += (TeHdr.NumberOfSections - 1 - Index) * sizeof (EFI_IMAGE_SECTION_HEADER);
+          Index = TeHdr.NumberOfSections - 1;
+          continue;
+        }
+      }
+
+      //
+      // In Te image header there is not a field to describe the ImageSize.
+      // Actually, the ImageSize equals the RVA plus the VirtualSize of 
+      // the last section mapped into memory (Must be rounded up to 
+      // a mulitple of Section Alignment). Per the PE/COFF specification, the
+      // section headers in the Section Table must appear in order of the RVA
+      // values for the corresponding sections. So the ImageSize can be determined
+      // by the RVA and the VirtualSize of the last section header in the
+      // Section Table.
+      //
+      if ((++Index) == (UINTN) TeHdr.NumberOfSections) {
+        ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize +
+                                   ImageContext->SectionAlignment - 1) & ~(ImageContext->SectionAlignment - 1);
+      }
+
+      SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
+    }
+
+    if (DebugDirectoryEntryFileOffset != 0) {
+      for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {
+        //
+        // Read next debug directory entry
+        //
+        Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
+        Status = ImageContext->ImageRead (
+                                 ImageContext->Handle,
+                                 DebugDirectoryEntryFileOffset,
+                                 &Size,
+                                 &DebugEntry
+                                 );
+        if (EFI_ERROR (Status)) {
+          ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+          return Status;
+        }
+
+        if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
+          ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));
+          return EFI_SUCCESS;
+        }
+      }
+    }
+  }
+
+  return EFI_SUCCESS;
+}
+
+STATIC
+VOID *
+PeCoffLoaderImageAddress (
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     UINTN                                 Address
+  )
+/*++
+
+Routine Description:
+
+  Converts an image address to the loaded address
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  Address       - The address to be converted to the loaded address
+
+Returns:
+
+  NULL if the address can not be converted, otherwise, the converted address
+
+--*/
+{
+  if (Address >= ImageContext->ImageSize) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_IMAGE_ADDRESS;
+    return NULL;
+  }
+
+  return (CHAR8 *) ((UINTN) ImageContext->ImageAddress + Address);
+}
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderRelocateImage (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Relocates a PE/COFF image in memory
+
+Arguments:
+
+  This         - Calling context
+
+  ImageContext - Contains information on the loaded image to relocate
+
+Returns:
+
+  EFI_SUCCESS      if the PE/COFF image was relocated
+  EFI_LOAD_ERROR   if the image is not a valid PE/COFF image
+  EFI_UNSUPPORTED  not support
+
+--*/
+{
+  EFI_STATUS                Status;
+  EFI_IMAGE_NT_HEADERS      *PeHdr;
+  EFI_TE_IMAGE_HEADER       *TeHdr;
+  EFI_IMAGE_DATA_DIRECTORY  *RelocDir;
+  UINT64                    Adjust;
+  EFI_IMAGE_BASE_RELOCATION *RelocBase;
+  EFI_IMAGE_BASE_RELOCATION *RelocBaseEnd;
+  UINT16                    *Reloc;
+  UINT16                    *RelocEnd;
+  CHAR8                     *Fixup;
+  CHAR8                     *FixupBase;
+  UINT16                    *F16;
+  UINT32                    *F32;
+  CHAR8                     *FixupData;
+  EFI_PHYSICAL_ADDRESS      BaseAddress;
+#ifdef EFI_NT_EMULATOR
+  VOID                      *DllEntryPoint;
+  VOID                      *ModHandle;
+  ModHandle = NULL;
+#endif
+
+  PeHdr = NULL;
+  TeHdr = NULL;
+  //
+  // Assume success
+  //
+  ImageContext->ImageError = EFI_IMAGE_ERROR_SUCCESS;
+
+  //
+  // If there are no relocation entries, then we are done
+  //
+  if (ImageContext->RelocationsStripped) {
+    return EFI_SUCCESS;
+  }
+
+  //
+  // If the destination address is not 0, use that rather than the
+  // image address as the relocation target.
+  //
+  if (ImageContext->DestinationAddress) {
+    BaseAddress = ImageContext->DestinationAddress;
+  } else {
+    BaseAddress = ImageContext->ImageAddress;
+  }
+
+  if (!(ImageContext->IsTeImage)) {
+    PeHdr = (EFI_IMAGE_NT_HEADERS *)((UINTN)ImageContext->ImageAddress + 
+                                            ImageContext->PeCoffHeaderOffset);
+    Adjust = (UINT64) BaseAddress - PeHdr->OptionalHeader.ImageBase;
+    PeHdr->OptionalHeader.ImageBase = (UINTN) BaseAddress;
+
+    //
+    // Find the relocation block
+    //
+    // Per the PE/COFF spec, you can't assume that a given data directory
+    // is present in the image. You have to check the NumberOfRvaAndSizes in
+    // the optional header to verify a desired directory entry is there.
+    //
+    if (PeHdr->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
+      RelocDir  = &PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
+      RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
+      RelocBaseEnd = PeCoffLoaderImageAddress (
+                      ImageContext,
+                      RelocDir->VirtualAddress + RelocDir->Size - 1
+                      );
+    } else {
+      //
+      // Set base and end to bypass processing below.
+      //
+      RelocBase = RelocBaseEnd = 0;
+    }
+  } else {
+    TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
+    Adjust            = (UINT64) (BaseAddress - TeHdr->ImageBase);
+    TeHdr->ImageBase  = (UINT64) (BaseAddress);
+
+    //
+    // Find the relocation block
+    //
+    RelocDir = &TeHdr->DataDirectory[0];
+    RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
+		                                ImageContext->ImageAddress + 
+		                                RelocDir->VirtualAddress +
+		                                sizeof(EFI_TE_IMAGE_HEADER) - 
+		                                TeHdr->StrippedSize
+		                                );
+    RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
+  }
+  
+  //
+  // Run the relocation information and apply the fixups
+  //
+  FixupData = ImageContext->FixupData;
+  while (RelocBase < RelocBaseEnd) {
+
+    Reloc     = (UINT16 *) ((CHAR8 *) RelocBase + sizeof (EFI_IMAGE_BASE_RELOCATION));
+    RelocEnd  = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock);
+    if (!(ImageContext->IsTeImage)) {
+      FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
+    } else {
+      FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
+	  	              RelocBase->VirtualAddress +
+	  	              sizeof(EFI_TE_IMAGE_HEADER) - 
+	  	              TeHdr->StrippedSize
+	  	              );
+    }
+
+    if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||
+        (CHAR8 *) RelocEnd > (CHAR8 *)((UINTN)ImageContext->ImageAddress + 
+          (UINTN)ImageContext->ImageSize)) {
+      ImageContext->ImageError = EFI_IMAGE_ERROR_FAILED_RELOCATION;
+      return EFI_LOAD_ERROR;
+    }
+
+    //
+    // Run this relocation record
+    //
+    while (Reloc < RelocEnd) {
+
+      Fixup = FixupBase + (*Reloc & 0xFFF);
+      switch ((*Reloc) >> 12) {
+      case EFI_IMAGE_REL_BASED_ABSOLUTE:
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGH:
+        F16   = (UINT16 *) Fixup;
+        *F16  = (UINT16) ((*F16 << 16) + (UINT16) Adjust);
+        if (FixupData != NULL) {
+          *(UINT16 *) FixupData = *F16;
+          FixupData             = FixupData + sizeof (UINT16);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_LOW:
+        F16   = (UINT16 *) Fixup;
+        *F16  = (UINT16) (*F16 + (UINT16) Adjust);
+        if (FixupData != NULL) {
+          *(UINT16 *) FixupData = *F16;
+          FixupData             = FixupData + sizeof (UINT16);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGHLOW:
+        F32   = (UINT32 *) Fixup;
+        *F32  = *F32 + (UINT32) Adjust;
+        if (FixupData != NULL) {
+          FixupData             = ALIGN_POINTER (FixupData, sizeof (UINT32));
+          *(UINT32 *) FixupData = *F32;
+          FixupData             = FixupData + sizeof (UINT32);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGHADJ:
+        //
+        // Return the same EFI_UNSUPPORTED return code as
+        // PeCoffLoaderRelocateImageEx() returns if it does not recognize
+        // the relocation type.
+        //
+        ImageContext->ImageError = EFI_IMAGE_ERROR_FAILED_RELOCATION;
+        return EFI_UNSUPPORTED;
+
+      default:
+        Status = PeCoffLoaderRelocateImageEx (Reloc, Fixup, &FixupData, Adjust);
+        if (EFI_ERROR (Status)) {
+          ImageContext->ImageError = EFI_IMAGE_ERROR_FAILED_RELOCATION;
+          return Status;
+        }
+      }
+
+      //
+      // Next relocation record
+      //
+      Reloc += 1;
+    }
+
+    //
+    // Next reloc block
+    //
+    RelocBase = (EFI_IMAGE_BASE_RELOCATION *) RelocEnd;
+  }
+
+#ifdef EFI_NT_EMULATOR
+  DllEntryPoint           = NULL;
+  ImageContext->ModHandle = NULL;
+  //
+  // Load the DLL if it's not an EBC image.
+  //
+  if ((ImageContext->PdbPointer != NULL) && 
+      (ImageContext->Machine != EFI_IMAGE_MACHINE_EBC)) {
+    Status = mPeCoffLoaderWinNtLoadAsDll->Entry (
+                                            ImageContext->PdbPointer,
+                                            &DllEntryPoint,
+                                            &ModHandle
+                                            );
+
+    if (!EFI_ERROR (Status) && DllEntryPoint != NULL) {
+      ImageContext->EntryPoint  = (EFI_PHYSICAL_ADDRESS) (UINTN) DllEntryPoint;
+      ImageContext->ModHandle   = ModHandle;
+    }
+  }
+#endif
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderLoadImage (
+  IN     EFI_PEI_PE_COFF_LOADER_PROTOCOL       *This,
+  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Loads a PE/COFF image into memory
+
+Arguments:
+
+  This         - Calling context
+
+  ImageContext - Contains information on image to load into memory
+
+Returns:
+
+  EFI_SUCCESS            if the PE/COFF image was loaded
+  EFI_BUFFER_TOO_SMALL   if the caller did not provide a large enough buffer
+  EFI_LOAD_ERROR         if the image is a runtime driver with no relocations
+  EFI_INVALID_PARAMETER  if the image address is invalid
+
+--*/
+{
+  EFI_STATUS                            Status;
+  EFI_IMAGE_NT_HEADERS                  *PeHdr;
+  EFI_TE_IMAGE_HEADER                   *TeHdr;
+  EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT  CheckContext;
+  EFI_IMAGE_SECTION_HEADER              *FirstSection;
+  EFI_IMAGE_SECTION_HEADER              *Section;
+  UINTN                                 NumberOfSections;
+  UINTN                                 Index;
+  CHAR8                                 *Base;
+  CHAR8                                 *End;
+  CHAR8                                 *MaxEnd;
+  EFI_IMAGE_DATA_DIRECTORY              *DirectoryEntry;
+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY       *DebugEntry;
+  UINTN                                 Size;
+  UINT32                                TempDebugEntryRva;
+
+  PeHdr = NULL;
+  TeHdr = NULL;
+  //
+  // Assume success
+  //
+  ImageContext->ImageError = EFI_IMAGE_ERROR_SUCCESS;
+
+  //
+  // Copy the provided context info into our local version, get what we
+  // can from the original image, and then use that to make sure everything
+  // is legit.
+  //
+  CopyMem (&CheckContext, ImageContext, sizeof (EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT));
+
+  Status = PeCoffLoaderGetImageInfo (
+            This,
+            &CheckContext
+            );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Make sure there is enough allocated space for the image being loaded
+  //
+  if (ImageContext->ImageSize < CheckContext.ImageSize) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_IMAGE_SIZE;
+    return EFI_BUFFER_TOO_SMALL;
+  }
+
+  //
+  // If there's no relocations, then make sure it's not a runtime driver,
+  // and that it's being loaded at the linked address.
+  //
+  if (CheckContext.RelocationsStripped) {
+    //
+    // If the image does not contain relocations and it is a runtime driver
+    // then return an error.
+    //
+    if (CheckContext.ImageType == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER) {
+      ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_SUBSYSTEM;
+      return EFI_LOAD_ERROR;
+    }
+    //
+    // If the image does not contain relocations, and the requested load address
+    // is not the linked address, then return an error.
+    //
+    if (CheckContext.ImageAddress != ImageContext->ImageAddress) {
+      ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_IMAGE_ADDRESS;
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+  //
+  // Make sure the allocated space has the proper section alignment
+  //
+  if (!(ImageContext->IsTeImage)) {
+    if ((ImageContext->ImageAddress & (CheckContext.SectionAlignment - 1)) != 0) {
+      ImageContext->ImageError = EFI_IMAGE_ERROR_INVALID_SECTION_ALIGNMENT;
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+  //
+  // Read the entire PE/COFF or TE header into memory
+  //
+  if (!(ImageContext->IsTeImage)) {
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &ImageContext->SizeOfHeaders,
+                            (VOID *) (UINTN) ImageContext->ImageAddress
+                            );
+
+    PeHdr = (EFI_IMAGE_NT_HEADERS *)
+      ((UINTN)ImageContext->ImageAddress + ImageContext->PeCoffHeaderOffset);
+
+    FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
+                      (UINTN)ImageContext->ImageAddress +
+                      ImageContext->PeCoffHeaderOffset +
+                      sizeof(UINT32) + 
+                      sizeof(EFI_IMAGE_FILE_HEADER) + 
+                      PeHdr->FileHeader.SizeOfOptionalHeader
+      );
+    NumberOfSections = (UINTN) (PeHdr->FileHeader.NumberOfSections);
+  } else {
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &ImageContext->SizeOfHeaders,
+                            (void *) (UINTN) ImageContext->ImageAddress
+                            );
+
+    TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
+
+    FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
+		      (UINTN)ImageContext->ImageAddress +
+		      sizeof(EFI_TE_IMAGE_HEADER)
+		      );
+    NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);
+
+  }
+
+  if (EFI_ERROR (Status)) {
+    ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+    return EFI_LOAD_ERROR;
+  }
+
+  //
+  // Load each section of the image
+  //
+  Section = FirstSection;
+  for (Index = 0, MaxEnd = NULL; Index < NumberOfSections; Index++) {
+
+    //
+    // Compute sections address
+    //
+    Base = PeCoffLoaderImageAddress (ImageContext, Section->VirtualAddress);
+    End = PeCoffLoaderImageAddress (
+            ImageContext,
+            Section->VirtualAddress + Section->Misc.VirtualSize - 1
+            );
+    if (ImageContext->IsTeImage) {
+      Base  = (CHAR8 *) ((UINTN) Base + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize);
+      End   = (CHAR8 *) ((UINTN) End + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize);
+    }
+
+    if (End > MaxEnd) {
+      MaxEnd = End;
+    }
+    //
+    // If the base start or end address resolved to 0, then fail.
+    //
+    if ((Base == NULL) || (End == NULL)) {
+      ImageContext->ImageError = EFI_IMAGE_ERROR_SECTION_NOT_LOADED;
+      return EFI_LOAD_ERROR;
+    }
+
+    //
+    // Read the section
+    //
+    Size = (UINTN) Section->Misc.VirtualSize;
+    if ((Size == 0) || (Size > Section->SizeOfRawData)) {
+      Size = (UINTN) Section->SizeOfRawData;
+    }
+
+    if (Section->SizeOfRawData) {
+      if (!(ImageContext->IsTeImage)) {
+        Status = ImageContext->ImageRead (
+                                ImageContext->Handle,
+                                Section->PointerToRawData,
+                                &Size,
+                                Base
+                                );
+      } else {
+        Status = ImageContext->ImageRead (
+                                ImageContext->Handle,
+                                Section->PointerToRawData + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize,
+                                &Size,
+                                Base
+                                );
+      }
+
+      if (EFI_ERROR (Status)) {
+        ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+        return Status;
+      }
+    }
+
+    //
+    // If raw size is less then virt size, zero fill the remaining
+    //
+
+    if (Size < Section->Misc.VirtualSize) {
+      ZeroMem (Base + Size, Section->Misc.VirtualSize - Size);
+    }
+
+    //
+    // Next Section
+    //
+    Section += 1;
+  }
+
+  //
+  // Get image's entry point
+  //
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->EntryPoint = (EFI_PHYSICAL_ADDRESS) (UINTN) PeCoffLoaderImageAddress (
+                                                                ImageContext,
+                                                                PeHdr->OptionalHeader.AddressOfEntryPoint
+                                                                );
+  } else {
+    ImageContext->EntryPoint =  (EFI_PHYSICAL_ADDRESS) (
+		                   (UINTN)ImageContext->ImageAddress +
+		                   (UINTN)TeHdr->AddressOfEntryPoint +
+		                   (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+          (UINTN) TeHdr->StrippedSize
+      );
+  }
+
+  //
+  // Determine the size of the fixup data
+  //
+  // Per the PE/COFF spec, you can't assume that a given data directory
+  // is present in the image. You have to check the NumberOfRvaAndSizes in
+  // the optional header to verify a desired directory entry is there.
+  //
+  if (!(ImageContext->IsTeImage)) {
+    if (PeHdr->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
+      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)
+        &PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
+      ImageContext->FixupDataSize = DirectoryEntry->Size / sizeof (UINT16) * sizeof (UINTN);
+    } else {
+      ImageContext->FixupDataSize = 0;
+    }
+  } else {
+    DirectoryEntry              = &TeHdr->DataDirectory[0];
+    ImageContext->FixupDataSize = DirectoryEntry->Size / sizeof (UINT16) * sizeof (UINTN);
+  }
+  //
+  // Consumer must allocate a buffer for the relocation fixup log.
+  // Only used for runtime drivers.
+  //
+  ImageContext->FixupData = NULL;
+
+  //
+  // Load the Codeview info if present
+  //
+  if (ImageContext->DebugDirectoryEntryRva != 0) {
+    if (!(ImageContext->IsTeImage)) {
+      DebugEntry = PeCoffLoaderImageAddress (
+                    ImageContext,
+                    ImageContext->DebugDirectoryEntryRva
+                    );
+    } else {
+      DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
+	  	                                         ImageContext->ImageAddress +
+	  	                                         ImageContext->DebugDirectoryEntryRva +
+	  	                                         sizeof(EFI_TE_IMAGE_HEADER) -
+	  	                                         TeHdr->StrippedSize
+	  	                                         );
+    }
+
+    if (DebugEntry != NULL) {
+      TempDebugEntryRva = DebugEntry->RVA;
+      if (DebugEntry->RVA == 0 && DebugEntry->FileOffset != 0) {
+        Section--;
+        if ((UINTN) Section->SizeOfRawData < Section->Misc.VirtualSize) {
+          TempDebugEntryRva = Section->VirtualAddress + Section->Misc.VirtualSize;
+        } else {
+          TempDebugEntryRva = Section->VirtualAddress + Section->SizeOfRawData;
+        }
+      }
+
+      if (TempDebugEntryRva != 0) {
+        if (!(ImageContext->IsTeImage)) {
+          ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
+        } else {
+          ImageContext->CodeView = (VOID *)(
+		  	              (UINTN)ImageContext->ImageAddress +
+		  	              (UINTN)TempDebugEntryRva +
+		  	              (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                (UINTN) TeHdr->StrippedSize
+            );
+        }
+
+        if (ImageContext->CodeView == NULL) {
+          ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+          return EFI_LOAD_ERROR;
+        }
+
+        if (DebugEntry->RVA == 0) {
+          Size = DebugEntry->SizeOfData;
+          if (!(ImageContext->IsTeImage)) {
+            Status = ImageContext->ImageRead (
+                                    ImageContext->Handle,
+                                    DebugEntry->FileOffset,
+                                    &Size,
+                                    ImageContext->CodeView
+                                    );
+          } else {
+            Status = ImageContext->ImageRead (
+                                    ImageContext->Handle,
+                                    DebugEntry->FileOffset + sizeof (EFI_TE_IMAGE_HEADER) - TeHdr->StrippedSize,
+                                    &Size,
+                                    ImageContext->CodeView
+                                    );
+            //
+            // Should we apply fix up to this field according to the size difference between PE and TE?
+            // Because now we maintain TE header fields unfixed, this field will also remain as they are
+            // in original PE image.
+            //
+          }
+
+          if (EFI_ERROR (Status)) {
+            ImageContext->ImageError = EFI_IMAGE_ERROR_IMAGE_READ;
+            return EFI_LOAD_ERROR;
+          }
+
+          DebugEntry->RVA = TempDebugEntryRva;
+        }
+
+        switch (*(UINT32 *) ImageContext->CodeView) {
+        case CODEVIEW_SIGNATURE_NB10:
+          ImageContext->PdbPointer = (CHAR8 *) ImageContext->CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);
+          break;
+
+        case CODEVIEW_SIGNATURE_RSDS:
+          ImageContext->PdbPointer = (CHAR8 *) ImageContext->CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);
+          break;
+
+        default:
+          break;
+        }
+      }
+    }
+  }
+
+  return Status;
+}
+
+EFI_STATUS
+EFIAPI
+PeCoffLoaderUnloadImage (
+  IN EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Unload a PE/COFF image from memory
+
+Arguments:
+
+  ImageContext - Contains information on image to load into memory
+
+Returns:
+
+  EFI_SUCCESS            
+
+--*/
+{
+#ifdef EFI_NT_EMULATOR
+  //
+  // Calling Win32 API free library
+  //
+  mPeCoffLoaderWinNtLoadAsDll->FreeLibrary (ImageContext->ModHandle);
+
+#endif
+
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/PeiLib.c b/Tools/Source/TianoTools/Common/PeiLib/PeiLib.c
new file mode 100644
index 0000000000..fec7182908
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/PeiLib.c
@@ -0,0 +1,169 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  PeiLib.c
+
+Abstract:
+
+  PEI Library Functions
+ 
+--*/
+
+#include "TianoCommon.h"
+#include "PeiHob.h"
+#include "Pei.h"
+
+VOID
+PeiCopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  );
+
+VOID
+ZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+/*++
+
+Routine Description:
+
+  Set Buffer to zero for Size bytes.
+
+Arguments:
+
+  Buffer  - Memory to set.
+
+  Size    - Number of bytes to set
+
+Returns:
+
+  None
+
+--*/
+{
+  INT8  *Ptr;
+
+  Ptr = Buffer;
+  while (Size--) {
+    *(Ptr++) = 0;
+  }
+}
+
+VOID
+PeiCopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+/*++
+
+Routine Description:
+
+  Copy Length bytes from Source to Destination.
+
+Arguments:
+
+  Destination - Target of copy
+
+  Source      - Place to copy from
+
+  Length      - Number of bytes to copy
+
+Returns:
+
+  None
+
+--*/
+{
+  CHAR8 *Destination8;
+  CHAR8 *Source8;
+
+  Destination8  = Destination;
+  Source8       = Source;
+  while (Length--) {
+    *(Destination8++) = *(Source8++);
+  }
+}
+
+VOID
+CopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+/*++
+
+Routine Description:
+
+  Copy Length bytes from Source to Destination.
+
+Arguments:
+
+  Destination - Target of copy
+
+  Source      - Place to copy from
+
+  Length      - Number of bytes to copy
+
+Returns:
+
+  None
+
+--*/
+{
+  CHAR8 *Destination8;
+  CHAR8 *Source8;
+
+  Destination8  = Destination;
+  Source8       = Source;
+  while (Length--) {
+    *(Destination8++) = *(Source8++);
+  }
+}
+
+BOOLEAN
+CompareGuid (
+  IN EFI_GUID     *Guid1,
+  IN EFI_GUID     *Guid2
+  )
+/*++
+
+Routine Description:
+
+  Compares two GUIDs
+
+Arguments:
+
+  Guid1 - guid to compare
+  Guid2 - guid to compare
+
+Returns:
+  = TRUE  if Guid1 == Guid2
+  = FALSE if Guid1 != Guid2 
+
+--*/
+{
+  if ((((INT32 *) Guid1)[0] - ((INT32 *) Guid2)[0]) == 0) {
+    if ((((INT32 *) Guid1)[1] - ((INT32 *) Guid2)[1]) == 0) {
+      if ((((INT32 *) Guid1)[2] - ((INT32 *) Guid2)[2]) == 0) {
+        if ((((INT32 *) Guid1)[3] - ((INT32 *) Guid2)[3]) == 0) {
+          return TRUE;
+        }
+      }
+    }
+  }
+
+  return FALSE;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/PeiLib.h b/Tools/Source/TianoTools/Common/PeiLib/PeiLib.h
new file mode 100644
index 0000000000..ccb8d2f6a6
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/PeiLib.h
@@ -0,0 +1,798 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  PeiLib.h
+
+Abstract:
+
+  PEI Library Functions
+ 
+--*/
+
+#ifndef _PEI_LIB_H_
+#define _PEI_LIB_H_
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "peiHobLib.h"
+#include EFI_PROTOCOL_DEFINITION (Decompress)
+#include EFI_PROTOCOL_DEFINITION (TianoDecompress)
+#include EFI_GUID_DEFINITION (PeiPeCoffLoader)
+
+VOID
+PeiCopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+/*++
+
+Routine Description:
+
+  Copy Length bytes from Source to Destination.
+
+Arguments:
+
+  Destination - Target of copy
+
+  Source      - Place to copy from
+
+  Length      - Number of bytes to copy
+
+Returns:
+
+  None
+
+--*/
+;
+
+VOID
+ZeroMem (
+  IN VOID   *Buffer,
+  IN UINTN  Size
+  )
+/*++
+
+Routine Description:
+
+  Set Buffer to zero for Size bytes.
+
+Arguments:
+
+  Buffer  - Memory to set.
+
+  Size    - Number of bytes to set
+
+Returns:
+
+  None
+
+--*/
+;
+
+VOID
+CopyMem (
+  IN VOID   *Destination,
+  IN VOID   *Source,
+  IN UINTN  Length
+  )
+/*++
+
+Routine Description:
+
+  Copy Length bytes from Source to Destination.
+
+Arguments:
+
+  Destination - Target of copy
+
+  Source      - Place to copy from
+
+  Length      - Number of bytes to copy
+
+Returns:
+
+  None
+
+--*/
+;
+
+BOOLEAN
+CompareGuid (
+  IN EFI_GUID     *Guid1,
+  IN EFI_GUID     *Guid2
+  )
+/*++
+
+Routine Description:
+
+  Compares two GUIDs
+
+Arguments:
+
+  Guid1 - guid to compare
+  Guid2 - guid to compare
+
+Returns:
+  = TRUE  if Guid1 == Guid2
+  = FALSE if Guid1 != Guid2 
+
+--*/
+;
+
+EFI_STATUS
+InstallEfiPeiPeCoffLoader (
+  IN EFI_PEI_SERVICES                     **PeiServices,
+  IN EFI_PEI_PE_COFF_LOADER_PROTOCOL      **This,
+  IN EFI_PEI_PPI_DESCRIPTOR               *ThisPpi
+  )
+/*++
+
+Routine Description:
+
+  Install EFI Pei PE coff loader protocol.
+  
+Arguments:
+
+  PeiServices - The PEI core services table.
+  
+  This        - Pointer to get Pei PE coff loader protocol as output
+  
+  ThisPpi     - Passed in as EFI_NT_LOAD_AS_DLL_PPI on NT_EMULATOR platform
+
+Returns:
+
+  EFI_SUCCESS
+
+--*/
+;
+
+EFI_STATUS
+InstallEfiDecompress (
+  EFI_DECOMPRESS_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Install EFI decompress protocol.
+
+Arguments:
+
+  This  - Pointer to get decompress protocol as output
+
+Returns:
+
+  EFI_SUCCESS - EFI decompress protocol successfully installed.
+
+--*/
+;
+
+EFI_STATUS
+InstallTianoDecompress (
+  EFI_TIANO_DECOMPRESS_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Install Tiano decompress protocol.
+
+Arguments:
+
+  This  - Pointer to get decompress protocol as output
+
+Returns:
+
+  EFI_SUCCESS - Tiano decompress protocol successfully installed.
+
+--*/
+;
+
+VOID
+PeiPerfMeasure (
+  EFI_PEI_SERVICES              **PeiServices,
+  IN UINT16                     *Token,
+  IN EFI_FFS_FILE_HEADER        *FileHeader,
+  IN BOOLEAN                    EntryExit,
+  IN UINT64                     Value
+  )
+/*++
+
+Routine Description:
+
+  Log a timestamp count.
+
+Arguments:
+
+  PeiServices - Pointer to the PEI Core Services table
+  
+  Token       - Pointer to Token Name
+  
+  FileHeader  - Pointer to the file header
+
+  EntryExit   - Indicates start or stop measurement
+
+  Value       - The start time or the stop time
+
+Returns:
+
+--*/
+;
+
+EFI_STATUS
+GetTimerValue (
+  OUT UINT64    *TimerValue
+  )
+/*++
+
+Routine Description:
+
+  Get timer value.
+
+Arguments:
+
+  TimerValue  - Pointer to the returned timer value
+
+Returns:
+
+  EFI_SUCCESS - Successfully got timer value
+
+--*/
+;
+
+#ifdef EFI_PEI_PERFORMANCE
+#define PEI_PERF_START(Ps, Token, FileHeader, Value)  PeiPerfMeasure (Ps, Token, FileHeader, FALSE, Value)
+#define PEI_PERF_END(Ps, Token, FileHeader, Value)    PeiPerfMeasure (Ps, Token, FileHeader, TRUE, Value)
+#else
+#define PEI_PERF_START(Ps, Token, FileHeader, Value)
+#define PEI_PERF_END(Ps, Token, FileHeader, Value)
+#endif
+
+#ifdef EFI_NT_EMULATOR
+EFI_STATUS
+PeCoffLoaderWinNtLoadAsDll (
+  IN  CHAR8  *PdbFileName,
+  IN  VOID   **ImageEntryPoint,
+  OUT VOID   **ModHandle
+  )
+/*++
+
+Routine Description:
+
+  Loads the .DLL file is present when a PE/COFF file is loaded.  This provides source level
+  debugging for drivers that have cooresponding .DLL files on the local system.
+
+Arguments:
+
+  PdbFileName     - The name of the .PDB file.  This was found from the PE/COFF
+                    file's debug directory entry.
+
+  ImageEntryPoint - A pointer to the DLL entry point of the .DLL file was loaded.
+
+  ModHandle       - Pointer to loaded library.
+
+Returns:
+
+  EFI_SUCCESS     - The .DLL file was loaded, and the DLL entry point is returned in ImageEntryPoint
+
+  EFI_NOT_FOUND   - The .DLL file could not be found
+
+  EFI_UNSUPPORTED - The .DLL file was loaded, but the entry point to the .DLL file could not
+                    determined.
+
+--*/
+;
+
+#endif
+//
+// hob.c
+//
+EFI_STATUS
+PeiBuildHobModule (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_GUID                    *ModuleName,
+  IN EFI_PHYSICAL_ADDRESS        Module,
+  IN UINT64                      ModuleLength,
+  IN EFI_PHYSICAL_ADDRESS        EntryPoint
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for a loaded PE32 module
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+  ModuleName                - The GUID File Name of the module
+  Memory                    - The 64 bit physical address of the module
+  ModuleLength              - The length of the module in bytes
+  EntryPoint                - The 64 bit physical address of the entry point
+                              to the module
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobResourceDescriptor (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_RESOURCE_TYPE           ResourceType,
+  IN EFI_RESOURCE_ATTRIBUTE_TYPE ResourceAttribute,
+  IN EFI_PHYSICAL_ADDRESS        PhysicalStart,
+  IN UINT64                      NumberOfBytes
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB that describes a chunck of system memory
+
+Arguments:
+
+  PeiServices        - The PEI core services table.
+ 
+  ResourceType       - The type of resource described by this HOB
+
+  ResourceAttribute  - The resource attributes of the memory described by this HOB
+
+  PhysicalStart      - The 64 bit physical address of memory described by this HOB
+
+  NumberOfBytes      - The length of the memoty described by this HOB in bytes
+
+Returns:
+
+  EFI_SUCCESS     - Hob is successfully built.
+  Others          - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobGuid (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_GUID                    *Guid,
+  IN UINTN                       DataLength,
+  IN OUT VOID                    **Hob
+  )
+/*++
+
+Routine Description:
+
+  Builds a custom HOB that is tagged with a GUID for identification
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  Guid        - The GUID of the custome HOB type
+
+  DataLength  - The size of the data payload for the GUIDed HOB
+
+  Hob         - Pointer to the Hob
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobGuidData (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_GUID                    *Guid,
+  IN VOID                        *Data,
+  IN UINTN                       DataLength
+  )
+/*++
+
+Routine Description:
+
+  Builds a custom HOB that is tagged with a GUID for identification
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  Guid        - The GUID of the custome HOB type
+
+  Data        - The data to be copied into the GUIDed HOB data field.
+
+  DataLength  - The data field length.
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobFv (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length
+  )
+/*++
+
+Routine Description:
+
+  Builds a Firmware Volume HOB
+
+Arguments:
+
+  PeiServices - The PEI core services table.
+
+  BaseAddress - The base address of the Firmware Volume
+
+  Length      - The size of the Firmware Volume in bytes
+
+Returns:
+
+  EFI_SUCCESS   - Hob is successfully built.
+  Others        - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobCpu (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN UINT8                       SizeOfMemorySpace,
+  IN UINT8                       SizeOfIoSpace
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the CPU
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  SizeOfMemorySpace         - Identifies the maximum 
+                              physical memory addressibility of the processor.
+
+  SizeOfIoSpace             - Identifies the maximum physical I/O addressibility 
+                              of the processor.
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobStack (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the Stack
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the Stack
+
+  Length                    - The length of the stack in bytes
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobBspStore (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length,
+  IN EFI_MEMORY_TYPE             MemoryType
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the bsp store
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the bsp store
+
+  Length                    - The length of the bsp store in bytes
+
+  MemoryType                - Memory type
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+;
+
+EFI_STATUS
+PeiBuildHobMemoryAllocation (
+  IN EFI_PEI_SERVICES            **PeiServices,
+  IN EFI_PHYSICAL_ADDRESS        BaseAddress,
+  IN UINT64                      Length,
+  IN EFI_GUID                    *Name,
+  IN EFI_MEMORY_TYPE             MemoryType
+  )
+/*++
+
+Routine Description:
+
+  Builds a HOB for the memory allocation
+
+Arguments:
+
+  PeiServices               - The PEI core services table.
+
+  BaseAddress               - The 64 bit physical address of the memory
+
+  Length                    - The length of the memory allocation in bytes
+
+  Name                      - Name for Hob
+
+  MemoryType                - Memory type
+
+Returns:
+
+  EFI_SUCCESS               - Hob is successfully built.
+  Others                    - Errors occur while creating new Hob
+
+--*/
+;
+
+//
+// print.c
+//
+UINTN
+AvSPrint (
+  OUT CHAR8       *StartOfBuffer,
+  IN  UINTN       StrSize,
+  IN  CONST CHAR8 *Format,
+  IN  VA_LIST     Marker
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint function to process format and place the results in Buffer. Since a 
+  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus 
+  this is the main print working routine
+
+Arguments:
+
+  StartOfBuffer - Ascii buffer to print the results of the parsing of Format into.
+
+  StrSize       - Maximum number of characters to put into buffer. Zero means 
+                  no limit.
+
+  FormatString  - Ascii format string see file header for more details.
+
+  Marker        - Vararg list consumed by processing Format.
+
+Returns: 
+
+  Number of characters printed.
+
+--*/
+;
+
+UINTN
+ASPrint (
+  OUT CHAR8       *Buffer,
+  IN UINTN        BufferSize,
+  IN CONST CHAR8  *Format,
+  ...
+  )
+/*++
+
+Routine Description:
+
+  ASPrint function to process format and place the results in Buffer.
+
+Arguments:
+
+  Buffer     - Ascii buffer to print the results of the parsing of Format into.
+
+  BufferSize - Maximum number of characters to put into buffer. Zero means no 
+               limit.
+
+  Format - Ascii format string see file header for more details.
+
+  ...    - Vararg list consumed by processing Format.
+
+Returns: 
+
+  Number of characters printed.
+
+--*/
+;
+
+//
+// math.c
+//
+UINT64
+MultU64x32 (
+  IN  UINT64  Multiplicand,
+  IN  UINTN   Multiplier
+  )
+/*++  
+  
+Routine Description:
+
+  This routine allows a 64 bit value to be multiplied with a 32 bit 
+  value returns 64bit result.
+  No checking if the result is greater than 64bits
+
+Arguments:
+
+  Multiplicand  - multiplicand
+  Multiplier    - multiplier
+
+Returns:
+
+  Multiplicand * Multiplier
+  
+--*/
+;
+
+UINT64
+DivU64x32 (
+  IN  UINT64  Dividend,
+  IN  UINTN   Divisor,
+  OUT UINTN   *Remainder OPTIONAL
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be divided with a 32 bit value returns 
+  64bit result and the Remainder.
+  N.B. only works for 31bit divisors!!
+
+Arguments:
+
+  Dividend  - dividend
+  Divisor   - divisor
+  Remainder - buffer for remainder
+ 
+Returns:
+
+  Dividend  / Divisor
+  Remainder = Dividend mod Divisor
+
+--*/
+;
+
+UINT64
+RShiftU64 (
+  IN  UINT64  Operand,
+  IN  UINTN   Count
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be right shifted by 32 bits and returns the 
+  shifted value.
+  Count is valid up 63. (Only Bits 0-5 is valid for Count)
+
+Arguments:
+
+  Operand - Value to be shifted
+  Count   - Number of times to shift right.
+ 
+Returns:
+
+  Value shifted right identified by the Count.
+
+--*/
+;
+
+UINT64
+LShiftU64 (
+  IN  UINT64  Operand,
+  IN  UINTN   Count
+  )
+/*++
+
+Routine Description:
+
+  This routine allows a 64 bit value to be left shifted by 32 bits and 
+  returns the shifted value.
+  Count is valid up 63. (Only Bits 0-5 is valid for Count)
+
+Arguments:
+
+  Operand - Value to be shifted
+  Count   - Number of times to shift left.
+
+Returns:
+
+  Value shifted left identified by the Count.
+
+--*/
+;
+
+VOID
+RegisterNativeCpuIo (
+  IN EFI_PEI_SERVICES         **PeiServices,
+  IN VOID                     *CpuIo
+  )
+/*++
+
+Routine Description:
+
+  Register a native Cpu IO
+
+Arguments:
+
+  PeiServices - Calling context
+  CpuIo       - CpuIo instance to register
+
+Returns:
+
+  None
+
+--*/
+;
+
+VOID
+GetNativeCpuIo (
+  IN EFI_PEI_SERVICES         **PeiServices,
+  OUT VOID                    **CpuIo
+  )
+/*++
+
+Routine Description:
+
+  Get registered Cpu IO.
+
+Arguments:
+
+  PeiServices - Calling context
+  CpuIo       - CpuIo instance registered before
+
+Returns:
+
+  None
+
+--*/
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Perf.c b/Tools/Source/TianoTools/Common/PeiLib/Perf.c
new file mode 100644
index 0000000000..cfc265ee66
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Perf.c
@@ -0,0 +1,233 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Perf.c
+
+Abstract:
+
+  Support for performance primitives. 
+
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "PeiLib.h"
+#include "PeiHob.h"
+
+#include EFI_GUID_DEFINITION (PeiPerformanceHob)
+
+//
+// Perfomance HOB data definitions
+//
+
+#define MAX_PEI_PERF_LOG_ENTRIES 28
+
+//
+// Prototype functions
+//  
+EFI_STATUS
+GetTimerValue (
+  OUT UINT64    *TimerValue
+  );
+
+
+VOID
+PeiPerfMeasure (
+  EFI_PEI_SERVICES              **PeiServices,
+  IN UINT16                     *Token,
+  IN EFI_FFS_FILE_HEADER        *FileHeader,
+  IN BOOLEAN                    EntryExit,
+  IN UINT64                     Value
+  )
+/*++
+
+Routine Description:
+
+  Log a timestamp count.
+
+Arguments:
+
+  PeiServices - Pointer to the PEI Core Services table
+  
+  Token       - Pointer to Token Name
+  
+  FileHeader  - Pointer to the file header
+
+  EntryExit   - Indicates start or stop measurement
+
+  Value       - The start time or the stop time
+
+Returns:
+
+--*/
+{
+  EFI_STATUS                         Status;
+  EFI_HOB_GUID_TYPE                  *Hob;
+  EFI_HOB_GUID_DATA_PERFORMANCE_LOG  *PerfHobData;
+  PEI_PERFORMANCE_MEASURE_LOG_ENTRY  *Log;
+  EFI_PEI_PPI_DESCRIPTOR             *PerfHobDescriptor;
+  UINT64                             TimeCount;
+  INTN                               Index;
+  UINTN                              Index2;
+  EFI_GUID                           *Guid;
+  EFI_GUID                           *CheckGuid;
+
+  TimeCount = 0;
+  //
+  // Get the END time as early as possible to make it more accurate.
+  //
+  if (EntryExit) {
+    GetTimerValue (&TimeCount);
+  }
+
+  //
+  // Locate the Pei Performance Log Hob.
+  //
+  Status = (*PeiServices)->LocatePpi (
+                             PeiServices,
+                             &gEfiPeiPerformanceHobGuid,
+                             0,
+                             &PerfHobDescriptor,
+                             NULL
+                             );
+
+  //
+  // If the Performance Hob was not found, build and install one.
+  //
+  if (EFI_ERROR(Status)) {
+    Status = PeiBuildHobGuid (
+               PeiServices,
+               &gEfiPeiPerformanceHobGuid,
+               (sizeof(EFI_HOB_GUID_DATA_PERFORMANCE_LOG) +
+                 ((MAX_PEI_PERF_LOG_ENTRIES-1) * 
+                 sizeof(PEI_PERFORMANCE_MEASURE_LOG_ENTRY)) +
+                 sizeof(EFI_PEI_PPI_DESCRIPTOR)
+               ),
+               &Hob
+               );
+    ASSERT_PEI_ERROR(PeiServices, Status);
+
+    PerfHobData = (EFI_HOB_GUID_DATA_PERFORMANCE_LOG *)(Hob+1);
+    PerfHobData->NumberOfEntries = 0;
+
+    PerfHobDescriptor = (EFI_PEI_PPI_DESCRIPTOR *)((UINT8 *)(PerfHobData+1) +
+                                                     (sizeof(PEI_PERFORMANCE_MEASURE_LOG_ENTRY) *
+                                                       (MAX_PEI_PERF_LOG_ENTRIES-1)
+                                                     )
+                                                  );
+    PerfHobDescriptor->Flags = (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST);
+    PerfHobDescriptor->Guid = &gEfiPeiPerformanceHobGuid;
+    PerfHobDescriptor->Ppi = NULL;
+
+    (*PeiServices)->InstallPpi (
+                      PeiServices,
+                      PerfHobDescriptor
+                      );
+  }
+
+  PerfHobData = (EFI_HOB_GUID_DATA_PERFORMANCE_LOG *)(((UINT8 *)(PerfHobDescriptor)) -
+                                                        ((sizeof(PEI_PERFORMANCE_MEASURE_LOG_ENTRY) *
+                                                           (MAX_PEI_PERF_LOG_ENTRIES-1)
+                                                         )
+                                                         + sizeof(EFI_HOB_GUID_DATA_PERFORMANCE_LOG)
+                                                      )
+                                                     );
+
+  if (PerfHobData->NumberOfEntries >= MAX_PEI_PERF_LOG_ENTRIES) {
+    return;
+  }
+
+  if (!EntryExit) {
+    Log = &(PerfHobData->Log[PerfHobData->NumberOfEntries]);
+    (*PeiServices)->SetMem (Log, sizeof(PEI_PERFORMANCE_MEASURE_LOG_ENTRY), 0);
+
+    //
+    // If not NULL pointer, copy the file name
+    //
+    if (FileHeader != NULL) {
+      Log->Name = FileHeader->Name;
+    }
+
+    //
+    // Copy the description string
+    //
+    (*PeiServices)->CopyMem (
+                      &(Log->DescriptionString), 
+                      Token,
+                      (PEI_PERF_MAX_DESC_STRING-1) * sizeof(UINT16)
+                      );
+
+    //
+    // Get the start time as late as possible to make it more accurate.
+    //
+    GetTimerValue (&TimeCount);
+
+    //
+    // Record the time stamp.
+    //
+    if (Value != 0) {
+      Log->StartTimeCount = Value;
+    } else {
+      Log->StartTimeCount = TimeCount;
+    }
+    Log->StopTimeCount = 0;
+
+    //
+    // Increment the number of valid log entries.
+    //
+    PerfHobData->NumberOfEntries++;
+
+  } else {
+
+    for (Index = PerfHobData->NumberOfEntries-1; Index >= 0; Index--) {
+      Log = NULL;
+      for (Index2 = 0; Index2 < PEI_PERF_MAX_DESC_STRING; Index2++) {
+        if (PerfHobData->Log[Index].DescriptionString[Index2] == 0) {
+          Log = &(PerfHobData->Log[Index]);
+          break;
+        }
+        if (PerfHobData->Log[Index].DescriptionString[Index2] !=
+            Token[Index2]) {
+          break;
+        }
+      }
+      if (Log != NULL) {
+        if (FileHeader != NULL) {
+          Guid = &(Log->Name);
+          CheckGuid = &(FileHeader->Name);
+          if ((((INT32 *)Guid)[0] == ((INT32 *)CheckGuid)[0]) &&
+              (((INT32 *)Guid)[1] == ((INT32 *)CheckGuid)[1]) &&
+              (((INT32 *)Guid)[2] == ((INT32 *)CheckGuid)[2]) &&
+              (((INT32 *)Guid)[3] == ((INT32 *)CheckGuid)[3]))  {
+            if (Value != 0) {
+              Log->StopTimeCount = Value;
+            } else {
+             Log->StopTimeCount = TimeCount;
+            }
+            break;
+          }
+        } else {
+          if (Value != 0) {
+            Log->StopTimeCount = Value;
+          } else {
+           Log->StopTimeCount = TimeCount;
+          }
+          break;
+        }
+      }
+    }
+            
+  }
+
+  return;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Print/Print.c b/Tools/Source/TianoTools/Common/PeiLib/Print/Print.c
new file mode 100644
index 0000000000..13e7d33ae0
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Print/Print.c
@@ -0,0 +1,736 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Print.c
+
+Abstract:
+
+  Basic Ascii AvSPrintf() function named AvSPrint(). AvSPrint() enables very
+  simple implemenation of debug prints.
+
+  You can not Print more than PEI_LIB_MAX_PRINT_BUFFER characters at a 
+  time. This makes the implementation very simple.
+
+  AvSPrint format specification has the follwoing form
+
+  %[flags][width]type
+
+  flags:
+    '-' - Left justify
+    '+' - Prefix a sign
+    ' ' - Prefix a blank
+    ',' - Place commas in numberss
+    '0' - Prefix for width with zeros
+    'l' - UINT64
+    'L' - UINT64
+
+  width:
+    '*' - Get width from a UINTN argumnet from the argument list
+    Decimal number that represents width of print
+
+  type:
+    'X' - argument is a UINTN hex number, prefix '0'
+    'x' - argument is a hex number
+    'd' - argument is a decimal number
+    'a' - argument is an ascii string 
+    'S', 's' - argument is an Unicode string
+    'g' - argument is a pointer to an EFI_GUID
+    't' - argument is a pointer to an EFI_TIME structure
+    'c' - argument is an ascii character
+    'r' - argument is EFI_STATUS
+    '%' - Print a %
+
+--*/
+
+#include "Tiano.h"
+#include "Pei.h"
+#include "PeiLib.h"
+#include "Print.h"
+
+
+STATIC
+CHAR8 *
+GetFlagsAndWidth (
+  IN  CHAR8       *Format, 
+  OUT UINTN       *Flags, 
+  OUT UINTN       *Width,
+  IN OUT  VA_LIST *Marker
+  );
+
+STATIC
+UINTN
+ValueToString (
+  IN  OUT CHAR8   *Buffer, 
+  IN  INT64       Value, 
+  IN  UINTN       Flags, 
+  IN  UINTN       Width
+  );
+
+STATIC
+UINTN
+ValueTomHexStr (
+  IN  OUT CHAR8   *Buffer, 
+  IN  UINT64      Value, 
+  IN  UINTN       Flags, 
+  IN  UINTN       Width
+  );
+
+STATIC
+UINTN
+GuidToString (
+  IN  EFI_GUID  *Guid,
+  IN OUT CHAR8  *Buffer,
+  IN  UINTN     BufferSize
+  );
+
+STATIC
+UINTN
+TimeToString (
+  IN  EFI_TIME  *Time,
+  IN OUT CHAR8  *Buffer,
+  IN  UINTN     BufferSize
+  );
+
+STATIC
+UINTN
+EfiStatusToString (
+  IN EFI_STATUS   Status,
+  OUT CHAR8       *Buffer,
+  IN  UINTN       BufferSize
+  );
+
+
+UINTN
+ASPrint (
+  OUT CHAR8         *Buffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR8   *Format,
+  ...
+  )
+/*++
+
+Routine Description:
+
+  ASPrint function to process format and place the results in Buffer.
+
+Arguments:
+
+  Buffer     - Ascii buffer to print the results of the parsing of Format into.
+
+  BufferSize - Maximum number of characters to put into buffer. Zero means no 
+               limit.
+
+  Format - Ascii format string see file header for more details.
+
+  ...    - Vararg list consumed by processing Format.
+
+Returns: 
+
+  Number of characters printed.
+
+--*/
+{
+  UINTN   Return;
+  VA_LIST Marker;
+
+  VA_START(Marker, Format);
+  Return = AvSPrint(Buffer, BufferSize, Format, Marker);
+  VA_END (Marker);
+  
+  return Return;
+}
+
+
+UINTN
+AvSPrint (
+  OUT CHAR8         *StartOfBuffer,
+  IN  UINTN         BufferSize,
+  IN  CONST CHAR8   *FormatString,
+  IN  VA_LIST       Marker
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint function to process format and place the results in Buffer. Since a 
+  VA_LIST is used this rountine allows the nesting of Vararg routines. Thus 
+  this is the main print working routine
+
+Arguments:
+
+  StartOfBuffer - Ascii buffer to print the results of the parsing of Format into.
+
+  BufferSize    - Maximum number of characters to put into buffer. Zero means 
+                  no limit.
+
+  FormatString  - Ascii format string see file header for more details.
+
+  Marker        - Vararg list consumed by processing Format.
+
+Returns: 
+
+  Number of characters printed.
+
+--*/
+{
+  CHAR8   *Buffer;
+  CHAR8   *AsciiStr;
+  CHAR16  *UnicodeStr;
+  CHAR8   *Format;
+  UINTN   Index;
+  UINTN   Flags;
+  UINTN   Width;
+  UINT64  Value;
+
+  //
+  // Process the format string. Stop if Buffer is over run.
+  //
+
+  Buffer = StartOfBuffer;
+  Format = (CHAR8 *)FormatString; 
+  for (Index = 0; (*Format != '\0') && (Index < BufferSize); Format++) {
+    if (*Format != '%') {
+      if (*Format == '\n') {
+        //
+        // If carage return add line feed
+        //
+        Buffer[Index++] = '\r';
+      }
+      Buffer[Index++] = *Format;
+    } else {
+      
+      //
+      // Now it's time to parse what follows after %
+      //
+      Format = GetFlagsAndWidth (Format, &Flags, &Width, &Marker);
+      switch (*Format) {
+      case 'X':
+        Flags |= PREFIX_ZERO;
+        Width = sizeof (UINT64) * 2;
+        //
+        // break skiped on purpose
+        //
+      case 'x':
+        if ((Flags & LONG_TYPE) == LONG_TYPE) {
+          Value = VA_ARG (Marker, UINT64);
+        } else {
+          Value = VA_ARG (Marker, UINTN);
+        }
+        Index += ValueTomHexStr (&Buffer[Index], Value, Flags, Width);
+        break;
+
+      case 'd':
+        if ((Flags & LONG_TYPE) == LONG_TYPE) {
+          Value = VA_ARG (Marker, UINT64);
+        } else {
+          Value = (UINTN)VA_ARG (Marker, UINTN);
+        }
+        Index += ValueToString (&Buffer[Index], Value, Flags, Width);
+        break;
+
+      case 's':
+      case 'S':
+        UnicodeStr = (CHAR16 *)VA_ARG (Marker, CHAR16 *);
+        if (UnicodeStr == NULL) {
+          UnicodeStr = L"<null string>";
+        }
+        for ( ;*UnicodeStr != '\0'; UnicodeStr++) {
+          Buffer[Index++] = (CHAR8)*UnicodeStr;
+        }
+        break;
+
+      case 'a':
+        AsciiStr = (CHAR8 *)VA_ARG (Marker, CHAR8 *);
+        if (AsciiStr == NULL) {
+          AsciiStr = "<null string>";
+        }
+        while (*AsciiStr != '\0') {
+          Buffer[Index++] = *AsciiStr++;
+        }
+        break;
+
+      case 'c':
+        Buffer[Index++] = (CHAR8)VA_ARG (Marker, UINTN);
+        break;
+
+      case 'g':
+        Index += GuidToString (
+                  VA_ARG (Marker, EFI_GUID *), 
+                  &Buffer[Index], 
+                  BufferSize
+                  );
+        break;
+
+      case 't':
+        Index += TimeToString (
+                  VA_ARG (Marker, EFI_TIME *), 
+                  &Buffer[Index], 
+                  BufferSize
+                  );
+        break;
+
+      case 'r':
+        Index += EfiStatusToString (
+                  VA_ARG (Marker, EFI_STATUS), 
+                  &Buffer[Index], 
+                  BufferSize
+                  );
+        break;
+
+      case '%':
+        Buffer[Index++] = *Format;
+        break;
+    
+      default:
+        //
+        // if the type is unknown print it to the screen
+        //
+        Buffer[Index++] = *Format;
+      }
+
+    } 
+  }
+  Buffer[Index++] = '\0'; 
+  
+  return &Buffer[Index] - StartOfBuffer;
+}
+
+
+
+STATIC
+CHAR8 *
+GetFlagsAndWidth (
+  IN  CHAR8       *Format, 
+  OUT UINTN       *Flags, 
+  OUT UINTN       *Width,
+  IN OUT  VA_LIST *Marker
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that parses flag and width information from the 
+  Format string and returns the next index into the Format string that needs
+  to be parsed. See file headed for details of Flag and Width.
+
+Arguments:
+
+  Format - Current location in the AvSPrint format string.
+
+  Flags  - Returns flags
+
+  Width  - Returns width of element
+
+  Marker - Vararg list that may be paritally consumed and returned.
+
+Returns: 
+
+  Pointer indexed into the Format string for all the information parsed
+  by this routine.
+
+--*/
+{
+  UINTN   Count;
+  BOOLEAN Done;
+
+  *Flags = 0;
+  *Width = 0;
+  for (Done = FALSE; !Done; ) {
+    Format++;
+
+    switch (*Format) {
+
+    case '-': *Flags |= LEFT_JUSTIFY; break;
+    case '+': *Flags |= PREFIX_SIGN;  break;
+    case ' ': *Flags |= PREFIX_BLANK; break;
+    case ',': *Flags |= COMMA_TYPE;   break;
+    case 'L':
+    case 'l': *Flags |= LONG_TYPE;    break;
+
+    case '*':
+      *Width = VA_ARG (*Marker, UINTN);
+      break;
+
+    case '0':
+      *Flags |= PREFIX_ZERO;
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      Count = 0;
+      do {
+        Count = (Count * 10) + *Format - '0';
+        Format++;
+      } while ((*Format >= '0')  &&  (*Format <= '9'));
+      Format--;
+      *Width = Count;
+      break;
+
+    default:
+      Done = TRUE;
+    }
+  }
+  return Format;
+}
+
+static CHAR8 mHexStr[] = { '0','1','2','3','4','5','6','7',
+                          '8','9','A','B','C','D','E','F' };
+
+STATIC
+UINTN
+ValueTomHexStr (
+  IN  OUT CHAR8   *Buffer, 
+  IN  UINT64      Value, 
+  IN  UINTN       Flags, 
+  IN  UINTN       Width
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that prints a Value as a hex number in Buffer
+
+Arguments:
+
+  Buffer - Location to place ascii hex string of Value.
+
+  Value  - Hex value to convert to a string in Buffer.
+
+  Flags  - Flags to use in printing Hex string, see file header for details.
+
+  Width  - Width of hex value.
+
+Returns: 
+
+  Number of characters printed.  
+
+--*/
+{
+  CHAR8   TempBuffer[30];
+  CHAR8   *TempStr;
+  CHAR8   Prefix;
+  CHAR8   *BufferPtr;
+  UINTN   Count;
+  UINTN   Index;
+
+  TempStr = TempBuffer;
+  BufferPtr = Buffer;
+  
+  //
+  // Count starts at one since we will null terminate. Each iteration of the
+  // loop picks off one nibble. Oh yea TempStr ends up backwards
+  //
+  Count = 0;
+  do {
+    *(TempStr++) = mHexStr[Value & 0x0f];
+    Value = RShiftU64 (Value, 4);
+    Count++;
+  } while (Value != 0);
+
+  if (Flags & PREFIX_ZERO) {
+    Prefix = '0';
+  } else if (!(Flags & LEFT_JUSTIFY)) { 
+    Prefix = ' ';
+  } else {
+    Prefix = 0x00;
+  }                    
+  for (Index = Count; Index < Width; Index++) {
+    *(TempStr++) = Prefix;
+  }
+
+  //
+  // Reverse temp string into Buffer.
+  //
+  while (TempStr != TempBuffer) {
+    *(BufferPtr++) = *(--TempStr);
+  }  
+    
+  *BufferPtr = 0;
+  return Index;
+}
+
+STATIC
+UINTN
+ValueToString (
+  IN  OUT CHAR8   *Buffer, 
+  IN  INT64       Value, 
+  IN  UINTN       Flags, 
+  IN  UINTN       Width
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that prints a Value as a decimal number in Buffer
+
+Arguments:
+
+  Buffer - Location to place ascii decimal number string of Value.
+
+  Value  - Decimal value to convert to a string in Buffer.
+
+  Flags  - Flags to use in printing decimal string, see file header for details.
+
+  Width  - Width of hex value.
+
+Returns: 
+
+  Number of characters printed.  
+
+--*/
+{
+  CHAR8   TempBuffer[30];
+  CHAR8   *TempStr;
+  CHAR8   *BufferPtr;
+  UINTN   Count;
+  UINTN   Remainder;
+
+  TempStr = TempBuffer;
+  BufferPtr = Buffer;
+  Count = 0;
+
+  if (Value < 0) {
+    *(BufferPtr++) = '-';
+    Value = -Value;
+    Count++;
+  }
+
+  do {
+    Value = (INT64)DivU64x32 ((UINT64)Value, 10, &Remainder);
+    *(TempStr++) = (CHAR8)(Remainder + '0');
+    Count++;
+    if ((Flags & COMMA_TYPE) == COMMA_TYPE) {
+      if (Count % 3 == 0) {
+        *(TempStr++) = ',';
+      }
+    }
+  } while (Value != 0);
+
+  //
+  // Reverse temp string into Buffer.
+  //
+  while (TempStr != TempBuffer) {
+    *(BufferPtr++) = *(--TempStr);
+  }  
+
+  *BufferPtr = 0;
+  return Count;
+}
+
+STATIC
+UINTN
+GuidToString (
+  IN  EFI_GUID  *Guid,
+  IN  CHAR8     *Buffer,
+  IN  UINTN     BufferSize
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that prints an EFI_GUID.
+
+Arguments:
+
+  Guid       - Pointer to GUID to print.
+
+  Buffer     - Buffe to print Guid into.
+  
+  BufferSize - Size of Buffer.
+
+Returns: 
+
+  Number of characters printed.  
+
+--*/
+{
+  UINTN Size;
+
+  Size = ASPrint (
+            Buffer,
+            BufferSize, 
+            "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+            Guid->Data1,                    
+            Guid->Data2,
+            Guid->Data3,
+            Guid->Data4[0],
+            Guid->Data4[1],
+            Guid->Data4[2],
+            Guid->Data4[3],
+            Guid->Data4[4],
+            Guid->Data4[5],
+            Guid->Data4[6],
+            Guid->Data4[7]
+            );
+
+  //
+  // ASPrint will null terminate the string. The -1 skips the null
+  //
+  return Size - 1;
+}
+
+
+STATIC
+UINTN
+TimeToString (
+  IN EFI_TIME   *Time,
+  OUT CHAR8     *Buffer,
+  IN  UINTN     BufferSize
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that prints EFI_TIME.
+
+Arguments:
+
+  Time       - Pointer to EFI_TIME sturcture to print.
+
+  Buffer     - Buffer to print Time into.
+  
+  BufferSize - Size of Buffer.
+
+Returns: 
+
+  Number of characters printed.  
+
+--*/
+{ 
+  UINTN Size;
+
+  Size = ASPrint (
+            Buffer,
+            BufferSize, 
+            "%02d/%02d/%04d  %02d:%02d",
+            Time->Month,
+            Time->Day,
+            Time->Year,
+            Time->Hour,
+            Time->Minute
+            );
+
+  //
+  // ASPrint will null terminate the string. The -1 skips the null
+  //
+  return Size - 1;
+} 
+
+STATIC
+UINTN
+EfiStatusToString (
+  IN EFI_STATUS   Status,
+  OUT CHAR8       *Buffer,
+  IN  UINTN       BufferSize
+  )
+/*++
+
+Routine Description:
+
+  AvSPrint worker function that prints EFI_STATUS as a string. If string is
+  not known a hex value will be printed.
+
+Arguments:
+
+  Status     -  EFI_STATUS sturcture to print.
+
+  Buffer     - Buffer to print EFI_STATUS message string into.
+  
+  BufferSize - Size of Buffer.
+
+Returns: 
+
+  Number of characters printed.  
+
+--*/
+{
+  UINTN   Size;
+  CHAR8   *Desc;
+  
+  if (Status == EFI_SUCCESS) {
+    Desc = "Success";
+  } else if (Status == EFI_LOAD_ERROR) {
+    Desc = "Load Error";
+  } else if (Status == EFI_INVALID_PARAMETER) {
+    Desc = "Invalid Parameter";
+  } else if (Status == EFI_UNSUPPORTED) {
+    Desc = "Unsupported";
+  } else if (Status == EFI_BAD_BUFFER_SIZE) {
+    Desc = "Bad Buffer Size";
+  } else if (Status == EFI_BUFFER_TOO_SMALL) {
+    Desc = "Buffer Too Small";
+  } else if (Status == EFI_NOT_READY) {
+    Desc = "Not Ready";
+  } else if (Status == EFI_DEVICE_ERROR) {
+    Desc = "Device Error";
+  } else if (Status == EFI_WRITE_PROTECTED) {
+    Desc = "Write Protected";
+  } else if (Status == EFI_OUT_OF_RESOURCES) {
+    Desc = "Out of Resources";
+  } else if (Status == EFI_VOLUME_CORRUPTED) {
+    Desc = "Volume Corrupt";
+  } else if (Status == EFI_VOLUME_FULL) {
+    Desc = "Volume Full";
+  } else if (Status == EFI_NO_MEDIA) {
+    Desc = "No Media";
+  } else if (Status == EFI_MEDIA_CHANGED) {
+    Desc = "Media changed";
+  } else if (Status == EFI_NOT_FOUND) {
+    Desc = "Not Found";
+  } else if (Status == EFI_ACCESS_DENIED) {
+    Desc = "Access Denied";
+  } else if (Status == EFI_NO_RESPONSE) {
+    Desc = "No Response";
+  } else if (Status == EFI_NO_MAPPING) {
+    Desc = "No mapping";
+  } else if (Status == EFI_TIMEOUT) {
+    Desc = "Time out";
+  } else if (Status == EFI_NOT_STARTED) {
+    Desc = "Not started";
+  } else if (Status == EFI_ALREADY_STARTED) {
+    Desc = "Already started";
+  } else if (Status == EFI_ABORTED) {
+    Desc = "Aborted";
+  } else if (Status == EFI_ICMP_ERROR) {
+    Desc = "ICMP Error";
+  } else if (Status == EFI_TFTP_ERROR) {
+    Desc = "TFTP Error";
+  } else if (Status == EFI_PROTOCOL_ERROR) {
+    Desc = "Protocol Error";
+  } else if (Status == EFI_WARN_UNKNOWN_GLYPH) {
+    Desc = "Warning Unknown Glyph";
+  } else if (Status == EFI_WARN_DELETE_FAILURE) {
+    Desc = "Warning Delete Failure";
+  } else if (Status == EFI_WARN_WRITE_FAILURE) {
+    Desc = "Warning Write Failure";
+  } else if (Status == EFI_WARN_BUFFER_TOO_SMALL) {
+    Desc = "Warning Buffer Too Small";
+  } else {
+    Desc = NULL;
+  }
+  //
+  // If we found a match, copy the message to the user's buffer. Otherwise
+  // sprint the hex status code to their buffer.
+  //
+  if (Desc != NULL) {
+    Size = ASPrint (Buffer, BufferSize, "%a", Desc);
+  } else {
+    Size = ASPrint (Buffer, BufferSize, "%X", Status);
+  }
+  return Size - 1;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/Print/Print.h b/Tools/Source/TianoTools/Common/PeiLib/Print/Print.h
new file mode 100644
index 0000000000..18c1834b81
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/Print/Print.h
@@ -0,0 +1,37 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  Print.h
+
+Abstract:
+
+  Private data for Print.c
+
+--*/
+
+#ifndef _PRINT_H_
+#define _PRINT_H_
+
+#define LEFT_JUSTIFY  0x01
+#define PREFIX_SIGN   0x02
+#define PREFIX_BLANK  0x04
+#define COMMA_TYPE    0x08
+#define LONG_TYPE     0x10
+#define PREFIX_ZERO   0x20
+
+//
+// Largest number of characters that can be printed out.
+//
+#define PEI_LIB_MAX_PRINT_BUFFER  (80 * 4)
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.c b/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..6e40bf8ddf
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.c
@@ -0,0 +1,56 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.c
+
+Abstract:
+
+    IA-32 Specific relocation fixups
+
+Revision History
+
+--*/
+
+#include "TianoCommon.h"
+
+EFI_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup,
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an IA-32 specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  EFI_UNSUPPORTED   - Unsupported now
+
+--*/
+{
+  return EFI_UNSUPPORTED;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.h b/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.h
new file mode 100644
index 0000000000..e0f1e22598
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/PeCoffLoaderEx.h
@@ -0,0 +1,65 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.h
+
+Abstract:
+
+    IA-32 Specific relocation fixups
+
+Revision History
+
+--*/
+
+#ifndef _PE_COFF_LOADER_EX_H_
+#define _PE_COFF_LOADER_EX_H_
+
+//
+// Define macro to determine if the machine type is supported.
+// Returns 0 if the machine is not supported, Not 0 otherwise.
+//
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
+  ((Machine) == EFI_IMAGE_MACHINE_IA32 || \
+   (Machine) == EFI_IMAGE_MACHINE_EBC)
+
+EFI_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup,
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an IA-32 specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  EFI_UNSUPPORTED   - Unsupported now
+
+--*/
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/PerformancePrimitives.c b/Tools/Source/TianoTools/Common/PeiLib/ia32/PerformancePrimitives.c
new file mode 100644
index 0000000000..4efec656ae
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/PerformancePrimitives.c
@@ -0,0 +1,47 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  PerformancePrimitives.c
+
+Abstract:
+
+  Support for Performance library
+
+--*/
+
+#include "TianoCommon.h"
+#include "CpuIA32.h"
+
+EFI_STATUS
+GetTimerValue (
+  OUT UINT64    *TimerValue
+  )
+/*++
+
+Routine Description:
+
+  Get timer value.
+
+Arguments:
+
+  TimerValue  - Pointer to the returned timer value
+
+Returns:
+
+  EFI_SUCCESS - Successfully got timer value
+
+--*/
+{
+  *TimerValue = EfiReadTsc ();
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/Processor.c b/Tools/Source/TianoTools/Common/PeiLib/ia32/Processor.c
new file mode 100644
index 0000000000..4010db25a2
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/Processor.c
@@ -0,0 +1,140 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    Processor.c
+
+Abstract:
+
+--*/
+
+#include "Tiano.h"
+#include "EfiJump.h"
+#include EFI_GUID_DEFINITION (PeiFlushInstructionCache)
+#include EFI_GUID_DEFINITION (PeiTransferControl)
+
+//
+// Prototypes
+//
+EFI_STATUS
+EFIAPI
+TransferControlSetJump (
+  IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,
+  IN EFI_JUMP_BUFFER                    *Jump
+  );
+
+EFI_STATUS
+EFIAPI
+TransferControlLongJump (
+  IN EFI_PEI_TRANSFER_CONTROL_PROTOCOL  *This,
+  IN EFI_JUMP_BUFFER                    *Jump
+  );
+
+EFI_STATUS
+EFIAPI
+FlushInstructionCacheFlush (
+  IN EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL *This,
+  IN EFI_PHYSICAL_ADDRESS                     Start,
+  IN UINT64                                   Length
+  );
+
+//
+// Table declarations
+//
+EFI_PEI_TRANSFER_CONTROL_PROTOCOL         mTransferControl = {
+  TransferControlSetJump,
+  TransferControlLongJump,
+  sizeof (EFI_JUMP_BUFFER)
+};
+
+EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL  mFlushInstructionCache = {
+  FlushInstructionCacheFlush
+};
+
+
+EFI_STATUS
+InstallEfiPeiTransferControl (
+  IN OUT EFI_PEI_TRANSFER_CONTROL_PROTOCOL **This
+  )
+/*++
+
+Routine Description:
+
+  Installs the pointer to the transfer control mechanism
+
+Arguments:
+
+  This       - Pointer to transfer control mechanism.
+
+Returns:
+
+  EFI_SUCCESS     - Successfully installed.
+
+--*/
+{
+  *This = &mTransferControl;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+InstallEfiPeiFlushInstructionCache (
+  IN OUT EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL  **This
+  )
+/*++
+
+Routine Description:
+
+  Installs the pointer to the flush instruction cache mechanism
+
+Arguments:
+
+  This       - Pointer to flush instruction cache mechanism.
+
+Returns:
+
+  EFI_SUCCESS     - Successfully installed
+
+--*/
+{
+  *This = &mFlushInstructionCache;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+EFIAPI
+FlushInstructionCacheFlush (
+  IN EFI_PEI_FLUSH_INSTRUCTION_CACHE_PROTOCOL   *This,
+  IN EFI_PHYSICAL_ADDRESS                       Start,
+  IN UINT64                                     Length
+  )
+/*++
+
+Routine Description:
+
+  This routine would provide support for flushing the CPU instruction cache.
+  In the case of IA32, this flushing is not necessary and is thus not implemented.
+
+Arguments:
+
+  This      - Pointer to CPU Architectural Protocol interface
+  Start     - Start adddress in memory to flush
+  Length    - Length of memory to flush
+
+Returns:
+
+  Status
+    EFI_SUCCESS
+
+--*/
+{
+  return EFI_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/ProcessorAsms.Asm b/Tools/Source/TianoTools/Common/PeiLib/ia32/ProcessorAsms.Asm
new file mode 100644
index 0000000000..bf0d5cbed7
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/ProcessorAsms.Asm
@@ -0,0 +1,223 @@
+;
+; Copyright (c) 2004, Intel Corporation                                                         
+; All rights reserved. This program and the accompanying materials                          
+; are licensed and made available under the terms and conditions of the BSD License         
+; which accompanies this distribution.  The full text of the license may be found at        
+; http://opensource.org/licenses/bsd-license.php                                            
+;                                                                                           
+; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+; 
+; Module Name:
+; 
+;    ProcessorAsms.Asm
+;
+; Abstract:
+;       This is separated from processor.c to allow this functions to be built with /O1
+;
+; Notes:
+; - Masm uses "This", "ebx", etc as a directive.
+; - H2INC is still not embedded in our build process so I translated the struc manually.
+; - Unreferenced variables/arguments (This, NewBsp, NewStack) were causing compile errors and 
+;       did not know of "pragma" mechanism in MASM and I did not want to reduce the warning level. 
+;       Instead, I did a dummy referenced.
+;
+
+  .686P
+  .MMX
+  .MODEL SMALL
+  .CODE
+
+EFI_SUCCESS                     equ     0
+EFI_WARN_RETURN_FROM_LONG_JUMP  equ     5
+
+;
+; Generated by h2inc run manually
+;
+_EFI_JUMP_BUFFER                STRUCT 2t
+_ebx            DWORD           ?
+_esi            DWORD           ?
+_edi            DWORD           ?
+_ebp            DWORD           ?
+_esp            DWORD           ?
+_eip            DWORD           ?
+_EFI_JUMP_BUFFER                ENDS
+
+EFI_JUMP_BUFFER         TYPEDEF         _EFI_JUMP_BUFFER
+
+TransferControlSetJump      PROTO  C \
+        _This:PTR EFI_PEI_TRANSFER_CONTROL_PROTOCOL, \
+        Jump:PTR EFI_JUMP_BUFFER
+
+TransferControlLongJump     PROTO  C \
+        _This:PTR EFI_PEI_TRANSFER_CONTROL_PROTOCOL, \
+        Jump:PTR EFI_JUMP_BUFFER
+
+SwitchStacks    PROTO  C \
+   EntryPoint:PTR DWORD, \
+   Parameter:DWORD, \
+   NewStack:PTR DWORD, \
+   NewBsp:PTR DWORD
+   
+SwitchIplStacks PROTO  C \
+   EntryPoint:PTR DWORD, \
+   Parameter1:DWORD, \
+   Parameter2:DWORD, \
+   NewStack:PTR DWORD, \
+   NewBsp:PTR DWORD
+
+;
+;Routine Description:
+;
+;  This routine implements the IA32 variant of the SetJump call.  Its
+;  responsibility is to store system state information for a possible
+;  subsequent LongJump.
+;
+;Arguments:
+;
+;  Pointer to CPU context save buffer.
+;
+;Returns:
+;
+;  EFI_SUCCESS
+;
+TransferControlSetJump      PROC  C \
+  _This:PTR EFI_PEI_TRANSFER_CONTROL_PROTOCOL, \
+  Jump:PTR EFI_JUMP_BUFFER
+    
+  mov   eax, _This 
+  mov   ecx, Jump
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._ebx, ebx
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._esi, esi
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._edi, edi
+  mov   eax, [ebp]
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._ebp, eax
+  lea   eax, [ebp+4]
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._esp, eax
+  mov   eax, [ebp+4]
+  mov   (EFI_JUMP_BUFFER PTR [ecx])._eip, eax
+  mov   eax, EFI_SUCCESS
+  
+  ret
+  
+TransferControlSetJump      ENDP
+
+;
+; Routine Description:
+; 
+;  This routine implements the IA32 variant of the LongJump call.  Its
+;  responsibility is restore the system state to the Context Buffer and
+;  pass control back.
+;
+; Arguments:
+; 
+;  Pointer to CPU context save buffer.
+;
+; Returns:
+;
+;  EFI_WARN_RETURN_FROM_LONG_JUMP
+;
+
+TransferControlLongJump     PROC  C \
+        _This:PTR EFI_PEI_TRANSFER_CONTROL_PROTOCOL, \
+        Jump:PTR EFI_JUMP_BUFFER
+
+  push  ebx
+  push  esi
+  push  edi
+
+  mov   eax, _This
+    ; set return from SetJump to EFI_WARN_RETURN_FROM_LONG_JUMP
+  mov   eax, EFI_WARN_RETURN_FROM_LONG_JUMP          
+  mov   ecx, Jump
+  mov   ebx, (EFI_JUMP_BUFFER PTR [ecx])._ebx
+  mov   esi, (EFI_JUMP_BUFFER PTR [ecx])._esi
+  mov   edi, (EFI_JUMP_BUFFER PTR [ecx])._edi
+  mov   ebp, (EFI_JUMP_BUFFER PTR [ecx])._ebp
+  mov   esp, (EFI_JUMP_BUFFER PTR [ecx])._esp
+  add   esp, 4                                       ;pop the eip
+  jmp   DWORD PTR (EFI_JUMP_BUFFER PTR [ecx])._eip
+  mov   eax, EFI_WARN_RETURN_FROM_LONG_JUMP
+  
+  pop   edi
+  pop   esi
+  pop   ebx
+  ret
+  
+TransferControlLongJump     ENDP
+
+;
+; Routine Description:
+;       This allows the caller to switch the stack and goes to the new entry point
+;
+; Arguments:
+;       EntryPoint      - Pointer to the location to enter
+;       Parameter       - Parameter to pass in
+;       NewStack        - New Location of the stack
+;       NewBsp          - New BSP
+;
+; Returns:
+;
+;       Nothing. Goes to the Entry Point passing in the new parameters
+;
+SwitchStacks    PROC  C \
+  EntryPoint:PTR DWORD, \
+  Parameter:DWORD, \
+  NewStack:PTR DWORD, \
+  NewBsp:PTR DWORD
+  
+  push  ebx
+  mov   eax, NewBsp
+  mov   ebx, Parameter
+  mov   ecx, EntryPoint
+  mov   eax, NewStack
+  mov   esp, eax
+  push  ebx
+  push  0
+  jmp   ecx
+  
+  pop   ebx
+  ret
+  
+SwitchStacks    ENDP
+
+;
+; Routine Description:
+;       This allows the caller to switch the stack and goes to the new entry point
+;
+; Arguments:
+;       EntryPoint              - Pointer to the location to enter
+;       Parameter1/Parameter2   - Parameter to pass in
+;       NewStack                - New Location of the stack
+;       NewBsp                  - New BSP
+;
+; Returns:
+;
+;       Nothing. Goes to the Entry Point passing in the new parameters
+;
+SwitchIplStacks PROC  C \
+  EntryPoint:PTR DWORD, \
+  Parameter1:DWORD, \
+  Parameter2:DWORD, \
+  NewStack:PTR DWORD, \
+  NewBsp:PTR DWORD
+  
+  push  ebx
+  mov   eax, NewBsp         
+  mov   ebx, Parameter1
+  mov   edx, Parameter2
+  mov   ecx, EntryPoint
+  mov   eax, NewStack
+  mov   esp, eax
+
+  push  edx
+  push  ebx
+  call  ecx
+  
+  pop   ebx
+  ret
+  
+SwitchIplStacks ENDP
+
+  END
+
diff --git a/Tools/Source/TianoTools/Common/PeiLib/ia32/efijump.h b/Tools/Source/TianoTools/Common/PeiLib/ia32/efijump.h
new file mode 100644
index 0000000000..cdd7ca8c84
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/PeiLib/ia32/efijump.h
@@ -0,0 +1,34 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  EfiJump.h
+
+Abstract:
+
+  This is the Setjump/Longjump pair for an IA32 processor.
+
+--*/
+
+#ifndef _EFI_JUMP_H_
+#define _EFI_JUMP_H_
+
+typedef struct {
+  UINT32  ebx;
+  UINT32  esi;
+  UINT32  edi;
+  UINT32  ebp;
+  UINT32  esp;
+  UINT32  eip;
+} EFI_JUMP_BUFFER;
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.c b/Tools/Source/TianoTools/Common/SimpleFileParsing.c
new file mode 100644
index 0000000000..3ee3349d1a
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.c
@@ -0,0 +1,1460 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  SimpleFileParsing.c  
+
+Abstract:
+
+  Generic but simple file parsing routines.
+
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+/*
+#include "Tiano.h"
+*/
+#include "EfiUtilityMsgs.h"
+#include "SimpleFileParsing.h"
+
+#ifndef MAX_PATH
+#define MAX_PATH  255
+#endif
+//
+// just in case we get in an endless loop.
+//
+#define MAX_NEST_DEPTH  20
+//
+// number of wchars
+//
+#define MAX_STRING_IDENTIFIER_NAME  100
+
+#define MAX_LINE_LEN                400
+
+#define T_CHAR_SPACE                ' '
+#define T_CHAR_NULL                 0
+#define T_CHAR_CR                   '\r'
+#define T_CHAR_TAB                  '\t'
+#define T_CHAR_LF                   '\n'
+#define T_CHAR_SLASH                '/'
+#define T_CHAR_BACKSLASH            '\\'
+#define T_CHAR_DOUBLE_QUOTE         '"'
+#define T_CHAR_LC_X                 'x'
+#define T_CHAR_0                    '0'
+#define T_CHAR_STAR                 '*'
+
+//
+// We keep a linked list of these for the source files we process
+//
+typedef struct _SOURCE_FILE {
+  FILE                *Fptr;
+  T_CHAR              *FileBuffer;
+  T_CHAR              *FileBufferPtr;
+  unsigned int        FileSize;
+  char                FileName[MAX_PATH];
+  unsigned int        LineNum;
+  BOOLEAN             EndOfFile;
+  BOOLEAN             SkipToHash;
+  struct _SOURCE_FILE *Previous;
+  struct _SOURCE_FILE *Next;
+  T_CHAR              ControlCharacter;
+} SOURCE_FILE;
+
+typedef struct {
+  T_CHAR  *FileBufferPtr;
+} FILE_POSITION;
+
+//
+// Keep all our module globals in this structure
+//
+static struct {
+  SOURCE_FILE SourceFile;
+  BOOLEAN     VerboseFile;
+  BOOLEAN     VerboseToken;
+} mGlobals;
+
+static
+unsigned int
+t_strcmp (
+  T_CHAR *Buffer,
+  T_CHAR *Str
+  );
+
+static
+unsigned int
+t_strncmp (
+  T_CHAR *Str1,
+  T_CHAR *Str2,
+  int    Len
+  );
+
+static
+unsigned int
+t_strlen (
+  T_CHAR *Str
+  );
+
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+unsigned int
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+T_CHAR  *
+t_strcpy (
+  T_CHAR *Dest,
+  T_CHAR *Src
+  );
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  );
+
+static
+STATUS
+ParseFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+FILE    *
+FindFile (
+  char          *FileName,
+  char          *FoundFileName,
+  unsigned int  FoundFileNameLen
+  );
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+STATUS
+GetFilePosition (
+  FILE_POSITION *Fpos
+  );
+
+static
+STATUS
+SetFilePosition (
+  FILE_POSITION *Fpos
+  );
+
+STATUS
+SFPInit (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+Arguments:
+  None.
+
+Returns:
+  STATUS_SUCCESS always
+
+--*/
+{
+  memset ((void *) &mGlobals, 0, sizeof (mGlobals));
+  return STATUS_SUCCESS;
+}
+
+unsigned
+int
+SFPGetLineNumber (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Return the line number of the file we're parsing. Used
+  for error reporting purposes.
+
+Arguments:
+  None.
+
+Returns:
+  The line number, or 0 if no file is being processed
+
+--*/
+{
+  return mGlobals.SourceFile.LineNum;
+}
+
+T_CHAR *
+SFPGetFileName (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Return the name of the file we're parsing. Used
+  for error reporting purposes.
+
+Arguments:
+  None.
+
+Returns:
+  A pointer to the file name. Null if no file is being
+  processed.
+
+--*/
+{
+  if (mGlobals.SourceFile.FileName[0]) {
+    return mGlobals.SourceFile.FileName;
+  }
+
+  return NULL;
+}
+
+STATUS
+SFPOpenFile (
+  char      *FileName
+  )
+/*++
+
+Routine Description:
+  Open a file for parsing.
+
+Arguments:
+  FileName  - name of the file to parse
+
+Returns:
+  
+
+--*/
+{
+  STATUS  Status;
+  t_strcpy (mGlobals.SourceFile.FileName, FileName);
+  Status = ProcessIncludeFile (&mGlobals.SourceFile, NULL);
+  return Status;
+}
+
+BOOLEAN
+SFPIsToken (
+  T_CHAR *Str
+  )
+/*++
+
+Routine Description:
+  Check to see if the specified token is found at
+  the current position in the input file.
+
+Arguments:
+  Str - the token to look for
+
+Returns:
+  TRUE - the token is next
+  FALSE - the token is not next
+
+Notes:
+  We do a simple string comparison on this function. It is
+  the responsibility of the caller to ensure that the token
+  is not a subset of some other token.
+
+  The file pointer is advanced past the token in the input file.
+
+--*/
+{
+  unsigned int  Len;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if ((Len = t_strcmp (mGlobals.SourceFile.FileBufferPtr, Str)) > 0) {
+    mGlobals.SourceFile.FileBufferPtr += Len;
+    if (mGlobals.VerboseToken) {
+      printf ("Token: '%s'\n", Str);
+    }
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+BOOLEAN
+SFPIsKeyword (
+  T_CHAR *Str
+  )
+/*++
+
+Routine Description:
+  Check to see if the specified keyword is found at
+  the current position in the input file.
+
+Arguments:
+  Str - keyword to look for
+
+Returns:
+  TRUE - the keyword is next
+  FALSE - the keyword is not next
+
+Notes:
+  A keyword is defined as a "special" string that has a non-alphanumeric
+  character following it.
+
+--*/
+{
+  unsigned int  Len;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if ((Len = t_strcmp (mGlobals.SourceFile.FileBufferPtr, Str)) > 0) {
+    if (isalnum (mGlobals.SourceFile.FileBufferPtr[Len])) {
+      return FALSE;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr += Len;
+    if (mGlobals.VerboseToken) {
+      printf ("Token: '%s'\n", Str);
+    }
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+BOOLEAN
+SFPGetNextToken (
+  T_CHAR        *Str,
+  unsigned int  Len
+  )
+/*++
+
+Routine Description:
+  Get the next token from the input stream. 
+
+Arguments:
+  Str - pointer to a copy of the next token
+  Len - size of buffer pointed to by Str
+
+Returns:
+  TRUE  - next token successfully returned
+  FALSE - otherwise
+
+Notes:
+  Preceeding white space is ignored. 
+  The parser's buffer pointer is advanced past the end of the
+  token.
+
+--*/
+{
+  unsigned int  Index;
+  T_CHAR        TempChar;
+
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+  //
+  // Have to have enough string for at least one char and a null-terminator
+  //
+  if (Len < 2) {
+    return FALSE;
+  }
+  //
+  // Look at the first character. If it's an identifier, then treat it
+  // as such
+  //
+  TempChar = mGlobals.SourceFile.FileBufferPtr[0];
+  if (((TempChar >= 'a') && (TempChar <= 'z')) || ((TempChar >= 'A') && (TempChar <= 'Z')) || (TempChar == '_')) {
+    Str[0] = TempChar;
+    mGlobals.SourceFile.FileBufferPtr++;
+    Index = 1;
+    while (!EndOfFile (&mGlobals.SourceFile) && (Index < Len)) {
+      TempChar = mGlobals.SourceFile.FileBufferPtr[0];
+      if (((TempChar >= 'a') && (TempChar <= 'z')) ||
+          ((TempChar >= 'A') && (TempChar <= 'Z')) ||
+          ((TempChar >= '0') && (TempChar <= '9')) ||
+          (TempChar == '_')
+          ) {
+        Str[Index] = mGlobals.SourceFile.FileBufferPtr[0];
+        mGlobals.SourceFile.FileBufferPtr++;
+        Index++;
+      } else {
+        //
+        // Invalid character for symbol name, so break out
+        //
+        break;
+      }
+    }
+    //
+    // Null terminate and return success
+    //
+    Str[Index] = 0;
+    return TRUE;
+  } else if ((TempChar == ')') || (TempChar == '(') || (TempChar == '*')) {
+    Str[0] = mGlobals.SourceFile.FileBufferPtr[0];
+    mGlobals.SourceFile.FileBufferPtr++;
+    Str[1] = 0;
+    return TRUE;
+  } else {
+    //
+    // Everything else is white-space (or EOF) separated
+    //
+    Index = 0;
+    while (!EndOfFile (&mGlobals.SourceFile) && (Index < Len)) {
+      if (IsWhiteSpace (&mGlobals.SourceFile)) {
+        if (Index > 0) {
+          Str[Index] = 0;
+          return TRUE;
+        }
+
+        return FALSE;
+      } else {
+        Str[Index] = mGlobals.SourceFile.FileBufferPtr[0];
+        mGlobals.SourceFile.FileBufferPtr++;
+        Index++;
+      }
+    }
+    //
+    // See if we just ran out of file contents, but did find a token
+    //
+    if ((Index > 0) && EndOfFile (&mGlobals.SourceFile)) {
+      Str[Index] = 0;
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+BOOLEAN
+SFPGetGuidToken (
+  T_CHAR *Str,
+  UINT32 Len
+  )
+/*++
+
+Routine Description:
+  Parse a GUID from the input stream. Stop when you discover white space.
+
+Arguments:
+  Str - pointer to a copy of the next token
+  Len - size of buffer pointed to by Str
+
+Returns:
+  TRUE  - GUID string returned successfully
+  FALSE - otherwise
+
+--*/
+{
+  UINT32  Index;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  Index = 0;
+  while (!EndOfFile (&mGlobals.SourceFile) && (Index < Len)) {
+    if (IsWhiteSpace (&mGlobals.SourceFile)) {
+      if (Index > 0) {
+        Str[Index] = 0;
+        return TRUE;
+      }
+
+      return FALSE;
+    } else {
+      Str[Index] = mGlobals.SourceFile.FileBufferPtr[0];
+      mGlobals.SourceFile.FileBufferPtr++;
+      Index++;
+    }
+  }
+
+  return FALSE;
+}
+
+BOOLEAN
+SFPSkipToToken (
+  T_CHAR *Str
+  )
+{
+  unsigned int  Len;
+  T_CHAR        *SavePos;
+  Len     = t_strlen (Str);
+  SavePos = mGlobals.SourceFile.FileBufferPtr;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  while (!EndOfFile (&mGlobals.SourceFile)) {
+    if (t_strncmp (Str, mGlobals.SourceFile.FileBufferPtr, Len) == 0) {
+      mGlobals.SourceFile.FileBufferPtr += Len;
+      return TRUE;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    SkipWhiteSpace (&mGlobals.SourceFile);
+  }
+
+  mGlobals.SourceFile.FileBufferPtr = SavePos;
+  return FALSE;
+}
+
+BOOLEAN
+SFPGetNumber (
+  unsigned int *Value
+  )
+/*++
+
+Routine Description:
+  Check the token at the current file position for a numeric value.
+  May be either decimal or hex.
+
+Arguments:
+  Value  - pointer where to store the value
+
+Returns:
+  FALSE    - current token is not a number
+  TRUE     - current token is a number
+
+--*/
+{
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if (isdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+    //
+    // Check for hex value
+    //
+    if ((mGlobals.SourceFile.FileBufferPtr[0] == T_CHAR_0) && (mGlobals.SourceFile.FileBufferPtr[1] == T_CHAR_LC_X)) {
+      if (!isxdigit (mGlobals.SourceFile.FileBufferPtr[2])) {
+        return FALSE;
+      }
+
+      mGlobals.SourceFile.FileBufferPtr += 2;
+      sscanf (mGlobals.SourceFile.FileBufferPtr, "%x", Value);
+      while (isxdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+        mGlobals.SourceFile.FileBufferPtr++;
+      }
+
+      return TRUE;
+    } else {
+      *Value = atoi (mGlobals.SourceFile.FileBufferPtr);
+      while (isdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+        mGlobals.SourceFile.FileBufferPtr++;
+      }
+
+      return TRUE;
+    }
+  } else {
+    return FALSE;
+  }
+}
+
+STATUS
+SFPCloseFile (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Close the file being parsed.
+
+Arguments:
+  None.
+
+Returns:
+  STATUS_SUCCESS - the file was closed 
+  STATUS_ERROR   - no file is currently open
+
+--*/
+{
+  if (mGlobals.SourceFile.FileBuffer != NULL) {
+    free (mGlobals.SourceFile.FileBuffer);
+    memset (&mGlobals.SourceFile, 0, sizeof (mGlobals.SourceFile));
+    return STATUS_SUCCESS;
+  }
+
+  return STATUS_ERROR;
+}
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  )
+/*++
+
+Routine Description:
+
+  Given a source file, open the file and parse it
+  
+Arguments:
+
+  SourceFile        - name of file to parse
+  ParentSourceFile  - for error reporting purposes, the file that #included SourceFile.
+
+Returns:
+
+  Standard status.
+  
+--*/
+{
+  static unsigned int NestDepth = 0;
+  char                FoundFileName[MAX_PATH];
+  STATUS              Status;
+
+  Status = STATUS_SUCCESS;
+  NestDepth++;
+  //
+  // Print the file being processed. Indent so you can tell the include nesting
+  // depth.
+  //
+  if (mGlobals.VerboseFile) {
+    fprintf (stdout, "%*cProcessing file '%s'\n", NestDepth * 2, ' ', SourceFile->FileName);
+    fprintf (stdout, "Parent source file = '%s'\n", ParentSourceFile);
+  }
+
+  //
+  // Make sure we didn't exceed our maximum nesting depth
+  //
+  if (NestDepth > MAX_NEST_DEPTH) {
+    Error (NULL, 0, 0, SourceFile->FileName, "max nesting depth (%d) exceeded", NestDepth);
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+  //
+  // Try to open the file locally, and if that fails try along our include paths.
+  //
+  strcpy (FoundFileName, SourceFile->FileName);
+  if ((SourceFile->Fptr = fopen (FoundFileName, "rb")) == NULL) {
+    return STATUS_ERROR;
+  }
+  //
+  // Process the file found
+  //
+  ProcessFile (SourceFile);
+Finish:
+  //
+  // Close open files and return status
+  //
+  if (SourceFile->Fptr != NULL) {
+    fclose (SourceFile->Fptr);
+    SourceFile->Fptr = NULL;
+  }
+
+  return Status;
+}
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  )
+/*++
+
+Routine Description:
+
+  Given a source file that's been opened, read the contents into an internal
+  buffer and pre-process it to remove comments.
+  
+Arguments:
+
+  SourceFile        - structure containing info on the file to process
+
+Returns:
+
+  Standard status.
+  
+--*/
+{
+  //
+  // Get the file size, and then read the entire thing into memory.
+  // Allocate extra space for a terminator character.
+  //
+  fseek (SourceFile->Fptr, 0, SEEK_END);
+  SourceFile->FileSize = ftell (SourceFile->Fptr);
+  if (mGlobals.VerboseFile) {
+    printf ("FileSize = %d (0x%X)\n", SourceFile->FileSize, SourceFile->FileSize);
+  }
+
+  fseek (SourceFile->Fptr, 0, SEEK_SET);
+  SourceFile->FileBuffer = (T_CHAR *) malloc (SourceFile->FileSize + sizeof (T_CHAR));
+  if (SourceFile->FileBuffer == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  fread ((void *) SourceFile->FileBuffer, SourceFile->FileSize, 1, SourceFile->Fptr);
+  SourceFile->FileBuffer[(SourceFile->FileSize / sizeof (T_CHAR))] = T_CHAR_NULL;
+  //
+  // Pre-process the file to replace comments with spaces
+  //
+  PreprocessFile (SourceFile);
+  SourceFile->LineNum = 1;
+  return STATUS_SUCCESS;
+}
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  )
+/*++
+
+Routine Description:
+  Preprocess a file to replace all carriage returns with NULLs so
+  we can print lines (as part of error messages) from the file to the screen.
+  
+Arguments:
+  SourceFile - structure that we use to keep track of an input file.
+
+Returns:
+  Nothing.
+  
+--*/
+{
+  BOOLEAN InComment;
+  BOOLEAN SlashSlashComment;
+  int     LineNum;
+
+  RewindFile (SourceFile);
+  InComment         = FALSE;
+  SlashSlashComment = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    //
+    // If a line-feed, then no longer in a comment if we're in a // comment
+    //
+    if (SourceFile->FileBufferPtr[0] == T_CHAR_LF) {
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      if (InComment && SlashSlashComment) {
+        InComment         = FALSE;
+        SlashSlashComment = FALSE;
+      }
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_CR) {
+      //
+      // Replace all carriage returns with a NULL so we can print stuff
+      //
+      SourceFile->FileBufferPtr[0] = 0;
+      SourceFile->FileBufferPtr++;
+      //
+      // Check for */ comment end
+      //
+    } else if (InComment &&
+             !SlashSlashComment &&
+             (SourceFile->FileBufferPtr[0] == T_CHAR_STAR) &&
+             (SourceFile->FileBufferPtr[1] == T_CHAR_SLASH)
+            ) {
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+      InComment = FALSE;
+    } else if (InComment) {
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+      //
+      // Check for // comments
+      //
+    } else if ((SourceFile->FileBufferPtr[0] == T_CHAR_SLASH) && (SourceFile->FileBufferPtr[1] == T_CHAR_SLASH)) {
+      InComment         = TRUE;
+      SlashSlashComment = TRUE;
+      //
+      // Check for /* comment start
+      //
+    } else if ((SourceFile->FileBufferPtr[0] == T_CHAR_SLASH) && (SourceFile->FileBufferPtr[1] == T_CHAR_STAR)) {
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+      SlashSlashComment = FALSE;
+      InComment         = TRUE;
+    } else {
+      SourceFile->FileBufferPtr++;
+    }
+  }
+  //
+  // Could check for end-of-file and still in a comment, but
+  // should not be necessary. So just restore the file pointers.
+  //
+  RewindFile (SourceFile);
+  //
+  // Dump the reformatted file if verbose mode
+  //
+  if (mGlobals.VerboseFile) {
+    LineNum = 1;
+    printf ("%04d: ", LineNum);
+    while (!EndOfFile (SourceFile)) {
+      if (SourceFile->FileBufferPtr[0] == T_CHAR_LF) {
+        printf ("'\n%04d: '", ++LineNum);
+      } else {
+        printf ("%c", SourceFile->FileBufferPtr[0]);
+      }
+
+      SourceFile->FileBufferPtr++;
+    }
+
+    printf ("'\n");
+    printf ("FileSize = %d (0x%X)\n", SourceFile->FileSize, SourceFile->FileSize);
+    RewindFile (SourceFile);
+  }
+}
+
+BOOLEAN
+SFPGetQuotedString (
+  T_CHAR      *Str,
+  int         Length
+  )
+/*++
+
+Routine Description:
+  Retrieve a quoted-string from the input file. 
+  
+Arguments:
+  Str    - pointer to a copy of the quoted string parsed
+  Length - size of buffer pointed to by Str
+
+Returns:
+  TRUE    - next token in input stream was a quoted string, and
+            the string value was returned in Str
+  FALSE   - otherwise
+  
+--*/
+{
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if (mGlobals.SourceFile.FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) {
+    mGlobals.SourceFile.FileBufferPtr++;
+    while (Length > 0) {
+      if (EndOfFile (&mGlobals.SourceFile)) {
+        return FALSE;
+      }
+      //
+      // Check for closing quote
+      //
+      if (mGlobals.SourceFile.FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) {
+        mGlobals.SourceFile.FileBufferPtr++;
+        *Str = 0;
+        return TRUE;
+      }
+
+      *Str = mGlobals.SourceFile.FileBufferPtr[0];
+      Str++;
+      Length--;
+      mGlobals.SourceFile.FileBufferPtr++;
+    }
+  }
+  //
+  // First character was not a quote, or the input string length was
+  // insufficient to contain the quoted string, so return failure code.
+  //
+  return FALSE;
+}
+
+BOOLEAN
+SFPIsEOF (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Return TRUE of FALSE to indicate whether or not we've reached the end of the
+  file we're parsing.
+  
+Arguments:
+  NA
+
+Returns:
+  TRUE    - EOF reached
+  FALSE   - otherwise
+  
+--*/
+{
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  return EndOfFile (&mGlobals.SourceFile);
+}
+
+#if 0
+static
+T_CHAR *
+GetQuotedString (
+  SOURCE_FILE *SourceFile,
+  BOOLEAN     Optional
+  )
+{
+  T_CHAR        *String;
+  T_CHAR        *Start;
+  T_CHAR        *Ptr;
+  unsigned int  Len;
+  BOOLEAN       PreviousBackslash;
+
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    if (Optional == FALSE) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted string", "%S", SourceFile->FileBufferPtr);
+    }
+
+    return NULL;
+  }
+
+  Len = 0;
+  SourceFile->FileBufferPtr++;
+  Start             = Ptr = SourceFile->FileBufferPtr;
+  PreviousBackslash = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) && (PreviousBackslash == FALSE)) {
+      break;
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_CR) {
+      Warning (SourceFile->FileName, SourceFile->LineNum, 0, "carriage return found in quoted string", "%S", Start);
+      PreviousBackslash = FALSE;
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_BACKSLASH) {
+      PreviousBackslash = TRUE;
+    } else {
+      PreviousBackslash = FALSE;
+    }
+
+    SourceFile->FileBufferPtr++;
+    Len++;
+  }
+
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "missing closing quote on string", "%S", Start);
+  } else {
+    SourceFile->FileBufferPtr++;
+  }
+  //
+  // Now allocate memory for the string and save it off
+  //
+  String = (T_CHAR *) malloc ((Len + 1) * sizeof (T_CHAR));
+  if (String == NULL) {
+    Error (NULL, 0, 0, "memory allocation failed", NULL);
+    return NULL;
+  }
+  //
+  // Copy the string from the file buffer to the local copy.
+  // We do no reformatting of it whatsoever at this point.
+  //
+  Ptr = String;
+  while (Len > 0) {
+    *Ptr = *Start;
+    Start++;
+    Ptr++;
+    Len--;
+  }
+
+  *Ptr = 0;
+  return String;
+}
+#endif
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  //
+  // The file buffer pointer will typically get updated before the End-of-file flag in the
+  // source file structure, so check it first.
+  //
+  if (SourceFile->FileBufferPtr >= SourceFile->FileBuffer + SourceFile->FileSize / sizeof (T_CHAR)) {
+    SourceFile->EndOfFile = TRUE;
+    return TRUE;
+  }
+
+  if (SourceFile->EndOfFile) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+#if 0
+static
+void
+ProcessTokenInclude (
+  SOURCE_FILE *SourceFile
+  )
+{
+  char          IncludeFileName[MAX_PATH];
+  char          *To;
+  unsigned int  Len;
+  BOOLEAN       ReportedError;
+  SOURCE_FILE   IncludedSourceFile;
+
+  ReportedError = FALSE;
+  if (SkipWhiteSpace (SourceFile) == 0) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "expected whitespace following #include keyword", NULL);
+  }
+  //
+  // Should be quoted file name
+  //
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted include file name", NULL);
+    goto FailDone;
+  }
+
+  SourceFile->FileBufferPtr++;
+  //
+  // Copy the filename as ascii to our local string
+  //
+  To  = IncludeFileName;
+  Len = 0;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == T_CHAR_CR) || (SourceFile->FileBufferPtr[0] == T_CHAR_LF)) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "end-of-line found in quoted include file name", NULL);
+      goto FailDone;
+    }
+
+    if (SourceFile->FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) {
+      SourceFile->FileBufferPtr++;
+      break;
+    }
+    //
+    // If too long, then report the error once and process until the closing quote
+    //
+    Len++;
+    if (!ReportedError && (Len >= sizeof (IncludeFileName))) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "length of include file name exceeds limit", NULL);
+      ReportedError = TRUE;
+    }
+
+    if (!ReportedError) {
+      *To = (T_CHAR) SourceFile->FileBufferPtr[0];
+      To++;
+    }
+
+    SourceFile->FileBufferPtr++;
+  }
+
+  if (!ReportedError) {
+    *To = 0;
+    memset ((char *) &IncludedSourceFile, 0, sizeof (SOURCE_FILE));
+    strcpy (IncludedSourceFile.FileName, IncludeFileName);
+    ProcessIncludeFile (&IncludedSourceFile, SourceFile);
+  }
+
+  return ;
+FailDone:
+  //
+  // Error recovery -- skip to next #
+  //
+  SourceFile->SkipToHash = TRUE;
+}
+#endif
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  switch (*SourceFile->FileBufferPtr) {
+  case T_CHAR_NULL:
+  case T_CHAR_CR:
+  case T_CHAR_SPACE:
+  case T_CHAR_TAB:
+  case T_CHAR_LF:
+    return TRUE;
+
+  default:
+    return FALSE;
+  }
+}
+
+unsigned int
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  unsigned int  Count;
+
+  Count = 0;
+  while (!EndOfFile (SourceFile)) {
+    Count++;
+    switch (*SourceFile->FileBufferPtr) {
+    case T_CHAR_NULL:
+    case T_CHAR_CR:
+    case T_CHAR_SPACE:
+    case T_CHAR_TAB:
+      SourceFile->FileBufferPtr++;
+      break;
+
+    case T_CHAR_LF:
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      break;
+
+    default:
+      return Count - 1;
+    }
+  }
+  //
+  // Some tokens require trailing whitespace. If we're at the end of the
+  // file, then we count that as well.
+  //
+  if ((Count == 0) && (EndOfFile (SourceFile))) {
+    Count++;
+  }
+
+  return Count;
+}
+
+static
+unsigned int
+t_strcmp (
+  T_CHAR *Buffer,
+  T_CHAR *Str
+  )
+/*++
+
+Routine Description:
+  Compare two strings for equality. The string pointed to by 'Buffer' may or may not be null-terminated,
+  so only compare up to the length of Str.
+
+Arguments:
+  Buffer  - pointer to first (possibly not null-terminated) string
+  Str     - pointer to null-terminated string to compare to Buffer
+
+Returns:
+  Number of bytes matched if exact match
+  0 if Buffer does not start with Str
+
+--*/
+{
+  unsigned int  Len;
+
+  Len = 0;
+  while (*Str && (*Str == *Buffer)) {
+    Buffer++;
+    Str++;
+    Len++;
+  }
+
+  if (*Str) {
+    return 0;
+  }
+
+  return Len;
+}
+
+static
+unsigned int
+t_strlen (
+  T_CHAR *Str
+  )
+{
+  unsigned int  Len;
+  Len = 0;
+  while (*Str) {
+    Len++;
+    Str++;
+  }
+
+  return Len;
+}
+
+static
+unsigned int
+t_strncmp (
+  T_CHAR *Str1,
+  T_CHAR *Str2,
+  int    Len
+  )
+{
+  while (Len > 0) {
+    if (*Str1 != *Str2) {
+      return Len;
+    }
+
+    Len--;
+    Str1++;
+    Str2++;
+  }
+
+  return 0;
+}
+
+static
+T_CHAR *
+t_strcpy (
+  T_CHAR *Dest,
+  T_CHAR *Src
+  )
+{
+  T_CHAR  *SaveDest;
+  SaveDest = Dest;
+  while (*Src) {
+    *Dest = *Src;
+    Dest++;
+    Src++;
+  }
+
+  *Dest = 0;
+  return SaveDest;
+}
+
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  SourceFile->LineNum       = 1;
+  SourceFile->FileBufferPtr = SourceFile->FileBuffer;
+  SourceFile->EndOfFile     = 0;
+}
+
+static
+UINT32
+GetHexChars (
+  T_CHAR      *Buffer,
+  UINT32      BufferLen
+  )
+{
+  UINT32  Len;
+  Len = 0;
+  while (!EndOfFile (&mGlobals.SourceFile) && (BufferLen > 0)) {
+    if (isxdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+      *Buffer = mGlobals.SourceFile.FileBufferPtr[0];
+      Buffer++;
+      Len++;
+      BufferLen--;
+      mGlobals.SourceFile.FileBufferPtr++;
+    } else {
+      break;
+    }
+  }
+  //
+  // Null terminate if we can
+  //
+  if ((Len > 0) && (BufferLen > 0)) {
+    *Buffer = 0;
+  }
+
+  return Len;
+}
+
+BOOLEAN
+SFPGetGuid (
+  int         GuidStyle,
+  EFI_GUID    *Value
+  )
+/*++
+
+Routine Description:
+  Parse a GUID from the input stream. Stop when you discover white space.
+
+Arguments:
+  GuidStyle - Style of the following GUID token
+  Value     - pointer to EFI_GUID struct for output
+
+Returns:
+  TRUE  - GUID string parsed successfully
+  FALSE - otherwise
+
+  GUID styles
+    Style[0] 12345678-1234-5678-AAAA-BBBBCCCCDDDD
+
+--*/
+{
+  UINT32        Value32;
+  UINT32        Index;
+  FILE_POSITION FPos;
+  T_CHAR        TempString[20];
+  T_CHAR        TempString2[3];
+  T_CHAR        *From;
+  T_CHAR        *To;
+  UINT32        Len;
+  BOOLEAN       Status;
+
+  Status = FALSE;
+  //
+  // Skip white space, then start parsing
+  //
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  GetFilePosition (&FPos);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if (GuidStyle == PARSE_GUID_STYLE_5_FIELDS) {
+    //
+    // Style[0] 12345678-1234-5678-AAAA-BBBBCCCCDDDD
+    //
+    Len = GetHexChars (TempString, sizeof (TempString));
+    if ((Len == 0) || (Len > 8)) {
+      goto Done;
+    }
+
+    sscanf (TempString, "%x", &Value32);
+    Value->Data1 = Value32;
+    //
+    // Next two UINT16 fields
+    //
+    if (mGlobals.SourceFile.FileBufferPtr[0] != '-') {
+      goto Done;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    Len = GetHexChars (TempString, sizeof (TempString));
+    if ((Len == 0) || (Len > 4)) {
+      goto Done;
+    }
+
+    sscanf (TempString, "%x", &Value32);
+    Value->Data2 = (UINT16) Value32;
+
+    if (mGlobals.SourceFile.FileBufferPtr[0] != '-') {
+      goto Done;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    Len = GetHexChars (TempString, sizeof (TempString));
+    if ((Len == 0) || (Len > 4)) {
+      goto Done;
+    }
+
+    sscanf (TempString, "%x", &Value32);
+    Value->Data3 = (UINT16) Value32;
+    //
+    // Parse the "AAAA" as two bytes
+    //
+    if (mGlobals.SourceFile.FileBufferPtr[0] != '-') {
+      goto Done;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    Len = GetHexChars (TempString, sizeof (TempString));
+    if ((Len == 0) || (Len > 4)) {
+      goto Done;
+    }
+
+    sscanf (TempString, "%x", &Value32);
+    Value->Data4[0] = (UINT8) (Value32 >> 8);
+    Value->Data4[1] = (UINT8) Value32;
+    if (mGlobals.SourceFile.FileBufferPtr[0] != '-') {
+      goto Done;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    //
+    // Read the last 6 bytes of the GUID
+    //
+    //
+    Len = GetHexChars (TempString, sizeof (TempString));
+    if ((Len == 0) || (Len > 12)) {
+      goto Done;
+    }
+    //
+    // Insert leading 0's to make life easier
+    //
+    if (Len != 12) {
+      From            = TempString + Len - 1;
+      To              = TempString + 11;
+      TempString[12]  = 0;
+      while (From >= TempString) {
+        *To = *From;
+        To--;
+        From--;
+      }
+
+      while (To >= TempString) {
+        *To = '0';
+        To--;
+      }
+    }
+    //
+    // Now parse each byte
+    //
+    TempString2[2] = 0;
+    for (Index = 0; Index < 6; Index++) {
+      //
+      // Copy the two characters from the input string to something
+      // we can parse.
+      //
+      TempString2[0]  = TempString[Index * 2];
+      TempString2[1]  = TempString[Index * 2 + 1];
+      sscanf (TempString2, "%x", &Value32);
+      Value->Data4[Index + 2] = (UINT8) Value32;
+    }
+
+    Status = TRUE;
+  } else {
+    //
+    // Unsupported GUID style
+    //
+    return FALSE;
+  }
+
+Done:
+  if (Status == FALSE) {
+    SetFilePosition (&FPos);
+  }
+
+  return Status;
+}
+
+static
+STATUS
+GetFilePosition (
+  FILE_POSITION *Fpos
+  )
+{
+  Fpos->FileBufferPtr = mGlobals.SourceFile.FileBufferPtr;
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+SetFilePosition (
+  FILE_POSITION *Fpos
+  )
+{
+  //
+  // Should check range of pointer
+  //
+  mGlobals.SourceFile.FileBufferPtr = Fpos->FileBufferPtr;
+  return STATUS_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/Common/SimpleFileParsing.h b/Tools/Source/TianoTools/Common/SimpleFileParsing.h
new file mode 100644
index 0000000000..ea1f5a0adc
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/SimpleFileParsing.h
@@ -0,0 +1,121 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  SimpleFileParsing.h
+
+Abstract:
+
+  Function prototypes and defines for the simple file parsing routines.
+
+--*/
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+#ifndef _SIMPLE_FILE_PARSING_H_
+#define _SIMPLE_FILE_PARSING_H_
+
+#define T_CHAR  char
+
+STATUS
+SFPInit (
+  VOID
+  )
+;
+
+STATUS
+SFPOpenFile (
+  char    *FileName
+  )
+;
+
+BOOLEAN
+SFPIsKeyword (
+  T_CHAR *Str
+  )
+;
+
+BOOLEAN
+SFPIsToken (
+  T_CHAR *Str
+  )
+;
+
+BOOLEAN
+SFPGetNextToken (
+  T_CHAR        *Str,
+  unsigned int  Len
+  )
+;
+
+BOOLEAN
+SFPGetGuidToken (
+  T_CHAR *Str,
+  UINT32 Len
+  )
+;
+
+#define PARSE_GUID_STYLE_5_FIELDS 0
+
+BOOLEAN
+SFPGetGuid (
+  int         GuidStyle,
+  EFI_GUID    *Value
+  )
+;
+
+BOOLEAN
+SFPSkipToToken (
+  T_CHAR *Str
+  )
+;
+
+BOOLEAN
+SFPGetNumber (
+  unsigned int   *Value
+  )
+;
+
+BOOLEAN
+SFPGetQuotedString (
+  T_CHAR      *Str,
+  int         Length
+  )
+;
+
+BOOLEAN
+SFPIsEOF (
+  VOID
+  )
+;
+
+STATUS
+SFPCloseFile (
+  VOID
+  )
+;
+
+unsigned
+int
+SFPGetLineNumber (
+  VOID
+  )
+;
+
+T_CHAR  *
+SFPGetFileName (
+  VOID
+  )
+;
+
+#endif // #ifndef _SIMPLE_FILE_PARSING_H_
diff --git a/Tools/Source/TianoTools/Common/WinNtInclude.h b/Tools/Source/TianoTools/Common/WinNtInclude.h
new file mode 100644
index 0000000000..80e45b4ad6
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/WinNtInclude.h
@@ -0,0 +1,73 @@
+/*--
+
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+Module Name:
+  WinNtInclude.h
+
+Abstract:
+  Include file for the WinNt Library
+
+--*/
+
+#ifndef __WIN_NT_INCLUDE_H__
+#define __WIN_NT_INCLUDE_H__
+
+//
+// Win32 include files do not compile clean with /W4, so we use the warning
+// pragma to suppress the warnings for Win32 only. This way our code can stil
+// compile at /W4 (highest warning level) with /WX (warnings cause build
+// errors).
+//
+#pragma warning(disable : 4115)
+#pragma warning(disable : 4201)
+#pragma warning(disable : 4214)
+#pragma warning(disable : 4028)
+#pragma warning(disable : 4133)
+
+#define GUID  _WINNT_DUP_GUID_____
+#define _LIST_ENTRY  _WINNT_DUP_LIST_ENTRY_FORWARD
+#define LIST_ENTRY   _WINNT_DUP_LIST_ENTRY
+#define InterlockedIncrement _WINNT_DUP_InterlockedIncrement
+#define InterlockedDecrement _WINNT_DUP_InterlockedDecrement
+#define InterlockedCompareExchange64 _WINNT_DUP_InterlockedCompareExchange64
+#undef UNALIGNED
+#undef CONST
+#undef VOID
+
+#ifndef __GNUC__
+#include "windows.h"
+#endif
+
+#undef GUID
+#undef _LIST_ENTRY
+#undef LIST_ENTRY
+#undef InterlockedIncrement
+#undef InterlockedDecrement
+#undef InterlockedCompareExchange64
+#undef InterlockedCompareExchangePointer
+
+#define VOID void
+
+//
+// Prevent collisions with Windows API name macros that deal with Unicode/Not issues
+//
+#undef LoadImage
+#undef CreateEvent
+
+//
+// Set the warnings back on as the EFI code must be /W4.
+//
+#pragma warning(default : 4115)
+#pragma warning(default : 4201)
+#pragma warning(default : 4214)
+
+
+#endif
diff --git a/Tools/Source/TianoTools/Common/build.gcc b/Tools/Source/TianoTools/Common/build.gcc
new file mode 100644
index 0000000000..fb7ab10326
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/build.gcc
@@ -0,0 +1,8 @@
+mkdir -p ../Library-mingw
+mkdir -p ../Library-cygwin
+rm *.o
+gcc -c -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c
+ar cr ../Library-cygwin/libCommon.a *.o
+rm *.o
+gcc -mno-cygwin -c -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c
+ar cr ../Library-mingw/libCommon.a *.o
diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
new file mode 100644
index 0000000000..593db567b3
--- /dev/null
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="CommonTools.lib" basedir=".">
+<!--
+    EDK Common Tools Library
+  Copyright (c) 2006, Intel Corporation
+-->
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+  <property name="tmp" value="tmp"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/Common/tmp"/>
+
+  <target name="CommonTools.lib" depends="init, ToolsLibrary">
+    <echo message="Building the EDK CommonTools Library"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK CommonTools Library"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="ToolsLibrary" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${LIB_DIR}/CommonTools"
+        outtype="static"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+
+      <fileset dir="${basedir}/Common" 
+        includes="*.h *.c" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+    </cc>
+    <if>
+      <os family="dos"/>
+      <then>
+        <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
+          <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CommonTools${ext_static}"/>
+        </exec>
+      </then>
+    </if>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only from ${BUILD_DIR}"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.c b/Tools/Source/TianoTools/CompressDll/CompressDll.c
new file mode 100644
index 0000000000..783587f654
--- /dev/null
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.c
@@ -0,0 +1,89 @@
+#include "CompressDll.h"
+#include "EfiCompress.h"
+
+extern
+EFI_STATUS
+Compress (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  );
+  
+JNIEXPORT jbyteArray JNICALL  Java_org_tianocore_framework_tasks_Compress_CallCompress 
+(JNIEnv *env, jobject obj, jbyteArray SourceBuffer, jint SourceSize, jstring path)
+{
+  char*          DestBuffer;
+  int            DestSize;   
+  int            Result;
+  char           *InputBuffer;
+  jbyteArray     OutputBuffer;
+  jbyte          *TempByte;
+  
+  DestSize   = 0;
+  DestBuffer = NULL;
+  
+  TempByte = (*env)->GetByteArrayElements(env, SourceBuffer, 0);
+  InputBuffer = (char*) TempByte;
+
+  
+   //
+   //  First call compress function and get need buffer size
+   //
+
+   Result = Compress (
+			  (char*) InputBuffer, 
+			  SourceSize,  
+			  DestBuffer,
+			  &DestSize
+			  );
+
+   if (Result = EFI_BUFFER_TOO_SMALL) {
+	   DestBuffer = malloc (DestSize);
+   }
+
+   //
+   //  Second call compress and get the DestBuffer value
+   //
+   Result = Compress(
+              (char*) InputBuffer, 
+			  SourceSize,  
+			  DestBuffer,
+			  &DestSize  
+	   );
+
+   //
+   // new a MV array to store the return compressed buffer
+   //
+   OutputBuffer = (*env)->NewByteArray(env, DestSize);
+   (*env)->SetByteArrayRegion(env, OutputBuffer,0, DestSize, (jbyte*) DestBuffer);
+
+   //
+   // Free Ouputbuffer.
+   //
+   free (DestBuffer);
+  
+
+  if (Result != 0) {
+    return NULL;
+  } else {
+    return OutputBuffer;
+  }
+}
+
+#ifdef _MSC_VER
+BOOLEAN 
+__stdcall 
+DllMainCRTStartup(
+    unsigned int hDllHandle, 
+    unsigned int nReason,    
+    void*   Reserved    
+)
+{
+	return TRUE;
+}
+#else
+#ifdef __GNUC__
+#endif
+#endif
+
diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.h b/Tools/Source/TianoTools/CompressDll/CompressDll.h
new file mode 100644
index 0000000000..3b0fbb2cee
--- /dev/null
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_tianocore_frameworktasks_Compress */
+
+#ifndef _Included_org_tianocore_framework_tasks_Compress
+#define _Included_org_tianocore_framework_tasks_Compress
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_tianocore_frameworktasks_Compress
+ * Method:    CallCompress
+ * Signature: ([BILjava/lang/String;)[B
+ */
+JNIEXPORT jbyteArray JNICALL Java_org_tianocore_framework_tasks_Compress_CallCompress
+  (JNIEnv *, jobject, jbyteArray, jint, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
new file mode 100644
index 0000000000..e742e21763
--- /dev/null
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+  <!--EDK GenDepex Tool
+  Copyright (c) 2006, Intel Corporation-->
+  <property environment="env"/>
+  <property name="WORKSPACE" value="${env.WORKSPACE}"/>
+  <property name="ToolName" value="CompressDll"/>
+  <property name="LibName" value="CompressDll"/>
+  <property name="FileSet" value="CompressDll.c CompressDll.h"/>
+  <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>
+  <target name="GenTool" depends="init,Lib,Dll">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+      <elseif>
+        <os family="dos"/>
+        <then>
+          <echo message="Windows Family"/>
+          <property name="ToolChain" value="msvc"/>
+        </then>
+      </elseif>
+      <elseif>
+        <os family="unix"/>
+        <then>
+          <echo message="UNIX Family"/>
+          <property name="ToolChain" value="gcc"/>
+        </then>
+      </elseif>
+      <else>
+        <echo>Unsupported Operating System
+        Please Contact Intel Corporation</echo>
+      </else>
+    </if>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+        </then>
+      </elseif>
+    </if>
+    <condition property="CheckDepends">
+      <uptodate targetfile="${BIN_DIR}/${LibName}${ext_dynamic}">
+        <srcfiles dir="${BUILD_DIR}" includes="CommonTools.lib, CustomizedCompress.lib, CompressDll.obj"/>
+      </uptodate>
+    </condition>
+  
+  </target>
+  
+  <target name="Lib" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" outtype="static" optimize="speed">
+      <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+      <includepath path="${env.JAVA_HOME}/include"/>
+      <includepath path="${env.JAVA_HOME}/include/win32"/>
+    </cc>
+  </target>
+  <target name="Dll" unless="CheckDepends">
+     <if>
+      <os family="dos"/>
+      <then>
+        <echo message="Begin link!"/>
+        <exec dir="${BUILD_DIR}" executable="link" failonerror="false">
+          <arg line="kernel32.lib ${LIB_DIR}/CommonTools.lib ${LIB_DIR}/CustomizedCompress.lib /NOLOGO /DLL /MACHINE:I386  /OUT:${BUILD_DIR}/${LibName}${ext_dynamic} ${ToolName}"/>
+        </exec>
+        <copy todir="${BIN_DIR}" file="${BUILD_DIR}/${LibName}${ext_dynamic}"/>
+      </then>
+    </if>
+  </target>
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_dynamic}"/>
+    </delete>
+  </target>
+</project>
diff --git a/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c b/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
new file mode 100644
index 0000000000..ca0ea17ce6
--- /dev/null
+++ b/Tools/Source/TianoTools/CustomizedCompress/CustomizedCompress.c
@@ -0,0 +1,147 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  CustomizedCompress.c
+
+Abstract:
+
+  Header file for Customized compression routine
+  
+--*/
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+
+EFI_STATUS
+SetCustomizedCompressionType (
+  IN  CHAR8   *Type
+  )
+/*++
+
+Routine Description:
+
+The implementation of Customized SetCompressionType().
+
+Arguments:
+  Type        - The type if compression.
+    
+Returns:
+    
+  EFI_SUCCESS           - The type has been set.
+  EFI_UNSUPPORTED       - This type is unsupported.
+
+    
+--*/
+{
+  return EFI_UNSUPPORTED;
+}
+
+EFI_STATUS
+CustomizedGetInfo (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  OUT     UINT32  *DstSize,
+  OUT     UINT32  *ScratchSize
+  )
+/*++
+
+Routine Description:
+
+The implementation of Customized GetInfo().
+
+Arguments:
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  DstSize     - The size of destination buffer.
+  ScratchSize - The size of scratch buffer.
+    
+Returns:
+    
+  EFI_SUCCESS           - The size of destination buffer and the size of scratch buffer are successull retrieved.
+  EFI_INVALID_PARAMETER - The source data is corrupted
+  EFI_UNSUPPORTED       - The operation is unsupported.
+
+    
+--*/
+{
+  return EFI_UNSUPPORTED;
+}
+
+EFI_STATUS
+CustomizedDecompress (
+  IN      VOID    *Source,
+  IN      UINT32  SrcSize,
+  IN OUT  VOID    *Destination,
+  IN      UINT32  DstSize,
+  IN OUT  VOID    *Scratch,
+  IN      UINT32  ScratchSize
+  )
+/*++
+
+Routine Description:
+
+  The implementation of Customized Decompress().
+
+Arguments:
+
+  This        - The protocol instance pointer
+  Source      - The source buffer containing the compressed data.
+  SrcSize     - The size of source buffer
+  Destination - The destination buffer to store the decompressed data
+  DstSize     - The size of destination buffer.
+  Scratch     - The buffer used internally by the decompress routine. This  buffer is needed to store intermediate data.
+  ScratchSize - The size of scratch buffer.
+
+Returns:
+
+  EFI_SUCCESS           - Decompression is successfull
+  EFI_INVALID_PARAMETER - The source data is corrupted
+  EFI_UNSUPPORTED       - The operation is unsupported.
+
+--*/
+{
+  return EFI_UNSUPPORTED;
+}
+
+EFI_STATUS
+CustomizedCompress (
+  IN      UINT8   *SrcBuffer,
+  IN      UINT32  SrcSize,
+  IN      UINT8   *DstBuffer,
+  IN OUT  UINT32  *DstSize
+  )
+/*++
+
+Routine Description:
+
+  The Customized compression routine.
+
+Arguments:
+
+  SrcBuffer   - The buffer storing the source data
+  SrcSize     - The size of source data
+  DstBuffer   - The buffer to store the compressed data
+  DstSize     - On input, the size of DstBuffer; On output,
+                the size of the actual compressed data.
+
+Returns:
+
+  EFI_BUFFER_TOO_SMALL  - The DstBuffer is too small. In this case,
+                DstSize contains the size needed.
+  EFI_SUCCESS           - Compression is successful.
+
+  EFI_UNSUPPORTED       - The operation is unsupported.
+--*/
+{
+  return EFI_UNSUPPORTED;
+}
diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.gcc b/Tools/Source/TianoTools/CustomizedCompress/build.gcc
new file mode 100644
index 0000000000..09e29c47e2
--- /dev/null
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.gcc
@@ -0,0 +1,8 @@
+mkdir -p ../Library-mingw
+mkdir -p ../Library-cygwin
+rm *.o
+gcc -c -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c
+ar cr ../Library-cygwin/libCustomizedCompress.a *.o
+rm *.o
+gcc -mno-cygwin  -c -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c
+ar cr ../Library-mingw/libCustomizedCompress.a *.o
diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml
new file mode 100644
index 0000000000..ff41a011dd
--- /dev/null
+++ b/Tools/Source/TianoTools/CustomizedCompress/build.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="CustomizedCompress.lib" basedir=".">
+<!--
+    EDK Customized Compress Library
+  Copyright (c) 2006, Intel Corporation
+-->
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/CustomizedCompress/tmp"/>
+
+  <target name="CustomizedCompress.lib" depends="ToolsLibrary">
+    <echo message="Building the EDK CustomizedCompress Library"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK CustomizedCompress Library"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<property name="HOST_ARCH" value="IA32" />
+		<ToolChainSetup confPath="${WORKSPACE}/Tools/Conf" />
+    <echo message="Compiler: ${CC}"/>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="ToolsLibrary" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${LIB_DIR}/CustomizedCompress"
+        outtype="static"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/CustomizedCompress" 
+        includes="*.h *.c" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+    </cc>
+    <if>
+      <os family="dos"/>
+      <then>
+        <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
+          <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CustomizedCompress${ext_static}"/>
+        </exec>
+      </then>
+    </if>
+  </target>
+
+  <target name="clean">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall">
+    <echo message="Removing Object Files and the Library: CustomizedCompress${ext_static}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${LIB_DIR}" includes="CustomizedCompress${ext_static}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/FwImage/build.gcc b/Tools/Source/TianoTools/FwImage/build.gcc
new file mode 100644
index 0000000000..0cc3bbb4f9
--- /dev/null
+++ b/Tools/Source/TianoTools/FwImage/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c -o FwImage -L../Library-mingw -lCommon
diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
new file mode 100644
index 0000000000..c51e27e873
--- /dev/null
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK FwImage Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="FwImage"/>
+  <property name="FileSet" value="fwimage.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DRI}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/FwImage/fwimage.c b/Tools/Source/TianoTools/FwImage/fwimage.c
new file mode 100644
index 0000000000..e2e0d49b9f
--- /dev/null
+++ b/Tools/Source/TianoTools/FwImage/fwimage.c
@@ -0,0 +1,332 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    fwimage.c
+
+Abstract:
+
+    Converts a pe32+ image to an FW image type
+
+--*/
+
+#include <WinNtInclude.h>
+#ifndef __GNUC__
+#include <windows.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <CommonLib.h>
+#include <EfiImage.h>
+#include <EfiUtilityMsgs.c>
+
+#define UTILITY_NAME  "FwImage"
+
+#ifdef __GNUC__
+typedef unsigned long ULONG;
+typedef unsigned char UCHAR;
+typedef unsigned char *PUCHAR;
+typedef unsigned short USHORT;
+#endif
+
+VOID
+Usage (
+  VOID
+  )
+{
+  printf ("Usage: " UTILITY_NAME "  {-t time-date} [APPLICATION|BS_DRIVER|RT_DRIVER|SAL_RT_DRIVER|COMBINED_PEIM_DRIVER|SECURITY_CORE|PEI_CORE|PE32_PEIM|RELOCATABLE_PEIM] peimage [outimage]");
+}
+
+static
+STATUS
+FCopyFile (
+  FILE    *in,
+  FILE    *out
+  )
+{
+  ULONG filesize;
+  ULONG offset;
+  ULONG length;
+  UCHAR Buffer[8 * 1024];
+
+  fseek (in, 0, SEEK_END);
+  filesize = ftell (in);
+
+  fseek (in, 0, SEEK_SET);
+  fseek (out, 0, SEEK_SET);
+
+  offset = 0;
+  while (offset < filesize) {
+    length = sizeof (Buffer);
+    if (filesize - offset < length) {
+      length = filesize - offset;
+    }
+
+    fread (Buffer, length, 1, in);
+    fwrite (Buffer, length, 1, out);
+    offset += length;
+  }
+
+  if ((ULONG) ftell (out) != filesize) {
+    Error (NULL, 0, 0, "write error", NULL);
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+int
+main (
+  int  argc,
+  char *argv[]
+  )
+/*++
+
+Routine Description:
+
+  Main function.
+
+Arguments:
+
+  argc - Number of command line parameters.
+  argv - Array of pointers to command line parameter strings.
+
+Returns:
+  STATUS_SUCCESS - Utility exits successfully.
+  STATUS_ERROR   - Some error occurred during execution.
+
+--*/
+{
+  ULONG             Type;
+  PUCHAR            Ext;
+  PUCHAR            p;
+  PUCHAR            pe;
+  PUCHAR            OutImageName;
+  UCHAR             outname[500];
+  FILE              *fpIn;
+  FILE              *fpOut;
+  EFI_IMAGE_DOS_HEADER  DosHdr;
+  EFI_IMAGE_NT_HEADERS  PeHdr;
+  time_t            TimeStamp;
+  struct tm         TimeStruct;
+  EFI_IMAGE_DOS_HEADER  BackupDosHdr;
+  ULONG             Index;
+  BOOLEAN           TimeStampPresent;
+
+  SetUtilityName (UTILITY_NAME);
+  //
+  // Assign to fix compile warning
+  //
+  OutImageName      = NULL;
+  Type              = 0;
+  Ext               = 0;
+  TimeStamp         = 0;
+  TimeStampPresent  = FALSE;
+
+  //
+  // Look for -t time-date option first. If the time is "0", then
+  // skip it.
+  //
+  if ((argc > 2) && !strcmp (argv[1], "-t")) {
+    TimeStampPresent = TRUE;
+    if (strcmp (argv[2], "0") != 0) {
+      //
+      // Convert the string to a value
+      //
+      memset ((char *) &TimeStruct, 0, sizeof (TimeStruct));
+      if (sscanf(
+          argv[2], "%d/%d/%d,%d:%d:%d",
+          &TimeStruct.tm_mon,   /* months since January - [0,11] */
+          &TimeStruct.tm_mday,  /* day of the month - [1,31] */
+          &TimeStruct.tm_year,  /* years since 1900 */
+          &TimeStruct.tm_hour,  /* hours since midnight - [0,23] */
+          &TimeStruct.tm_min,   /* minutes after the hour - [0,59] */
+          &TimeStruct.tm_sec    /* seconds after the minute - [0,59] */
+            ) != 6) {
+        Error (NULL, 0, 0, argv[2], "failed to convert to mm/dd/yyyy,hh:mm:ss format");
+        return STATUS_ERROR;
+      }
+      //
+      // Now fixup some of the fields
+      //
+      TimeStruct.tm_mon--;
+      TimeStruct.tm_year -= 1900;
+      //
+      // Sanity-check values?
+      // Convert
+      //
+      TimeStamp = mktime (&TimeStruct);
+      if (TimeStamp == (time_t) - 1) {
+        Error (NULL, 0, 0, argv[2], "failed to convert time");
+        return STATUS_ERROR;
+      }
+    }
+    //
+    // Skip over the args
+    //
+    argc -= 2;
+    argv += 2;
+  }
+  //
+  // Check for enough args
+  //
+  if (argc < 3) {
+    Usage ();
+    return STATUS_ERROR;
+  }
+
+  if (argc == 4) {
+    OutImageName = argv[3];
+  }
+  //
+  // Get new image type
+  //
+  p = argv[1];
+  if (*p == '/' || *p == '\\') {
+    p += 1;
+  }
+
+  if (stricmp (p, "app") == 0 || stricmp (p, "APPLICATION") == 0) {
+    Type  = EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION;
+    Ext   = ".efi";
+
+  } else if (stricmp (p, "bsdrv") == 0 || stricmp (p, "BS_DRIVER") == 0) {
+    Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
+    Ext   = ".efi";
+
+  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "RT_DRIVER") == 0) {
+    Type  = EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER;
+    Ext   = ".efi";
+
+  } else if (stricmp (p, "rtdrv") == 0 || stricmp (p, "SAL_RT_DRIVER") == 0) {
+    Type  = EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER;
+    Ext   = ".efi";
+  } else if (stricmp (p, "SECURITY_CORE") == 0) {
+    Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
+    Ext   = ".sec";
+  } else if (stricmp (p, "peim") == 0 ||
+           stricmp (p, "PEI_CORE") == 0 ||
+           stricmp (p, "PE32_PEIM") == 0 ||
+           stricmp (p, "RELOCATABLE_PEIM") == 0 ||
+           stricmp (p, "combined_peim_driver") == 0
+          ) {
+    Type  = EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER;
+    Ext   = ".pei";
+  } else {
+    Usage ();
+    return STATUS_ERROR;
+  }
+  //
+  // open source file
+  //
+  fpIn = fopen (argv[2], "rb");
+  if (!fpIn) {
+    Error (NULL, 0, 0, argv[2], "failed to open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read the dos & pe hdrs of the image
+  //
+  fseek (fpIn, 0, SEEK_SET);
+  fread (&DosHdr, sizeof (DosHdr), 1, fpIn);
+  if (DosHdr.e_magic != EFI_IMAGE_DOS_SIGNATURE) {
+    Error (NULL, 0, 0, argv[2], "DOS header signature not found in source image");
+    fclose (fpIn);
+    return STATUS_ERROR;
+  }
+
+  fseek (fpIn, DosHdr.e_lfanew, SEEK_SET);
+  fread (&PeHdr, sizeof (PeHdr), 1, fpIn);
+  if (PeHdr.Signature != EFI_IMAGE_NT_SIGNATURE) {
+    Error (NULL, 0, 0, argv[2], "PE header signature not found in source image");
+    fclose (fpIn);
+    return STATUS_ERROR;
+  }
+  //
+  // open output file
+  //
+  strcpy (outname, argv[2]);
+  pe = NULL;
+  for (p = outname; *p; p++) {
+    if (*p == '.') {
+      pe = p;
+    }
+  }
+
+  if (!pe) {
+    pe = p;
+  }
+
+  strcpy (pe, Ext);
+
+  if (!OutImageName) {
+    OutImageName = outname;
+  }
+
+  fpOut = fopen (OutImageName, "w+b");
+  if (!fpOut) {
+    Error (NULL, 0, 0, OutImageName, "could not open output file for writing");
+    fclose (fpIn);
+    return STATUS_ERROR;
+  }
+  //
+  // Copy the file
+  //
+  if (FCopyFile (fpIn, fpOut) != STATUS_SUCCESS) {
+    fclose (fpIn);
+    fclose (fpOut);
+    return STATUS_ERROR;
+  }
+  //
+  // Zero all unused fields of the DOS header
+  //
+  memcpy (&BackupDosHdr, &DosHdr, sizeof (DosHdr));
+  memset (&DosHdr, 0, sizeof (DosHdr));
+  DosHdr.e_magic  = BackupDosHdr.e_magic;
+  DosHdr.e_lfanew = BackupDosHdr.e_lfanew;
+  fseek (fpOut, 0, SEEK_SET);
+  fwrite (&DosHdr, sizeof (DosHdr), 1, fpOut);
+
+  fseek (fpOut, sizeof (DosHdr), SEEK_SET);
+  for (Index = sizeof (DosHdr); Index < (ULONG) DosHdr.e_lfanew; Index++) {
+    fwrite (&DosHdr.e_cp, 1, 1, fpOut);
+  }
+  //
+  // Path the PE header
+  //
+  PeHdr.OptionalHeader.Subsystem = (USHORT) Type;
+  if (TimeStampPresent) {
+    PeHdr.FileHeader.TimeDateStamp = (UINT32) TimeStamp;
+  }
+
+  PeHdr.OptionalHeader.SizeOfStackReserve = 0;
+  PeHdr.OptionalHeader.SizeOfStackCommit  = 0;
+  PeHdr.OptionalHeader.SizeOfHeapReserve  = 0;
+  PeHdr.OptionalHeader.SizeOfHeapCommit   = 0;
+  fseek (fpOut, DosHdr.e_lfanew, SEEK_SET);
+  fwrite (&PeHdr, sizeof (PeHdr), 1, fpOut);
+
+  //
+  // Done
+  //
+  fclose (fpIn);
+  fclose (fpOut);
+  //
+  // printf ("Created %s\n", OutImageName);
+  //
+  return STATUS_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.c b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.c
new file mode 100644
index 0000000000..b99cf2f816
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.c
@@ -0,0 +1,286 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+    GenCRC32Section.c
+
+Abstract:
+
+  This file contains functions required to generate a Firmware File System 
+  file. The code is compliant with the Tiano C Coding standards.
+
+--*/
+
+#include "GenCRC32Section.h"
+
+#define TOOLVERSION   "0.2"
+
+#define UTILITY_NAME  "GenCrc32Section"
+
+EFI_GUID  gEfiCrc32SectionGuid = EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID;
+
+EFI_STATUS
+SignSectionWithCrc32 (
+  IN OUT UINT8  *FileBuffer,
+  IN OUT UINT32 *BufferSize,
+  IN UINT32     DataSize
+  )
+/*++
+        
+Routine Description:
+           
+  Signs the section with CRC32 and add GUIDed section header for the 
+  signed data. data stays in same location (overwrites source data).
+            
+Arguments:
+               
+  FileBuffer  - Buffer containing data to sign
+                
+  BufferSize  - On input, the size of FileBuffer. On output, the size of 
+                actual section data (including added section header).              
+
+  DataSize    - Length of data to Sign
+
+  Key         - Key to use when signing. Currently only CRC32 is supported.
+                                       
+Returns:
+                       
+  EFI_SUCCESS           - Successful
+  EFI_OUT_OF_RESOURCES  - Not enough resource to complete the operation.
+                        
+--*/
+{
+
+  UINT32                Crc32Checksum;
+  EFI_STATUS            Status;
+  UINT32                TotalSize;
+  CRC32_SECTION_HEADER  Crc32Header;
+  UINT8                 *SwapBuffer;
+
+  Crc32Checksum = 0;
+  SwapBuffer    = NULL;
+
+  if (DataSize == 0) {
+    *BufferSize = 0;
+
+    return EFI_SUCCESS;
+  }
+
+  Status = CalculateCrc32 (FileBuffer, DataSize, &Crc32Checksum);
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  TotalSize = DataSize + CRC32_SECTION_HEADER_SIZE;
+  Crc32Header.GuidSectionHeader.CommonHeader.Type     = EFI_SECTION_GUID_DEFINED;
+  Crc32Header.GuidSectionHeader.CommonHeader.Size[0]  = (UINT8) (TotalSize & 0xff);
+  Crc32Header.GuidSectionHeader.CommonHeader.Size[1]  = (UINT8) ((TotalSize & 0xff00) >> 8);
+  Crc32Header.GuidSectionHeader.CommonHeader.Size[2]  = (UINT8) ((TotalSize & 0xff0000) >> 16);
+  memcpy (&(Crc32Header.GuidSectionHeader.SectionDefinitionGuid), &gEfiCrc32SectionGuid, sizeof (EFI_GUID));
+  Crc32Header.GuidSectionHeader.Attributes  = EFI_GUIDED_SECTION_AUTH_STATUS_VALID;
+  Crc32Header.GuidSectionHeader.DataOffset  = CRC32_SECTION_HEADER_SIZE;
+  Crc32Header.CRC32Checksum                 = Crc32Checksum;
+
+  SwapBuffer = (UINT8 *) malloc (DataSize);
+  if (SwapBuffer == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  memcpy (SwapBuffer, FileBuffer, DataSize);
+  memcpy (FileBuffer, &Crc32Header, CRC32_SECTION_HEADER_SIZE);
+  memcpy (FileBuffer + CRC32_SECTION_HEADER_SIZE, SwapBuffer, DataSize);
+
+  //
+  // Make sure section ends on a DWORD boundary
+  //
+  while ((TotalSize & 0x03) != 0) {
+    FileBuffer[TotalSize] = 0;
+    TotalSize++;
+  }
+
+  *BufferSize = TotalSize;
+
+  if (SwapBuffer != NULL) {
+    free (SwapBuffer);
+  }
+
+  return EFI_SUCCESS;
+}
+
+VOID
+PrintUsage (
+  VOID
+  )
+{
+  printf ("Usage:\n");
+  printf (UTILITY_NAME " -i \"inputfile1\" \"inputfile2\" -o \"outputfile\" \n");
+  printf ("   -i \"inputfile\":\n ");
+  printf ("       specifies the input files that would be signed to CRC32 Guided section.\n");
+  printf ("   -o \"outputfile\":\n");
+  printf ("       specifies the output file that is a CRC32 Guided section.\n");
+}
+
+INT32
+ReadFilesContentsIntoBuffer (
+  IN      CHAR8   *argv[],
+  IN      INT32   Start,
+  IN OUT  UINT8   **FileBuffer,
+  IN OUT  UINT32  *BufferSize,
+  OUT     UINT32  *ContentSize,
+  IN      INT32   MaximumArguments
+  )
+{
+  INT32   Index;
+  CHAR8   *FileName;
+  FILE    *InputFile;
+  UINT8   Temp;
+  UINT32  Size;
+
+  FileName  = NULL;
+  InputFile = NULL;
+  Size      = 0;
+  Index     = 0;
+
+  //
+  // read all input files into one file buffer
+  //
+  while (argv[Start + Index][0] != '-') {
+
+    FileName  = argv[Start + Index];
+    InputFile = fopen (FileName, "rb");
+    if (InputFile == NULL) {
+      Error (NULL, 0, 0, FileName, "failed to open input binary file");
+      return -1;
+    }
+
+    fread (&Temp, sizeof (UINT8), 1, InputFile);
+    while (!feof (InputFile)) {
+      (*FileBuffer)[Size++] = Temp;
+      fread (&Temp, sizeof (UINT8), 1, InputFile);
+    }
+
+    fclose (InputFile);
+    InputFile = NULL;
+
+    //
+    // Make sure section ends on a DWORD boundary
+    //
+    while ((Size & 0x03) != 0) {
+      (*FileBuffer)[Size] = 0;
+      Size++;
+    }
+
+    Index++;
+    if (Index == MaximumArguments) {
+      break;
+    }
+  }
+
+  *ContentSize = Size;
+  return Index;
+}
+
+int
+main (
+  INT32 argc,
+  CHAR8 *argv[]
+  )
+{
+  FILE        *OutputFile;
+  UINT8       *FileBuffer;
+  UINT32      BufferSize;
+  EFI_STATUS  Status;
+  UINT32      ContentSize;
+  CHAR8       *OutputFileName;
+  INT32       ReturnValue;
+  INT32       Index;
+
+  OutputFile      = NULL;
+  FileBuffer      = NULL;
+  ContentSize     = 0;
+  OutputFileName  = NULL;
+
+  SetUtilityName (UTILITY_NAME);
+
+  if (argc == 1) {
+    PrintUsage ();
+    return -1;
+  }
+
+  BufferSize  = 1024 * 1024 * 16;
+  FileBuffer  = (UINT8 *) malloc (BufferSize * sizeof (UINT8));
+  if (FileBuffer == NULL) {
+    Error (NULL, 0, 0, "memory allocation failed", NULL);
+    return -1;
+  }
+
+  ZeroMem (FileBuffer, BufferSize);
+
+  for (Index = 0; Index < argc; Index++) {
+    if (strcmpi (argv[Index], "-i") == 0) {
+      ReturnValue = ReadFilesContentsIntoBuffer (
+                      argv,
+                      (Index + 1),
+                      &FileBuffer,
+                      &BufferSize,
+                      &ContentSize,
+                      (argc - (Index + 1))
+                      );
+      if (ReturnValue == -1) {
+        Error (NULL, 0, 0, "failed to read file contents", NULL);
+        return -1;
+      }
+
+      Index += ReturnValue;
+    }
+
+    if (strcmpi (argv[Index], "-o") == 0) {
+      OutputFileName = argv[Index + 1];
+    }
+  }
+
+  OutputFile = fopen (OutputFileName, "wb");
+  if (OutputFile == NULL) {
+    Error (NULL, 0, 0, OutputFileName, "failed to open output binary file");
+    free (FileBuffer);
+    return -1;
+  }
+
+  /*  
+  //
+  // make sure section ends on a DWORD boundary ??
+  //
+  while ( (Size & 0x03) != 0 ) {
+    FileBuffer[Size] = 0;
+    Size ++;
+  }
+*/
+  Status = SignSectionWithCrc32 (FileBuffer, &BufferSize, ContentSize);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "failed to sign section", NULL);
+    free (FileBuffer);
+    fclose (OutputFile);
+    return -1;
+  }
+
+  ContentSize = fwrite (FileBuffer, sizeof (UINT8), BufferSize, OutputFile);
+  if (ContentSize != BufferSize) {
+    Error (NULL, 0, 0, "failed to write output buffer", NULL);
+    ReturnValue = -1;
+  } else {
+    ReturnValue = 0;
+  }
+
+  free (FileBuffer);
+  fclose (OutputFile);
+  return ReturnValue;
+}
diff --git a/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
new file mode 100644
index 0000000000..574231d093
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCRC32Section/GenCRC32Section.h
@@ -0,0 +1,64 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenCRC32Section.h 
+
+Abstract:
+
+  Header file for GenFfsFile. Mainly defines the header of section
+  header for CRC32 GUID defined sections. Share with GenSection.c
+
+--*/
+
+//
+// External Files Referenced
+//
+
+/* Standard Headers */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+/* MDE Headers */
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <Common/EfiImage.h>
+#include <Common/FirmwareVolumeImageFormat.h>
+#include <Common/FirmwareFileSystem.h>
+#include <Common/FirmwareVolumeHeader.h>
+#include <Protocol/GuidedSectionExtraction.h>
+
+/* Tool Headers */
+#include <CommonLib.h>
+#include <Crc32.h>
+#include <EfiCompress.h>
+#include <EfiUtilityMsgs.h>
+#include <ParseInf.h>
+
+//
+// Module Coded to Tiano Coding Conventions
+//
+#ifndef _EFI_GEN_CRC32_SECTION_H
+#define _EFI_GEN_CRC32_SECTION_H
+
+
+typedef struct {
+  EFI_GUID_DEFINED_SECTION  GuidSectionHeader;
+  UINT32                    CRC32Checksum;
+} CRC32_SECTION_HEADER;
+
+#define EFI_SECTION_CRC32_GUID_DEFINED  0
+#define CRC32_SECTION_HEADER_SIZE       (sizeof (CRC32_SECTION_HEADER))
+
+#endif
diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.gcc b/Tools/Source/TianoTools/GenCRC32Section/build.gcc
new file mode 100644
index 0000000000..8d239da2fb
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c -o GenCRC32Section -L../Library-mingw -lCommon 
diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
new file mode 100644
index 0000000000..a239f983c0
--- /dev/null
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenCRC32Section Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenCRC32Section"/>
+  <property name="FileSet" value="GenCRC32Section.c GenCRC32Section.h"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+				<property name="MSVC_DIR" value="C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\Include" />
+				<property name="MSVC_SDK_DIR" value="C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK\Include" />
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools${ext_static}"/>
+
+    </cc>
+    <if>
+      <os family="dos"/>
+      <then>
+        <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
+          <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/${ToolName}${ext_exe}"/>
+        </exec>
+      </then>
+    </if>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenDepex/DepexParser.c b/Tools/Source/TianoTools/GenDepex/DepexParser.c
new file mode 100644
index 0000000000..9f0a0cbbab
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/DepexParser.c
@@ -0,0 +1,903 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  DepexParser.c
+
+Abstract:
+
+  Validate Dependency Expression syntax
+  recursive descent Algorithm
+
+  The original BNF grammar(taken from "Pre EFI Initialization Core Interface Specification 
+  draft review 0.9") is thus:
+       <depex>    ::= BEFORE <guid> END
+                    | AFTER <guid> END
+                    | SOR <bool> END
+                    | <bool> END    
+       <bool>     ::= <bool> AND <term> 
+                    | <bool> OR <term>  
+                    | <term>            
+       <term>     ::= NOT <factor>      
+                    | <factor>          
+       <factor>   ::= <bool>            
+                    | TRUE 
+                    | FALSE 
+                    | GUID
+
+       <guid>     ::= '{' <hex32> ',' <hex16> ',' <hex16> ','
+                      <hex8> ',' <hex8> ',' <hex8> ',' <hex8> ',' 
+                      <hex8> ',' <hex8> ',' <hex8> ',' <hex8> '}'
+       <hex32>    ::= <hexprefix> <hexvalue>
+       <hex16>    ::= <hexprefix> <hexvalue>
+       <hex8>     ::= <hexprefix> <hexvalue>
+       <hexprefix>::= '0' 'x'
+                    | '0' 'X'
+       <hexvalue> ::= <hexdigit> <hexvalue>
+                    | <hexdigit>
+       <hexdigit> ::= [0-9]
+                    | [a-f]
+                    | [A-F]
+
+  After cleaning left recursive and parentheses supported, the BNF grammar used in this module is thus:
+       <depex>    ::= BEFORE <guid>
+                    | AFTER <guid>
+                    | SOR <bool>
+                    | <bool>
+       <bool>     ::= <term><rightbool>
+       <rightbool>::= AND <term><rightbool>
+                    | OR <term><rightbool>
+                    | ''
+       <term>     ::= NOT <factor>
+                    | <factor>
+       <factor>   ::= '('<bool>')'<rightfactor>
+                    | NOT <factor> <rightbool> <rightfactor>
+                    | TRUE <rightfactor>
+                    | FALSE <rightfactor>
+                    | END <rightfactor>
+                    | <guid> <rightfactor>                    
+       <rightfactor> ::=AND <term><rightbool> <rightfactor>   
+                    | OR <term><rightbool> <rightfactor>                 
+                    | ''
+       <guid>     ::= '{' <hex32> ',' <hex16> ',' <hex16> ','
+                      <hex8> ',' <hex8> ',' <hex8> ',' <hex8> ',' 
+                      <hex8> ',' <hex8> ',' <hex8> ',' <hex8> '}'
+       <hex32>    ::= <hexprefix> <hexvalue>
+       <hex16>    ::= <hexprefix> <hexvalue>
+       <hex8>     ::= <hexprefix> <hexvalue>
+       <hexprefix>::= '0' 'x'
+                    | '0' 'X'
+       <hexvalue> ::= <hexdigit> <hexvalue>
+                    | <hexdigit>
+       <hexdigit> ::= [0-9]
+                    | [a-f]
+                    | [A-F]
+ 
+  Note: 1. There's no precedence in operators except parentheses;
+        2. For hex32, less and equal than 8 bits is valid, more than 8 bits is invalid.
+           Same constraint for hex16 is 4, hex8 is 2. All hex should contains at least 1 bit.
+        3. "<factor>   ::= '('<bool>')'<rightfactor>" is added to support parentheses;
+        4. "<factor>   ::= GUID" is changed to "<factor>   ::= <guid>";
+        5. "DEPENDENCY_END" is the terminal of the expression. But it has been filtered by caller. 
+           During parsing, "DEPENDENCY_END" will be treated as illegal factor;
+    
+  This code should build in any environment that supports a standard C-library w/ string
+  operations and File I/O services.
+
+  As an example of usage, consider the following:
+
+  The input string could be something like: 
+    
+      NOT ({ 0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72,
+        0x3b } AND { 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69,
+        0x72, 0x3b }) OR { 0x03c4e603, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27,
+        0x3f, 0xc1, 0x4d } AND
+
+  It's invalid for an extra "AND" in the end.
+
+  Complies with Tiano C Coding Standards Document, version 0.33, 16 Aug 2001.
+
+--*/
+
+#include "DepexParser.h"
+
+BOOLEAN
+ParseBool (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  );
+
+BOOLEAN
+ParseTerm (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  );
+
+BOOLEAN
+ParseRightBool (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  );
+
+BOOLEAN
+ParseFactor (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  );
+
+VOID
+LeftTrim (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Left trim the space, '\n' and '\r' character in string.
+  The space at the end does not need trim.
+
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  None
+
+
+--*/
+{
+  while
+  (
+    ((*Pindex) < (Pbegin + length)) &&
+    ((strncmp (*Pindex, " ", 1) == 0) || (strncmp (*Pindex, "\n", 1) == 0) || (strncmp (*Pindex, "\r", 1) == 0))
+  ) {
+    (*Pindex)++;
+  }
+}
+
+BOOLEAN
+ParseHexdigit (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse Hex bit in dependency expression.  
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    Length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If parses a valid hex bit, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  //
+  // <hexdigit> ::= [0-9] | [a-f] | [A-F]
+  //
+  if (((**Pindex) >= '0' && (**Pindex) <= '9') ||
+      ((**Pindex) >= 'a' && (**Pindex) <= 'f') ||
+      ((**Pindex) >= 'A' && (**Pindex) <= 'F')
+      ) {
+    (*Pindex)++;
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseHex32 (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse Hex32 in dependency expression.  
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    Length of the string
+  Pindex    The pointer of point to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If parses a valid hex32, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT32 Index;
+  INT8  *Pin;
+
+  Index = 0;
+  Pin   = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  if ((strncmp (*Pindex, "0x", 2) != 0) && (strncmp (*Pindex, "0X", 2) != 0)) {
+    return FALSE;
+  }
+  (*Pindex) += 2;
+
+  while (ParseHexdigit (Pbegin, length, Pindex)) {
+    Index++;
+  }
+
+  if (Index > 0 && Index <= 8) {
+    return TRUE;
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseHex16 (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse Hex16 in dependency expression.  
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    Length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If parses a valid hex16, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  int   Index;
+  INT8  *Pin;
+
+  Index = 0;
+  Pin   = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  if ((strncmp (*Pindex, "0x", 2) != 0) && (strncmp (*Pindex, "0X", 2) != 0)) {
+    return FALSE;
+  }
+  (*Pindex) += 2;
+
+  while (ParseHexdigit (Pbegin, length, Pindex)) {
+    Index++;
+  }
+
+  if (Index > 0 && Index <= 4) {
+    return TRUE;
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseHex8 (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse Hex8 in dependency expression.  
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    Length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If parses a valid hex8, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  int   Index;
+  INT8  *Pin;
+
+  Index = 0;
+  Pin   = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  if ((strncmp (*Pindex, "0x", 2) != 0) && (strncmp (*Pindex, "0X", 2) != 0)) {
+    return FALSE;
+  }
+  (*Pindex) += 2;
+
+  while (ParseHexdigit (Pbegin, length, Pindex)) {
+    Index++;
+  }
+
+  if (Index > 0 && Index <= 2) {
+    return TRUE;
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseGuid (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse guid in dependency expression.
+  There can be any number of spaces between '{' and hexword, ',' and hexword, 
+  hexword and ',', hexword and '}'. The hexword include hex32, hex16 and hex8.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If parses a valid guid, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT32 Index;
+  INT8  *Pin;
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, "{", 1) != 0) {
+    return FALSE;
+  }
+  (*Pindex)++;
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (!ParseHex32 (Pbegin, length, Pindex)) {
+    *Pindex = Pin;
+    return FALSE;
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, ",", 1) != 0) {
+    return FALSE;
+  } else {
+    (*Pindex)++;
+  }
+
+  for (Index = 0; Index < 2; Index++) {
+    LeftTrim (Pbegin, length, Pindex);
+    if (!ParseHex16 (Pbegin, length, Pindex)) {
+      *Pindex = Pin;
+      return FALSE;
+    }
+
+    LeftTrim (Pbegin, length, Pindex);
+    if (strncmp (*Pindex, ",", 1) != 0) {
+      return FALSE;
+    } else {
+      (*Pindex)++;
+    }
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, "{", 1) != 0) {
+    return FALSE;
+  }
+  (*Pindex)++;
+
+  for (Index = 0; Index < 7; Index++) {
+    LeftTrim (Pbegin, length, Pindex);
+    if (!ParseHex8 (Pbegin, length, Pindex)) {
+      *Pindex = Pin;
+      return FALSE;
+    }
+
+    LeftTrim (Pbegin, length, Pindex);
+    if (strncmp (*Pindex, ",", 1) != 0) {
+      return FALSE;
+    } else {
+      (*Pindex)++;
+    }
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (!ParseHex8 (Pbegin, length, Pindex)) {
+    *Pindex = Pin;
+    return FALSE;
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, "}", 1) != 0) {
+    return FALSE;
+  } else {
+    (*Pindex)++;
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, "}", 1) != 0) {
+    return FALSE;
+  } else {
+    (*Pindex)++;
+  }
+
+  return TRUE;
+}
+
+BOOLEAN
+ParseRightFactor (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse rightfactor in bool expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If string is a valid rightfactor expression, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT8  *Pin;
+
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  //
+  // <rightfactor> ::=AND <term> <rightbool> <rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_AND, strlen (OPERATOR_AND)) == 0) {
+    *Pindex += strlen (OPERATOR_AND);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseTerm (Pbegin, length, Pindex)) {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (ParseRightBool (Pbegin, length, Pindex)) {
+        LeftTrim (Pbegin, length, Pindex);
+        if (ParseRightFactor (Pbegin, length, Pindex)) {
+          return TRUE;
+        } else {
+          *Pindex = Pin;
+        }
+      } else {
+        *Pindex = Pin;
+      }
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <rightfactor> ::=OR <term> <rightbool> <rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_OR, strlen (OPERATOR_OR)) == 0) {
+    *Pindex += strlen (OPERATOR_OR);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseTerm (Pbegin, length, Pindex)) {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (ParseRightBool (Pbegin, length, Pindex)) {
+        LeftTrim (Pbegin, length, Pindex);
+        if (ParseRightFactor (Pbegin, length, Pindex)) {
+          return TRUE;
+        } else {
+          *Pindex = Pin;
+        }
+      } else {
+        *Pindex = Pin;
+      }
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <rightfactor> ::= ''
+  //
+  *Pindex = Pin;
+  return TRUE;
+}
+
+BOOLEAN
+ParseRightBool (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse rightbool in bool expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If string is a valid rightbool expression, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT8  *Pin;
+
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  //
+  // <rightbool>::= AND <term><rightbool>
+  //
+  if (strncmp (*Pindex, OPERATOR_AND, strlen (OPERATOR_AND)) == 0) {
+    *Pindex += strlen (OPERATOR_AND);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseTerm (Pbegin, length, Pindex)) {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (ParseRightBool (Pbegin, length, Pindex)) {
+        return TRUE;
+      } else {
+        *Pindex = Pin;
+      }
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <rightbool>::=  OR <term><rightbool>
+  //
+  if (strncmp (*Pindex, OPERATOR_OR, strlen (OPERATOR_OR)) == 0) {
+    *Pindex += strlen (OPERATOR_OR);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseTerm (Pbegin, length, Pindex)) {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (ParseRightBool (Pbegin, length, Pindex)) {
+        return TRUE;
+      } else {
+        *Pindex = Pin;
+      }
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <rightbool>::= ''
+  //
+  *Pindex = Pin;
+  return TRUE;
+}
+
+BOOLEAN
+ParseFactor (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse factor in bool expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If string is a valid factor, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT8  *Pin;
+
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  //
+  // <factor>   ::= '('<bool>')'<rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_LEFT_PARENTHESIS, strlen (OPERATOR_LEFT_PARENTHESIS)) == 0) {
+    *Pindex += strlen (OPERATOR_LEFT_PARENTHESIS);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (!ParseBool (Pbegin, length, Pindex)) {
+      *Pindex = Pin;
+    } else {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (strncmp (*Pindex, OPERATOR_RIGHT_PARENTHESIS, strlen (OPERATOR_RIGHT_PARENTHESIS)) == 0) {
+        *Pindex += strlen (OPERATOR_RIGHT_PARENTHESIS);
+        LeftTrim (Pbegin, length, Pindex);
+
+        if (ParseRightFactor (Pbegin, length, Pindex)) {
+          return TRUE;
+        } else {
+          *Pindex = Pin;
+        }
+      }
+    }
+  }
+  //
+  // <factor>   ::= NOT <factor> <rightbool> <rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_NOT, strlen (OPERATOR_NOT)) == 0) {
+    *Pindex += strlen (OPERATOR_NOT);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseFactor (Pbegin, length, Pindex)) {
+      LeftTrim (Pbegin, length, Pindex);
+
+      if (ParseRightBool (Pbegin, length, Pindex)) {
+        LeftTrim (Pbegin, length, Pindex);
+
+        if (ParseRightFactor (Pbegin, length, Pindex)) {
+          return TRUE;
+        } else {
+          *Pindex = Pin;
+        }
+      } else {
+        *Pindex = Pin;
+      }
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <factor>   ::= TRUE <rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_TRUE, strlen (OPERATOR_TRUE)) == 0) {
+    *Pindex += strlen (OPERATOR_TRUE);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseRightFactor (Pbegin, length, Pindex)) {
+      return TRUE;
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <factor>   ::= FALSE <rightfactor>
+  //
+  if (strncmp (*Pindex, OPERATOR_FALSE, strlen (OPERATOR_FALSE)) == 0) {
+    *Pindex += strlen (OPERATOR_FALSE);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseRightFactor (Pbegin, length, Pindex)) {
+      return TRUE;
+    } else {
+      *Pindex = Pin;
+    }
+  }
+  //
+  // <factor>   ::= <guid> <rightfactor>
+  //
+  if (ParseGuid (Pbegin, length, Pindex)) {
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (ParseRightFactor (Pbegin, length, Pindex)) {
+      return TRUE;
+    } else {
+      *Pindex = Pin;
+      return FALSE;
+    }
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseTerm (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse term in bool expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If string is a valid term, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT8  *Pin;
+
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  //
+  // <term>     ::= NOT <factor>
+  //
+  if (strncmp (*Pindex, OPERATOR_NOT, strlen (OPERATOR_NOT)) == 0) {
+    *Pindex += strlen (OPERATOR_NOT);
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (!ParseFactor (Pbegin, length, Pindex)) {
+      *Pindex = Pin;
+    } else {
+      return TRUE;
+    }
+  }
+  //
+  // <term>     ::=<factor>
+  //
+  if (ParseFactor (Pbegin, length, Pindex)) {
+    return TRUE;
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseBool (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length,
+  IN OUT  INT8      **Pindex
+  )
+/*++
+
+Routine Description:
+
+  Parse bool expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+  Pindex    The pointer of pointer to the next parse character in the string
+
+Returns:
+
+  BOOLEAN   If string is a valid bool expression, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  INT8  *Pin;
+  Pin = *Pindex;
+  LeftTrim (Pbegin, length, Pindex);
+
+  if (ParseTerm (Pbegin, length, Pindex)) {
+    LeftTrim (Pbegin, length, Pindex);
+
+    if (!ParseRightBool (Pbegin, length, Pindex)) {
+      *Pindex = Pin;
+      return FALSE;
+    } else {
+      return TRUE;
+    }
+  } else {
+    *Pindex = Pin;
+    return FALSE;
+  }
+}
+
+BOOLEAN
+ParseDepex (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length
+  )
+/*++
+
+Routine Description:
+
+  Parse whole dependency expression.
+
+Arguments:
+
+  Pbegin    The pointer to the string  
+  length    length of the string
+
+Returns:
+
+  BOOLEAN   If string is a valid dependency expression, return TRUE, otherwise FALSE
+
+
+--*/
+{
+  BOOLEAN Result;
+  INT8    **Pindex;
+  INT8    *temp;
+
+  Result  = FALSE;
+  temp    = Pbegin;
+  Pindex  = &temp;
+
+  LeftTrim (Pbegin, length, Pindex);
+  if (strncmp (*Pindex, OPERATOR_BEFORE, strlen (OPERATOR_BEFORE)) == 0) {
+    (*Pindex) += strlen (OPERATOR_BEFORE);
+    Result = ParseGuid (Pbegin, length, Pindex);
+
+  } else if (strncmp (*Pindex, OPERATOR_AFTER, strlen (OPERATOR_AFTER)) == 0) {
+    (*Pindex) += strlen (OPERATOR_AFTER);
+    Result = ParseGuid (Pbegin, length, Pindex);
+
+  } else if (strncmp (*Pindex, OPERATOR_SOR, strlen (OPERATOR_SOR)) == 0) {
+    (*Pindex) += strlen (OPERATOR_SOR);
+    Result = ParseBool (Pbegin, length, Pindex);
+
+  } else {
+    Result = ParseBool (Pbegin, length, Pindex);
+
+  }
+
+  LeftTrim (Pbegin, length, Pindex);
+  return (BOOLEAN) (Result && (*Pindex) >= (Pbegin + length));
+}
diff --git a/Tools/Source/TianoTools/GenDepex/DepexParser.h b/Tools/Source/TianoTools/GenDepex/DepexParser.h
new file mode 100644
index 0000000000..29e0884a3e
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/DepexParser.h
@@ -0,0 +1,26 @@
+/*++
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+  Module Name:  
+          GenDepex.h
+
+  Abstract:
+          This file contains the relevant declarations required
+          to generate a binary Dependency File
+
+  Complies with Tiano C Coding Standards Document, version 0.31, 12 Dec 2000.
+
+--*/
+
+// TODO: fix comment to set correct module name: DepexParser.h
+#ifndef _EFI_DEPEX_PARSER_H_
+#define _EFI_DEPEX_PARSER_H_
+#include "GenDepex.h"
+#endif
diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.c b/Tools/Source/TianoTools/GenDepex/GenDepex.c
new file mode 100644
index 0000000000..2a65e086fc
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/GenDepex.c
@@ -0,0 +1,916 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenDepex.c
+
+Abstract:
+
+  Generate Dependency Expression ("GenDepex")
+
+  Infix to Postfix Algorithm
+
+  This code has been scrubbed to be free of having any EFI core tree dependencies.
+  It should build in any environment that supports a standard C-library w/ string
+  operations and File I/O services.
+
+  As an example of usage, consider the following:
+
+  The input user file could be something like "Sample.DXS" whose contents are
+
+    #include "Tiano.h"
+
+    DEPENDENCY_START
+      NOT (DISK_IO_PROTOCOL AND SIMPLE_FILE_SYSTEM_PROTOCOL) 
+        OR EFI_PXE_BASE_CODE_PROTOCOL
+    DEPENDENCY_END
+
+  This file is then washed through the C-preprocessor, viz.,
+
+    cl /EP Sample.DXS > Sample.TMP1
+
+  This yields the following file "Sample.TMP1" whose contents are
+
+    DEPENDENCY_START
+      NOT ({ 0xce345171, 0xba0b, 0x11d2, 0x8e, 0x4f, 0x0, 0xa0, 0xc9, 0x69, 0x72,
+        0x3b } AND { 0x964e5b22, 0x6459, 0x11d2, 0x8e, 0x39, 0x0, 0xa0, 0xc9, 0x69,
+        0x72, 0x3b }) OR { 0x03c4e603, 0xac28, 0x11d3, 0x9a, 0x2d, 0x00, 0x90, 0x27,
+        0x3f, 0xc1, 0x4d }
+    DEPENDENCY_END
+
+  This file, in turn, will be fed into the utility, viz.,
+
+    GenDepex Sample.TMP1 Sample.TMP2
+
+  With a file that is 55 bytes long:
+
+     55 bytes for the grammar binary
+        PUSH opcode         - 1  byte
+        GUID Instance       - 16 bytes
+        PUSH opcode         - 1  byte
+        GUID Instance       - 16 bytes
+        AND opcode          - 1  byte
+        NOT opcode          - 1  byte
+        PUSH opcode         - 1  byte
+        GUID Instance       - 16 bytes
+        OR opcode           - 1  byte
+        END opcode          - 1  byte
+
+  The file "Sample.TMP2" could be fed via a Section-builder utility 
+  (GenSection) that would be used for the creation of a dependency
+  section file (.DPX) which in turn would be used by a generate FFS
+  utility (GenFfsFile) to produce a DXE driver/core (.DXE) or 
+  a DXE application (.APP) file.
+
+  Complies with Tiano C Coding Standards Document, version 0.31, 12 Dec 2000.
+
+--*/
+
+#include "GenDepex.h"
+
+#define TOOL_NAME "GenDepex"
+
+extern
+ParseDepex (
+  IN      INT8      *Pbegin,
+  IN      UINT32    length
+  );
+
+VOID
+PrintGenDepexUtilityInfo (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Displays the standard utility information to SDTOUT.
+
+Arguments:
+
+  None
+
+Returns:
+
+  None
+
+--*/
+{
+  printf (
+    "%s, Tiano Dependency Expression Generation Utility. Version %d.%d.\n",
+    UTILITY_NAME,
+    UTILITY_MAJOR_VERSION,
+    UTILITY_MINOR_VERSION
+    );
+  printf ("Copyright (C) 1996-2002 Intel Corporation.  All rights reserved.\n\n");
+}
+
+VOID
+PrintGenDepexUsageInfo (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Displays the utility usage syntax to STDOUT.
+
+Arguments:
+
+  None
+
+Returns:
+
+  None
+
+--*/
+{
+  printf (
+    "Usage: %s -I <INFILE> -O <OUTFILE> [-P <Optional Boundary for padding up>] \n",
+    UTILITY_NAME
+    );
+  printf (" Where:\n");
+  printf ("  <INFILE> is the input pre-processed dependency text files name.\n");
+  printf ("  <OUTFILE> is the output binary dependency files name.\n");
+  printf ("  <Optional Boundary for padding up> is the padding integer value.\n");
+  printf ("    This is the boundary to align the output file size to.\n");
+}
+
+DEPENDENCY_OPCODE
+PopOpCode (
+  IN OUT VOID **Stack
+  )
+/*++
+
+Routine Description:
+
+  Pop an element from the Opcode stack.
+
+Arguments:
+
+  Stack               Current top of the OpCode stack location
+
+Returns:
+
+  DEPENDENCY_OPCODE   OpCode at the top of the OpCode stack.
+  Stack               New top of the OpCode stack location
+
+
+--*/
+{
+  DEPENDENCY_OPCODE *OpCodePtr;
+
+  OpCodePtr = *Stack;
+  OpCodePtr--;
+  *Stack = OpCodePtr;
+  return *OpCodePtr;
+}
+
+VOID
+PushOpCode (
+  IN OUT  VOID                **Stack,
+  IN      DEPENDENCY_OPCODE   OpCode
+  )
+/*++
+
+Routine Description:
+
+  Push an element onto the Opcode Stack
+
+Arguments:
+
+  Stack     Current top of the OpCode stack location
+  OpCode    OpCode to push onto the stack
+
+Returns:
+
+  Stack     New top of the OpCode stack location
+
+--*/
+{
+  DEPENDENCY_OPCODE *OpCodePtr;
+
+  OpCodePtr   = *Stack;
+  *OpCodePtr  = OpCode;
+  OpCodePtr++;
+  *Stack = OpCodePtr;
+}
+
+EFI_STATUS
+GenerateDependencyExpression (
+  IN     FILE           *InFile,
+  IN OUT FILE           *OutFile,
+  IN     UINT8          Padding  OPTIONAL
+  )
+/*++
+
+Routine Description:
+
+  This takes the pre-compiled dependency text file and 
+  converts it into a binary dependency file.
+
+  The BNF for the dependency expression is as follows 
+  (from the DXE 1.0 Draft specification).
+
+  The inputted BNF grammar is thus:
+    <depex> ::= sor <dep> | 
+                before GUID <dep> | 
+                after GUID <dep> | 
+                <bool>
+
+    <dep> ::=   <bool> |
+
+    <bool> ::=  <bool> and <term> | 
+                <bool> or <term> | 
+                <term>
+
+    <term> ::=  not <factor> | 
+                <factor>
+
+    <factor> ::= ( <bool> ) | 
+                 <term> <term> | 
+                 GUID | 
+                 <boolval>
+
+    <boolval> ::= true | 
+                  false
+
+  The outputed binary grammer is thus:
+    <depex> ::= sor <dep> | 
+                before <depinst> <dep> | 
+                after <depinst> <dep> | 
+                <bool>
+
+    <dep> ::=   <bool> |
+
+    <bool> ::=  <bool> and <term> | 
+                <bool> or <term> | <term>
+
+    <term> ::=  not <factor> | 
+                <factor>
+
+    <factor> ::= ( <bool> ) | 
+                 <term> <term> | 
+                 <boolval> | 
+                 <depinst> | 
+                 <termval>
+
+    <boolval> ::= true | 
+                  false
+
+    <depinst> ::= push GUID
+
+    <termval> ::= end
+
+  BugBug: A correct grammer is parsed correctly. A file that violates the
+          grammer may parse when it should generate an error. There is some
+          error checking and it covers most of the case when it's an include
+          of definition issue. An ill formed expresion may not be detected.
+
+Arguments:
+
+  InFile -  Input pre-compiled text file of the dependency expression.
+            This needs to be in ASCII.
+            The file pointer can not be NULL.
+
+  OutFile - Binary dependency file.
+            The file pointer can not be NULL.
+
+  Padding - OPTIONAL integer value to pad the output file to.
+
+
+Returns:
+
+  EFI_SUCCESS             The function completed successfully.
+  EFI_INVALID_PARAMETER   One of the parameters in the text file was invalid.
+  EFI_OUT_OF_RESOURCES    Unable to allocate memory.
+  EFI_ABORTED             An misc error occurred.
+
+--*/
+{
+  INT8              *Ptrx;
+  INT8              *Pend;
+  INT8              *EvaluationStack;
+  INT8              *StackPtr;
+  INT8              *Buffer;
+  INT8              Line[LINESIZE];
+  UINTN             Index;
+  UINTN             OutFileSize;
+  UINTN             FileSize;
+  UINTN             Results;
+  BOOLEAN           NotDone;
+  BOOLEAN           Before_Flag;
+  BOOLEAN           After_Flag;
+  BOOLEAN           Dep_Flag;
+  BOOLEAN           SOR_Flag;
+  EFI_GUID          Guid;
+  UINTN             ArgCountParsed;
+  DEPENDENCY_OPCODE Opcode;
+
+  Before_Flag = FALSE;
+  After_Flag  = FALSE;
+  Dep_Flag    = FALSE;
+  SOR_Flag    = FALSE;
+
+  memset (Line, 0, LINESIZE);
+
+  OutFileSize     = 0;
+
+  EvaluationStack = (INT8 *) malloc (EVAL_STACK_SIZE);
+
+  if (EvaluationStack != NULL) {
+    StackPtr = EvaluationStack;
+  } else {
+    printf ("Unable to allocate memory to EvaluationStack - Out of resources\n");
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  Results = (UINTN) fseek (InFile, 0, SEEK_END);
+
+  if (Results != 0) {
+    printf ("FSEEK failed - Aborted\n");
+    return EFI_ABORTED;
+  }
+
+  FileSize = ftell (InFile);
+
+  if (FileSize == -1L) {
+    printf ("FTELL failed - Aborted\n");
+    return EFI_ABORTED;
+  }
+
+  Buffer = (INT8 *) malloc (FileSize + BUFFER_SIZE);
+
+  if (Buffer == NULL) {
+    printf ("Unable to allocate memory to Buffer - Out of resources\n");
+    free (EvaluationStack);
+
+    Results = (UINTN) fclose (InFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    Results = (UINTN) fclose (OutFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  Results = (UINTN) fseek (InFile, 0, SEEK_SET);
+
+  if (Results != 0) {
+    printf ("FSEEK failed - Aborted\n");
+    return EFI_ABORTED;
+  }
+
+  fread (Buffer, FileSize, 1, InFile);
+
+  Ptrx    = Buffer;
+  Pend    = Ptrx + FileSize - strlen (DEPENDENCY_END);
+  Index   = FileSize;
+
+  NotDone = TRUE;
+  while ((Index--) && NotDone) {
+
+    if (strncmp (Pend, DEPENDENCY_END, strlen (DEPENDENCY_END)) == 0) {
+      NotDone = FALSE;
+    } else {
+      Pend--;
+    }
+  }
+
+  if (NotDone) {
+    printf ("Couldn't find end string %s\n", DEPENDENCY_END);
+
+    Results = (UINTN) fclose (InFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    Results = (UINTN) fclose (OutFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    free (Buffer);
+    free (EvaluationStack);
+
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Index   = FileSize;
+
+  NotDone = TRUE;
+  while ((Index--) && NotDone) {
+
+    if (strncmp (Ptrx, DEPENDENCY_START, strlen (DEPENDENCY_START)) == 0) {
+      Ptrx += sizeof (DEPENDENCY_START);
+      NotDone = FALSE;
+      //
+      // BUGBUG -- should Index be decremented by sizeof(DEPENDENCY_START)?
+      //
+    } else {
+      Ptrx++;
+    }
+  }
+
+  if (NotDone) {
+    printf ("Couldn't find start string %s\n", DEPENDENCY_START);
+
+    Results = (UINTN) fclose (InFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    Results = (UINTN) fclose (OutFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    free (Buffer);
+    free (EvaluationStack);
+
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  //  validate the syntax of expression
+  //
+  if (!ParseDepex (Ptrx, Pend - Ptrx - 1)) {
+    printf ("The syntax of expression is wrong\n");
+
+    Results = (UINTN) fclose (InFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    Results = (UINTN) fclose (OutFile);
+    if (Results != 0) {
+      printf ("FCLOSE failed\n");
+    }
+
+    free (Buffer);
+    free (EvaluationStack);
+
+    return EFI_INVALID_PARAMETER;
+  }
+
+  NotDone = TRUE;
+
+  while ((Index--) && NotDone) {
+
+    if (*Ptrx == ' ') {
+      Ptrx++;
+    } else if (*Ptrx == '\n' || *Ptrx == '\r') {
+      Ptrx++;
+    } else if (strncmp (Ptrx, OPERATOR_SOR, strlen (OPERATOR_SOR)) == 0) {
+      //
+      //  Checks for some invalid dependencies
+      //
+      if (Before_Flag) {
+
+        printf ("A BEFORE operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (After_Flag) {
+
+        printf ("An AFTER operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (SOR_Flag) {
+
+        printf ("Another SOR operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (Dep_Flag) {
+
+        printf ("The Schedule On Request - SOR operator must be the first operator following DEPENDENCY_START\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else {
+        //
+        //  BUGBUG - This was not in the spec but is in the CORE code
+        //  An OPERATOR_SOR has to be first - following the DEPENDENCY_START
+        //
+        fputc (EFI_DEP_SOR, OutFile);
+        OutFileSize++;
+        Ptrx += sizeof (OPERATOR_SOR);
+        SOR_Flag = TRUE;
+
+      }
+    } else if (strncmp (Ptrx, OPERATOR_BEFORE, strlen (OPERATOR_BEFORE)) == 0) {
+      //
+      //  Checks for some invalid dependencies
+      //
+      if (Before_Flag) {
+
+        printf ("Another BEFORE operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (After_Flag) {
+
+        printf ("An AFTER operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (SOR_Flag) {
+
+        printf ("A SOR operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (Dep_Flag) {
+
+        printf ("The BEFORE operator must be the first operator following DEPENDENCY_START\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else {
+        fputc (EFI_DEP_BEFORE, OutFile);
+        OutFileSize++;
+        Ptrx += sizeof (OPERATOR_BEFORE);
+        Before_Flag = TRUE;
+      }
+    } else if (strncmp (Ptrx, OPERATOR_AFTER, strlen (OPERATOR_AFTER)) == 0) {
+      //
+      //  Checks for some invalid dependencies
+      //
+      if (Before_Flag) {
+
+        printf ("A BEFORE operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (After_Flag) {
+
+        printf ("Another AFTER operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (SOR_Flag) {
+
+        printf ("A SOR operator was detected.\n");
+        printf ("There can only be one SOR or one AFTER or one BEFORE operator\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else if (Dep_Flag) {
+
+        printf ("The AFTER operator must be the first operator following DEPENDENCY_START\n");
+        return EFI_INVALID_PARAMETER;
+
+      } else {
+        fputc (EFI_DEP_AFTER, OutFile);
+        OutFileSize++;
+        Ptrx += sizeof (OPERATOR_AFTER);
+        Dep_Flag    = TRUE;
+        After_Flag  = TRUE;
+      }
+    } else if (strncmp (Ptrx, OPERATOR_AND, strlen (OPERATOR_AND)) == 0) {
+      while (StackPtr != EvaluationStack) {
+        Opcode = PopOpCode ((VOID **) &StackPtr);
+        if (Opcode != DXE_DEP_LEFT_PARENTHESIS) {
+          fputc (Opcode, OutFile);
+          OutFileSize++;
+        } else {
+          PushOpCode ((VOID **) &StackPtr, DXE_DEP_LEFT_PARENTHESIS);
+          break;
+        }
+      }
+
+      PushOpCode ((VOID **) &StackPtr, EFI_DEP_AND);
+      Ptrx += sizeof (OPERATOR_AND);
+      Dep_Flag = TRUE;
+
+    } else if (strncmp (Ptrx, OPERATOR_OR, strlen (OPERATOR_OR)) == 0) {
+      while (StackPtr != EvaluationStack) {
+        Opcode = PopOpCode ((VOID **) &StackPtr);
+        if (Opcode != DXE_DEP_LEFT_PARENTHESIS) {
+          fputc (Opcode, OutFile);
+          OutFileSize++;
+        } else {
+          PushOpCode ((VOID **) &StackPtr, DXE_DEP_LEFT_PARENTHESIS);
+          break;
+        }
+      }
+
+      PushOpCode ((VOID **) &StackPtr, EFI_DEP_OR);
+      Ptrx += sizeof (OPERATOR_OR);
+      Dep_Flag = TRUE;
+
+    } else if (strncmp (Ptrx, OPERATOR_NOT, strlen (OPERATOR_NOT)) == 0) {
+      while (StackPtr != EvaluationStack) {
+        Opcode = PopOpCode ((VOID **) &StackPtr);
+        if (Opcode != DXE_DEP_LEFT_PARENTHESIS) {
+          fputc (Opcode, OutFile);
+          OutFileSize++;
+        } else {
+          PushOpCode ((VOID **) &StackPtr, DXE_DEP_LEFT_PARENTHESIS);
+          break;
+        }
+      }
+
+      PushOpCode ((VOID **) &StackPtr, EFI_DEP_NOT);
+      Ptrx += sizeof (OPERATOR_NOT);
+      Dep_Flag = TRUE;
+
+    } else if (*Ptrx == '\t') {
+
+      printf ("File contains tabs. This violates the coding standard\n");
+      return EFI_INVALID_PARAMETER;
+
+    } else if (*Ptrx == '\n') {
+      //
+      // Skip the newline character in the file
+      //
+      Ptrx++;
+
+    } else if (strncmp (Ptrx, OPERATOR_LEFT_PARENTHESIS, strlen (OPERATOR_LEFT_PARENTHESIS)) == 0) {
+      PushOpCode ((VOID **) &StackPtr, DXE_DEP_LEFT_PARENTHESIS);
+
+      Ptrx += strlen (OPERATOR_LEFT_PARENTHESIS);
+      Dep_Flag = TRUE;
+
+    } else if (strncmp (Ptrx, OPERATOR_RIGHT_PARENTHESIS, strlen (OPERATOR_RIGHT_PARENTHESIS)) == 0) {
+      while (StackPtr != EvaluationStack) {
+        Opcode = PopOpCode ((VOID **) &StackPtr);
+        if (Opcode != DXE_DEP_LEFT_PARENTHESIS) {
+          fputc (Opcode, OutFile);
+          OutFileSize++;
+        } else {
+          break;
+        }
+      }
+
+      Ptrx += strlen (OPERATOR_RIGHT_PARENTHESIS);
+      Dep_Flag = TRUE;
+
+    } else if (strncmp (Ptrx, OPERATOR_TRUE, strlen (OPERATOR_TRUE)) == 0) {
+
+      fputc (EFI_DEP_TRUE, OutFile);
+
+      OutFileSize++;
+
+      //
+      // OutFileSize += sizeof (EFI_DEP_TRUE);
+      //
+      Dep_Flag = TRUE;
+
+      Ptrx += strlen (OPERATOR_TRUE);
+
+    } else if (strncmp (Ptrx, OPERATOR_FALSE, strlen (OPERATOR_FALSE)) == 0) {
+
+      fputc (EFI_DEP_FALSE, OutFile);
+
+      OutFileSize++;
+
+      //
+      // OutFileSize += sizeof (EFI_DEP_FALSE);
+      //
+      Dep_Flag = TRUE;
+
+      Ptrx += strlen (OPERATOR_FALSE);
+
+    } else if (*Ptrx == '{') {
+      Ptrx++;
+
+      if (*Ptrx == ' ') {
+        Ptrx++;
+      }
+
+      ArgCountParsed = sscanf (
+                        Ptrx,
+						"%x, %x, %x, { %x, %x, %x, %x, %x, %x, %x, %x }",
+                        &Guid.Data1,
+                        &Guid.Data2,
+                        &Guid.Data3,
+                        &Guid.Data4[0],
+                        &Guid.Data4[1],
+                        &Guid.Data4[2],
+                        &Guid.Data4[3],
+                        &Guid.Data4[4],
+                        &Guid.Data4[5],
+                        &Guid.Data4[6],
+                        &Guid.Data4[7]
+                        );
+
+      if (ArgCountParsed != 11) {
+        printf ("We have found an illegal GUID\n");
+        printf ("Fix your depex\n");
+        exit (-1);
+      }
+
+      while (*Ptrx != '}') {
+        Ptrx++;
+      }
+
+	  Ptrx++;
+      while (*Ptrx != '}') {
+        Ptrx++;
+      }
+	  //
+      // Absorb the closing }
+      //
+      Ptrx++;
+
+      //
+      // Don't provide a PUSH Opcode for the Before and After case
+      //
+      if ((!Before_Flag) && (!After_Flag)) {
+        fputc (EFI_DEP_PUSH, OutFile);
+        OutFileSize++;
+      }
+
+      fwrite (&Guid, sizeof (EFI_GUID), 1, OutFile);
+
+      OutFileSize += sizeof (EFI_GUID);
+      Dep_Flag = TRUE;
+
+    } else if (strncmp (Ptrx, DEPENDENCY_END, strlen (DEPENDENCY_END)) == 0) {
+      NotDone = FALSE;
+    } else {
+      //
+      // Not a valid construct. Null terminate somewhere out there and
+      // print an error message.
+      //
+      *(Ptrx + 20) = 0;
+      printf (TOOL_NAME " ERROR: Unrecognized input at: \"%s\"...\n", Ptrx);
+      return EFI_INVALID_PARAMETER;
+    }
+  }
+  //
+  //  DRAIN();
+  //
+  while (StackPtr != EvaluationStack) {
+    fputc (PopOpCode ((VOID **) &StackPtr), OutFile);
+    OutFileSize++;
+  }
+
+  if (OutFileSize == 0) {
+    printf ("Grammer contains no operators or constants\n");
+    return EFI_INVALID_PARAMETER;
+  }
+
+  fputc (EFI_DEP_END, OutFile);
+
+  OutFileSize++;
+
+  //
+  //  Checks for invalid padding values
+  //
+  if (Padding < 0) {
+
+    printf ("The inputted padding value was %d\n", Padding);
+    printf ("The optional padding value can not be less than ZERO\n");
+    return EFI_INVALID_PARAMETER;
+
+  } else if (Padding > 0) {
+
+    while ((OutFileSize % Padding) != 0) {
+
+      fputc (' ', OutFile);
+      OutFileSize++;
+    }
+  }
+
+  Results = (UINTN) fclose (InFile);
+  if (Results != 0) {
+    printf ("FCLOSE failed\n");
+  }
+
+  Results = (UINTN) fclose (OutFile);
+  if (Results != 0) {
+    printf ("FCLOSE failed\n");
+  }
+
+  free (Buffer);
+  free (EvaluationStack);
+
+  return EFI_SUCCESS;
+} // End GenerateDependencyExpression function
+
+int
+main (
+  IN UINTN argc,
+  IN CHAR8 *argv[]
+  )
+/*++
+
+Routine Description:
+
+  Parse user entries.  Print some rudimentary help
+
+Arguments:
+
+  argc    The count of input arguments
+  argv    The input arguments string array
+
+Returns:
+
+  EFI_SUCCESS             The function completed successfully.
+  EFI_INVALID_PARAMETER   One of the input parameters was invalid or one of the parameters in the text file was invalid.
+  EFI_OUT_OF_RESOURCES    Unable to allocate memory.
+  EFI_ABORTED             Unable to open/create a file or a misc error.
+
+--*/
+// TODO:    ] - add argument and description to function comment
+{
+  FILE    *OutFile;
+  FILE    *InFile;
+  UINT8   Padding;
+  UINTN   Index;
+  BOOLEAN Input_Flag;
+  BOOLEAN Output_Flag;
+  BOOLEAN Pad_Flag;
+
+  InFile      = NULL;
+  OutFile     = NULL;
+  Padding     = 0;
+  Input_Flag  = FALSE;
+  Output_Flag = FALSE;
+  Pad_Flag    = FALSE;
+
+  //
+  //  Output the calling arguments
+  //
+  printf ("\n\n");
+  for (Index = 0; Index < argc; Index++) {
+    printf ("%s ", argv[Index]);
+  }
+
+  printf ("\n\n");
+
+  if (argc < 5) {
+    printf ("Not enough arguments\n");
+    PrintGenDepexUsageInfo ();
+    return EFI_INVALID_PARAMETER;
+  }
+
+  for (Index = 1; Index < argc - 1; Index++) {
+
+    if ((strcmp (argv[Index], "-I") == 0) || (strcmp (argv[Index], "-i") == 0)) {
+
+      if (!Input_Flag) {
+
+        InFile      = fopen (argv[Index + 1], "rb");
+        Input_Flag  = TRUE;
+
+      } else {
+        printf ("GenDepex only allows one INPUT (-I) argument\n");
+        return EFI_INVALID_PARAMETER;
+      }
+
+    } else if ((strcmp (argv[Index], "-O") == 0) || (strcmp (argv[Index], "-o") == 0)) {
+
+      if (!Output_Flag) {
+
+        OutFile     = fopen (argv[Index + 1], "wb");
+        Output_Flag = TRUE;
+
+      } else {
+        printf ("GenDepex only allows one OUTPUT (-O) argument\n");
+        return EFI_INVALID_PARAMETER;
+      }
+
+    } else if ((strcmp (argv[Index], "-P") == 0) || (strcmp (argv[Index], "-p") == 0)) {
+
+      if (!Pad_Flag) {
+
+        Padding   = (UINT8) atoi (argv[Index + 1]);
+        Pad_Flag  = TRUE;
+
+      } else {
+        printf ("GenDepex only allows one PADDING (-P) argument\n");
+        return EFI_INVALID_PARAMETER;
+      }
+    }
+  }
+
+  PrintGenDepexUtilityInfo ();
+
+  if (InFile == NULL) {
+    printf ("Can not open <INFILE> for reading.\n");
+    PrintGenDepexUsageInfo ();
+    return EFI_ABORTED;
+  }
+
+  if (OutFile == NULL) {
+    printf ("Can not open <OUTFILE> for writting.\n");
+    PrintGenDepexUsageInfo ();
+    return EFI_ABORTED;
+  }
+
+  return GenerateDependencyExpression (InFile, OutFile, Padding);
+}
diff --git a/Tools/Source/TianoTools/GenDepex/GenDepex.h b/Tools/Source/TianoTools/GenDepex/GenDepex.h
new file mode 100644
index 0000000000..cfba0f2011
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/GenDepex.h
@@ -0,0 +1,71 @@
+/*++
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+  Module Name:  
+          GenDepex.h
+
+  Abstract:
+          This file contains the relevant declarations required
+          to generate a binary Dependency File
+
+  Complies with Tiano C Coding Standards Document, version 0.31, 12 Dec 2000.
+
+--*/
+
+#ifndef _EFI_GEN_DEPEX_H
+#define _EFI_GEN_DEPEX_H
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+#ifndef __GNUC__
+#include <malloc.h>
+#endif
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <Dependency.h>
+
+#define DEPENDENCY_START            "DEPENDENCY_START"
+#define OPERATOR_BEFORE             "BEFORE"
+#define OPERATOR_AFTER              "AFTER"
+#define OPERATOR_AND                "AND"
+#define OPERATOR_OR                 "OR"
+#define OPERATOR_NOT                "NOT"
+#define OPERATOR_TRUE               "TRUE"
+#define OPERATOR_FALSE              "FALSE"
+#define OPERATOR_SOR                "SOR"
+#define OPERATOR_END                "END"
+#define OPERATOR_LEFT_PARENTHESIS   "("
+#define OPERATOR_RIGHT_PARENTHESIS  ")"
+#define DEPENDENCY_END              "DEPENDENCY_END"
+
+#define DXE_DEP_LEFT_PARENTHESIS    0x0a
+#define DXE_DEP_RIGHT_PARENTHESIS   0x0b
+
+#define LINESIZE                    320
+#define SIZE_A_SYMBOL               60
+#define DEPENDENCY_OPCODE           UINT8
+#define EVAL_STACK_SIZE             0x1024
+#define BUFFER_SIZE                 0x100
+
+//
+// Utility Name
+//
+#define UTILITY_NAME  "GenDepex"
+
+//
+// Utility version information
+//
+#define UTILITY_MAJOR_VERSION 0
+#define UTILITY_MINOR_VERSION 5
+
+#endif
diff --git a/Tools/Source/TianoTools/GenDepex/build.gcc b/Tools/Source/TianoTools/GenDepex/build.gcc
new file mode 100644
index 0000000000..71f5a9b731
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c -o GenDepex -L../Library-mingw -lCommon 
diff --git a/Tools/Source/TianoTools/GenDepex/build.xml b/Tools/Source/TianoTools/GenDepex/build.xml
new file mode 100644
index 0000000000..9135694d2f
--- /dev/null
+++ b/Tools/Source/TianoTools/GenDepex/build.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenDepex Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenDepex"/>
+  <property name="LibName" value="DepexParser"/>
+  <property name="FileSet" value="GenDepex.c GenDepex.h"/>
+	<property name="LibFileSet" value="DepexParser.c DepexParser.h" />
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Lib, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init, Lib">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools${ext_static}"/>
+			<linkerarg value="${LIB_DIR}/${LibName}${ext_static}"/>
+    </cc>
+	</target>
+
+	<target name="Lib" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${LIB_DIR}/${LibName}"
+        outtype="static"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${LibFileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+		</cc>
+      <if>
+        <os family="dos"/>
+        <then>
+          <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">
+            <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/${LibName}${ext_static}"/>
+          </exec>
+        </then>
+      </if>
+  </target>
+	
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
new file mode 100644
index 0000000000..0e93a47cc9
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.c
@@ -0,0 +1,2645 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenFfsFile.c
+
+Abstract:
+
+  This file contains functions required to generate a Firmware File System
+  file.
+
+--*/
+
+#include "Base.h"
+#include "UefiBaseTypes.h"
+#include "FirmwareVolumeImageFormat.h"
+#include "FirmwareFileSystem.h"
+#include "FirmwareVolumeHeader.h"
+#include "FirmwareVolumeImageFormat.h"
+#include "ParseInf.h"
+#include "EfiCompress.h"
+#include "EfiCustomizedCompress.h"
+#include "Crc32.h"
+#include "GenFfsFile.h"
+#include <stdio.h>
+#include <ctype.h>  // for isalpha()
+//
+// include file for _spawnv
+//
+#ifndef __GNUC__
+#include <process.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+#include "CommonLib.h"
+#include "EfiUtilityMsgs.h"
+#include "SimpleFileParsing.h"
+
+#define UTILITY_NAME    "GenFfsFile"
+#define TOOLVERSION     "0.32"
+#define MAX_ARRAY_SIZE  100
+
+static
+INT32
+GetNextLine (
+  OUT CHAR8       *Destination,
+  IN FILE         *Package,
+  IN OUT UINT32   *LineNumber
+  );
+
+static
+void
+CheckSlash (
+  IN OUT CHAR8  *String,
+  IN FILE       *In,
+  IN OUT UINT32 *LineNumber
+  );
+
+static
+INT32
+FindSectionInPackage (
+  IN CHAR8        *BuildDirectory,
+  IN FILE         *OverridePackage,
+  IN OUT UINT32   *LineNumber
+  );
+
+static
+STATUS
+ProcessCommandLineArgs (
+  int     Argc,
+  char    *Argv[]
+  );
+
+static
+void
+PrintUsage (
+  void
+  );
+
+//
+// Keep globals in this structure
+//
+static struct {
+  UINT8   BuildDirectory[_MAX_PATH];
+  UINT8   PrimaryPackagePath[_MAX_PATH];
+  UINT8   OverridePackagePath[_MAX_PATH];
+  BOOLEAN Verbose;
+} mGlobals;
+
+static EFI_GUID mZeroGuid = { 0 };
+
+static
+void
+StripQuotes (
+  IN OUT CHAR8 *String
+  )
+/*++
+
+Routine Description:
+
+  Removes quotes and/or whitespace from around a string
+
+Arguments:
+
+ String    - String to remove quotes from
+
+Returns:
+
+  None
+
+--*/
+{
+  UINTN Index;
+  UINTN Index2;
+  UINTN StrLen;
+
+  Index2  = strspn (String, "\" \t\n");
+  StrLen  = strlen (String);
+
+  for (Index = Index2; String[Index] != '\"', Index < StrLen; Index++) {
+    String[Index - Index2] = String[Index];
+  }
+
+  String[Index - Index2] = 0;
+}
+
+static
+void
+PrintUsage (
+  void
+  )
+/*++
+
+Routine Description:
+
+  Print Error / Help message.
+
+Arguments:
+
+  void
+
+Returns:
+
+  None
+
+--*/
+{
+  printf ("Usage:\n");
+  printf (UTILITY_NAME " -b \"build directory\" -p1 \"package1.inf\" -p2 \"package2.inf\" -v\n");
+  printf ("   -b \"build directory\":\n ");
+  printf ("       specifies the full path to the component build directory.\n");
+  printf ("   -p1 \"P1_path\":\n");
+  printf ("       specifies fully qualified file name to the primary package file.\n");
+  printf ("       This file will normally exist in the same directory as the makefile\n");
+  printf ("       for the component. Required.\n");
+  printf ("   -p2 \"P2_path\":\n");
+  printf ("       specifies fully qualified file name to the override package file.\n");
+  printf ("       This file will normally exist in the build tip. Optional.\n");
+}
+
+static
+INT32
+TestComment (
+  IN CHAR8  *String,
+  IN FILE   *In
+  )
+/*++
+
+Routine Description:
+
+  Tests input string to see if it is a comment, and if so goes to the next line in the file that is not a comment
+
+Arguments:
+
+  String      - String to test
+
+  In          - Open file to move pointer within
+
+Returns:
+
+  -1          - End of file reached
+   0          - Not a comment
+   1          - Comment bypassed
+
+--*/
+{
+  CHAR8 CharBuffer;
+
+  CharBuffer = 0;
+  if ((String[0] == '/') && (String[1] == '/')) {
+    while (CharBuffer != '\n') {
+      fscanf (In, "%c", &CharBuffer);
+      if (feof (In)) {
+        return -1;
+      }
+    }
+  } else {
+    return 0;
+  }
+
+  return 1;
+}
+
+static
+void
+BreakString (
+  IN CONST CHAR8 *Source,
+  OUT CHAR8      *Destination,
+  IN INTN        Direction
+  )
+/*++
+
+Routine Description:
+
+  Takes an input string and returns either the part before the =, or the part after the =, depending on direction
+
+Arguments:
+
+  Source      - String to break
+
+  Destination - Buffer to place new string in
+
+  Direction   - 0 to return all of source string before =
+                1 to return all of source string after =
+
+Returns:
+
+  None
+
+--*/
+{
+  UINTN Index;
+  UINTN Index2;
+
+  Index   = 0;
+  Index2  = 0;
+
+  if (strchr (Source, '=') == NULL) {
+    strcpy (Destination, Source);
+
+    return ;
+  }
+
+  if (Direction == 0) {
+    //
+    // return part of string before =
+    //
+    while (Source[Index] != '=') {
+      Destination[Index] = Source[Index++];
+    }
+
+    Destination[Index] = 0;
+  } else {
+    //
+    // return part of string after =
+    //
+    strcpy (Destination, strchr (Source, '=') + 1);
+  }
+}
+
+static
+INT32
+GetNextLine (
+  OUT CHAR8       *Destination,
+  IN FILE         *Package,
+  IN OUT UINT32   *LineNumber
+  )
+/*++
+
+Routine Description:
+
+  Gets the next non-commented line from the file
+
+Arguments:
+
+  Destination - Where to put string
+
+  Package     - Package to get string from
+  
+  LineNumber  - The actual line number.
+
+Returns:
+
+  -1          - End of file reached
+   0          - Success
+
+--*/
+{
+  CHAR8 String[_MAX_PATH];
+  fscanf (Package, "%s", &String);
+  if (feof (Package)) {
+    return -1;
+  }
+
+  while (TestComment (String, Package) == 1) {
+    fscanf (Package, "%s", &String);
+    if (feof (Package)) {
+      return -1;
+    }
+  }
+
+  strcpy (Destination, String);
+  return 0;
+}
+
+static
+VOID
+CheckSlash (
+  IN OUT CHAR8  *String,
+  IN FILE       *In,
+  IN OUT UINT32 *LineNumber
+  )
+/*++
+
+Routine Description:
+
+  Checks to see if string is line continuation character, if so goes to next valid line
+
+Arguments:
+
+  String      - String to test
+
+  In          - Open file to move pointer within
+  
+  LineNumber  - The line number.
+
+Returns:
+
+  None
+
+--*/
+{
+  CHAR8 ByteBuffer;
+  ByteBuffer = 0;
+
+  switch (String[0]) {
+
+  case '\\':
+    while (String[0] == '\\') {
+      while (ByteBuffer != '\n') {
+        fscanf (In, "%c", &ByteBuffer);
+      }
+      (*LineNumber)++;
+      if (GetNextLine (String, In, LineNumber) == -1) {
+        return ;
+      }
+    }
+    break;
+
+  case '\n':
+    (*LineNumber)++;
+    while (String[0] == '\n') {
+      if (GetNextLine (String, In, LineNumber) == -1) {
+        return ;
+      }
+    }
+    break;
+
+  default:
+    break;
+
+  }
+
+}
+
+static
+INT32
+FindSectionInPackage (
+  IN CHAR8        *BuildDirectory,
+  IN FILE         *OverridePackage,
+  IN OUT UINT32   *LineNumber
+  )
+/*++
+
+Routine Description:
+
+  Finds the matching section within the package
+
+Arguments:
+
+  BuildDirectory  - name of section to find
+
+  OverridePackage - Package file to search within
+  
+  LineNumber      - The line number.
+
+Returns:
+
+  -1          - End of file reached
+   0          - Success
+
+--*/
+{
+  CHAR8 String[_MAX_PATH];
+  CHAR8 NewString[_MAX_PATH];
+  String[0] = 0;
+
+  while (strcmp (BuildDirectory, String) != 0) {
+    if (GetNextLine (NewString, OverridePackage, LineNumber) != 0) {
+      return -1;
+    }
+
+    if (NewString[0] == '[') {
+      if (NewString[strlen (NewString) - 1] != ']') {
+        //
+        // have to construct string.
+        //
+        strcpy (String, NewString + 1);
+
+        while (1) {
+          fscanf (OverridePackage, "%s", &NewString);
+          if (feof (OverridePackage)) {
+            return -1;
+          }
+
+          if (NewString[0] != ']') {
+            if (strlen (String) != 0) {
+              strcat (String, " ");
+            }
+
+            strcat (String, NewString);
+            if (String[strlen (String) - 1] == ']') {
+              String[strlen (String) - 1] = 0;
+              break;
+            }
+          } else {
+            break;
+          }
+        }
+      } else {
+        NewString[strlen (NewString) - 1] = 0;
+        strcpy (String, NewString + 1);
+      }
+    }
+  }
+
+  return 0;
+}
+
+static
+EFI_STATUS
+GenSimpleGuidSection (
+  IN OUT UINT8  *FileBuffer,
+  IN OUT UINT32 *BufferSize,
+  IN UINT32     DataSize,
+  IN EFI_GUID   SignGuid,
+  IN UINT16     GuidedSectionAttributes
+  )
+/*++
+
+Routine Description:
+
+  add GUIDed section header for the data buffer.
+  data stays in same location (overwrites source data).
+
+Arguments:
+
+  FileBuffer  - Buffer containing data to sign
+
+  BufferSize  - On input, the size of FileBuffer. On output, the size of
+                actual section data (including added section header).
+
+  DataSize    - Length of data to Sign
+
+  SignGuid    - Guid to be add.
+  
+  GuidedSectionAttributes - The section attribute.
+
+Returns:
+
+  EFI_SUCCESS           - Successful
+  EFI_OUT_OF_RESOURCES  - Not enough resource.
+
+--*/
+{
+  UINT32                    TotalSize;
+
+  EFI_GUID_DEFINED_SECTION  GuidSectionHeader;
+  UINT8                     *SwapBuffer;
+
+  SwapBuffer = NULL;
+
+  if (DataSize == 0) {
+    *BufferSize = 0;
+
+    return EFI_SUCCESS;
+  }
+
+  TotalSize = DataSize + sizeof (EFI_GUID_DEFINED_SECTION);
+  GuidSectionHeader.CommonHeader.Type     = EFI_SECTION_GUID_DEFINED;
+  GuidSectionHeader.CommonHeader.Size[0]  = (UINT8) (TotalSize & 0xff);
+  GuidSectionHeader.CommonHeader.Size[1]  = (UINT8) ((TotalSize & 0xff00) >> 8);
+  GuidSectionHeader.CommonHeader.Size[2]  = (UINT8) ((TotalSize & 0xff0000) >> 16);
+  memcpy (&(GuidSectionHeader.SectionDefinitionGuid), &SignGuid, sizeof (EFI_GUID));
+  GuidSectionHeader.Attributes  = GuidedSectionAttributes;
+  GuidSectionHeader.DataOffset  = sizeof (EFI_GUID_DEFINED_SECTION);
+
+  SwapBuffer                    = (UINT8 *) malloc (DataSize);
+  if (SwapBuffer == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  memcpy (SwapBuffer, FileBuffer, DataSize);
+  memcpy (FileBuffer, &GuidSectionHeader, sizeof (EFI_GUID_DEFINED_SECTION));
+  memcpy (FileBuffer + sizeof (EFI_GUID_DEFINED_SECTION), SwapBuffer, DataSize);
+
+  //
+  // Make sure section ends on a DWORD boundary
+  //
+  while ((TotalSize & 0x03) != 0) {
+    FileBuffer[TotalSize] = 0;
+    TotalSize++;
+  }
+
+  *BufferSize = TotalSize;
+
+  if (SwapBuffer != NULL) {
+    free (SwapBuffer);
+  }
+
+  return EFI_SUCCESS;
+}
+
+static
+EFI_STATUS
+CompressSection (
+  UINT8  *FileBuffer,
+  UINT32 *BufferSize,
+  UINT32 DataSize,
+  CHAR8  *Type
+  )
+/*++
+
+Routine Description:
+
+  Compress the data and add section header for the compressed data.
+  Compressed data (with section header) stays in same location as the source
+  (overwrites source data).
+
+Arguments:
+
+  FileBuffer  - Buffer containing data to Compress
+
+  BufferSize  - On input, the size of FileBuffer. On output, the size of
+                actual compressed data (including added section header).
+                When buffer is too small, this value indicates the size needed.
+
+  DataSize    - The size of data to compress
+
+  Type        - The compression type (not used currently).
+                Assume EFI_HEAVY_COMPRESSION.
+
+Returns:
+
+  EFI_BUFFER_TOO_SMALL - Buffer size is too small.
+  EFI_UNSUPPORTED      - Compress type can not be supported.
+  EFI_SUCCESS          - Successful
+  EFI_OUT_OF_RESOURCES - Not enough resource.
+
+--*/
+{
+  EFI_STATUS              Status;
+  UINT8                   *CompData;
+  UINT32                  CompSize;
+  UINT32                  TotalSize;
+  EFI_COMPRESSION_SECTION CompressionSet;
+  UINT8                   CompressionType;
+  COMPRESS_FUNCTION       CompressFunction;
+
+  Status            = EFI_SUCCESS;
+  CompData          = NULL;
+  CompSize          = 0;
+  TotalSize         = 0;
+  CompressFunction  = NULL;
+
+  //
+  // Get the compress type
+  //
+  if (strcmpi (Type, "Dummy") == 0) {
+    //
+    // Added "Dummy" to keep backward compatibility.
+    //
+    CompressionType   = EFI_STANDARD_COMPRESSION;
+    CompressFunction  = (COMPRESS_FUNCTION) Compress;
+
+  } else if (strcmpi (Type, "LZH") == 0) {
+    //
+    // EFI stardard compression (LZH)
+    //
+    CompressionType   = EFI_STANDARD_COMPRESSION;
+    CompressFunction  = (COMPRESS_FUNCTION) Compress;
+
+  } else {
+    //
+    // Customized compression
+    //
+    Status = SetCustomizedCompressionType (Type);
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+
+    CompressionType   = EFI_CUSTOMIZED_COMPRESSION;
+    CompressFunction  = (COMPRESS_FUNCTION) CustomizedCompress;
+  }
+  //
+  // Compress the raw data
+  //
+  Status = CompressFunction (FileBuffer, DataSize, CompData, &CompSize);
+  if (Status == EFI_BUFFER_TOO_SMALL) {
+    CompData = malloc (CompSize);
+    if (!CompData) {
+      return EFI_OUT_OF_RESOURCES;
+    }
+
+    Status = CompressFunction (FileBuffer, DataSize, CompData, &CompSize);
+  }
+
+  if (EFI_ERROR (Status)) {
+    if (CompData != NULL) {
+      free (CompData);
+    }
+
+    return Status;
+  }
+
+  TotalSize = CompSize + sizeof (EFI_COMPRESSION_SECTION);
+
+  //
+  // Buffer too small?
+  //
+  if (TotalSize > *BufferSize) {
+    *BufferSize = TotalSize;
+    if (CompData != NULL) {
+      free (CompData);
+    }
+
+    return EFI_BUFFER_TOO_SMALL;
+  }
+  //
+  // Add the section header for the compressed data
+  //
+  CompressionSet.CommonHeader.Type    = EFI_SECTION_COMPRESSION;
+  CompressionSet.CommonHeader.Size[0] = (UINT8) (TotalSize & 0xff);
+  CompressionSet.CommonHeader.Size[1] = (UINT8) ((TotalSize & 0xff00) >> 8);
+  CompressionSet.CommonHeader.Size[2] = (UINT8) ((TotalSize & 0xff0000) >> 16);
+  CompressionSet.CompressionType      = CompressionType;
+  CompressionSet.UncompressedLength   = DataSize;
+
+  //
+  // Copy header and data to the buffer
+  //
+  memcpy (FileBuffer, &CompressionSet, sizeof (EFI_COMPRESSION_SECTION));
+  memcpy (FileBuffer + sizeof (CompressionSet), CompData, CompSize);
+
+  //
+  // Make sure section ends on a DWORD boundary
+  //
+  while ((TotalSize & 0x03) != 0) {
+    FileBuffer[TotalSize] = 0;
+    TotalSize++;
+  }
+
+  *BufferSize = TotalSize;
+
+  if (CompData != NULL) {
+    free (CompData);
+  }
+
+  return EFI_SUCCESS;
+}
+
+static
+void
+StripParens (
+  IN OUT CHAR8 *String
+  )
+/*++
+
+Routine Description:
+
+  Removes Parenthesis from around a string
+
+Arguments:
+
+ String    - String to remove parens from
+
+Returns:
+
+  None
+
+--*/
+{
+  INT32 Index;
+
+  if (String[0] != '(') {
+    return ;
+  }
+
+  for (Index = 1; String[Index] != ')'; Index++) {
+    String[Index - 1] = String[Index];
+    if (String[Index] == 0) {
+      return ;
+    }
+  }
+
+  String[Index - 1] = 0;
+
+  return ;
+}
+
+static
+void
+StripEqualMark (
+  IN OUT CHAR8 *String
+  )
+/*++
+
+Routine Description:
+
+  Removes Equal Mark from around a string
+
+Arguments:
+
+ String    - String to remove equal mark from
+
+Returns:
+
+  None
+
+--*/
+{
+  INT32 Index;
+
+  if (String[0] != '=' && String[strlen (String) - 1] != '=') {
+    return ;
+  }
+
+  if (String[0] == '=') {
+
+    for (Index = 1; String[Index] != 0; Index++) {
+      String[Index - 1] = String[Index];
+    }
+
+    String[Index - 1] = 0;
+  }
+
+  if (String[strlen (String) - 1] == '=') {
+    String[strlen (String) - 1] = 0;
+  }
+
+  return ;
+}
+
+static
+INT32
+ProcessEnvironmentVariable (
+  IN CHAR8  *Buffer,
+  OUT CHAR8 *NewBuffer
+  )
+/*++
+
+Routine Description:
+
+  Converts environment variables to values
+
+Arguments:
+
+  Buffer      - Buffer containing Environment Variable String
+
+  NewBuffer   - Buffer containing value of environment variable
+
+
+Returns:
+
+  Number of characters from Buffer used
+
+--*/
+{
+  INT32 Index;
+  INT32 Index2;
+  CHAR8 VariableBuffer[_MAX_PATH];
+
+  Index   = 2;
+  Index2  = 0;
+
+  while (Buffer[Index] != ')') {
+    VariableBuffer[Index - 2] = Buffer[Index++];
+  }
+
+  VariableBuffer[Index - 2] = 0;
+  Index++;
+
+  if (getenv (VariableBuffer) != NULL) {
+    strcpy (NewBuffer, getenv (VariableBuffer));
+  } else {
+    printf ("Environment variable %s not found!\n", VariableBuffer);
+  }
+
+  return Index;
+}
+
+static
+void
+SplitAttributesField (
+  IN CHAR8       *Buffer,
+  IN CHAR8       *AttributesArray[],
+  IN OUT UINT32  *NumberOfAttributes
+  )
+/*
+  NumberOfAttributes: on input, it specifies the current number of attributes
+                      stored in AttributeArray.
+                      on output, it is updated to the latest number of attributes
+                      stored in AttributesArray.
+*/
+{
+  UINT32  Index;
+  UINT32  Index2;
+  UINT32  z;
+  CHAR8   *CharBuffer;
+
+  CharBuffer  = NULL;
+  CharBuffer  = (CHAR8 *) malloc (_MAX_PATH);
+  ZeroMem (CharBuffer, _MAX_PATH);
+
+  for (Index = 0, z = 0, Index2 = 0; Index < strlen (Buffer); Index++) {
+
+    if (Buffer[Index] != '|') {
+      CharBuffer[z] = Buffer[Index];
+      z++;
+    } else {
+
+      CharBuffer[z] = 0;
+      AttributesArray[*NumberOfAttributes + Index2] = CharBuffer;
+      Index2++;
+
+      //
+      // allocate new char buffer for the next attributes string
+      //
+      CharBuffer = (CHAR8 *) malloc (_MAX_PATH);
+      ZeroMem (CharBuffer, _MAX_PATH);
+      z = 0;
+    }
+  }
+
+  CharBuffer[z] = 0;
+  //
+  // record the last attributes string in the Buffer
+  //
+  AttributesArray[*NumberOfAttributes + Index2] = CharBuffer;
+  Index2++;
+
+  *NumberOfAttributes += Index2;
+
+  return ;
+}
+
+static
+INT32
+GetToolArguments (
+  CHAR8       *ToolArgumentsArray[],
+  FILE        *Package,
+  CHAR8       **PtrInputFileName,
+  CHAR8       **PtrOutputFileName,
+  EFI_GUID    *Guid,
+  UINT16      *GuidedSectionAttributes
+  )
+{
+  CHAR8       Buffer[_MAX_PATH];
+  BOOLEAN     ArgumentsFlag;
+  BOOLEAN     InputFlag;
+  BOOLEAN     OutputFlag;
+  BOOLEAN     GuidFlag;
+  BOOLEAN     AttributesFlag;
+  UINT32      argc;
+  UINT32      Index2;
+  UINT32      z;
+  CHAR8       *CharBuffer;
+  INT32       Index;
+  INT32       ReturnValue;
+  EFI_STATUS  Status;
+
+  CHAR8       *AttributesArray[MAX_ARRAY_SIZE];
+  UINT32      NumberOfAttributes;
+  CHAR8       *InputFileName;
+  CHAR8       *OutputFileName;
+  UINT32      LineNumber;
+  Buffer[_MAX_PATH];
+
+  ArgumentsFlag   = FALSE;
+  InputFlag       = FALSE;
+  OutputFlag      = FALSE;
+  GuidFlag        = FALSE;
+  AttributesFlag  = FALSE;
+  //
+  // Start at 1, since ToolArgumentsArray[0]
+  // is the program name.
+  //
+  argc            = 1;
+  Index2              = 0;
+
+  z                   = 0;
+  ReturnValue         = 0;
+  NumberOfAttributes  = 0;
+  InputFileName       = NULL;
+  OutputFileName      = NULL;
+
+  ZeroMem (Buffer, _MAX_PATH);
+  ZeroMem (AttributesArray, sizeof (CHAR8 *) * MAX_ARRAY_SIZE);
+  LineNumber = 0;
+  while (Buffer[0] != ')') {
+
+    if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+      CheckSlash (Buffer, Package, &LineNumber);
+      StripEqualMark (Buffer);
+    } else {
+      Error (NULL, 0, 0, "failed to get next line from package file", NULL);
+      return -1;
+    }
+
+    if (Buffer[0] == ')') {
+      break;
+    } else if (strcmpi (Buffer, "ARGS") == 0) {
+
+      ArgumentsFlag   = TRUE;
+      AttributesFlag  = FALSE;
+      continue;
+
+    } else if (strcmpi (Buffer, "INPUT") == 0) {
+
+      InputFlag       = TRUE;
+      ArgumentsFlag   = FALSE;
+      AttributesFlag  = FALSE;
+      continue;
+
+    } else if (strcmpi (Buffer, "OUTPUT") == 0) {
+
+      OutputFlag      = TRUE;
+      ArgumentsFlag   = FALSE;
+      AttributesFlag  = FALSE;
+      continue;
+
+    } else if (strcmpi (Buffer, "GUID") == 0) {
+
+      GuidFlag        = TRUE;
+      ArgumentsFlag   = FALSE;
+      AttributesFlag  = FALSE;
+      //
+      // fetch the GUID for the section
+      //
+      continue;
+
+    } else if (strcmpi (Buffer, "ATTRIBUTES") == 0) {
+
+      AttributesFlag  = TRUE;
+      ArgumentsFlag   = FALSE;
+      //
+      // fetch the GUIDed Section's Attributes
+      //
+      continue;
+
+    } else if (strcmpi (Buffer, "") == 0) {
+      continue;
+    }
+    //
+    // get all command arguments into ToolArgumentsArray
+    //
+    if (ArgumentsFlag) {
+
+      StripEqualMark (Buffer);
+
+      CharBuffer = (CHAR8 *) malloc (_MAX_PATH);
+      if (CharBuffer == NULL) {
+        goto ErrorExit;
+      }
+
+      ZeroMem (CharBuffer, sizeof (_MAX_PATH));
+
+      ToolArgumentsArray[argc] = CharBuffer;
+
+      if (Buffer[0] == '$') {
+        Index = ProcessEnvironmentVariable (&Buffer[0], ToolArgumentsArray[argc]);
+        //
+        // if there is string after the environment variable, cat it.
+        //
+        if ((UINT32) Index < strlen (Buffer)) {
+          strcat (ToolArgumentsArray[argc], &Buffer[Index]);
+        }
+      } else {
+        strcpy (ToolArgumentsArray[argc], Buffer);
+      }
+
+      argc += 1;
+      ToolArgumentsArray[argc] = NULL;
+      continue;
+    }
+
+    if (InputFlag) {
+
+      StripEqualMark (Buffer);
+
+      InputFileName = (CHAR8 *) malloc (_MAX_PATH);
+      if (InputFileName == NULL) {
+        goto ErrorExit;
+      }
+
+      ZeroMem (InputFileName, sizeof (_MAX_PATH));
+
+      if (Buffer[0] == '$') {
+        Index = ProcessEnvironmentVariable (&Buffer[0], InputFileName);
+        //
+        // if there is string after the environment variable, cat it.
+        //
+        if ((UINT32) Index < strlen (Buffer)) {
+          strcat (InputFileName, &Buffer[Index]);
+        }
+      } else {
+        strcpy (InputFileName, Buffer);
+      }
+
+      InputFlag = FALSE;
+      continue;
+    }
+
+    if (OutputFlag) {
+
+      StripEqualMark (Buffer);
+
+      OutputFileName = (CHAR8 *) malloc (_MAX_PATH);
+      if (OutputFileName == NULL) {
+        goto ErrorExit;
+      }
+
+      ZeroMem (OutputFileName, sizeof (_MAX_PATH));
+
+      if (Buffer[0] == '$') {
+        Index = ProcessEnvironmentVariable (&Buffer[0], OutputFileName);
+        //
+        // if there is string after the environment variable, cat it.
+        //
+        if ((UINT32) Index < strlen (Buffer)) {
+          strcat (OutputFileName, &Buffer[Index]);
+        }
+      } else {
+        strcpy (OutputFileName, Buffer);
+      }
+
+      OutputFlag = FALSE;
+      continue;
+    }
+
+    if (GuidFlag) {
+
+      StripEqualMark (Buffer);
+
+      Status = StringToGuid (Buffer, Guid);
+      if (EFI_ERROR (Status)) {
+        ReturnValue = -1;
+        goto ErrorExit;
+      }
+
+      GuidFlag = FALSE;
+    }
+
+    if (AttributesFlag) {
+
+      StripEqualMark (Buffer);
+
+      //
+      // there might be no space between each attribute in the statement,
+      // split them aside and return each attribute string
+      // in the AttributesArray
+      //
+      SplitAttributesField (Buffer, AttributesArray, &NumberOfAttributes);
+    }
+  }
+  //
+  // ReplaceVariableInBuffer (ToolArgumentsArray,&i,"INPUT",InputVariable,j);
+  // ReplaceVariableInBuffer (ToolArgumentsArray,&i,"OUTPUT",&TargetFileName,1);
+  //
+  for (z = 0; z < NumberOfAttributes; z++) {
+    if (strcmpi (AttributesArray[z], "PROCESSING_REQUIRED") == 0) {
+      *GuidedSectionAttributes |= EFI_GUIDED_SECTION_PROCESSING_REQUIRED;
+    } else if (strcmpi (AttributesArray[z], "AUTH_STATUS_VALID") == 0) {
+      *GuidedSectionAttributes |= EFI_GUIDED_SECTION_AUTH_STATUS_VALID;
+    }
+  }
+
+ErrorExit:
+
+  for (Index2 = 0; Index2 < MAX_ARRAY_SIZE; Index2++) {
+    if (AttributesArray[Index2] == NULL) {
+      break;
+    }
+
+    free (AttributesArray[Index2]);
+  }
+
+  *PtrInputFileName   = InputFileName;
+  *PtrOutputFileName  = OutputFileName;
+
+  return ReturnValue;
+}
+
+static
+INT32
+ProcessScript (
+  IN OUT UINT8   *FileBuffer,
+  IN FILE        *Package,
+  IN CHAR8       *BuildDirectory,
+  IN BOOLEAN     ForceUncompress
+  )
+/*++
+
+Routine Description:
+
+  Signs the section, data stays in same location
+
+Arguments:
+
+  FileBuffer  - Data Buffer
+
+  Package     - Points to curly brace in Image Script
+
+  BuildDirectory     - Name of the source directory parameter
+  
+  ForceUncompress   - Whether to force uncompress.
+
+Returns:
+
+  Number of bytes added to file buffer
+  -1 on error
+
+--*/
+{
+  EFI_STATUS  Status;
+  UINT32      Size;
+  CHAR8       Buffer[_MAX_PATH];
+  CHAR8       Type[_MAX_PATH];
+  CHAR8       FileName[_MAX_PATH];
+  CHAR8       NewBuffer[_MAX_PATH];
+  INT32       Index3;
+  INT32       Index2;
+  UINT32      ReturnValue;
+  UINT8       ByteBuffer;
+  FILE        *InFile;
+  UINT32      SourceDataSize;
+  CHAR8       *ToolArgumentsArray[MAX_ARRAY_SIZE];
+  CHAR8       *OutputFileName;
+  CHAR8       *InputFileName;
+  CHAR8       ToolName[_MAX_PATH];
+  FILE        *OutputFile;
+  FILE        *InputFile;
+  UINT8       Temp;
+  int         returnint;
+  INT32       Index;
+  UINT32      LineNumber;
+  BOOLEAN     IsError;
+  EFI_GUID    SignGuid;
+  UINT16      GuidedSectionAttributes;
+  UINT8       *TargetFileBuffer;
+
+  OutputFileName          = NULL;
+  InputFileName           = NULL;
+  OutputFile              = NULL;
+  InputFile               = NULL;
+  IsError                 = FALSE;
+  GuidedSectionAttributes = 0;
+  TargetFileBuffer        = NULL;
+
+  Size                    = 0;
+  LineNumber              = 0;
+  Buffer[0]               = 0;
+  for (Index3 = 0; Index3 < MAX_ARRAY_SIZE; ++Index3) {
+    ToolArgumentsArray[Index3] = NULL;
+  }
+
+  while (Buffer[0] != '}') {
+    if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+      CheckSlash (Buffer, Package, &LineNumber);
+    } else {
+      printf ("ERROR in IMAGE SCRIPT!\n");
+      IsError = TRUE;
+      goto Done;
+    }
+
+    if (strcmpi (Buffer, "Compress") == 0) {
+      //
+      // Handle compress
+      //
+      //
+      // read compression type
+      //
+      if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+        CheckSlash (Buffer, Package, &LineNumber);
+      }
+
+      StripParens (Buffer);
+      if (Buffer[0] == '$') {
+        ProcessEnvironmentVariable (&Buffer[0], Type);
+      } else {
+        strcpy (Type, Buffer);
+      }
+      //
+      // build buffer
+      //
+      while (Buffer[0] != '{') {
+        if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+          CheckSlash (Buffer, Package, &LineNumber);
+        }
+      }
+
+      ReturnValue = ProcessScript (&FileBuffer[Size], Package, BuildDirectory, ForceUncompress);
+      if (ReturnValue == -1) {
+        IsError = TRUE;
+        goto Done;
+      }
+      //
+      // Call compress routine on buffer.
+      // Occasionally, compressed data + section header would
+      // be largere than the source and EFI_BUFFER_TOO_SMALL is
+      // returned from CompressSection()
+      //
+      SourceDataSize = ReturnValue;
+
+      if (!ForceUncompress) {
+
+        Status = CompressSection (
+                  &FileBuffer[Size],
+                  &ReturnValue,
+                  SourceDataSize,
+                  Type
+                  );
+
+        if (Status == EFI_BUFFER_TOO_SMALL) {
+          Status = CompressSection (
+                    &FileBuffer[Size],
+                    &ReturnValue,
+                    SourceDataSize,
+                    Type
+                    );
+        }
+
+        if (EFI_ERROR (Status)) {
+          IsError = TRUE;
+          goto Done;
+        }
+      }
+
+      Size += ReturnValue;
+
+    } else if (strcmpi (Buffer, "Tool") == 0) {
+
+      ZeroMem (ToolName, _MAX_PATH);
+      ZeroMem (ToolArgumentsArray, sizeof (CHAR8 *) * MAX_ARRAY_SIZE);
+      ZeroMem (&SignGuid, sizeof (EFI_GUID));
+
+      //
+      // handle signing Tool
+      //
+      while (Buffer[0] != '(') {
+        if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+          CheckSlash (Buffer, Package, &LineNumber);
+        }
+      }
+
+      if (strcmpi (Buffer, "(") == 0) {
+        if (GetNextLine (Buffer, Package, &LineNumber) != -1) {
+          CheckSlash (Buffer, Package, &LineNumber);
+        }
+      }
+
+      StripParens (Buffer);
+
+      if (Buffer[0] == '$') {
+        Index = ProcessEnvironmentVariable (&Buffer[0], ToolName);
+        //
+        // if there is string after the environment variable, cat it.
+        //
+        if ((UINT32) Index < strlen (Buffer)) {
+          strcat (ToolName, &Buffer[Index]);
+        }
+      } else {
+        strcpy (ToolName, Buffer);
+      }
+
+      ToolArgumentsArray[0] = ToolName;
+
+      //
+      // read ARGS
+      //
+      if (GetToolArguments (
+            ToolArgumentsArray,
+            Package,
+            &InputFileName,
+            &OutputFileName,
+            &SignGuid,
+            &GuidedSectionAttributes
+            ) == -1) {
+        IsError = TRUE;
+        goto Done;
+      }
+      //
+      // if the tool need input file,
+      // dump the file buffer to the specified input file.
+      //
+      if (InputFileName != NULL) {
+        InputFile = fopen (InputFileName, "wb");
+        if (InputFile == NULL) {
+          Error (NULL, 0, 0, InputFileName, "failed to open output file for writing");
+          IsError = TRUE;
+          goto Done;
+        }
+
+        fwrite (FileBuffer, sizeof (UINT8), Size, InputFile);
+        fclose (InputFile);
+        InputFile = NULL;
+        free (InputFileName);
+        InputFileName = NULL;
+      }
+      //
+      // dispatch signing tool
+      //
+#ifdef __GNUC__
+      {
+        char CommandLine[1000];
+        sprintf(CommandLine, "%s %s", ToolName, ToolArgumentsArray);
+        returnint = system(CommandLine);
+      }
+#else
+      returnint = _spawnv (_P_WAIT, ToolName, ToolArgumentsArray);
+#endif
+      if (returnint != 0) {
+        Error (NULL, 0, 0, ToolName, "external tool failed");
+        IsError = TRUE;
+        goto Done;
+      }
+      //
+      // if the tool has output file,
+      // dump the output file to the file buffer
+      //
+      if (OutputFileName != NULL) {
+
+        OutputFile = fopen (OutputFileName, "rb");
+        if (OutputFile == NULL) {
+          Error (NULL, 0, 0, OutputFileName, "failed to open output file for writing");
+          IsError = TRUE;
+          goto Done;
+        }
+
+        TargetFileBuffer  = &FileBuffer[Size];
+        SourceDataSize    = Size;
+
+        fread (&Temp, sizeof (UINT8), 1, OutputFile);
+        while (!feof (OutputFile)) {
+          FileBuffer[Size++] = Temp;
+          fread (&Temp, sizeof (UINT8), 1, OutputFile);
+        }
+
+        while ((Size & 0x03) != 0) {
+          FileBuffer[Size] = 0;
+          Size++;
+        }
+
+        SourceDataSize = Size - SourceDataSize;
+
+        fclose (OutputFile);
+        OutputFile = NULL;
+        free (OutputFileName);
+        OutputFileName = NULL;
+
+        if (CompareGuid (&SignGuid, &mZeroGuid) != 0) {
+          ReturnValue = SourceDataSize;
+          Status = GenSimpleGuidSection (
+                    TargetFileBuffer,
+                    &ReturnValue,
+                    SourceDataSize,
+                    SignGuid,
+                    GuidedSectionAttributes
+                    );
+          if (EFI_ERROR (Status)) {
+            IsError = TRUE;
+            goto Done;
+          }
+
+          Size = ReturnValue;
+        }
+      }
+
+    } else if (Buffer[0] != '}') {
+      //
+      // if we are here, we should see either a file name,
+      // or a }.
+      //
+      Index3      = 0;
+      FileName[0] = 0;
+      //
+      // Prepend the build directory to the file name if the
+      // file name does not already contain a full path.
+      //
+      if (!isalpha (Buffer[0]) || (Buffer[1] != ':')) {
+        sprintf (FileName, "%s\\", BuildDirectory);
+      }
+
+      while (Buffer[Index3] != '\n') {
+        if (Buffer[Index3] == '$') {
+          Index3 += ProcessEnvironmentVariable (&Buffer[Index3], NewBuffer);
+          strcat (FileName, NewBuffer);
+        }
+
+        if (Buffer[Index3] == 0) {
+          break;
+        } else {
+          Index2              = strlen (FileName);
+          FileName[Index2++]  = Buffer[Index3++];
+          FileName[Index2]    = 0;
+        }
+      }
+
+      InFile = fopen (FileName, "rb");
+      if (InFile == NULL) {
+        Error (NULL, 0, 0, FileName, "failed to open file for reading");
+        IsError = TRUE;
+        goto Done;
+      }
+
+      fread (&ByteBuffer, sizeof (UINT8), 1, InFile);
+      while (!feof (InFile)) {
+        FileBuffer[Size++] = ByteBuffer;
+        fread (&ByteBuffer, sizeof (UINT8), 1, InFile);
+      }
+
+      fclose (InFile);
+      InFile = NULL;
+
+      //
+      // Make sure section ends on a DWORD boundary
+      //
+      while ((Size & 0x03) != 0) {
+        FileBuffer[Size] = 0;
+        Size++;
+      }
+
+    }
+  }
+
+Done:
+  for (Index3 = 1; Index3 < MAX_ARRAY_SIZE; Index3++) {
+    if (ToolArgumentsArray[Index3] == NULL) {
+      break;
+    }
+
+    free (ToolArgumentsArray[Index3]);
+  }
+
+  if (IsError) {
+    return -1;
+  }
+
+  return Size;
+
+}
+
+static
+UINT8
+StringToType (
+  IN CHAR8 *String
+  )
+/*++
+
+Routine Description:
+
+  Converts File Type String to value.  EFI_FV_FILETYPE_ALL indicates that an
+  unrecognized file type was specified.
+
+Arguments:
+
+  String    - File type string
+
+Returns:
+
+  File Type Value
+
+--*/
+{
+  if (strcmpi (String, "EFI_FV_FILETYPE_RAW") == 0) {
+    return EFI_FV_FILETYPE_RAW;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_FREEFORM") == 0) {
+    return EFI_FV_FILETYPE_FREEFORM;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_SECURITY_CORE") == 0) {
+    return EFI_FV_FILETYPE_SECURITY_CORE;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_PEI_CORE") == 0) {
+    return EFI_FV_FILETYPE_PEI_CORE;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_DXE_CORE") == 0) {
+    return EFI_FV_FILETYPE_DXE_CORE;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_PEIM") == 0) {
+    return EFI_FV_FILETYPE_PEIM;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_DRIVER") == 0) {
+    return EFI_FV_FILETYPE_DRIVER;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER") == 0) {
+    return EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_APPLICATION") == 0) {
+    return EFI_FV_FILETYPE_APPLICATION;
+  }
+
+  if (strcmpi (String, "EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE") == 0) {
+    return EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE;
+  }
+
+  return EFI_FV_FILETYPE_ALL;
+}
+
+static
+UINT32
+AdjustFileSize (
+  IN UINT8  *FileBuffer,
+  IN UINT32 FileSize
+  )
+/*++
+
+Routine Description:
+  Adjusts file size to insure sectioned file is exactly the right length such
+  that it ends on exactly the last byte of the last section.  ProcessScript()
+  may have padded beyond the end of the last section out to a 4 byte boundary.
+  This padding is stripped.
+
+Arguments:
+  FileBuffer  - Data Buffer - contains a section stream
+  FileSize    - Size of FileBuffer as returned from ProcessScript()
+
+Returns:
+  Corrected size of file.
+
+--*/
+{
+  UINT32                    TotalLength;
+  UINT32                    CurrentLength;
+  UINT32                    SectionLength;
+  UINT32                    SectionStreamLength;
+  EFI_COMMON_SECTION_HEADER *SectionHeader;
+  EFI_COMMON_SECTION_HEADER *NextSectionHeader;
+
+  TotalLength         = 0;
+  CurrentLength       = 0;
+  SectionStreamLength = FileSize;
+
+  SectionHeader       = (EFI_COMMON_SECTION_HEADER *) FileBuffer;
+
+  while (TotalLength < SectionStreamLength) {
+    SectionLength = *((UINT32 *) SectionHeader->Size) & 0x00ffffff;
+    TotalLength += SectionLength;
+
+    if (TotalLength == SectionStreamLength) {
+      return TotalLength;
+    }
+    //
+    // Move to the next byte following the section...
+    //
+    SectionHeader = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) SectionHeader + SectionLength);
+    CurrentLength = (UINTN) SectionHeader - (UINTN) FileBuffer;
+
+    //
+    // Figure out where the next section begins
+    //
+    NextSectionHeader = (EFI_COMMON_SECTION_HEADER *) ((UINT8 *) SectionHeader + 3);
+    NextSectionHeader = (EFI_COMMON_SECTION_HEADER *) ((UINTN) NextSectionHeader &~ (UINTN) 3);
+    TotalLength += (UINTN) NextSectionHeader - (UINTN) SectionHeader;
+    SectionHeader = NextSectionHeader;
+  }
+
+  return CurrentLength;
+}
+
+static
+INT32
+MainEntry (
+  INT32     argc,
+  CHAR8     *argv[],
+  BOOLEAN   ForceUncompress
+  )
+/*++
+
+Routine Description:
+
+  MainEntry function.
+
+Arguments:
+
+  argc            - Number of command line parameters.
+  argv            - Array of pointers to command line parameter strings.
+  ForceUncompress - If TRUE, force to do not compress the sections even if compression
+                    is specified in the script. Otherwise, FALSE.
+
+Returns:
+  STATUS_SUCCESS  - Function exits successfully.
+  STATUS_ERROR    - Some error occurred during execution.
+
+--*/
+{
+  FILE                    *PrimaryPackage;
+  FILE                    *OverridePackage;
+  FILE                    *Out;
+  CHAR8                   BaseName[_MAX_PATH];
+  EFI_GUID                FfsGuid;
+  CHAR8                   GuidString[_MAX_PATH];
+  EFI_FFS_FILE_HEADER     FileHeader;
+  CHAR8                   FileType[_MAX_PATH];
+  EFI_FFS_FILE_ATTRIBUTES FfsAttrib;
+  EFI_FFS_FILE_ATTRIBUTES FfsAttribDefined;
+  UINT64                  FfsAlignment;
+  UINT32                  FfsAlignment32;
+  CHAR8                   InputString[_MAX_PATH];
+  BOOLEAN                 ImageScriptInOveride;
+  UINT32                  FileSize;
+  UINT8                   *FileBuffer;
+  EFI_STATUS              Status;
+  UINT32                  LineNumber;
+  EFI_FFS_FILE_TAIL       TailValue;
+
+  BaseName[0]       = 0;
+  FileType[0]       = 0;
+  FfsAttrib         = 0;
+  FfsAttribDefined  = 0;
+  FfsAlignment      = 0;
+  FfsAlignment32    = 0;
+  PrimaryPackage    = NULL;
+  Out               = NULL;
+  OverridePackage   = NULL;
+  FileBuffer        = NULL;
+
+  strcpy (GuidString, "00000000-0000-0000-0000-000000000000");
+  Status = StringToGuid (GuidString, &FfsGuid);
+  if (Status != 0) {
+    Error (NULL, 0, 0, GuidString, "error parsing GUID string");
+    return STATUS_ERROR;
+  }
+
+  GuidString[0]         = 0;
+  ImageScriptInOveride  = FALSE;
+  //
+  // Initialize the simple file parsing routines. Then open
+  // the primary package file for parsing.
+  //
+  SFPInit ();
+  if (SFPOpenFile (mGlobals.PrimaryPackagePath) != STATUS_SUCCESS) {
+    Error (NULL, 0, 0, mGlobals.PrimaryPackagePath, "unable to open primary package file");
+    goto Done;
+  }
+  //
+  // First token in the file must be "PACKAGE.INF"
+  //
+  if (!SFPIsToken ("PACKAGE.INF")) {
+    Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 'PACKAGE.INF'", NULL);
+    goto Done;
+  }
+  //
+  // Find the [.] section
+  //
+  if (!SFPSkipToToken ("[.]")) {
+    Error (mGlobals.PrimaryPackagePath, 1, 0, "could not locate [.] section in package file", NULL);
+    goto Done;
+  }
+  //
+  // Start parsing the data. The algorithm is essentially the same for each keyword:
+  //   1. Identify the keyword
+  //   2. Verify that the keyword/value pair has not already been defined
+  //   3. Set some flag indicating that the keyword/value pair has been defined
+  //   4. Skip over the "="
+  //   5. Get the value, which may be a number, TRUE, FALSE, or a string.
+  //
+  while (1) {
+    if (SFPIsToken ("BASE_NAME")) {
+      //
+      // Found BASE_NAME, format:
+      //   BASE_NAME = MyBaseName
+      //
+      if (BaseName[0] != 0) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "BASE_NAME already defined", NULL);
+        goto Done;
+      }
+
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (!SFPGetNextToken (BaseName, sizeof (BaseName))) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected valid base name", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("IMAGE_SCRIPT")) {
+      //
+      // Found IMAGE_SCRIPT. Break out and process below.
+      //
+      break;
+    } else if (SFPIsToken ("FFS_FILEGUID")) {
+      //
+      // found FILEGUID, format:
+      //   FFS_FILEGUID = F7845C4F-EDF5-42C5-BD8F-A02AF63DD93A
+      //
+      if (GuidString[0] != 0) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "FFS_FILEGUID already defined", NULL);
+        goto Done;
+      }
+
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (SFPGetGuidToken (GuidString, sizeof (GuidString)) != TRUE) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected file GUID", NULL);
+        goto Done;
+      }
+
+      Status = StringToGuid (GuidString, &FfsGuid);
+      if (Status != 0) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected valid file GUID", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_FILETYPE")) {
+      //
+      // ***********************************************************************
+      //
+      // Found FFS_FILETYPE, format:
+      //  FFS_FILETYPE = EFI_FV_FILETYPE_APPLICATION
+      //
+      if (FileType[0] != 0) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "FFS_FILETYPE previously defined", NULL);
+        goto Done;
+      }
+
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (!SFPGetNextToken (FileType, sizeof (FileType))) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected valid FFS_FILETYPE", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_ATTRIB_HEADER_EXTENSION")) {
+      //
+      // ***********************************************************************
+      //
+      // Found: FFS_ATTRIB_HEADER_EXTENSION = FALSE
+      // Spec says the bit is for future expansion, and must be false.
+      //
+      if (FfsAttribDefined & FFS_ATTRIB_HEADER_EXTENSION) {
+        Error (
+          mGlobals.PrimaryPackagePath,
+          SFPGetLineNumber (),
+          0,
+          "FFS_ATTRIB_HEADER_EXTENSION previously defined",
+          NULL
+          );
+        goto Done;
+      }
+
+      FfsAttribDefined |= FFS_ATTRIB_HEADER_EXTENSION;
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (SFPIsToken ("TRUE")) {
+        Error (
+          mGlobals.PrimaryPackagePath,
+          SFPGetLineNumber (),
+          0,
+          "only FFS_ATTRIB_HEADER_EXTENSION = FALSE is supported",
+          NULL
+          );
+        goto Done;
+      } else if (SFPIsToken ("FALSE")) {
+        //
+        // Default is FALSE
+        //
+      } else {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 'FALSE'", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_ATTRIB_TAIL_PRESENT")) {
+      //
+      // ***********************************************************************
+      //
+      // Found: FFS_ATTRIB_TAIL_PRESENT = TRUE | FALSE
+      //
+      if (FfsAttribDefined & FFS_ATTRIB_TAIL_PRESENT) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "FFS_ATTRIB_TAIL_PRESENT previously defined", NULL);
+        goto Done;
+      }
+
+      FfsAttribDefined |= FFS_ATTRIB_TAIL_PRESENT;
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (SFPIsToken ("TRUE")) {
+        FfsAttrib |= FFS_ATTRIB_TAIL_PRESENT;
+      } else if (SFPIsToken ("FALSE")) {
+        //
+        // Default is FALSE
+        //
+      } else {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 'TRUE' or 'FALSE'", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_ATTRIB_RECOVERY")) {
+      //
+      // ***********************************************************************
+      //
+      // Found: FFS_ATTRIB_RECOVERY = TRUE | FALSE
+      //
+      if (FfsAttribDefined & FFS_ATTRIB_RECOVERY) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "FFS_ATTRIB_RECOVERY previously defined", NULL);
+        goto Done;
+      }
+
+      FfsAttribDefined |= FFS_ATTRIB_RECOVERY;
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (SFPIsToken ("TRUE")) {
+        FfsAttrib |= FFS_ATTRIB_RECOVERY;
+      } else if (SFPIsToken ("FALSE")) {
+        //
+        // Default is FALSE
+        //
+      } else {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 'TRUE' or 'FALSE'", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_ATTRIB_CHECKSUM")) {
+      //
+      // ***********************************************************************
+      //
+      // Found: FFS_ATTRIB_CHECKSUM = TRUE | FALSE
+      //
+      if (FfsAttribDefined & FFS_ATTRIB_CHECKSUM) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "FFS_ATTRIB_CHECKSUM previously defined", NULL);
+        goto Done;
+      }
+
+      FfsAttribDefined |= FFS_ATTRIB_CHECKSUM;
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (SFPIsToken ("TRUE")) {
+        FfsAttrib |= FFS_ATTRIB_CHECKSUM;
+      } else if (SFPIsToken ("FALSE")) {
+        //
+        // Default is FALSE
+        //
+      } else {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 'TRUE' or 'FALSE'", NULL);
+        goto Done;
+      }
+    } else if (SFPIsToken ("FFS_ALIGNMENT") || SFPIsToken ("FFS_ATTRIB_DATA_ALIGNMENT")) {
+      //
+      // ***********************************************************************
+      //
+      // Found FFS_ALIGNMENT, formats:
+      //   FFS_ALIGNMENT = 0-7
+      //   FFS_ATTRIB_DATA_ALIGNMENT = 0-7
+      //
+      if (FfsAttribDefined & FFS_ATTRIB_DATA_ALIGNMENT) {
+        Error (
+          mGlobals.PrimaryPackagePath,
+          SFPGetLineNumber (),
+          0,
+          "FFS_ALIGNMENT/FFS_ATTRIB_DATA_ALIGNMENT previously defined",
+          NULL
+          );
+        goto Done;
+      }
+
+      FfsAttribDefined |= FFS_ATTRIB_DATA_ALIGNMENT;
+      if (!SFPIsToken ("=")) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected '='", NULL);
+        goto Done;
+      }
+
+      if (!SFPGetNumber (&FfsAlignment32)) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected numeric value for alignment", NULL);
+        goto Done;
+      }
+
+      if (FfsAlignment32 > 7) {
+        Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, "expected 0 <= alignment <= 7", NULL);
+        goto Done;
+      }
+
+      FfsAttrib |= (((EFI_FFS_FILE_ATTRIBUTES) FfsAlignment32) << 3);
+    } else {
+      SFPGetNextToken (InputString, sizeof (InputString));
+      Error (mGlobals.PrimaryPackagePath, SFPGetLineNumber (), 0, InputString, "unrecognized/unexpected token");
+      goto Done;
+    }
+  }
+  //
+  // Close the primary package file
+  //
+  SFPCloseFile ();
+  //
+  // TODO: replace code below with basically a copy of the code above. Don't
+  // forget to reset the FfsAttribDefined variable first. Also, you'll need
+  // to somehow keep track of whether or not the basename is defined multiple
+  // times in the override package. Ditto on the file GUID.
+  //
+  if (mGlobals.OverridePackagePath[0] != 0) {
+    OverridePackage = fopen (mGlobals.OverridePackagePath, "r");
+    //
+    // NOTE: For package override to work correctly, the code below must be modified to
+    //       SET or CLEAR bits properly. For example, if the primary package set
+    //       FFS_ATTRIB_CHECKSUM = TRUE, and the override set FFS_ATTRIB_CHECKSUM = FALSE, then
+    //       we'd need to clear the bit below. Since this is not happening, I'm guessing that
+    //       the override functionality is not being used, so should be made obsolete. If I'm
+    //       wrong, and it is being used, then it needs to be fixed. Thus emit an error if it is
+    //       used, and we'll address it then.  4/10/2003
+    //
+    Error (__FILE__, __LINE__, 0, "package override functionality is not implemented correctly", NULL);
+    goto Done;
+  } else {
+    OverridePackage = NULL;
+  }
+
+#ifdef OVERRIDE_SUPPORTED
+  if (OverridePackage != NULL) {
+    //
+    // Parse override package file
+    //
+    fscanf (OverridePackage, "%s", &InputString);
+    if (strcmpi (InputString, "PACKAGE.INF") != 0) {
+      Error (mGlobals.OverridePackagePath, 1, 0, "invalid package file", "expected 'PACKAGE.INF'");
+      goto Done;
+    }
+    //
+    // Match [dir] to Build Directory
+    //
+    if (FindSectionInPackage (mGlobals.BuildDirectory, OverridePackage, &LineNumber) != 0) {
+      Error (mGlobals.OverridePackagePath, 1, 0, mGlobals.BuildDirectory, "section not found in package file");
+      goto Done;
+    }
+
+    InputString[0] = 0;
+    while ((InputString[0] != '[') && (!feof (OverridePackage))) {
+      if (GetNextLine (InputString, OverridePackage, &LineNumber) != -1) {
+        if (InputString[0] != '[') {
+here:
+          if (strcmpi (InputString, "BASE_NAME") == 0) {
+            //
+            // found BASE_NAME, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+              strcpy (BaseName, InputString);
+            } else {
+              BreakString (InputString, InputString, 1);
+              strcpy (BaseName, InputString);
+            }
+          } else if (strcmpi (InputString, "IMAGE_SCRIPT") == 0) {
+            //
+            // found IMAGE_SCRIPT, come back later to process it
+            //
+            ImageScriptInOveride = TRUE;
+            fscanf (OverridePackage, "%s", &InputString);
+          } else if (strcmpi (InputString, "FFS_FILEGUID") == 0) {
+            //
+            // found FILEGUID, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+              Status = StringToGuid (InputString, &FfsGuid);
+              if (Status != 0) {
+                Error (mGlobals.OverridePackagePath, 1, 0, InputString, "bad FFS_FILEGUID format");
+                goto Done;
+              }
+            } else {
+              BreakString (InputString, InputString, 1);
+              Status = StringToGuid (InputString, &FfsGuid);
+              if (Status != 0) {
+                Error (mGlobals.OverridePackagePath, 1, 0, InputString, "bad FFS_FILEGUID format");
+                goto Done;
+              }
+            }
+          } else if (strcmpi (InputString, "FFS_FILETYPE") == 0) {
+            //
+            // found FILETYPE, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+              strcpy (FileType, InputString);
+            } else {
+              BreakString (InputString, InputString, 1);
+              strcpy (FileType, InputString);
+            }
+
+          } else if (strcmpi (InputString, "FFS_ATTRIB_RECOVERY") == 0) {
+            //
+            // found FFS_ATTRIB_RECOVERY, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+              if (strcmpi (InputString, "TRUE") == 0) {
+                FfsAttrib |= FFS_ATTRIB_RECOVERY;
+              }
+            } else {
+              BreakString (InputString, InputString, 1);
+              if (strcmpi (InputString, "TRUE") == 0) {
+                FfsAttrib |= FFS_ATTRIB_RECOVERY;
+              }
+            }
+          } else if (strcmpi (InputString, "FFS_ATTRIB_CHECKSUM") == 0) {
+            //
+            // found FFS_ATTRIB_CHECKSUM, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+              if (strcmpi (InputString, "TRUE") == 0) {
+                FfsAttrib |= FFS_ATTRIB_CHECKSUM;
+              }
+            } else {
+              BreakString (InputString, InputString, 1);
+              if (strcmpi (InputString, "TRUE") == 0) {
+                FfsAttrib |= FFS_ATTRIB_CHECKSUM;
+              }
+            }
+          } else if (strcmpi (InputString, "FFS_ALIGNMENT") == 0) {
+            //
+            // found FFS_ALIGNMENT, next is = and string.
+            //
+            fscanf (OverridePackage, "%s", &InputString);
+            CheckSlash (InputString, OverridePackage, &LineNumber);
+            if (strlen (InputString) == 1) {
+              //
+              // string is just =
+              //
+              fscanf (OverridePackage, "%s", &InputString);
+              CheckSlash (InputString, OverridePackage, &LineNumber);
+            } else {
+              BreakString (InputString, InputString, 1);
+            }
+
+            AsciiStringToUint64 (InputString, FALSE, &FfsAlignment);
+            if (FfsAlignment > 7) {
+              Error (mGlobals.OverridePackagePath, 1, 0, InputString, "invalid FFS_ALIGNMENT value");
+              goto Done;
+            }
+
+            FfsAttrib |= (((EFI_FFS_FILE_ATTRIBUTES) FfsAlignment) << 3);
+          } else if (strchr (InputString, '=') != NULL) {
+            BreakString (InputString, String, 1);
+            fseek (OverridePackage, (-1 * (strlen (String) + 1)), SEEK_CUR);
+            BreakString (InputString, InputString, 0);
+            goto here;
+          }
+        }
+      }
+    }
+  }
+#endif // #ifdef OVERRIDE_SUPPORTED
+  //
+  // Require that they specified a file GUID at least, since that's how we're
+  // naming the file.
+  //
+  if (GuidString[0] == 0) {
+    Error (mGlobals.PrimaryPackagePath, 1, 0, "FFS_FILEGUID must be specified", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // Build Header and process image script
+  //
+  FileBuffer = (UINT8 *) malloc ((1024 * 1024 * 16) * sizeof (UINT8));
+  if (FileBuffer == NULL) {
+    Error (__FILE__, __LINE__, 0, "memory allocation failed", NULL);
+    goto Done;
+  }
+
+  FileSize = 0;
+  if (ImageScriptInOveride) {
+#ifdef OVERRIDE_SUPORTED
+    rewind (OverridePackage);
+    LineNumber = 0;
+    FindSectionInPackage (mGlobals.BuildDirectory, OverridePackage, &LineNumber);
+    while (strcmpi (InputString, "IMAGE_SCRIPT") != 0) {
+      GetNextLine (InputString, OverridePackage, &LineNumber);
+      CheckSlash (InputString, OverridePackage, &LineNumber);
+      if (strchr (InputString, '=') != NULL) {
+        BreakString (InputString, InputString, 0);
+      }
+    }
+
+    while (InputString[0] != '{') {
+      GetNextLine (InputString, OverridePackage, &LineNumber);
+      CheckSlash (InputString, OverridePackage, &LineNumber);
+    }
+    //
+    // Found start of image script, process it
+    //
+    FileSize += ProcessScript (FileBuffer, OverridePackage, mGlobals.BuildDirectory, ForceUncompress);
+    if (FileSize == -1) {
+      return -1;
+    }
+
+    if (StringToType (FileType) != EFI_FV_FILETYPE_RAW) {
+      FileSize = AdjustFileSize (FileBuffer, FileSize);
+    }
+
+    if (BaseName[0] == '\"') {
+      StripQuotes (BaseName);
+    }
+
+    if (BaseName[0] != 0) {
+      sprintf (InputString, "%s-%s", GuidString, BaseName);
+    } else {
+      strcpy (InputString, GuidString);
+    }
+
+    switch (StringToType (FileType)) {
+
+    case EFI_FV_FILETYPE_SECURITY_CORE:
+      strcat (InputString, ".SEC");
+      break;
+
+    case EFI_FV_FILETYPE_PEIM:
+    case EFI_FV_FILETYPE_PEI_CORE:
+    case EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER:
+      strcat (InputString, ".PEI");
+      break;
+
+    case EFI_FV_FILETYPE_DRIVER:
+    case EFI_FV_FILETYPE_DXE_CORE:
+      strcat (InputString, ".DXE");
+      break;
+
+    case EFI_FV_FILETYPE_APPLICATION:
+      strcat (InputString, ".APP");
+      break;
+
+    case EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE:
+      strcat (InputString, ".FVI");
+      break;
+
+    case EFI_FV_FILETYPE_ALL:
+      Error (mGlobals.OverridePackagePath, 1, 0, "invalid FFS file type for this utility", NULL);
+      goto Done;
+
+    default:
+      strcat (InputString, ".FFS");
+      break;
+    }
+
+    if (ForceUncompress) {
+      strcat (InputString, ".ORG");
+    }
+
+    Out = fopen (InputString, "wb");
+    if (Out == NULL) {
+      Error (NULL, 0, 0, InputString, "could not open output file for writing");
+      goto Done;
+    }
+    //
+    // create ffs header
+    //
+    memset (&FileHeader, 0, sizeof (EFI_FFS_FILE_HEADER));
+    memcpy (&FileHeader.Name, &FfsGuid, sizeof (EFI_GUID));
+    FileHeader.Type       = StringToType (FileType);
+    FileHeader.Attributes = FfsAttrib;
+    //
+    // Now FileSize includes the EFI_FFS_FILE_HEADER
+    //
+    FileSize += sizeof (EFI_FFS_FILE_HEADER);
+    FileHeader.Size[0]  = (UINT8) (FileSize & 0xFF);
+    FileHeader.Size[1]  = (UINT8) ((FileSize & 0xFF00) >> 8);
+    FileHeader.Size[2]  = (UINT8) ((FileSize & 0xFF0000) >> 16);
+    //
+    // Fill in checksums and state, these must be zero for checksumming
+    //
+    // FileHeader.IntegrityCheck.Checksum.Header = 0;
+    // FileHeader.IntegrityCheck.Checksum.File = 0;
+    // FileHeader.State = 0;
+    //
+    FileHeader.IntegrityCheck.Checksum.Header = CalculateChecksum8 (
+                                                  (UINT8 *) &FileHeader,
+                                                  sizeof (EFI_FFS_FILE_HEADER)
+                                                  );
+    if (FileHeader.Attributes & FFS_ATTRIB_CHECKSUM) {
+      FileHeader.IntegrityCheck.Checksum.File = CalculateChecksum8 ((UINT8 *) &FileHeader, FileSize);
+    } else {
+      FileHeader.IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+    }
+
+    FileHeader.State = EFI_FILE_HEADER_CONSTRUCTION | EFI_FILE_HEADER_VALID | EFI_FILE_DATA_VALID;
+    //
+    // write header
+    //
+    if (fwrite (&FileHeader, sizeof (FileHeader), 1, Out) != 1) {
+      Error (NULL, 0, 0, "failed to write file header to output file", NULL);
+      goto Done;
+    }
+    //
+    // write data
+    //
+    if (fwrite (FileBuffer, FileSize - sizeof (EFI_FFS_FILE_HEADER), 1, Out) != 1) {
+      Error (NULL, 0, 0, "failed to write all bytes to output file", NULL);
+      goto Done;
+    }
+
+    fclose (Out);
+    Out = NULL;
+#endif // #ifdef OVERRIDE_SUPPORTED
+  } else {
+    //
+    // Open primary package file and process the IMAGE_SCRIPT section
+    //
+    PrimaryPackage = fopen (mGlobals.PrimaryPackagePath, "r");
+    if (PrimaryPackage == NULL) {
+      Error (NULL, 0, 0, mGlobals.PrimaryPackagePath, "unable to open primary package file");
+      goto Done;
+    }
+
+    LineNumber = 1;
+    FindSectionInPackage (".", PrimaryPackage, &LineNumber);
+    while (strcmpi (InputString, "IMAGE_SCRIPT") != 0) {
+      GetNextLine (InputString, PrimaryPackage, &LineNumber);
+      CheckSlash (InputString, PrimaryPackage, &LineNumber);
+      if (strchr (InputString, '=') != NULL) {
+        BreakString (InputString, InputString, 0);
+      }
+    }
+
+    while (InputString[0] != '{') {
+      GetNextLine (InputString, PrimaryPackage, &LineNumber);
+      CheckSlash (InputString, PrimaryPackage, &LineNumber);
+    }
+    //
+    // Found start of image script, process it
+    //
+    FileSize += ProcessScript (FileBuffer, PrimaryPackage, mGlobals.BuildDirectory, ForceUncompress);
+    if (FileSize == -1) {
+      goto Done;
+    }
+
+    if (StringToType (FileType) != EFI_FV_FILETYPE_RAW) {
+      FileSize = AdjustFileSize (FileBuffer, FileSize);
+    }
+
+    if (BaseName[0] == '\"') {
+      StripQuotes (BaseName);
+    }
+
+    if (BaseName[0] != 0) {
+      sprintf (InputString, "%s-%s", GuidString, BaseName);
+    } else {
+      strcpy (InputString, GuidString);
+    }
+
+    switch (StringToType (FileType)) {
+
+    case EFI_FV_FILETYPE_SECURITY_CORE:
+      strcat (InputString, ".SEC");
+      break;
+
+    case EFI_FV_FILETYPE_PEIM:
+    case EFI_FV_FILETYPE_PEI_CORE:
+    case EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER:
+      strcat (InputString, ".PEI");
+      break;
+
+    case EFI_FV_FILETYPE_DRIVER:
+    case EFI_FV_FILETYPE_DXE_CORE:
+      strcat (InputString, ".DXE");
+      break;
+
+    case EFI_FV_FILETYPE_APPLICATION:
+      strcat (InputString, ".APP");
+      break;
+
+    case EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE:
+      strcat (InputString, ".FVI");
+      break;
+
+    case EFI_FV_FILETYPE_ALL:
+      Error (mGlobals.PrimaryPackagePath, 1, 0, "invalid FFS file type for this utility", NULL);
+      goto Done;
+
+    default:
+      strcat (InputString, ".FFS");
+      break;
+    }
+
+    if (ForceUncompress) {
+      strcat (InputString, ".ORG");
+    }
+
+    Out = fopen (InputString, "wb");
+    if (Out == NULL) {
+      Error (NULL, 0, 0, InputString, "failed to open output file for writing");
+      goto Done;
+    }
+    //
+    // Initialize the FFS file header
+    //
+    memset (&FileHeader, 0, sizeof (EFI_FFS_FILE_HEADER));
+    memcpy (&FileHeader.Name, &FfsGuid, sizeof (EFI_GUID));
+    FileHeader.Type       = StringToType (FileType);
+    FileHeader.Attributes = FfsAttrib;
+    //
+    // From this point on FileSize includes the size of the EFI_FFS_FILE_HEADER
+    //
+    FileSize += sizeof (EFI_FFS_FILE_HEADER);
+    //
+    // If using a tail, then it adds two bytes
+    //
+    if (FileHeader.Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+      //
+      // Tail is not allowed for pad and 0-length files
+      //
+      if ((FileHeader.Type == EFI_FV_FILETYPE_FFS_PAD) || (FileSize == sizeof (EFI_FFS_FILE_HEADER))) {
+        Error (
+          mGlobals.PrimaryPackagePath,
+          1,
+          0,
+          "FFS_ATTRIB_TAIL_PRESENT=TRUE is invalid for PAD or 0-length files",
+          NULL
+          );
+        goto Done;
+      }
+
+      FileSize += sizeof (EFI_FFS_FILE_TAIL);
+    }
+
+    FileHeader.Size[0]  = (UINT8) (FileSize & 0xFF);
+    FileHeader.Size[1]  = (UINT8) ((FileSize & 0xFF00) >> 8);
+    FileHeader.Size[2]  = (UINT8) ((FileSize & 0xFF0000) >> 16);
+    //
+    // Fill in checksums and state, they must be 0 for checksumming.
+    //
+    // FileHeader.IntegrityCheck.Checksum.Header = 0;
+    // FileHeader.IntegrityCheck.Checksum.File = 0;
+    // FileHeader.State = 0;
+    //
+    FileHeader.IntegrityCheck.Checksum.Header = CalculateChecksum8 (
+                                                  (UINT8 *) &FileHeader,
+                                                  sizeof (EFI_FFS_FILE_HEADER)
+                                                  );
+    if (FileHeader.Attributes & FFS_ATTRIB_CHECKSUM) {
+      //
+      // Cheating here.  Since the header checksums, just calculate the checksum of the body.
+      // Checksum does not include the tail
+      //
+      if (FileHeader.Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+        FileHeader.IntegrityCheck.Checksum.File = CalculateChecksum8 (
+                                                    FileBuffer,
+                                                    FileSize - sizeof (EFI_FFS_FILE_HEADER) - sizeof (EFI_FFS_FILE_TAIL)
+                                                    );
+      } else {
+        FileHeader.IntegrityCheck.Checksum.File = CalculateChecksum8 (
+                                                    FileBuffer,
+                                                    FileSize - sizeof (EFI_FFS_FILE_HEADER)
+                                                    );
+      }
+    } else {
+      FileHeader.IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+    }
+    //
+    // Set the state now. Spec says the checksum assumes the state is 0
+    //
+    FileHeader.State = EFI_FILE_HEADER_CONSTRUCTION | EFI_FILE_HEADER_VALID | EFI_FILE_DATA_VALID;
+    //
+    // If there is a tail, then set it
+    //
+    if (FileHeader.Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+      TailValue = FileHeader.IntegrityCheck.TailReference;
+      TailValue = (UINT16) (~TailValue);
+      memcpy (
+        (UINT8 *) FileBuffer + FileSize - sizeof (EFI_FFS_FILE_HEADER) - sizeof (EFI_FFS_FILE_TAIL),
+        &TailValue,
+        sizeof (TailValue)
+        );
+    }
+    //
+    // Write the FFS file header
+    //
+    if (fwrite (&FileHeader, sizeof (FileHeader), 1, Out) != 1) {
+      Error (NULL, 0, 0, "failed to write file header contents", NULL);
+      goto Done;
+    }
+    //
+    // Write data
+    //
+    if (fwrite (FileBuffer, FileSize - sizeof (EFI_FFS_FILE_HEADER), 1, Out) != 1) {
+      Error (NULL, 0, 0, "failed to write file contents", NULL);
+      goto Done;
+    }
+  }
+
+Done:
+  SFPCloseFile ();
+  if (Out != NULL) {
+    fclose (Out);
+  }
+
+  if (PrimaryPackage != NULL) {
+    fclose (PrimaryPackage);
+  }
+
+  if (FileBuffer != NULL) {
+    free (FileBuffer);
+  }
+
+  if (OverridePackage != NULL) {
+    fclose (OverridePackage);
+  }
+
+  return GetUtilityStatus ();
+}
+
+int
+main (
+  INT32 argc,
+  CHAR8 *argv[]
+  )
+/*++
+
+Routine Description:
+
+  Main function.
+
+Arguments:
+
+  argc - Number of command line parameters.
+  argv - Array of pointers to parameter strings.
+
+Returns:
+  STATUS_SUCCESS - Utility exits successfully.
+  STATUS_ERROR   - Some error occurred during execution.
+
+--*/
+{
+  STATUS  Status;
+  //
+  // Set the name of our utility for error reporting purposes.
+  //
+  SetUtilityName (UTILITY_NAME);
+  Status = ProcessCommandLineArgs (argc, argv);
+  if (Status != STATUS_SUCCESS) {
+    return Status;
+  }
+
+  Status = MainEntry (argc, argv, TRUE);
+  if (Status == STATUS_SUCCESS) {
+    MainEntry (argc, argv, FALSE);
+  }
+  //
+  // If any errors were reported via the standard error reporting
+  // routines, then the status has been saved. Get the value and
+  // return it to the caller.
+  //
+  return GetUtilityStatus ();
+}
+
+static
+STATUS
+ProcessCommandLineArgs (
+  int     Argc,
+  char    *Argv[]
+  )
+/*++
+
+Routine Description:
+  Process the command line arguments.
+
+Arguments:
+  Argc - as passed in to main()
+  Argv - as passed in to main()
+
+Returns:
+  STATUS_SUCCESS    - arguments all ok
+  STATUS_ERROR      - problem with args, so caller should exit
+
+--*/
+{
+  //
+  // If no args, then print usage instructions and return an error
+  //
+  if (Argc == 1) {
+    PrintUsage ();
+    return STATUS_ERROR;
+  }
+
+  memset (&mGlobals, 0, sizeof (mGlobals));
+  Argc--;
+  Argv++;
+  while (Argc > 0) {
+    if (strcmpi (Argv[0], "-b") == 0) {
+      //
+      // OPTION: -b BuildDirectory
+      // Make sure there is another argument, then save it to our globals.
+      //
+      if (Argc < 2) {
+        Error (NULL, 0, 0, "-b option requires the build directory name", NULL);
+        return STATUS_ERROR;
+      }
+
+      if (mGlobals.BuildDirectory[0]) {
+        Error (NULL, 0, 0, Argv[0], "option can only be specified once");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.BuildDirectory, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (strcmpi (Argv[0], "-p1") == 0) {
+      //
+      // OPTION: -p1 PrimaryPackageFile
+      // Make sure there is another argument, then save it to our globals.
+      //
+      if (Argc < 2) {
+        Error (NULL, 0, 0, Argv[0], "option requires the primary package file name");
+        return STATUS_ERROR;
+      }
+
+      if (mGlobals.PrimaryPackagePath[0]) {
+        Error (NULL, 0, 0, Argv[0], "option can only be specified once");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.PrimaryPackagePath, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (strcmpi (Argv[0], "-p2") == 0) {
+      //
+      // OPTION: -p2 OverridePackageFile
+      // Make sure there is another argument, then save it to our globals.
+      //
+      if (Argc < 2) {
+        Error (NULL, 0, 0, Argv[0], "option requires the override package file name");
+        return STATUS_ERROR;
+      }
+
+      if (mGlobals.OverridePackagePath[0]) {
+        Error (NULL, 0, 0, Argv[0], "option can only be specified once");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.OverridePackagePath, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (strcmpi (Argv[0], "-v") == 0) {
+      //
+      // OPTION: -v       verbose
+      //
+      mGlobals.Verbose = TRUE;
+    } else if (strcmpi (Argv[0], "-h") == 0) {
+      //
+      // OPTION: -h      help
+      //
+      PrintUsage ();
+      return STATUS_ERROR;
+    } else if (strcmpi (Argv[0], "-?") == 0) {
+      //
+      // OPTION:  -?      help
+      //
+      PrintUsage ();
+      return STATUS_ERROR;
+    } else {
+      Error (NULL, 0, 0, Argv[0], "unrecognized option");
+      PrintUsage ();
+      return STATUS_ERROR;
+    }
+
+    Argv++;
+    Argc--;
+  }
+  //
+  // Must have at least specified the package file name
+  //
+  if (mGlobals.PrimaryPackagePath[0] == 0) {
+    Error (NULL, 0, 0, "must specify primary package file", NULL);
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
new file mode 100644
index 0000000000..695809ce43
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFfsFile/GenFfsFile.h
@@ -0,0 +1,36 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenFfsFile.h 
+
+Abstract:
+
+  Header file for GenFfsFile.
+
+--*/
+
+//
+// Module Coded to Tiano Coding Conventions
+//
+#ifndef _EFI_GEN_FFSFILE_H
+#define _EFI_GEN_FFSFILE_H
+
+//
+// External Files Referenced
+//
+#include "Base.h"
+#include "UefiBaseTypes.h"
+#include "FirmwareVolumeImageFormat.h"
+#include "MyAlloc.h"
+
+#endif
diff --git a/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c b/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
new file mode 100644
index 0000000000..d3933db420
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFfsFile/SimpleFileParsing.c
@@ -0,0 +1,969 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  SimpleFileParsing.c  
+
+Abstract:
+
+  Generic but simple file parsing routines.
+
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "Base.h"
+#include "UefiBaseTypes.h"
+#include "EfiUtilityMsgs.h"
+#include "SimpleFileParsing.h"
+
+#define MAX_PATH                    255
+#define MAX_NEST_DEPTH              20  // just in case we get in an endless loop.
+#define MAX_STRING_IDENTIFIER_NAME  100 // number of wchars
+#define MAX_LINE_LEN                400
+
+#define T_CHAR_SPACE                ' '
+#define T_CHAR_NULL                 0
+#define T_CHAR_CR                   '\r'
+#define T_CHAR_TAB                  '\t'
+#define T_CHAR_LF                   '\n'
+#define T_CHAR_SLASH                '/'
+#define T_CHAR_BACKSLASH            '\\'
+#define T_CHAR_DOUBLE_QUOTE         '"'
+#define T_CHAR_LC_X                 'x'
+#define T_CHAR_0                    '0'
+
+//
+// We keep a linked list of these for the source files we process
+//
+typedef struct _SOURCE_FILE {
+  FILE                *Fptr;
+  T_CHAR              *FileBuffer;
+  T_CHAR              *FileBufferPtr;
+  UINT32              FileSize;
+  INT8                FileName[MAX_PATH];
+  UINT32              LineNum;
+  BOOLEAN             EndOfFile;
+  BOOLEAN             SkipToHash;
+  struct _SOURCE_FILE *Previous;
+  struct _SOURCE_FILE *Next;
+  T_CHAR              ControlCharacter;
+} SOURCE_FILE;
+
+//
+// Here's all our module globals.
+//
+static struct {
+  SOURCE_FILE SourceFile;
+  BOOLEAN     Verbose;
+} mGlobals;
+
+static
+UINT32
+t_strcmp (
+  T_CHAR *Buffer,
+  T_CHAR *Str
+  );
+
+static
+UINT32
+t_strncmp (
+  T_CHAR *Str1,
+  T_CHAR *Str2,
+  UINT32 Len
+  );
+
+static
+UINT32
+t_strlen (
+  T_CHAR *Str
+  );
+
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+SkipTo (
+  SOURCE_FILE *SourceFile,
+  T_CHAR      TChar,
+  BOOLEAN     StopAfterNewline
+  );
+
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+UINT32
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+//
+// static
+// T_CHAR *
+// GetQuotedString (
+//  SOURCE_FILE *SourceFile,
+//  BOOLEAN     Optional
+//  );
+//
+static
+T_CHAR  *
+t_strcpy (
+  T_CHAR *Dest,
+  T_CHAR *Src
+  );
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  );
+
+static
+STATUS
+ParseFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+FILE    *
+FindFile (
+  IN INT8     *FileName,
+  OUT INT8    *FoundFileName,
+  IN UINT32   FoundFileNameLen
+  );
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+STATUS
+SFPInit (
+  VOID
+  )
+{
+  memset ((void *) &mGlobals, 0, sizeof (mGlobals));
+  return STATUS_SUCCESS;
+}
+
+UINT32
+SFPGetLineNumber (
+  VOID
+  )
+{
+  return mGlobals.SourceFile.LineNum;
+}
+
+/*++
+
+Routine Description:
+  Return the line number of the file we're parsing. Used
+  for error reporting purposes.
+
+Arguments:
+  None.
+
+Returns:
+  The line number, or 0 if no file is being processed
+
+--*/
+T_CHAR *
+SFPGetFileName (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Return the name of the file we're parsing. Used
+  for error reporting purposes.
+
+Arguments:
+  None.
+
+Returns:
+  A pointer to the file name. Null if no file is being
+  processed.
+
+--*/
+{
+  if (mGlobals.SourceFile.FileName[0]) {
+    return mGlobals.SourceFile.FileName;
+  }
+
+  return NULL;
+}
+
+STATUS
+SFPOpenFile (
+  IN INT8   *FileName
+  )
+/*++
+
+Routine Description:
+  Open a file for parsing.
+
+Arguments:
+  FileName  - name of the file to parse
+
+Returns:
+  
+
+--*/
+{
+  STATUS  Status;
+  t_strcpy (mGlobals.SourceFile.FileName, FileName);
+  Status = ProcessIncludeFile (&mGlobals.SourceFile, NULL);
+  return Status;
+}
+
+BOOLEAN
+SFPIsToken (
+  T_CHAR *Str
+  )
+/*++
+
+Routine Description:
+  Check to see if the specified token is found at
+  the current position in the input file.
+
+Arguments:
+  Str - the token to look for
+
+Returns:
+  TRUE - the token is next
+  FALSE - the token is not next
+
+Notes:
+  We do a simple string comparison on this function. It is
+  the responsibility of the caller to ensure that the token
+  is not a subset of some other token.
+
+  The file pointer is advanced past the token in the input file.
+
+--*/
+{
+  UINT32  Len;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+
+  if ((Len = t_strcmp (mGlobals.SourceFile.FileBufferPtr, Str)) > 0) {
+    mGlobals.SourceFile.FileBufferPtr += Len;
+    return TRUE;
+  }
+
+  return FALSE;
+
+}
+
+BOOLEAN
+SFPGetNextToken (
+  T_CHAR *Str,
+  UINT32 Len
+  )
+{
+  UINT32  Index;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  Index = 0;
+  while (!EndOfFile (&mGlobals.SourceFile) && (Index < Len)) {
+    if (IsWhiteSpace (&mGlobals.SourceFile)) {
+      if (Index > 0) {
+        Str[Index] = 0;
+        return TRUE;
+      }
+
+      return FALSE;
+    } else {
+      Str[Index] = mGlobals.SourceFile.FileBufferPtr[0];
+      mGlobals.SourceFile.FileBufferPtr++;
+      Index++;
+    }
+  }
+
+  return FALSE;
+}
+
+BOOLEAN
+SFPSkipToToken (
+  T_CHAR *Str
+  )
+{
+  UINT32  Len;
+  T_CHAR  *SavePos;
+  Len     = t_strlen (Str);
+  SavePos = mGlobals.SourceFile.FileBufferPtr;
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  while (!EndOfFile (&mGlobals.SourceFile)) {
+    if (t_strncmp (Str, mGlobals.SourceFile.FileBufferPtr, Len) == 0) {
+      mGlobals.SourceFile.FileBufferPtr += Len;
+      return TRUE;
+    }
+
+    mGlobals.SourceFile.FileBufferPtr++;
+    SkipWhiteSpace (&mGlobals.SourceFile);
+  }
+
+  mGlobals.SourceFile.FileBufferPtr = SavePos;
+  return FALSE;
+}
+
+BOOLEAN
+SFPGetNumber (
+  UINT32   *Value
+  )
+/*++
+
+Routine Description:
+  Check the token at the current file position for a numeric value.
+  May be either decimal or hex.
+
+Arguments:
+  Value  - pointer where to store the value
+
+Returns:
+  FALSE    - current token is not a number
+  TRUE     - current token is a number
+
+--*/
+{
+  //
+  //  UINT32 Len;
+  //
+  SkipWhiteSpace (&mGlobals.SourceFile);
+  if (EndOfFile (&mGlobals.SourceFile)) {
+    return FALSE;
+  }
+
+  if (isdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+    //
+    // Check for hex value
+    //
+    if ((mGlobals.SourceFile.FileBufferPtr[0] == T_CHAR_0) && (mGlobals.SourceFile.FileBufferPtr[1] == T_CHAR_LC_X)) {
+      if (!isxdigit (mGlobals.SourceFile.FileBufferPtr[2])) {
+        return FALSE;
+      }
+
+      mGlobals.SourceFile.FileBufferPtr += 2;
+      sscanf (mGlobals.SourceFile.FileBufferPtr, "%x", Value);
+      while (isxdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+        mGlobals.SourceFile.FileBufferPtr++;
+      }
+
+      return TRUE;
+    } else {
+      *Value = atoi (mGlobals.SourceFile.FileBufferPtr);
+      while (isdigit (mGlobals.SourceFile.FileBufferPtr[0])) {
+        mGlobals.SourceFile.FileBufferPtr++;
+      }
+
+      return TRUE;
+    }
+  } else {
+    return FALSE;
+  }
+}
+
+STATUS
+SFPCloseFile (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Close the file being parsed.
+
+Arguments:
+  None.
+
+Returns:
+  STATUS_SUCCESS - the file was closed 
+  STATUS_ERROR   - no file is currently open
+
+--*/
+{
+  if (mGlobals.SourceFile.FileBuffer != NULL) {
+    free (mGlobals.SourceFile.FileBuffer);
+    memset (&mGlobals.SourceFile, 0, sizeof (mGlobals.SourceFile));
+    return STATUS_SUCCESS;
+  }
+
+  return STATUS_ERROR;
+}
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  )
+/*++
+
+Routine Description:
+
+  Given a source file, open the file and parse it
+  
+Arguments:
+
+  SourceFile        - name of file to parse
+  ParentSourceFile  - for error reporting purposes, the file that #included SourceFile.
+
+Returns:
+
+  Standard status.
+  
+--*/
+{
+  static UINT32 NestDepth = 0;
+  INT8          FoundFileName[MAX_PATH];
+  STATUS        Status;
+
+  Status = STATUS_SUCCESS;
+  NestDepth++;
+  //
+  // Print the file being processed. Indent so you can tell the include nesting
+  // depth.
+  //
+  if (mGlobals.Verbose) {
+    fprintf (stdout, "%*cProcessing file '%s'\n", NestDepth * 2, ' ', SourceFile->FileName);
+  }
+
+  //
+  // Make sure we didn't exceed our maximum nesting depth
+  //
+  if (NestDepth > MAX_NEST_DEPTH) {
+    Error (NULL, 0, 0, SourceFile->FileName, "max nesting depth (%d) exceeded", NestDepth);
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+  //
+  // Try to open the file locally, and if that fails try along our include paths.
+  //
+  strcpy (FoundFileName, SourceFile->FileName);
+  if ((SourceFile->Fptr = fopen (FoundFileName, "r")) == NULL) {
+    //
+    // Try to find it among the paths if it has a parent (that is, it is included
+    // by someone else).
+    //
+    Error (NULL, 0, 0, SourceFile->FileName, "file not found");
+    return STATUS_ERROR;
+  }
+  //
+  // Process the file found
+  //
+  ProcessFile (SourceFile);
+Finish:
+  //
+  // Close open files and return status
+  //
+  if (SourceFile->Fptr != NULL) {
+    fclose (SourceFile->Fptr);
+    SourceFile->Fptr = NULL;
+  }
+
+  return Status;
+}
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  //
+  // Get the file size, and then read the entire thing into memory.
+  // Allocate space for a terminator character.
+  //
+  fseek (SourceFile->Fptr, 0, SEEK_END);
+  SourceFile->FileSize = ftell (SourceFile->Fptr);
+  fseek (SourceFile->Fptr, 0, SEEK_SET);
+  SourceFile->FileBuffer = (T_CHAR *) malloc (SourceFile->FileSize + sizeof (T_CHAR));
+  if (SourceFile->FileBuffer == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  fread ((VOID *) SourceFile->FileBuffer, SourceFile->FileSize, 1, SourceFile->Fptr);
+  SourceFile->FileBuffer[(SourceFile->FileSize / sizeof (T_CHAR))] = T_CHAR_NULL;
+  //
+  // Pre-process the file to replace comments with spaces
+  //
+  PreprocessFile (SourceFile);
+  SourceFile->LineNum = 1;
+  return STATUS_SUCCESS;
+}
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  )
+/*++
+
+Routine Description:
+  Preprocess a file to replace all carriage returns with NULLs so
+  we can print lines from the file to the screen.
+  
+Arguments:
+  SourceFile - structure that we use to keep track of an input file.
+
+Returns:
+  Nothing.
+  
+--*/
+{
+  BOOLEAN InComment;
+
+  RewindFile (SourceFile);
+  InComment = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    //
+    // If a line-feed, then no longer in a comment
+    //
+    if (SourceFile->FileBufferPtr[0] == T_CHAR_LF) {
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      InComment = 0;
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_CR) {
+      //
+      // Replace all carriage returns with a NULL so we can print stuff
+      //
+      SourceFile->FileBufferPtr[0] = 0;
+      SourceFile->FileBufferPtr++;
+    } else if (InComment) {
+      SourceFile->FileBufferPtr[0] = T_CHAR_SPACE;
+      SourceFile->FileBufferPtr++;
+    } else if ((SourceFile->FileBufferPtr[0] == T_CHAR_SLASH) && (SourceFile->FileBufferPtr[1] == T_CHAR_SLASH)) {
+      SourceFile->FileBufferPtr += 2;
+      InComment = TRUE;
+    } else {
+      SourceFile->FileBufferPtr++;
+    }
+  }
+  //
+  // Could check for end-of-file and still in a comment, but
+  // should not be necessary. So just restore the file pointers.
+  //
+  RewindFile (SourceFile);
+}
+
+#if 0
+static
+T_CHAR *
+GetQuotedString (
+  SOURCE_FILE *SourceFile,
+  BOOLEAN     Optional
+  )
+{
+  T_CHAR  *String;
+  T_CHAR  *Start;
+  T_CHAR  *Ptr;
+  UINT32  Len;
+  BOOLEAN PreviousBackslash;
+
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    if (!Optional) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted string", "%S", SourceFile->FileBufferPtr);
+    }
+
+    return NULL;
+  }
+
+  Len = 0;
+  SourceFile->FileBufferPtr++;
+  Start             = Ptr = SourceFile->FileBufferPtr;
+  PreviousBackslash = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) && (!PreviousBackslash)) {
+      break;
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_CR) {
+      Warning (SourceFile->FileName, SourceFile->LineNum, 0, "carriage return found in quoted string", "%S", Start);
+      PreviousBackslash = FALSE;
+    } else if (SourceFile->FileBufferPtr[0] == T_CHAR_BACKSLASH) {
+      PreviousBackslash = TRUE;
+    } else {
+      PreviousBackslash = FALSE;
+    }
+
+    SourceFile->FileBufferPtr++;
+    Len++;
+  }
+
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "missing closing quote on string", "%S", Start);
+  } else {
+    SourceFile->FileBufferPtr++;
+  }
+  //
+  // Now allocate memory for the string and save it off
+  //
+  String = (T_CHAR *) malloc ((Len + 1) * sizeof (T_CHAR));
+  if (String == NULL) {
+    Error (NULL, 0, 0, "memory allocation failed", NULL);
+    return NULL;
+  }
+  //
+  // Copy the string from the file buffer to the local copy.
+  // We do no reformatting of it whatsoever at this point.
+  //
+  Ptr = String;
+  while (Len > 0) {
+    *Ptr = *Start;
+    Start++;
+    Ptr++;
+    Len--;
+  }
+
+  *Ptr = 0;
+  return String;
+}
+#endif
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  //
+  // The file buffer pointer will typically get updated before the End-of-file flag in the
+  // source file structure, so check it first.
+  //
+  if (SourceFile->FileBufferPtr >= SourceFile->FileBuffer + SourceFile->FileSize / sizeof (T_CHAR)) {
+    SourceFile->EndOfFile = TRUE;
+    return TRUE;
+  }
+
+  if (SourceFile->EndOfFile) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+#if 0
+static
+void
+ProcessTokenInclude (
+  SOURCE_FILE *SourceFile
+  )
+{
+  INT8        IncludeFileName[MAX_PATH];
+  INT8        *To;
+  UINT32      Len;
+  BOOLEAN     ReportedError;
+  SOURCE_FILE IncludedSourceFile;
+
+  ReportedError = FALSE;
+  if (SkipWhiteSpace (SourceFile) == 0) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "expected whitespace following #include keyword", NULL);
+  }
+  //
+  // Should be quoted file name
+  //
+  if (SourceFile->FileBufferPtr[0] != T_CHAR_DOUBLE_QUOTE) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted include file name", NULL);
+    goto FailDone;
+  }
+
+  SourceFile->FileBufferPtr++;
+  //
+  // Copy the filename as ascii to our local string
+  //
+  To  = IncludeFileName;
+  Len = 0;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == T_CHAR_CR) || (SourceFile->FileBufferPtr[0] == T_CHAR_LF)) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "end-of-line found in quoted include file name", NULL);
+      goto FailDone;
+    }
+
+    if (SourceFile->FileBufferPtr[0] == T_CHAR_DOUBLE_QUOTE) {
+      SourceFile->FileBufferPtr++;
+      break;
+    }
+    //
+    // If too long, then report the error once and process until the closing quote
+    //
+    Len++;
+    if (!ReportedError && (Len >= sizeof (IncludeFileName))) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "length of include file name exceeds limit", NULL);
+      ReportedError = TRUE;
+    }
+
+    if (!ReportedError) {
+      //
+      // *To = UNICODE_TO_ASCII(SourceFile->FileBufferPtr[0]);
+      //
+      *To = (T_CHAR) SourceFile->FileBufferPtr[0];
+      To++;
+    }
+
+    SourceFile->FileBufferPtr++;
+  }
+
+  if (!ReportedError) {
+    *To = 0;
+    memset ((char *) &IncludedSourceFile, 0, sizeof (SOURCE_FILE));
+    strcpy (IncludedSourceFile.FileName, IncludeFileName);
+    //
+    // IncludedSourceFile.ControlCharacter = DEFAULT_CONTROL_CHARACTER;
+    //
+    ProcessIncludeFile (&IncludedSourceFile, SourceFile);
+    //
+    // printf ("including file '%s'\n", IncludeFileName);
+    //
+  }
+
+  return ;
+FailDone:
+  //
+  // Error recovery -- skip to next #
+  //
+  SourceFile->SkipToHash = TRUE;
+}
+#endif
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  switch (*SourceFile->FileBufferPtr) {
+  case T_CHAR_NULL:
+  case T_CHAR_CR:
+  case T_CHAR_SPACE:
+  case T_CHAR_TAB:
+  case T_CHAR_LF:
+    return TRUE;
+
+  default:
+    return FALSE;
+  }
+}
+
+UINT32
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  UINT32  Count;
+
+  Count = 0;
+  while (!EndOfFile (SourceFile)) {
+    Count++;
+    switch (*SourceFile->FileBufferPtr) {
+    case T_CHAR_NULL:
+    case T_CHAR_CR:
+    case T_CHAR_SPACE:
+    case T_CHAR_TAB:
+      SourceFile->FileBufferPtr++;
+      break;
+
+    case T_CHAR_LF:
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      if (mGlobals.Verbose) {
+        printf ("%d: %S\n", SourceFile->LineNum, SourceFile->FileBufferPtr);
+      }
+      break;
+
+    default:
+      return Count - 1;
+    }
+  }
+  //
+  // Some tokens require trailing whitespace. If we're at the end of the
+  // file, then we count that as well.
+  //
+  if ((Count == 0) && (EndOfFile (SourceFile))) {
+    Count++;
+  }
+
+  return Count;
+}
+
+static
+UINT32
+t_strcmp (
+  T_CHAR *Buffer,
+  T_CHAR *Str
+  )
+{
+  UINT32  Len;
+
+  Len = 0;
+  while (*Str == *Buffer) {
+    Buffer++;
+    Str++;
+    Len++;
+  }
+
+  if (*Str) {
+    return 0;
+  }
+
+  return Len;
+}
+
+static
+UINT32
+t_strlen (
+  T_CHAR *Str
+  )
+{
+  UINT32  Len;
+  Len = 0;
+  while (*Str) {
+    Len++;
+    Str++;
+  }
+
+  return Len;
+}
+
+static
+UINT32
+t_strncmp (
+  T_CHAR *Str1,
+  T_CHAR *Str2,
+  UINT32 Len
+  )
+{
+  while (Len > 0) {
+    if (*Str1 != *Str2) {
+      return Len;
+    }
+
+    Len--;
+    Str1++;
+    Str2++;
+  }
+
+  return 0;
+}
+
+static
+T_CHAR *
+t_strcpy (
+  T_CHAR *Dest,
+  T_CHAR *Src
+  )
+{
+  T_CHAR  *SaveDest;
+  SaveDest = Dest;
+  while (*Src) {
+    *Dest = *Src;
+    Dest++;
+    Src++;
+  }
+
+  *Dest = 0;
+  return SaveDest;
+}
+
+#if 0
+static
+BOOLEAN
+IsValidIdentifierChar (
+  INT8      Char,
+  BOOLEAN   FirstChar
+  )
+{
+  //
+  // If it's the first character of an identifier, then
+  // it must be one of [A-Za-z_].
+  //
+  if (FirstChar) {
+    if (isalpha (Char) || (Char == '_')) {
+      return TRUE;
+    }
+  } else {
+    //
+    // If it's not the first character, then it can
+    // be one of [A-Za-z_0-9]
+    //
+    if (isalnum (Char) || (Char == '_')) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+#endif
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  SourceFile->LineNum       = 1;
+  SourceFile->FileBufferPtr = SourceFile->FileBuffer;
+  SourceFile->EndOfFile     = 0;
+}
+
+#if 0
+static
+BOOLEAN
+SkipTo (
+  SOURCE_FILE  *SourceFile,
+  T_CHAR       TChar,
+  BOOLEAN      StopAfterNewline
+  )
+{
+  while (!EndOfFile (SourceFile)) {
+    //
+    // Check for the character of interest
+    //
+    if (SourceFile->FileBufferPtr[0] == TChar) {
+      return TRUE;
+    } else {
+      if (SourceFile->FileBufferPtr[0] == T_CHAR_LF) {
+        SourceFile->LineNum++;
+        if (StopAfterNewline) {
+          SourceFile->FileBufferPtr++;
+          if (SourceFile->FileBufferPtr[0] == 0) {
+            SourceFile->FileBufferPtr++;
+          }
+
+          return FALSE;
+        }
+      }
+
+      SourceFile->FileBufferPtr++;
+    }
+  }
+
+  return FALSE;
+}
+#endif
diff --git a/Tools/Source/TianoTools/GenFfsFile/build.gcc b/Tools/Source/TianoTools/GenFfsFile/build.gcc
new file mode 100644
index 0000000000..6b75815073
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFfsFile/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. GenFfsFile.c  -L../Library-mingw -lCommon -lCustomizedCompress -o GenFfsFile
diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
new file mode 100644
index 0000000000..352ea0fca1
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenFfsFile Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenFfsFile"/>
+  <property name="FileSet" value="GenFfsFile.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+        <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenFvImage/BasePeCoff.c b/Tools/Source/TianoTools/GenFvImage/BasePeCoff.c
new file mode 100644
index 0000000000..b41a3a0e3b
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/BasePeCoff.c
@@ -0,0 +1,1062 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  PeCoffLoader.c
+
+Abstract:
+
+  Tiano PE/COFF loader 
+
+Revision History
+
+--*/
+
+
+#define EFI_SPECIFICATION_VERSION    0x00000000
+#define EDK_RELEASE_VERSION          0x00020000
+#include <Base.h>
+#include <Library/PeCoffLib.h>
+#include <Library/BaseMemoryLib.h>
+
+STATIC
+RETURN_STATUS
+PeCoffLoaderGetPeHeader (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  OUT    EFI_IMAGE_NT_HEADERS          *PeHdr,
+  OUT    EFI_TE_IMAGE_HEADER           *TeHdr
+  );
+
+STATIC
+RETURN_STATUS
+PeCoffLoaderCheckImageType (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     EFI_IMAGE_NT_HEADERS          *PeHdr,
+  IN     EFI_TE_IMAGE_HEADER           *TeHdr
+  );
+
+STATIC
+VOID                            *
+PeCoffLoaderImageAddress (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  IN     UINTN                         Address
+  );
+
+
+STATIC
+RETURN_STATUS
+PeCoffLoaderGetPeHeader (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext,
+  OUT    EFI_IMAGE_NT_HEADERS          *PeHdr,
+  OUT    EFI_TE_IMAGE_HEADER           *TeHdr
+  )
+/*++
+
+Routine Description:
+
+  Retrieves the PE or TE Header from a PE/COFF or TE image
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  PeHdr         - The buffer in which to return the PE header
+  
+  TeHdr         - The buffer in which to return the TE header
+
+Returns:
+
+  RETURN_SUCCESS if the PE or TE Header is read, 
+  Otherwise, the error status from reading the PE/COFF or TE image using the ImageRead function.
+
+--*/
+{
+  RETURN_STATUS            Status;
+  EFI_IMAGE_DOS_HEADER  DosHdr;
+  UINTN                 Size;
+
+  ImageContext->IsTeImage = FALSE;
+  //
+  // Read the DOS image headers
+  //
+  Size = sizeof (EFI_IMAGE_DOS_HEADER);
+  Status = ImageContext->ImageRead (
+                          ImageContext->Handle,
+                          0,
+                          &Size,
+                          &DosHdr
+                          );
+  if (RETURN_ERROR (Status)) {
+    ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+    return Status;
+  }
+
+  ImageContext->PeCoffHeaderOffset = 0;
+  if (DosHdr.e_magic == EFI_IMAGE_DOS_SIGNATURE) {
+    //
+    // DOS image header is present, so read the PE header after the DOS image header
+    //
+    ImageContext->PeCoffHeaderOffset = DosHdr.e_lfanew;
+  }
+  //
+  // Read the PE/COFF Header
+  //
+  Size = sizeof (EFI_IMAGE_NT_HEADERS);
+  Status = ImageContext->ImageRead (
+                          ImageContext->Handle,
+                          ImageContext->PeCoffHeaderOffset,
+                          &Size,
+                          PeHdr
+                          );
+  if (RETURN_ERROR (Status)) {
+    ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+    return Status;
+  }
+  //
+  // Check the PE/COFF Header Signature. If not, then try to read a TE header
+  //
+  if (PeHdr->Signature != EFI_IMAGE_NT_SIGNATURE) {
+    Size = sizeof (EFI_TE_IMAGE_HEADER);
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &Size,
+                            TeHdr
+                            );
+    if (TeHdr->Signature != EFI_TE_IMAGE_HEADER_SIGNATURE) {
+      return RETURN_UNSUPPORTED;
+    }
+
+    ImageContext->IsTeImage = TRUE;
+  }
+
+  return RETURN_SUCCESS;
+}
+
+STATIC
+RETURN_STATUS
+PeCoffLoaderCheckImageType (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT          *ImageContext,
+  IN     EFI_IMAGE_NT_HEADERS                  *PeHdr,
+  IN     EFI_TE_IMAGE_HEADER                   *TeHdr
+  )
+/*++
+
+Routine Description:
+
+  Checks the PE or TE header of a PE/COFF or TE image to determine if it supported
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  PeHdr         - The buffer in which to return the PE header
+  
+  TeHdr         - The buffer in which to return the TE header
+
+Returns:
+
+  RETURN_SUCCESS if the PE/COFF or TE image is supported
+  RETURN_UNSUPPORTED of the PE/COFF or TE image is not supported.
+
+--*/
+{
+  //
+  // See if the machine type is supported.  We support a native machine type (IA-32/Itanium-based)
+  // and the machine type for the Virtual Machine.
+  //
+  if (ImageContext->IsTeImage == FALSE) {
+    ImageContext->Machine = PeHdr->FileHeader.Machine;
+  } else {
+    ImageContext->Machine = TeHdr->Machine;
+  }
+
+  if (!(EFI_IMAGE_MACHINE_TYPE_SUPPORTED (ImageContext->Machine))) {
+    ImageContext->ImageError = IMAGE_ERROR_INVALID_MACHINE_TYPE;
+    return RETURN_UNSUPPORTED;
+  }
+
+  //
+  // See if the image type is supported.  We support EFI Applications,
+  // EFI Boot Service Drivers, and EFI Runtime Drivers.
+  //
+  if (ImageContext->IsTeImage == FALSE) {
+    ImageContext->ImageType = PeHdr->OptionalHeader.Subsystem;
+  } else {
+    ImageContext->ImageType = (UINT16) (TeHdr->Subsystem);
+  }
+
+
+  return RETURN_SUCCESS;
+}
+
+RETURN_STATUS
+EFIAPI
+PeCoffLoaderGetImageInfo (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT           *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Retrieves information on a PE/COFF image
+
+Arguments:
+
+  This         - Calling context
+  ImageContext - The context of the image being loaded
+
+Returns:
+
+  RETURN_SUCCESS           - The information on the PE/COFF image was collected.
+  RETURN_INVALID_PARAMETER - ImageContext is NULL.
+  RETURN_UNSUPPORTED       - The PE/COFF image is not supported.
+  Otherwise             - The error status from reading the PE/COFF image using the
+                          ImageContext->ImageRead() function
+
+--*/
+{
+  RETURN_STATUS                      Status;
+  EFI_IMAGE_NT_HEADERS            PeHdr;
+  EFI_TE_IMAGE_HEADER             TeHdr;
+  EFI_IMAGE_DATA_DIRECTORY        *DebugDirectoryEntry;
+  UINTN                           Size;
+  UINTN                           Index;
+  UINTN                           DebugDirectoryEntryRva;
+  UINTN                           DebugDirectoryEntryFileOffset;
+  UINTN                           SectionHeaderOffset;
+  EFI_IMAGE_SECTION_HEADER        SectionHeader;
+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY DebugEntry;
+
+  if (NULL == ImageContext) {
+    return RETURN_INVALID_PARAMETER;
+  }
+  //
+  // Assume success
+  //
+  ImageContext->ImageError  = IMAGE_ERROR_SUCCESS;
+
+  Status                    = PeCoffLoaderGetPeHeader (ImageContext, &PeHdr, &TeHdr);
+  if (RETURN_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Verify machine type
+  //
+  Status = PeCoffLoaderCheckImageType (ImageContext, &PeHdr, &TeHdr);
+  if (RETURN_ERROR (Status)) {
+    return Status;
+  }
+  //
+  // Retrieve the base address of the image
+  //
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->ImageAddress = PeHdr.OptionalHeader.ImageBase;
+  } else {
+    ImageContext->ImageAddress = (PHYSICAL_ADDRESS) (TeHdr.ImageBase);
+  }
+  //
+  // Initialize the alternate destination address to 0 indicating that it
+  // should not be used.
+  //
+  ImageContext->DestinationAddress = 0;
+
+  //
+  // Initialize the codeview pointer.
+  //
+  ImageContext->CodeView    = NULL;
+  ImageContext->PdbPointer  = NULL;
+
+  //
+  // Three cases with regards to relocations:
+  // - Image has base relocs, RELOCS_STRIPPED==0    => image is relocatable
+  // - Image has no base relocs, RELOCS_STRIPPED==1 => Image is not relocatable
+  // - Image has no base relocs, RELOCS_STRIPPED==0 => Image is relocatable but
+  //   has no base relocs to apply
+  // Obviously having base relocations with RELOCS_STRIPPED==1 is invalid.
+  //
+  // Look at the file header to determine if relocations have been stripped, and
+  // save this info in the image context for later use.
+  //
+  if ((!(ImageContext->IsTeImage)) && ((PeHdr.FileHeader.Characteristics & EFI_IMAGE_FILE_RELOCS_STRIPPED) != 0)) {
+    ImageContext->RelocationsStripped = TRUE;
+  } else {
+    ImageContext->RelocationsStripped = FALSE;
+  }
+
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->ImageSize         = (UINT64) PeHdr.OptionalHeader.SizeOfImage;
+    ImageContext->SectionAlignment  = PeHdr.OptionalHeader.SectionAlignment;
+    ImageContext->SizeOfHeaders     = PeHdr.OptionalHeader.SizeOfHeaders;
+
+    //
+    // Modify ImageSize to contain .PDB file name if required and initialize
+    // PdbRVA field...
+    //
+    if (PeHdr.OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_DEBUG) {
+      DebugDirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *) &(PeHdr.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]);
+
+      DebugDirectoryEntryRva = DebugDirectoryEntry->VirtualAddress;
+
+      //
+      // Determine the file offset of the debug directory...  This means we walk
+      // the sections to find which section contains the RVA of the debug
+      // directory
+      //
+      DebugDirectoryEntryFileOffset = 0;
+
+      SectionHeaderOffset = (UINTN)(
+                               ImageContext->PeCoffHeaderOffset +
+                               sizeof (UINT32) + 
+                               sizeof (EFI_IMAGE_FILE_HEADER) + 
+                               PeHdr.FileHeader.SizeOfOptionalHeader
+                               );
+
+      for (Index = 0; Index < PeHdr.FileHeader.NumberOfSections; Index++) {
+        //
+        // Read section header from file
+        //
+        Size = sizeof (EFI_IMAGE_SECTION_HEADER);
+        Status = ImageContext->ImageRead (
+                                 ImageContext->Handle,
+                                 SectionHeaderOffset,
+                                 &Size,
+                                 &SectionHeader
+                                 );
+        if (RETURN_ERROR (Status)) {
+          ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+          return Status;
+        }
+
+        if (DebugDirectoryEntryRva >= SectionHeader.VirtualAddress &&
+            DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) {
+            DebugDirectoryEntryFileOffset =
+            DebugDirectoryEntryRva - SectionHeader.VirtualAddress + SectionHeader.PointerToRawData;
+          break;
+        }
+
+        SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
+      }
+
+      if (DebugDirectoryEntryFileOffset != 0) {
+        for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {
+          //
+          // Read next debug directory entry
+          //
+          Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
+          Status = ImageContext->ImageRead (
+                                   ImageContext->Handle,
+                                   DebugDirectoryEntryFileOffset,
+                                   &Size,
+                                   &DebugEntry
+                                   );
+          if (RETURN_ERROR (Status)) {
+            ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+            return Status;
+          }
+
+          if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
+            ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));
+            if (DebugEntry.RVA == 0 && DebugEntry.FileOffset != 0) {
+              ImageContext->ImageSize += DebugEntry.SizeOfData;
+            }
+
+            return RETURN_SUCCESS;
+          }
+        }
+      }
+    }
+  } else {
+    ImageContext->ImageSize         = 0;
+    ImageContext->SectionAlignment  = 4096;
+    ImageContext->SizeOfHeaders     = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN) TeHdr.BaseOfCode - (UINTN) TeHdr.StrippedSize;
+
+    DebugDirectoryEntry             = &TeHdr.DataDirectory[1];
+    DebugDirectoryEntryRva          = DebugDirectoryEntry->VirtualAddress;
+    SectionHeaderOffset             = (UINTN) (sizeof (EFI_TE_IMAGE_HEADER));
+
+    DebugDirectoryEntryFileOffset   = 0;
+
+    for (Index = 0; Index < TeHdr.NumberOfSections;) {
+      //
+      // Read section header from file
+      //
+      Size = sizeof (EFI_IMAGE_SECTION_HEADER);
+      Status = ImageContext->ImageRead (
+                               ImageContext->Handle,
+                               SectionHeaderOffset,
+                               &Size,
+                               &SectionHeader
+                               );
+      if (RETURN_ERROR (Status)) {
+        ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+        return Status;
+      }
+
+      if (DebugDirectoryEntryRva >= SectionHeader.VirtualAddress &&
+          DebugDirectoryEntryRva < SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize) {
+        DebugDirectoryEntryFileOffset = DebugDirectoryEntryRva -
+          SectionHeader.VirtualAddress +
+          SectionHeader.PointerToRawData +
+          sizeof (EFI_TE_IMAGE_HEADER) -
+          TeHdr.StrippedSize;
+
+        //
+        // File offset of the debug directory was found, if this is not the last
+        // section, then skip to the last section for calculating the image size.
+        //
+        if (Index < (UINTN) TeHdr.NumberOfSections - 1) {
+          SectionHeaderOffset += (TeHdr.NumberOfSections - 1 - Index) * sizeof (EFI_IMAGE_SECTION_HEADER);
+          Index = TeHdr.NumberOfSections - 1;
+          continue;
+        }
+      }
+
+      //
+      // In Te image header there is not a field to describe the ImageSize.
+      // Actually, the ImageSize equals the RVA plus the VirtualSize of 
+      // the last section mapped into memory (Must be rounded up to 
+      // a mulitple of Section Alignment). Per the PE/COFF specification, the
+      // section headers in the Section Table must appear in order of the RVA
+      // values for the corresponding sections. So the ImageSize can be determined
+      // by the RVA and the VirtualSize of the last section header in the
+      // Section Table.
+      //
+      if ((++Index) == (UINTN) TeHdr.NumberOfSections) {
+        ImageContext->ImageSize = (SectionHeader.VirtualAddress + SectionHeader.Misc.VirtualSize +
+                                   ImageContext->SectionAlignment - 1) & ~(ImageContext->SectionAlignment - 1);
+      }
+
+      SectionHeaderOffset += sizeof (EFI_IMAGE_SECTION_HEADER);
+    }
+
+    if (DebugDirectoryEntryFileOffset != 0) {
+      for (Index = 0; Index < DebugDirectoryEntry->Size; Index++) {
+        //
+        // Read next debug directory entry
+        //
+        Size = sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY);
+        Status = ImageContext->ImageRead (
+                                 ImageContext->Handle,
+                                 DebugDirectoryEntryFileOffset,
+                                 &Size,
+                                 &DebugEntry
+                                 );
+        if (RETURN_ERROR (Status)) {
+          ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+          return Status;
+        }
+
+        if (DebugEntry.Type == EFI_IMAGE_DEBUG_TYPE_CODEVIEW) {
+          ImageContext->DebugDirectoryEntryRva = (UINT32) (DebugDirectoryEntryRva + Index * sizeof (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY));
+          return RETURN_SUCCESS;
+        }
+      }
+    }
+  }
+
+  return RETURN_SUCCESS;
+}
+
+STATIC
+VOID *
+PeCoffLoaderImageAddress (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT          *ImageContext,
+  IN     UINTN                                 Address
+  )
+/*++
+
+Routine Description:
+
+  Converts an image address to the loaded address
+
+Arguments:
+
+  ImageContext  - The context of the image being loaded
+
+  Address       - The address to be converted to the loaded address
+
+Returns:
+
+  NULL if the address can not be converted, otherwise, the converted address
+
+--*/
+{
+  if (Address >= ImageContext->ImageSize) {
+    ImageContext->ImageError = IMAGE_ERROR_INVALID_IMAGE_ADDRESS;
+    return NULL;
+  }
+
+  return (CHAR8 *) ((UINTN) ImageContext->ImageAddress + Address);
+}
+
+RETURN_STATUS
+EFIAPI
+PeCoffLoaderRelocateImage (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Relocates a PE/COFF image in memory
+
+Arguments:
+
+  This         - Calling context
+
+  ImageContext - Contains information on the loaded image to relocate
+
+Returns:
+
+  RETURN_SUCCESS      if the PE/COFF image was relocated
+  RETURN_LOAD_ERROR   if the image is not a valid PE/COFF image
+  RETURN_UNSUPPORTED  not support
+
+--*/
+{
+  RETURN_STATUS                Status;
+  EFI_IMAGE_NT_HEADERS      *PeHdr;
+  EFI_TE_IMAGE_HEADER       *TeHdr;
+  EFI_IMAGE_DATA_DIRECTORY  *RelocDir;
+  UINT64                    Adjust;
+  EFI_IMAGE_BASE_RELOCATION *RelocBase;
+  EFI_IMAGE_BASE_RELOCATION *RelocBaseEnd;
+  UINT16                    *Reloc;
+  UINT16                    *RelocEnd;
+  CHAR8                     *Fixup;
+  CHAR8                     *FixupBase;
+  UINT16                    *F16;
+  UINT32                    *F32;
+  CHAR8                     *FixupData;
+  PHYSICAL_ADDRESS      BaseAddress;
+
+  PeHdr = NULL;
+  TeHdr = NULL;
+  //
+  // Assume success
+  //
+  ImageContext->ImageError = IMAGE_ERROR_SUCCESS;
+
+  //
+  // If there are no relocation entries, then we are done
+  //
+  if (ImageContext->RelocationsStripped) {
+    return RETURN_SUCCESS;
+  }
+
+  //
+  // If the destination address is not 0, use that rather than the
+  // image address as the relocation target.
+  //
+  if (ImageContext->DestinationAddress) {
+    BaseAddress = ImageContext->DestinationAddress;
+  } else {
+    BaseAddress = ImageContext->ImageAddress;
+  }
+
+  if (!(ImageContext->IsTeImage)) {
+    PeHdr = (EFI_IMAGE_NT_HEADERS *)((UINTN)ImageContext->ImageAddress + 
+                                            ImageContext->PeCoffHeaderOffset);
+    Adjust = (UINT64) BaseAddress - PeHdr->OptionalHeader.ImageBase;
+    PeHdr->OptionalHeader.ImageBase = (UINTN) BaseAddress;
+
+    //
+    // Find the relocation block
+    //
+    // Per the PE/COFF spec, you can't assume that a given data directory
+    // is present in the image. You have to check the NumberOfRvaAndSizes in
+    // the optional header to verify a desired directory entry is there.
+    //
+    if (PeHdr->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
+      RelocDir  = &PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
+      RelocBase = PeCoffLoaderImageAddress (ImageContext, RelocDir->VirtualAddress);
+      RelocBaseEnd = PeCoffLoaderImageAddress (
+                      ImageContext,
+                      RelocDir->VirtualAddress + RelocDir->Size - 1
+                      );
+    } else {
+      //
+      // Set base and end to bypass processing below.
+      //
+      RelocBase = RelocBaseEnd = 0;
+    }
+  } else {
+    TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
+    Adjust            = (UINT64) (BaseAddress - TeHdr->ImageBase);
+    TeHdr->ImageBase  = (UINT64) (BaseAddress);
+
+    //
+    // Find the relocation block
+    //
+    RelocDir = &TeHdr->DataDirectory[0];
+    RelocBase = (EFI_IMAGE_BASE_RELOCATION *)(UINTN)(
+		                                ImageContext->ImageAddress + 
+		                                RelocDir->VirtualAddress +
+		                                sizeof(EFI_TE_IMAGE_HEADER) - 
+		                                TeHdr->StrippedSize
+		                                );
+    RelocBaseEnd = (EFI_IMAGE_BASE_RELOCATION *) ((UINTN) RelocBase + (UINTN) RelocDir->Size - 1);
+  }
+  
+  //
+  // Run the relocation information and apply the fixups
+  //
+  FixupData = ImageContext->FixupData;
+  while (RelocBase < RelocBaseEnd) {
+
+    Reloc     = (UINT16 *) ((CHAR8 *) RelocBase + sizeof (EFI_IMAGE_BASE_RELOCATION));
+    RelocEnd  = (UINT16 *) ((CHAR8 *) RelocBase + RelocBase->SizeOfBlock);
+    if (!(ImageContext->IsTeImage)) {
+      FixupBase = PeCoffLoaderImageAddress (ImageContext, RelocBase->VirtualAddress);
+    } else {
+      FixupBase = (CHAR8 *)(UINTN)(ImageContext->ImageAddress +
+	  	              RelocBase->VirtualAddress +
+	  	              sizeof(EFI_TE_IMAGE_HEADER) - 
+	  	              TeHdr->StrippedSize
+	  	              );
+    }
+
+    if ((CHAR8 *) RelocEnd < (CHAR8 *) ((UINTN) ImageContext->ImageAddress) ||
+        (CHAR8 *) RelocEnd > (CHAR8 *)((UINTN)ImageContext->ImageAddress + 
+          (UINTN)ImageContext->ImageSize)) {
+      ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
+      return RETURN_LOAD_ERROR;
+    }
+
+    //
+    // Run this relocation record
+    //
+    while (Reloc < RelocEnd) {
+
+      Fixup = FixupBase + (*Reloc & 0xFFF);
+      switch ((*Reloc) >> 12) {
+      case EFI_IMAGE_REL_BASED_ABSOLUTE:
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGH:
+        F16   = (UINT16 *) Fixup;
+        *F16  = (UINT16) ((*F16 << 16) + (UINT16) Adjust);
+        if (FixupData != NULL) {
+          *(UINT16 *) FixupData = *F16;
+          FixupData             = FixupData + sizeof (UINT16);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_LOW:
+        F16   = (UINT16 *) Fixup;
+        *F16  = (UINT16) (*F16 + (UINT16) Adjust);
+        if (FixupData != NULL) {
+          *(UINT16 *) FixupData = *F16;
+          FixupData             = FixupData + sizeof (UINT16);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGHLOW:
+        F32   = (UINT32 *) Fixup;
+        *F32  = *F32 + (UINT32) Adjust;
+        if (FixupData != NULL) {
+          FixupData             = ALIGN_POINTER (FixupData, sizeof (UINT32));
+          *(UINT32 *) FixupData = *F32;
+          FixupData             = FixupData + sizeof (UINT32);
+        }
+        break;
+
+      case EFI_IMAGE_REL_BASED_HIGHADJ:
+        //
+        // Return the same EFI_UNSUPPORTED return code as
+        // PeCoffLoaderRelocateImageEx() returns if it does not recognize
+        // the relocation type.
+        //
+        ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
+        return RETURN_UNSUPPORTED;
+
+      default:
+        Status = PeCoffLoaderRelocateImageEx (Reloc, Fixup, &FixupData, Adjust);
+        if (RETURN_ERROR (Status)) {
+          ImageContext->ImageError = IMAGE_ERROR_FAILED_RELOCATION;
+          return Status;
+        }
+      }
+
+      //
+      // Next relocation record
+      //
+      Reloc += 1;
+    }
+
+    //
+    // Next reloc block
+    //
+    RelocBase = (EFI_IMAGE_BASE_RELOCATION *) RelocEnd;
+  }
+
+  return RETURN_SUCCESS;
+}
+
+RETURN_STATUS
+EFIAPI
+PeCoffLoaderLoadImage (
+  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
+  )
+/*++
+
+Routine Description:
+
+  Loads a PE/COFF image into memory
+
+Arguments:
+
+  This         - Calling context
+
+  ImageContext - Contains information on image to load into memory
+
+Returns:
+
+  RETURN_SUCCESS            if the PE/COFF image was loaded
+  RETURN_BUFFER_TOO_SMALL   if the caller did not provide a large enough buffer
+  RETURN_LOAD_ERROR         if the image is a runtime driver with no relocations
+  RETURN_INVALID_PARAMETER  if the image address is invalid
+
+--*/
+{
+  RETURN_STATUS                            Status;
+  EFI_IMAGE_NT_HEADERS                  *PeHdr;
+  EFI_TE_IMAGE_HEADER                   *TeHdr;
+  PE_COFF_LOADER_IMAGE_CONTEXT  CheckContext;
+  EFI_IMAGE_SECTION_HEADER              *FirstSection;
+  EFI_IMAGE_SECTION_HEADER              *Section;
+  UINTN                                 NumberOfSections;
+  UINTN                                 Index;
+  CHAR8                                 *Base;
+  CHAR8                                 *End;
+  CHAR8                                 *MaxEnd;
+  EFI_IMAGE_DATA_DIRECTORY              *DirectoryEntry;
+  EFI_IMAGE_DEBUG_DIRECTORY_ENTRY       *DebugEntry;
+  UINTN                                 Size;
+  UINT32                                TempDebugEntryRva;
+
+  PeHdr = NULL;
+  TeHdr = NULL;
+  //
+  // Assume success
+  //
+  ImageContext->ImageError = IMAGE_ERROR_SUCCESS;
+
+  //
+  // Copy the provided context info into our local version, get what we
+  // can from the original image, and then use that to make sure everything
+  // is legit.
+  //
+  CopyMem (&CheckContext, ImageContext, sizeof (PE_COFF_LOADER_IMAGE_CONTEXT));
+
+  Status = PeCoffLoaderGetImageInfo (&CheckContext);
+  if (RETURN_ERROR (Status)) {
+    return Status;
+  }
+
+  //
+  // Make sure there is enough allocated space for the image being loaded
+  //
+  if (ImageContext->ImageSize < CheckContext.ImageSize) {
+    ImageContext->ImageError = IMAGE_ERROR_INVALID_IMAGE_SIZE;
+    return RETURN_BUFFER_TOO_SMALL;
+  }
+
+  //
+  // If there's no relocations, then make sure it's not a runtime driver,
+  // and that it's being loaded at the linked address.
+  //
+  if (CheckContext.RelocationsStripped) {
+    //
+    // If the image does not contain relocations and it is a runtime driver
+    // then return an error.
+    //
+    if (CheckContext.ImageType == EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER) {
+      ImageContext->ImageError = IMAGE_ERROR_INVALID_SUBSYSTEM;
+      return RETURN_LOAD_ERROR;
+    }
+    //
+    // If the image does not contain relocations, and the requested load address
+    // is not the linked address, then return an error.
+    //
+    if (CheckContext.ImageAddress != ImageContext->ImageAddress) {
+      ImageContext->ImageError = IMAGE_ERROR_INVALID_IMAGE_ADDRESS;
+      return RETURN_INVALID_PARAMETER;
+    }
+  }
+  //
+  // Make sure the allocated space has the proper section alignment
+  //
+  if (!(ImageContext->IsTeImage)) {
+    if ((ImageContext->ImageAddress & (CheckContext.SectionAlignment - 1)) != 0) {
+      ImageContext->ImageError = IMAGE_ERROR_INVALID_SECTION_ALIGNMENT;
+      return RETURN_INVALID_PARAMETER;
+    }
+  }
+  //
+  // Read the entire PE/COFF or TE header into memory
+  //
+  if (!(ImageContext->IsTeImage)) {
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &ImageContext->SizeOfHeaders,
+                            (VOID *) (UINTN) ImageContext->ImageAddress
+                            );
+
+    PeHdr = (EFI_IMAGE_NT_HEADERS *)
+      ((UINTN)ImageContext->ImageAddress + ImageContext->PeCoffHeaderOffset);
+
+    FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
+                      (UINTN)ImageContext->ImageAddress +
+                      ImageContext->PeCoffHeaderOffset +
+                      sizeof(UINT32) + 
+                      sizeof(EFI_IMAGE_FILE_HEADER) + 
+                      PeHdr->FileHeader.SizeOfOptionalHeader
+      );
+    NumberOfSections = (UINTN) (PeHdr->FileHeader.NumberOfSections);
+  } else {
+    Status = ImageContext->ImageRead (
+                            ImageContext->Handle,
+                            0,
+                            &ImageContext->SizeOfHeaders,
+                            (void *) (UINTN) ImageContext->ImageAddress
+                            );
+
+    TeHdr             = (EFI_TE_IMAGE_HEADER *) (UINTN) (ImageContext->ImageAddress);
+
+    FirstSection = (EFI_IMAGE_SECTION_HEADER *) (
+		      (UINTN)ImageContext->ImageAddress +
+		      sizeof(EFI_TE_IMAGE_HEADER)
+		      );
+    NumberOfSections  = (UINTN) (TeHdr->NumberOfSections);
+
+  }
+
+  if (RETURN_ERROR (Status)) {
+    ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+    return RETURN_LOAD_ERROR;
+  }
+
+  //
+  // Load each section of the image
+  //
+  Section = FirstSection;
+  for (Index = 0, MaxEnd = NULL; Index < NumberOfSections; Index++) {
+
+    //
+    // Compute sections address
+    //
+    Base = PeCoffLoaderImageAddress (ImageContext, Section->VirtualAddress);
+    End = PeCoffLoaderImageAddress (
+            ImageContext,
+            Section->VirtualAddress + Section->Misc.VirtualSize - 1
+            );
+    if (ImageContext->IsTeImage) {
+      Base  = (CHAR8 *) ((UINTN) Base + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize);
+      End   = (CHAR8 *) ((UINTN) End + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize);
+    }
+
+    if (End > MaxEnd) {
+      MaxEnd = End;
+    }
+    //
+    // If the base start or end address resolved to 0, then fail.
+    //
+    if ((Base == NULL) || (End == NULL)) {
+      ImageContext->ImageError = IMAGE_ERROR_SECTION_NOT_LOADED;
+      return RETURN_LOAD_ERROR;
+    }
+
+    //
+    // Read the section
+    //
+    Size = (UINTN) Section->Misc.VirtualSize;
+    if ((Size == 0) || (Size > Section->SizeOfRawData)) {
+      Size = (UINTN) Section->SizeOfRawData;
+    }
+
+    if (Section->SizeOfRawData) {
+      if (!(ImageContext->IsTeImage)) {
+        Status = ImageContext->ImageRead (
+                                ImageContext->Handle,
+                                Section->PointerToRawData,
+                                &Size,
+                                Base
+                                );
+      } else {
+        Status = ImageContext->ImageRead (
+                                ImageContext->Handle,
+                                Section->PointerToRawData + sizeof (EFI_TE_IMAGE_HEADER) - (UINTN) TeHdr->StrippedSize,
+                                &Size,
+                                Base
+                                );
+      }
+
+      if (RETURN_ERROR (Status)) {
+        ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+        return Status;
+      }
+    }
+
+    //
+    // If raw size is less then virt size, zero fill the remaining
+    //
+
+    if (Size < Section->Misc.VirtualSize) {
+      ZeroMem (Base + Size, Section->Misc.VirtualSize - Size);
+    }
+
+    //
+    // Next Section
+    //
+    Section += 1;
+  }
+
+  //
+  // Get image's entry point
+  //
+  if (!(ImageContext->IsTeImage)) {
+    ImageContext->EntryPoint = (PHYSICAL_ADDRESS) (UINTN) PeCoffLoaderImageAddress (
+                                                                ImageContext,
+                                                                PeHdr->OptionalHeader.AddressOfEntryPoint
+                                                                );
+  } else {
+    ImageContext->EntryPoint =  (PHYSICAL_ADDRESS) (
+		                   (UINTN)ImageContext->ImageAddress +
+		                   (UINTN)TeHdr->AddressOfEntryPoint +
+		                   (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+          (UINTN) TeHdr->StrippedSize
+      );
+  }
+
+  //
+  // Determine the size of the fixup data
+  //
+  // Per the PE/COFF spec, you can't assume that a given data directory
+  // is present in the image. You have to check the NumberOfRvaAndSizes in
+  // the optional header to verify a desired directory entry is there.
+  //
+  if (!(ImageContext->IsTeImage)) {
+    if (PeHdr->OptionalHeader.NumberOfRvaAndSizes > EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC) {
+      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)
+        &PeHdr->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC];
+      ImageContext->FixupDataSize = DirectoryEntry->Size / sizeof (UINT16) * sizeof (UINTN);
+    } else {
+      ImageContext->FixupDataSize = 0;
+    }
+  } else {
+    DirectoryEntry              = &TeHdr->DataDirectory[0];
+    ImageContext->FixupDataSize = DirectoryEntry->Size / sizeof (UINT16) * sizeof (UINTN);
+  }
+  //
+  // Consumer must allocate a buffer for the relocation fixup log.
+  // Only used for runtime drivers.
+  //
+  ImageContext->FixupData = NULL;
+
+  //
+  // Load the Codeview info if present
+  //
+  if (ImageContext->DebugDirectoryEntryRva != 0) {
+    if (!(ImageContext->IsTeImage)) {
+      DebugEntry = PeCoffLoaderImageAddress (
+                    ImageContext,
+                    ImageContext->DebugDirectoryEntryRva
+                    );
+    } else {
+      DebugEntry = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *)(UINTN)(
+	  	                                         ImageContext->ImageAddress +
+	  	                                         ImageContext->DebugDirectoryEntryRva +
+	  	                                         sizeof(EFI_TE_IMAGE_HEADER) -
+	  	                                         TeHdr->StrippedSize
+	  	                                         );
+    }
+
+    if (DebugEntry != NULL) {
+      TempDebugEntryRva = DebugEntry->RVA;
+      if (DebugEntry->RVA == 0 && DebugEntry->FileOffset != 0) {
+        Section--;
+        if ((UINTN) Section->SizeOfRawData < Section->Misc.VirtualSize) {
+          TempDebugEntryRva = Section->VirtualAddress + Section->Misc.VirtualSize;
+        } else {
+          TempDebugEntryRva = Section->VirtualAddress + Section->SizeOfRawData;
+        }
+      }
+
+      if (TempDebugEntryRva != 0) {
+        if (!(ImageContext->IsTeImage)) {
+          ImageContext->CodeView = PeCoffLoaderImageAddress (ImageContext, TempDebugEntryRva);
+        } else {
+          ImageContext->CodeView = (VOID *)(
+		  	              (UINTN)ImageContext->ImageAddress +
+		  	              (UINTN)TempDebugEntryRva +
+		  	              (UINTN)sizeof(EFI_TE_IMAGE_HEADER) -
+                (UINTN) TeHdr->StrippedSize
+            );
+        }
+
+        if (ImageContext->CodeView == NULL) {
+          ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+          return RETURN_LOAD_ERROR;
+        }
+
+        if (DebugEntry->RVA == 0) {
+          Size = DebugEntry->SizeOfData;
+          if (!(ImageContext->IsTeImage)) {
+            Status = ImageContext->ImageRead (
+                                    ImageContext->Handle,
+                                    DebugEntry->FileOffset,
+                                    &Size,
+                                    ImageContext->CodeView
+                                    );
+          } else {
+            Status = ImageContext->ImageRead (
+                                    ImageContext->Handle,
+                                    DebugEntry->FileOffset + sizeof (EFI_TE_IMAGE_HEADER) - TeHdr->StrippedSize,
+                                    &Size,
+                                    ImageContext->CodeView
+                                    );
+            //
+            // Should we apply fix up to this field according to the size difference between PE and TE?
+            // Because now we maintain TE header fields unfixed, this field will also remain as they are
+            // in original PE image.
+            //
+          }
+
+          if (RETURN_ERROR (Status)) {
+            ImageContext->ImageError = IMAGE_ERROR_IMAGE_READ;
+            return RETURN_LOAD_ERROR;
+          }
+
+          DebugEntry->RVA = TempDebugEntryRva;
+        }
+
+        switch (*(UINT32 *) ImageContext->CodeView) {
+        case CODEVIEW_SIGNATURE_NB10:
+          ImageContext->PdbPointer = (CHAR8 *) ImageContext->CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY);
+          break;
+
+        case CODEVIEW_SIGNATURE_RSDS:
+          ImageContext->PdbPointer = (CHAR8 *) ImageContext->CodeView + sizeof (EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY);
+          break;
+
+        default:
+          break;
+        }
+      }
+    }
+  }
+
+  return Status;
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/Common/EfiImage.h b/Tools/Source/TianoTools/GenFvImage/Common/EfiImage.h
new file mode 100644
index 0000000000..0ad71d34bd
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/Common/EfiImage.h
@@ -0,0 +1,701 @@
+/** @file
+	EFI image format for PE32+. Please note some data structures are different
+	for IA-32 and Itanium-based images, look for UINTN and the #ifdef EFI_IA64
+
+	@bug Fix text - doc as defined in MSFT EFI specification.
+
+	Copyright (c) 2006, Intel Corporation                                                         
+	All rights reserved. This program and the accompanying materials                          
+	are licensed and made available under the terms and conditions of the BSD License         
+	which accompanies this distribution.  The full text of the license may be found at        
+	http://opensource.org/licenses/bsd-license.php                                            
+
+	THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+	WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+	Module Name:	EfiImage.h
+
+**/
+
+#ifndef __EFI_IMAGE_H__
+#define __EFI_IMAGE_H__
+
+//
+// PE32+ Subsystem type for EFI images
+//
+#define EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION         10
+#define EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11
+#define EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER      12
+#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER      13
+
+//
+// BugBug: Need to get a real answer for this problem. This is not in the
+//         PE specification.
+//
+//         A SAL runtime driver does not get fixed up when a transition to
+//         virtual mode is made. In all other cases it should be treated
+//         like a EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER image
+//
+#define EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER  13
+
+//
+// PE32+ Machine type for EFI images
+//
+#define IMAGE_FILE_MACHINE_I386     0x014c
+#define IMAGE_FILE_MACHINE_IA64     0x0200
+#define IMAGE_FILE_MACHINE_EBC      0x0EBC
+#define IMAGE_FILE_MACHINE_X64      0x8664
+//
+// Support old names for backward compatible
+//
+#define EFI_IMAGE_MACHINE_IA32      IMAGE_FILE_MACHINE_I386 
+#define EFI_IMAGE_MACHINE_IA64      IMAGE_FILE_MACHINE_IA64  
+#define EFI_IMAGE_MACHINE_IPF       IMAGE_FILE_MACHINE_IA64  
+#define EFI_IMAGE_MACHINE_EBC       IMAGE_FILE_MACHINE_EBC  
+#define EFI_IMAGE_MACHINE_X64       IMAGE_FILE_MACHINE_X64
+
+#define EFI_IMAGE_DOS_SIGNATURE     0x5A4D      // MZ
+#define EFI_IMAGE_OS2_SIGNATURE     0x454E      // NE
+#define EFI_IMAGE_OS2_SIGNATURE_LE  0x454C      // LE
+#define EFI_IMAGE_NT_SIGNATURE      0x00004550  // PE00
+#define EFI_IMAGE_EDOS_SIGNATURE    0x44454550  // PEED
+
+///
+/// PE images can start with an optional DOS header, so if an image is run
+///  under DOS it can print an error message.
+///
+typedef struct {
+  UINT16  e_magic;    // Magic number
+  UINT16  e_cblp;     // Bytes on last page of file
+  UINT16  e_cp;       // Pages in file
+  UINT16  e_crlc;     // Relocations
+  UINT16  e_cparhdr;  // Size of header in paragraphs
+  UINT16  e_minalloc; // Minimum extra paragraphs needed
+  UINT16  e_maxalloc; // Maximum extra paragraphs needed
+  UINT16  e_ss;       // Initial (relative) SS value
+  UINT16  e_sp;       // Initial SP value
+  UINT16  e_csum;     // Checksum
+  UINT16  e_ip;       // Initial IP value
+  UINT16  e_cs;       // Initial (relative) CS value
+  UINT16  e_lfarlc;   // File address of relocation table
+  UINT16  e_ovno;     // Overlay number
+  UINT16  e_res[4];   // Reserved words
+  UINT16  e_oemid;    // OEM identifier (for e_oeminfo)
+  UINT16  e_oeminfo;  // OEM information; e_oemid specific
+  UINT16  e_res2[10]; // Reserved words
+  UINT32  e_lfanew;   // File address of new exe header
+} EFI_IMAGE_DOS_HEADER;
+
+///
+/// File header format.
+///
+typedef struct {
+  UINT16  Machine;
+  UINT16  NumberOfSections;
+  UINT32  TimeDateStamp;
+  UINT32  PointerToSymbolTable;
+  UINT32  NumberOfSymbols;
+  UINT16  SizeOfOptionalHeader;
+  UINT16  Characteristics;
+} EFI_IMAGE_FILE_HEADER;
+
+#define EFI_IMAGE_SIZEOF_FILE_HEADER        20
+
+#define EFI_IMAGE_FILE_RELOCS_STRIPPED      0x0001  // Relocation info stripped from file.
+#define EFI_IMAGE_FILE_EXECUTABLE_IMAGE     0x0002  // File is executable  (i.e. no unresolved externel references).
+#define EFI_IMAGE_FILE_LINE_NUMS_STRIPPED   0x0004  // Line nunbers stripped from file.
+#define EFI_IMAGE_FILE_LOCAL_SYMS_STRIPPED  0x0008  // Local symbols stripped from file.
+#define EFI_IMAGE_FILE_BYTES_REVERSED_LO    0x0080  // Bytes of machine word are reversed.
+#define EFI_IMAGE_FILE_32BIT_MACHINE        0x0100  // 32 bit word machine.
+#define EFI_IMAGE_FILE_DEBUG_STRIPPED       0x0200  // Debugging info stripped from file in .DBG file
+#define EFI_IMAGE_FILE_SYSTEM               0x1000  // System File.
+#define EFI_IMAGE_FILE_DLL                  0x2000  // File is a DLL.
+#define EFI_IMAGE_FILE_BYTES_REVERSED_HI    0x8000  // Bytes of machine word are reversed.
+#define EFI_IMAGE_FILE_MACHINE_UNKNOWN      0
+#define EFI_IMAGE_FILE_MACHINE_I386         0x14c   // Intel 386.
+#define EFI_IMAGE_FILE_MACHINE_R3000        0x162   // MIPS* little-endian, 0540 big-endian
+#define EFI_IMAGE_FILE_MACHINE_R4000        0x166   // MIPS* little-endian
+#define EFI_IMAGE_FILE_MACHINE_ALPHA        0x184   // Alpha_AXP*
+#define EFI_IMAGE_FILE_MACHINE_POWERPC      0x1F0   // IBM* PowerPC Little-Endian
+#define EFI_IMAGE_FILE_MACHINE_TAHOE        0x7cc   // Intel EM machine
+//
+// * Other names and brands may be claimed as the property of others.
+//
+
+///
+/// Directory format.
+///
+typedef struct {
+  UINT32  VirtualAddress;
+  UINT32  Size;
+} EFI_IMAGE_DATA_DIRECTORY;
+
+#define EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES 16
+
+typedef struct {
+  UINT16  Magic;
+  UINT8   MajorLinkerVersion;
+  UINT8   MinorLinkerVersion;
+  UINT32  SizeOfCode;
+  UINT32  SizeOfInitializedData;
+  UINT32  SizeOfUninitializedData;
+  UINT32  AddressOfEntryPoint;
+  UINT32  BaseOfCode;
+  UINT32  BaseOfData;
+  UINT32  BaseOfBss;
+  UINT32  GprMask;
+  UINT32  CprMask[4];
+  UINT32  GpValue;
+} EFI_IMAGE_ROM_OPTIONAL_HEADER;
+
+#define EFI_IMAGE_ROM_OPTIONAL_HDR_MAGIC      0x107
+#define EFI_IMAGE_SIZEOF_ROM_OPTIONAL_HEADER  sizeof (EFI_IMAGE_ROM_OPTIONAL_HEADER)
+
+typedef struct {
+  EFI_IMAGE_FILE_HEADER         FileHeader;
+  EFI_IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;
+} EFI_IMAGE_ROM_HEADERS;
+
+///
+/// @attention
+/// EFI_IMAGE_OPTIONAL_HEADER32 and EFI_IMAGE_OPTIONAL_HEADER64
+/// are for use ONLY by tools.  All proper EFI code MUST use
+/// EFI_IMAGE_OPTIONAL_HEADER ONLY!!!
+///
+#define EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b
+
+typedef struct {
+  //
+  // Standard fields.
+  //
+  UINT16                    Magic;
+  UINT8                     MajorLinkerVersion;
+  UINT8                     MinorLinkerVersion;
+  UINT32                    SizeOfCode;
+  UINT32                    SizeOfInitializedData;
+  UINT32                    SizeOfUninitializedData;
+  UINT32                    AddressOfEntryPoint;
+  UINT32                    BaseOfCode;
+  UINT32                    BaseOfData;
+  //
+  // NT additional fields.
+  //
+  UINT32                    ImageBase;
+  UINT32                    SectionAlignment;
+  UINT32                    FileAlignment;
+  UINT16                    MajorOperatingSystemVersion;
+  UINT16                    MinorOperatingSystemVersion;
+  UINT16                    MajorImageVersion;
+  UINT16                    MinorImageVersion;
+  UINT16                    MajorSubsystemVersion;
+  UINT16                    MinorSubsystemVersion;
+  UINT32                    Win32VersionValue;
+  UINT32                    SizeOfImage;
+  UINT32                    SizeOfHeaders;
+  UINT32                    CheckSum;
+  UINT16                    Subsystem;
+  UINT16                    DllCharacteristics;
+  UINT32                    SizeOfStackReserve;
+  UINT32                    SizeOfStackCommit;
+  UINT32                    SizeOfHeapReserve;
+  UINT32                    SizeOfHeapCommit;
+  UINT32                    LoaderFlags;
+  UINT32                    NumberOfRvaAndSizes;
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
+} EFI_IMAGE_OPTIONAL_HEADER32;
+
+///
+/// @attention
+/// EFI_IMAGE_OPTIONAL_HEADER32 and EFI_IMAGE_OPTIONAL_HEADER64
+/// are for use ONLY by tools.  All proper EFI code MUST use
+/// EFI_IMAGE_OPTIONAL_HEADER ONLY!!!
+///
+#define EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b
+
+typedef struct {
+  //
+  // Standard fields.
+  //
+  UINT16                    Magic;
+  UINT8                     MajorLinkerVersion;
+  UINT8                     MinorLinkerVersion;
+  UINT32                    SizeOfCode;
+  UINT32                    SizeOfInitializedData;
+  UINT32                    SizeOfUninitializedData;
+  UINT32                    AddressOfEntryPoint;
+  UINT32                    BaseOfCode;
+  //
+  // NT additional fields.
+  //
+  UINT64                    ImageBase;
+  UINT32                    SectionAlignment;
+  UINT32                    FileAlignment;
+  UINT16                    MajorOperatingSystemVersion;
+  UINT16                    MinorOperatingSystemVersion;
+  UINT16                    MajorImageVersion;
+  UINT16                    MinorImageVersion;
+  UINT16                    MajorSubsystemVersion;
+  UINT16                    MinorSubsystemVersion;
+  UINT32                    Win32VersionValue;
+  UINT32                    SizeOfImage;
+  UINT32                    SizeOfHeaders;
+  UINT32                    CheckSum;
+  UINT16                    Subsystem;
+  UINT16                    DllCharacteristics;
+  UINT64                    SizeOfStackReserve;
+  UINT64                    SizeOfStackCommit;
+  UINT64                    SizeOfHeapReserve;
+  UINT64                    SizeOfHeapCommit;
+  UINT32                    LoaderFlags;
+  UINT32                    NumberOfRvaAndSizes;
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[EFI_IMAGE_NUMBER_OF_DIRECTORY_ENTRIES];
+} EFI_IMAGE_OPTIONAL_HEADER64;
+
+///
+/// @attention
+/// EFI_IMAGE_NT_HEADERS32 and EFI_IMAGE_HEADERS64 are for use ONLY
+/// by tools.  All proper EFI code MUST use EFI_IMAGE_NT_HEADERS ONLY!!!
+///
+typedef struct {
+  UINT32                      Signature;
+  EFI_IMAGE_FILE_HEADER       FileHeader;
+  EFI_IMAGE_OPTIONAL_HEADER32 OptionalHeader;
+} EFI_IMAGE_NT_HEADERS32;
+
+#define EFI_IMAGE_SIZEOF_NT_OPTIONAL32_HEADER sizeof (EFI_IMAGE_NT_HEADERS32)
+
+typedef struct {
+  UINT32                      Signature;
+  EFI_IMAGE_FILE_HEADER       FileHeader;
+  EFI_IMAGE_OPTIONAL_HEADER64 OptionalHeader;
+} EFI_IMAGE_NT_HEADERS64;
+
+#define EFI_IMAGE_SIZEOF_NT_OPTIONAL64_HEADER sizeof (EFI_IMAGE_NT_HEADERS64)
+
+//
+// Processor specific definition of EFI_IMAGE_OPTIONAL_HEADER so the
+// type name EFI_IMAGE_OPTIONAL_HEADER is appropriate to the build.  Same for
+// EFI_IMAGE_NT_HEADERS.  These definitions MUST be used by ALL EFI code.
+//
+#if   defined (MDE_CPU_IA32) && !defined (BUILDING_TOOLS) || \
+      defined (BUILDING_TOOLS) && defined (TOOL_BUILD_IA32_TARGET)
+
+// typedef EFI_IMAGE_OPTIONAL_HEADER32     EFI_IMAGE_OPTIONAL_HEADER;
+typedef EFI_IMAGE_NT_HEADERS32          EFI_IMAGE_NT_HEADERS;
+
+#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
+  (((Machine) == EFI_IMAGE_MACHINE_IA32) || ((Machine) == EFI_IMAGE_MACHINE_EBC))
+
+#elif defined (MDE_CPU_IPF) && !defined (BUILDING_TOOLS) || \
+      defined (BUILDING_TOOLS) && defined (TOOL_BUILD_IPF_TARGET)
+
+typedef EFI_IMAGE_OPTIONAL_HEADER64     EFI_IMAGE_OPTIONAL_HEADER;
+typedef EFI_IMAGE_NT_HEADERS64          EFI_IMAGE_NT_HEADERS;
+
+#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
+  (((Machine) == EFI_IMAGE_MACHINE_IPF) || ((Machine) == EFI_IMAGE_MACHINE_EBC))
+
+#elif defined (MDE_CPU_X64) && !defined (BUILDING_TOOLS) || \
+      defined (BUILDING_TOOLS) && defined (TOOL_BUILD_X64_TARGET)
+
+typedef EFI_IMAGE_OPTIONAL_HEADER64     EFI_IMAGE_OPTIONAL_HEADER;
+typedef EFI_IMAGE_NT_HEADERS64          EFI_IMAGE_NT_HEADERS;
+
+#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
+  (((Machine) == EFI_IMAGE_MACHINE_X64) || ((Machine) == EFI_IMAGE_MACHINE_EBC))
+
+#elif defined (MDE_CPU_EBC)
+
+//
+// This is just to make sure you can cross compile with the EBC compiiler.
+// It does not make sense to have a PE loader coded in EBC. You need to 
+// understand the basic 
+//
+typedef EFI_IMAGE_OPTIONAL_HEADER64     EFI_IMAGE_OPTIONAL_HEADER;
+typedef EFI_IMAGE_NT_HEADERS64          EFI_IMAGE_NT_HEADERS;
+
+#define EFI_IMAGE_NT_OPTIONAL_HDR_MAGIC EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC
+#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) ((Machine) == EFI_IMAGE_MACHINE_EBC)
+
+#else
+#error Unknown Processor Type
+#endif
+
+
+#define EFI_IMAGE_FIRST_SECTION(ntheader) \
+    ( \
+      (EFI_IMAGE_SECTION_HEADER *) \
+        ( \
+          (UINT32) ntheader + \
+          FIELD_OFFSET (EFI_IMAGE_NT_HEADERS, OptionalHeader) + \
+          ((EFI_IMAGE_NT_HEADERS *) (ntheader))->FileHeader.SizeOfOptionalHeader \
+        ) \
+    )
+
+//
+// Subsystem Values
+//
+#define EFI_IMAGE_SUBSYSTEM_UNKNOWN     0
+#define EFI_IMAGE_SUBSYSTEM_NATIVE      1
+#define EFI_IMAGE_SUBSYSTEM_WINDOWS_GUI 2
+#define EFI_IMAGE_SUBSYSTEM_WINDOWS_CUI 3.
+#define EFI_IMAGE_SUBSYSTEM_OS2_CUI     5
+#define EFI_IMAGE_SUBSYSTEM_POSIX_CUI   7
+
+//
+// Directory Entries
+//
+#define EFI_IMAGE_DIRECTORY_ENTRY_EXPORT      0
+#define EFI_IMAGE_DIRECTORY_ENTRY_IMPORT      1
+#define EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE    2
+#define EFI_IMAGE_DIRECTORY_ENTRY_EXCEPTION   3
+#define EFI_IMAGE_DIRECTORY_ENTRY_SECURITY    4
+#define EFI_IMAGE_DIRECTORY_ENTRY_BASERELOC   5
+#define EFI_IMAGE_DIRECTORY_ENTRY_DEBUG       6
+#define EFI_IMAGE_DIRECTORY_ENTRY_COPYRIGHT   7
+#define EFI_IMAGE_DIRECTORY_ENTRY_GLOBALPTR   8
+#define EFI_IMAGE_DIRECTORY_ENTRY_TLS         9
+#define EFI_IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10
+
+//
+// Section header format.
+//
+#define EFI_IMAGE_SIZEOF_SHORT_NAME 8
+
+typedef struct {
+  UINT8 Name[EFI_IMAGE_SIZEOF_SHORT_NAME];
+  union {
+    UINT32  PhysicalAddress;
+    UINT32  VirtualSize;
+  } Misc;
+  UINT32  VirtualAddress;
+  UINT32  SizeOfRawData;
+  UINT32  PointerToRawData;
+  UINT32  PointerToRelocations;
+  UINT32  PointerToLinenumbers;
+  UINT16  NumberOfRelocations;
+  UINT16  NumberOfLinenumbers;
+  UINT32  Characteristics;
+} EFI_IMAGE_SECTION_HEADER;
+
+#define EFI_IMAGE_SIZEOF_SECTION_HEADER       40
+
+#define EFI_IMAGE_SCN_TYPE_NO_PAD             0x00000008  // Reserved.
+#define EFI_IMAGE_SCN_CNT_CODE                0x00000020
+#define EFI_IMAGE_SCN_CNT_INITIALIZED_DATA    0x00000040
+#define EFI_IMAGE_SCN_CNT_UNINITIALIZED_DATA  0x00000080
+
+#define EFI_IMAGE_SCN_LNK_OTHER               0x00000100  // Reserved.
+#define EFI_IMAGE_SCN_LNK_INFO                0x00000200  // Section contains comments or some other type of information.
+#define EFI_IMAGE_SCN_LNK_REMOVE              0x00000800  // Section contents will not become part of image.
+#define EFI_IMAGE_SCN_LNK_COMDAT              0x00001000
+
+#define EFI_IMAGE_SCN_ALIGN_1BYTES            0x00100000
+#define EFI_IMAGE_SCN_ALIGN_2BYTES            0x00200000
+#define EFI_IMAGE_SCN_ALIGN_4BYTES            0x00300000
+#define EFI_IMAGE_SCN_ALIGN_8BYTES            0x00400000
+#define EFI_IMAGE_SCN_ALIGN_16BYTES           0x00500000
+#define EFI_IMAGE_SCN_ALIGN_32BYTES           0x00600000
+#define EFI_IMAGE_SCN_ALIGN_64BYTES           0x00700000
+
+#define EFI_IMAGE_SCN_MEM_DISCARDABLE         0x02000000
+#define EFI_IMAGE_SCN_MEM_NOT_CACHED          0x04000000
+#define EFI_IMAGE_SCN_MEM_NOT_PAGED           0x08000000
+#define EFI_IMAGE_SCN_MEM_SHARED              0x10000000
+#define EFI_IMAGE_SCN_MEM_EXECUTE             0x20000000
+#define EFI_IMAGE_SCN_MEM_READ                0x40000000
+#define EFI_IMAGE_SCN_MEM_WRITE               0x80000000
+
+///
+/// Symbol format.
+///
+#define EFI_IMAGE_SIZEOF_SYMBOL 18
+
+//
+// Section values.
+//
+// Symbols have a section number of the section in which they are
+// defined. Otherwise, section numbers have the following meanings:
+//
+#define EFI_IMAGE_SYM_UNDEFINED (UINT16) 0  // Symbol is undefined or is common.
+#define EFI_IMAGE_SYM_ABSOLUTE  (UINT16) -1 // Symbol is an absolute value.
+#define EFI_IMAGE_SYM_DEBUG     (UINT16) -2 // Symbol is a special debug item.
+//
+// Type (fundamental) values.
+//
+#define EFI_IMAGE_SYM_TYPE_NULL   0   // no type.
+#define EFI_IMAGE_SYM_TYPE_VOID   1   //
+#define EFI_IMAGE_SYM_TYPE_CHAR   2   // type character.
+#define EFI_IMAGE_SYM_TYPE_SHORT  3   // type short integer.
+#define EFI_IMAGE_SYM_TYPE_INT    4
+#define EFI_IMAGE_SYM_TYPE_LONG   5
+#define EFI_IMAGE_SYM_TYPE_FLOAT  6
+#define EFI_IMAGE_SYM_TYPE_DOUBLE 7
+#define EFI_IMAGE_SYM_TYPE_STRUCT 8
+#define EFI_IMAGE_SYM_TYPE_UNION  9
+#define EFI_IMAGE_SYM_TYPE_ENUM   10  // enumeration.
+#define EFI_IMAGE_SYM_TYPE_MOE    11  // member of enumeration.
+#define EFI_IMAGE_SYM_TYPE_BYTE   12
+#define EFI_IMAGE_SYM_TYPE_WORD   13
+#define EFI_IMAGE_SYM_TYPE_UINT   14
+#define EFI_IMAGE_SYM_TYPE_DWORD  15
+
+//
+// Type (derived) values.
+//
+#define EFI_IMAGE_SYM_DTYPE_NULL      0 // no derived type.
+#define EFI_IMAGE_SYM_DTYPE_POINTER   1
+#define EFI_IMAGE_SYM_DTYPE_FUNCTION  2
+#define EFI_IMAGE_SYM_DTYPE_ARRAY     3
+
+//
+// Storage classes.
+//
+#define EFI_IMAGE_SYM_CLASS_END_OF_FUNCTION   (UINT8) -1
+#define EFI_IMAGE_SYM_CLASS_NULL              0
+#define EFI_IMAGE_SYM_CLASS_AUTOMATIC         1
+#define EFI_IMAGE_SYM_CLASS_EXTERNAL          2
+#define EFI_IMAGE_SYM_CLASS_STATIC            3
+#define EFI_IMAGE_SYM_CLASS_REGISTER          4
+#define EFI_IMAGE_SYM_CLASS_EXTERNAL_DEF      5
+#define EFI_IMAGE_SYM_CLASS_LABEL             6
+#define EFI_IMAGE_SYM_CLASS_UNDEFINED_LABEL   7
+#define EFI_IMAGE_SYM_CLASS_MEMBER_OF_STRUCT  8
+#define EFI_IMAGE_SYM_CLASS_ARGUMENT          9
+#define EFI_IMAGE_SYM_CLASS_STRUCT_TAG        10
+#define EFI_IMAGE_SYM_CLASS_MEMBER_OF_UNION   11
+#define EFI_IMAGE_SYM_CLASS_UNION_TAG         12
+#define EFI_IMAGE_SYM_CLASS_TYPE_DEFINITION   13
+#define EFI_IMAGE_SYM_CLASS_UNDEFINED_STATIC  14
+#define EFI_IMAGE_SYM_CLASS_ENUM_TAG          15
+#define EFI_IMAGE_SYM_CLASS_MEMBER_OF_ENUM    16
+#define EFI_IMAGE_SYM_CLASS_REGISTER_PARAM    17
+#define EFI_IMAGE_SYM_CLASS_BIT_FIELD         18
+#define EFI_IMAGE_SYM_CLASS_BLOCK             100
+#define EFI_IMAGE_SYM_CLASS_FUNCTION          101
+#define EFI_IMAGE_SYM_CLASS_END_OF_STRUCT     102
+#define EFI_IMAGE_SYM_CLASS_FILE              103
+#define EFI_IMAGE_SYM_CLASS_SECTION           104
+#define EFI_IMAGE_SYM_CLASS_WEAK_EXTERNAL     105
+
+//
+// type packing constants
+//
+#define EFI_IMAGE_N_BTMASK  017
+#define EFI_IMAGE_N_TMASK   060
+#define EFI_IMAGE_N_TMASK1  0300
+#define EFI_IMAGE_N_TMASK2  0360
+#define EFI_IMAGE_N_BTSHFT  4
+#define EFI_IMAGE_N_TSHIFT  2
+
+//
+// Communal selection types.
+//
+#define EFI_IMAGE_COMDAT_SELECT_NODUPLICATES    1
+#define EFI_IMAGE_COMDAT_SELECT_ANY             2
+#define EFI_IMAGE_COMDAT_SELECT_SAME_SIZE       3
+#define EFI_IMAGE_COMDAT_SELECT_EXACT_MATCH     4
+#define EFI_IMAGE_COMDAT_SELECT_ASSOCIATIVE     5
+
+#define EFI_IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY  1
+#define EFI_IMAGE_WEAK_EXTERN_SEARCH_LIBRARY    2
+#define EFI_IMAGE_WEAK_EXTERN_SEARCH_ALIAS      3
+
+///
+/// Relocation format.
+///
+typedef struct {
+  UINT32  VirtualAddress;
+  UINT32  SymbolTableIndex;
+  UINT16  Type;
+} EFI_IMAGE_RELOCATION;
+
+#define EFI_IMAGE_SIZEOF_RELOCATION 10
+
+//
+// I386 relocation types.
+//
+#define EFI_IMAGE_REL_I386_ABSOLUTE 0   // Reference is absolute, no relocation is necessary
+#define EFI_IMAGE_REL_I386_DIR16    01  // Direct 16-bit reference to the symbols virtual address
+#define EFI_IMAGE_REL_I386_REL16    02  // PC-relative 16-bit reference to the symbols virtual address
+#define EFI_IMAGE_REL_I386_DIR32    06  // Direct 32-bit reference to the symbols virtual address
+#define EFI_IMAGE_REL_I386_DIR32NB  07  // Direct 32-bit reference to the symbols virtual address, base not included
+#define EFI_IMAGE_REL_I386_SEG12    011 // Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address
+#define EFI_IMAGE_REL_I386_SECTION  012
+#define EFI_IMAGE_REL_I386_SECREL   013
+#define EFI_IMAGE_REL_I386_REL32    024 // PC-relative 32-bit reference to the symbols virtual address
+
+///
+/// Based relocation format.
+///
+typedef struct {
+  UINT32  VirtualAddress;
+  UINT32  SizeOfBlock;
+} EFI_IMAGE_BASE_RELOCATION;
+
+#define EFI_IMAGE_SIZEOF_BASE_RELOCATION  8
+
+//
+// Based relocation types.
+//
+#define EFI_IMAGE_REL_BASED_ABSOLUTE      0
+#define EFI_IMAGE_REL_BASED_HIGH          1
+#define EFI_IMAGE_REL_BASED_LOW           2
+#define EFI_IMAGE_REL_BASED_HIGHLOW       3
+#define EFI_IMAGE_REL_BASED_HIGHADJ       4
+#define EFI_IMAGE_REL_BASED_MIPS_JMPADDR  5
+#define EFI_IMAGE_REL_BASED_IA64_IMM64    9
+#define EFI_IMAGE_REL_BASED_DIR64         10
+
+///
+/// Line number format.
+///
+typedef struct {
+  union {
+    UINT32  SymbolTableIndex; // Symbol table index of function name if Linenumber is 0.
+    UINT32  VirtualAddress;   // Virtual address of line number.
+  } Type;
+  UINT16  Linenumber;         // Line number.
+} EFI_IMAGE_LINENUMBER;
+
+#define EFI_IMAGE_SIZEOF_LINENUMBER 6
+
+//
+// Archive format.
+//
+#define EFI_IMAGE_ARCHIVE_START_SIZE        8
+#define EFI_IMAGE_ARCHIVE_START             "!<arch>\n"
+#define EFI_IMAGE_ARCHIVE_END               "`\n"
+#define EFI_IMAGE_ARCHIVE_PAD               "\n"
+#define EFI_IMAGE_ARCHIVE_LINKER_MEMBER     "/               "
+#define EFI_IMAGE_ARCHIVE_LONGNAMES_MEMBER  "//              "
+
+typedef struct {
+  UINT8 Name[16];     // File member name - `/' terminated.
+  UINT8 Date[12];     // File member date - decimal.
+  UINT8 UserID[6];    // File member user id - decimal.
+  UINT8 GroupID[6];   // File member group id - decimal.
+  UINT8 Mode[8];      // File member mode - octal.
+  UINT8 Size[10];     // File member size - decimal.
+  UINT8 EndHeader[2]; // String to end header.
+} EFI_IMAGE_ARCHIVE_MEMBER_HEADER;
+
+#define EFI_IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60
+
+//
+// DLL support.
+//
+
+///
+/// DLL Export Format
+///
+typedef struct {
+  UINT32  Characteristics;
+  UINT32  TimeDateStamp;
+  UINT16  MajorVersion;
+  UINT16  MinorVersion;
+  UINT32  Name;
+  UINT32  Base;
+  UINT32  NumberOfFunctions;
+  UINT32  NumberOfNames;
+  UINT32  AddressOfFunctions;
+  UINT32  AddressOfNames;
+  UINT32  AddressOfNameOrdinals;
+} EFI_IMAGE_EXPORT_DIRECTORY;
+
+///
+/// DLL support.
+/// Import Format
+///
+typedef struct {
+  UINT16  Hint;
+  UINT8   Name[1];
+} EFI_IMAGE_IMPORT_BY_NAME;
+
+typedef struct {
+  union {
+    UINT32                    Function;
+    UINT32                    Ordinal;
+    EFI_IMAGE_IMPORT_BY_NAME  *AddressOfData;
+  } u1;
+} EFI_IMAGE_THUNK_DATA;
+
+#define EFI_IMAGE_ORDINAL_FLAG              0x80000000
+#define EFI_IMAGE_SNAP_BY_ORDINAL(Ordinal)  ((Ordinal & EFI_IMAGE_ORDINAL_FLAG) != 0)
+#define EFI_IMAGE_ORDINAL(Ordinal)          (Ordinal & 0xffff)
+
+typedef struct {
+  UINT32                Characteristics;
+  UINT32                TimeDateStamp;
+  UINT32                ForwarderChain;
+  UINT32                Name;
+  EFI_IMAGE_THUNK_DATA  *FirstThunk;
+} EFI_IMAGE_IMPORT_DESCRIPTOR;
+
+///
+/// Debug Format
+///
+#define EFI_IMAGE_DEBUG_TYPE_CODEVIEW 2
+
+typedef struct {
+  UINT32  Characteristics;
+  UINT32  TimeDateStamp;
+  UINT16  MajorVersion;
+  UINT16  MinorVersion;
+  UINT32  Type;
+  UINT32  SizeOfData;
+  UINT32  RVA;
+  UINT32  FileOffset;
+} EFI_IMAGE_DEBUG_DIRECTORY_ENTRY;
+
+#define CODEVIEW_SIGNATURE_NB10 0x3031424E  // "NB10"
+typedef struct {
+  UINT32  Signature;                        // "NB10"
+  UINT32  Unknown;
+  UINT32  Unknown2;
+  UINT32  Unknown3;
+  //
+  // Filename of .PDB goes here
+  //
+} EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY;
+
+#define CODEVIEW_SIGNATURE_RSDS 0x53445352  // "RSDS"
+typedef struct {
+  UINT32  Signature;                        // "RSDS"
+  UINT32  Unknown;
+  UINT32  Unknown2;
+  UINT32  Unknown3;
+  UINT32  Unknown4;
+  UINT32  Unknown5;
+  //
+  // Filename of .PDB goes here
+  //
+} EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY;
+
+///
+/// Header format for TE images
+///
+typedef struct {
+  UINT16                    Signature;            // signature for TE format = "VZ"
+  UINT16                    Machine;              // from the original file header
+  UINT8                     NumberOfSections;     // from the original file header
+  UINT8                     Subsystem;            // from original optional header
+  UINT16                    StrippedSize;         // how many bytes we removed from the header
+  UINT32                    AddressOfEntryPoint;  // offset to entry point -- from original optional header
+  UINT32                    BaseOfCode;           // from original image -- required for ITP debug
+  UINT64                    ImageBase;            // from original file header
+  EFI_IMAGE_DATA_DIRECTORY  DataDirectory[2];     // only base relocation and debug directory
+} EFI_TE_IMAGE_HEADER;
+
+#define EFI_TE_IMAGE_HEADER_SIGNATURE 0x5A56      // "VZ"
+
+//
+// Data directory indexes in our TE image header
+//
+#define EFI_TE_IMAGE_DIRECTORY_ENTRY_BASERELOC  0
+#define EFI_TE_IMAGE_DIRECTORY_ENTRY_DEBUG      1
+
+#endif
diff --git a/Tools/Source/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c b/Tools/Source/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..e8cf8b6457
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/Ebc/PeCoffLoaderEx.c
@@ -0,0 +1,57 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.c
+
+Abstract:
+
+    EBC Specific relocation fixups
+
+Revision History
+
+--*/
+
+
+
+
+RETURN_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup,
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an IA-32 specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  EFI_UNSUPPORTED   - Unsupported now
+
+--*/
+{
+  return RETURN_UNSUPPORTED;
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.c b/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.c
new file mode 100644
index 0000000000..d0117b8ae9
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.c
@@ -0,0 +1,299 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenFvImageExe.c
+
+Abstract:
+
+  This contains all code necessary to build the GenFvImage.exe utility.       
+  This utility relies heavily on the GenFvImage Lib.  Definitions for both
+  can be found in the Tiano Firmware Volume Generation Utility 
+  Specification, review draft.
+
+--*/
+
+//
+// File included in build
+//
+#include "GenFvImageExe.h"
+#include "CommonLib.h"
+#include "EfiUtilityMsgs.h"
+
+VOID
+PrintUtilityInfo (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Displays the standard utility information to SDTOUT
+
+Arguments:
+
+  None
+
+Returns:
+
+  None
+
+--*/
+{
+  printf (
+    "%s - Tiano Firmware Volume Generation Utility."" Version %i.%i\n\n",
+    UTILITY_NAME,
+    UTILITY_MAJOR_VERSION,
+    UTILITY_MINOR_VERSION
+    );
+}
+
+VOID
+PrintUsage (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Displays the utility usage syntax to STDOUT
+
+Arguments:
+
+  None
+
+Returns:
+
+  None
+
+--*/
+{
+  printf ("Usage: %s -I FvInfFileName\n", UTILITY_NAME);
+  printf ("  Where:\n");
+  printf ("\tFvInfFileName is the name of the image description file.\n\n");
+}
+
+int
+main (
+  IN INTN   argc,
+  IN CHAR8  **argv
+  )
+/*++
+
+Routine Description:
+
+  This utility uses GenFvImage.Lib to build a firmware volume image.
+
+Arguments:
+
+  FvInfFileName      The name of an FV image description file.
+
+  Arguments come in pair in any order.
+    -I FvInfFileName 
+
+Returns:
+
+  EFI_SUCCESS            No error conditions detected.
+  EFI_INVALID_PARAMETER  One or more of the input parameters is invalid.
+  EFI_OUT_OF_RESOURCES   A resource required by the utility was unavailable.  
+                         Most commonly this will be memory allocation 
+                         or file creation.
+  EFI_LOAD_ERROR         GenFvImage.lib could not be loaded.
+  EFI_ABORTED            Error executing the GenFvImage lib.
+
+--*/
+{
+  EFI_STATUS  Status;
+  CHAR8       InfFileName[_MAX_PATH];
+  CHAR8       *InfFileImage;
+  UINTN       InfFileSize;
+  UINT8       *FvImage;
+  UINTN       FvImageSize;
+  UINT8       Index;
+  CHAR8       FvFileNameBuffer[_MAX_PATH];
+  CHAR8       *FvFileName;
+  FILE        *FvFile;
+  FILE        *SymFile;
+  CHAR8       SymFileNameBuffer[_MAX_PATH];
+  CHAR8       *SymFileName;
+  UINT8       *SymImage;
+  UINTN       SymImageSize;
+  CHAR8       *CurrentSymString;
+
+  FvFileName  = FvFileNameBuffer;
+  SymFileName = SymFileNameBuffer;
+
+  SetUtilityName (UTILITY_NAME);
+  //
+  // Display utility information
+  //
+  PrintUtilityInfo ();
+
+  //
+  // Verify the correct number of arguments
+  //
+  if (argc != MAX_ARGS) {
+    Error (NULL, 0, 0, "invalid number of input parameters specified", NULL);
+    PrintUsage ();
+    return GetUtilityStatus ();
+  }
+  //
+  // Initialize variables
+  //
+  strcpy (InfFileName, "");
+
+  //
+  // Parse the command line arguments
+  //
+  for (Index = 1; Index < MAX_ARGS; Index += 2) {
+    //
+    // Make sure argument pair begin with - or /
+    //
+    if (argv[Index][0] != '-' && argv[Index][0] != '/') {
+      Error (NULL, 0, 0, argv[Index], "argument pair must begin with \"-\" or \"/\"");
+      PrintUsage ();
+      return GetUtilityStatus ();
+    }
+    //
+    // Make sure argument specifier is only one letter
+    //
+    if (argv[Index][2] != 0) {
+      Error (NULL, 0, 0, argv[Index], "unrecognized argument");
+      PrintUsage ();
+      return GetUtilityStatus ();
+    }
+    //
+    // Determine argument to read
+    //
+    switch (argv[Index][1]) {
+
+    case 'I':
+    case 'i':
+      if (strlen (InfFileName) == 0) {
+        strcpy (InfFileName, argv[Index + 1]);
+      } else {
+        Error (NULL, 0, 0, argv[Index + 1], "FvInfFileName may only be specified once");
+        PrintUsage ();
+        return GetUtilityStatus ();
+      }
+      break;
+
+    default:
+      Error (NULL, 0, 0, argv[Index], "unrecognized argument");
+      PrintUsage ();
+      return GetUtilityStatus ();
+      break;
+    }
+  }
+  //
+  // Read the INF file image
+  //
+  Status = GetFileImage (InfFileName, &InfFileImage, &InfFileSize);
+  if (EFI_ERROR (Status)) {
+    return STATUS_ERROR;
+  }
+  //
+  // Call the GenFvImage lib
+  //
+  Status = GenerateFvImage (
+            InfFileImage,
+            InfFileSize,
+            &FvImage,
+            &FvImageSize,
+            &FvFileName,
+            &SymImage,
+            &SymImageSize,
+            &SymFileName
+            );
+
+  if (EFI_ERROR (Status)) {
+    switch (Status) {
+
+    case EFI_INVALID_PARAMETER:
+      Error (NULL, 0, 0, "invalid parameter passed to GenFvImage Lib", NULL);
+      return GetUtilityStatus ();
+      break;
+
+    case EFI_ABORTED:
+      Error (NULL, 0, 0, "error detected while creating the file image", NULL);
+      return GetUtilityStatus ();
+      break;
+
+    case EFI_OUT_OF_RESOURCES:
+      Error (NULL, 0, 0, "GenFvImage Lib could not allocate required resources", NULL);
+      return GetUtilityStatus ();
+      break;
+
+    case EFI_VOLUME_CORRUPTED:
+      Error (NULL, 0, 0, "no base address was specified, but the FV.INF included a PEI or BSF file", NULL);
+      return GetUtilityStatus ();
+      break;
+
+    case EFI_LOAD_ERROR:
+      Error (NULL, 0, 0, "could not load FV image generation library", NULL);
+      return GetUtilityStatus ();
+      break;
+
+    default:
+      Error (NULL, 0, 0, "GenFvImage Lib returned unknown status", "status returned = 0x%X", Status);
+      return GetUtilityStatus ();
+      break;
+    }
+  }
+  //
+  // Write file
+  //
+  FvFile = fopen (FvFileName, "wb");
+  if (FvFile == NULL) {
+    Error (NULL, 0, 0, FvFileName, "could not open output file");
+    free (FvImage);
+    free (SymImage);
+    return GetUtilityStatus ();
+  }
+
+  if (fwrite (FvImage, 1, FvImageSize, FvFile) != FvImageSize) {
+    Error (NULL, 0, 0, FvFileName, "failed to write to output file");
+    free (FvImage);
+    free (SymImage);
+    fclose (FvFile);
+    return GetUtilityStatus ();
+  }
+
+  fclose (FvFile);
+  free (FvImage);
+
+  //
+  // Write symbol file
+  //
+  if (strcmp (SymFileName, "")) {
+    SymFile = fopen (SymFileName, "wt");
+    if (SymFile == NULL) {
+      Error (NULL, 0, 0, SymFileName, "could not open output symbol file");
+      free (SymImage);
+      return GetUtilityStatus ();
+    }
+
+    fprintf (SymFile, "TEXTSYM format | V1.0\n");
+
+    CurrentSymString = SymImage;
+    while (((UINTN) CurrentSymString - (UINTN) SymImage) < SymImageSize) {
+      fprintf (SymFile, "%s", CurrentSymString);
+      CurrentSymString = (CHAR8 *) (((UINTN) CurrentSymString) + strlen (CurrentSymString) + 1);
+    }
+
+    fclose (SymFile);
+  }
+
+  free (SymImage);
+
+  return GetUtilityStatus ();
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.h
new file mode 100644
index 0000000000..9b97935656
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageExe.h
@@ -0,0 +1,98 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  GenFvImageExe.h
+
+Abstract:
+
+  Definitions for the PeimFixup exe utility.
+
+--*/
+
+//
+// Coded to Tiano Coding Standards
+//
+#ifndef _EFI_GEN_FV_IMAGE_EXE_H
+#define _EFI_GEN_FV_IMAGE_EXE_H
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "GenFvImageLib.h"
+
+//
+// Utility Name
+//
+#define UTILITY_NAME  "GenFvImage"
+
+//
+// Utility version information
+//
+#define UTILITY_MAJOR_VERSION 0
+#define UTILITY_MINOR_VERSION 1
+#define UTILITY_DATE          __DATE__
+
+//
+// The maximum number of arguments accepted from the command line.
+//
+#define MAX_ARGS  3
+
+//
+// The function that displays general utility information
+//
+VOID
+PrintUtilityInfo (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  TODO: Add function description
+
+Arguments:
+
+  None
+
+Returns:
+
+  TODO: add return values
+
+--*/
+;
+
+//
+// The function that displays the utility usage message.
+//
+VOID
+PrintUsage (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  TODO: Add function description
+
+Arguments:
+
+  None
+
+Returns:
+
+  TODO: add return values
+
+--*/
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
new file mode 100644
index 0000000000..c4515001d8
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.c
@@ -0,0 +1,2871 @@
+/*++
+i
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenFvImageLib.c
+
+Abstract:
+
+  This file contains functions required to generate a Firmware Volume.
+
+--*/
+
+//
+// Include files
+//
+#define EFI_SPECIFICATION_VERSION 0x00020000
+#define EDK_RELEASE_VERSION       0x00020000
+#ifdef __GNUC__
+#include <uuid/uuid.h>
+#include <sys/stat.h>
+#endif
+#include <string.h>
+#ifndef __GNUC__
+#include <io.h>
+#endif
+#include <assert.h>
+#include <Dxe.h>
+#include <Library/PeCoffLib.h>
+#include "GenFvImageLib.h"
+#include "GenFvImageLibInternal.h"
+#include <CommonLib.h>
+#include <FirmwareVolumeImageFormat.h>
+#include <Crc32.h>
+#include <EfiUtilityMsgs.h>
+#include <FvLib.h>
+#include <EfiCompress.h>
+#include <Variable.h>
+#include <WinNtInclude.h>
+#include <WorkingBlockHeader.h>
+
+
+//
+// Local function prototypes
+//
+EFI_STATUS
+GetPe32Info (
+  IN UINT8                  *Pe32,
+  OUT UINT32                *EntryPoint,
+  OUT UINT32                *BaseOfCode,
+  OUT UINT16                *MachineType
+  );
+
+//
+// Local function implementations.
+//
+EFI_GUID  FfsGuid = EFI_FIRMWARE_FILE_SYSTEM_GUID;
+EFI_GUID  DefaultFvPadFileNameGuid = { 0x78f54d4, 0xcc22, 0x4048, 0x9e, 0x94, 0x87, 0x9c, 0x21, 0x4d, 0x56, 0x2f };
+
+//
+// This data array will be located at the base of the Firmware Volume Header (FVH)
+// in the boot block.  It must not exceed 14 bytes of code.  The last 2 bytes
+// will be used to keep the FVH checksum consistent.
+// This code will be run in response to a starutp IPI for HT-enabled systems.
+//
+#define SIZEOF_STARTUP_DATA_ARRAY 0x10
+
+UINT8                                   m128kRecoveryStartupApDataArray[SIZEOF_STARTUP_DATA_ARRAY] = {
+  //
+  // EA D0 FF 00 F0               ; far jmp F000:FFD0
+  // 0, 0, 0, 0, 0, 0, 0, 0, 0,   ; Reserved bytes
+  // 0, 0                         ; Checksum Padding
+  //
+  0xEA,
+  0xD0,
+  0xFF,
+  0x0,
+  0xF0,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00
+};
+
+UINT8                                   m64kRecoveryStartupApDataArray[SIZEOF_STARTUP_DATA_ARRAY] = {
+  //
+  // EB CE                               ; jmp short ($-0x30)
+  // ; (from offset 0x0 to offset 0xFFD0)
+  // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ; Reserved bytes
+  // 0, 0                                ; Checksum Padding
+  //
+  0xEB,
+  0xCE,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00,
+  0x00
+};
+
+EFI_STATUS
+ParseFvInf (
+  IN MEMORY_FILE  *InfFile,
+  IN FV_INFO      *FvInfo
+  )
+/*++
+
+Routine Description:
+
+  This function parses a FV.INF file and copies info into a FV_INFO structure.
+
+Arguments:
+
+  InfFile         Memory file image.
+  FvInfo          Information read from INF file.
+
+Returns:
+
+  EFI_SUCCESS       INF file information successfully retrieved.
+  EFI_ABORTED       INF file has an invalid format.
+  EFI_NOT_FOUND     A required string was not found in the INF file.
+--*/
+{
+  CHAR8       Value[_MAX_PATH];
+  UINT64      Value64;
+  UINTN       Index;
+  EFI_STATUS  Status;
+
+  //
+  // Initialize FV info
+  //
+  memset (FvInfo, 0, sizeof (FV_INFO));
+
+  //
+  // Read the FV base address
+  //
+  Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_FV_BASE_ADDRESS_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Get the base address
+    //
+    Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, EFI_FV_BASE_ADDRESS_STRING, "invalid value");
+      return EFI_ABORTED;
+    }
+
+    FvInfo->BaseAddress = Value64;
+  } else {
+    Error (NULL, 0, 0, EFI_FV_BASE_ADDRESS_STRING, "could not find value");
+    return EFI_ABORTED;
+  }
+  //
+  // Read the FV Guid
+  //
+  Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_FV_GUID_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Get the guid value
+    //
+    Status = StringToGuid (Value, &FvInfo->FvGuid);
+    if (EFI_ERROR (Status)) {
+      memcpy (&FvInfo->FvGuid, &FfsGuid, sizeof (EFI_GUID));
+    }
+  } else {
+    memcpy (&FvInfo->FvGuid, &FfsGuid, sizeof (EFI_GUID));
+  }
+  //
+  // Read the FV file name
+  //
+  Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_FV_FILE_NAME_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // copy the file name
+    //
+    strcpy (FvInfo->FvName, Value);
+  } else {
+    Error (NULL, 0, 0, EFI_FV_FILE_NAME_STRING, "value not specified");
+    return EFI_ABORTED;
+  }
+  //
+  // Read the Sym file name
+  //
+  Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_SYM_FILE_NAME_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // copy the file name
+    //
+    strcpy (FvInfo->SymName, Value);
+  } else {
+    //
+    // Symbols not required, so init to NULL.
+    //
+    strcpy (FvInfo->SymName, "");
+  }
+  //
+  // Read the read disabled capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_READ_DISABLED_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the read disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_READ_DISABLED_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_READ_DISABLED_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_READ_DISABLED_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the read enabled capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_READ_ENABLED_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the read disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_READ_ENABLED_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_READ_ENABLED_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_READ_ENABLED_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the read status attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_READ_STATUS_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the read disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_READ_STATUS;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_READ_STATUS_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_READ_STATUS_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the write disabled capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_WRITE_DISABLED_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the write disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_WRITE_DISABLED_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_WRITE_DISABLED_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_WRITE_DISABLED_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the write enabled capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_WRITE_ENABLED_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the write disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_WRITE_ENABLED_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_WRITE_ENABLED_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_WRITE_ENABLED_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the write status attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_WRITE_STATUS_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the write disabled flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_WRITE_STATUS;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_WRITE_STATUS_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_WRITE_STATUS_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the lock capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_LOCK_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the attribute flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_LOCK_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_LOCK_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_LOCK_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the lock status attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_LOCK_STATUS_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the attribute flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_LOCK_STATUS;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_LOCK_STATUS_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_LOCK_STATUS_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the sticky write attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_STICKY_WRITE_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the attribute flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_STICKY_WRITE;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_STICKY_WRITE_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_STICKY_WRITE_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the memory mapped attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_MEMORY_MAPPED_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the attribute flag
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_MEMORY_MAPPED;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_MEMORY_MAPPED_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_MEMORY_MAPPED_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the erase polarity attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ERASE_POLARITY_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update the attribute flag
+    //
+    if (strcmp (Value, ONE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ERASE_POLARITY;
+    } else if (strcmp (Value, ZERO_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ERASE_POLARITY_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ERASE_POLARITY_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the alignment capabilities attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_CAP_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_CAP;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_CAP_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_CAP_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the word alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_2_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_2;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_2_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_2_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the dword alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_4_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_4;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_4_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_4_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the word alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_8_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_8;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_8_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_8_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the qword alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_16_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_16;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_16_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_16_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 32 byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_32_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_32;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_32_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_32_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 64 byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_64_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_64;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_64_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_64_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 128 byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_128_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_128;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_128_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_128_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 256 byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_256_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_256;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_256_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_256_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 512 byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_512_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_512;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_512_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_512_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 1K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_1K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_1K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_1K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_1K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 2K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_2K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_2K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_2K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_2K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 4K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_4K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_4K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_4K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_4K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 8K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_8K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_8K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_8K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_8K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 16K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_16K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_16K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_16K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_16K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 32K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_32K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_32K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_32K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_32K_STRING, "value not specified");
+    return Status;
+  }
+  //
+  // Read the 64K byte alignment capability attribute
+  //
+  Status = FindToken (InfFile, ATTRIBUTES_SECTION_STRING, EFI_FVB_ALIGNMENT_64K_STRING, 0, Value);
+
+  if (Status == EFI_SUCCESS) {
+    //
+    // Update attribute
+    //
+    if (strcmp (Value, TRUE_STRING) == 0) {
+      FvInfo->FvAttributes |= EFI_FVB_ALIGNMENT_64K;
+    } else if (strcmp (Value, FALSE_STRING) != 0) {
+      Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_64K_STRING, "expected %s | %s", TRUE_STRING, FALSE_STRING);
+      return EFI_ABORTED;
+    }
+  } else {
+    Error (NULL, 0, 0, EFI_FVB_ALIGNMENT_64K_STRING, "value not specified");
+    return Status;
+  }
+
+  if (!(FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_CAP) &&
+      (
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_2) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_4) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_8) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_16) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_32) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_64) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_128) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_256) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_512) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_1K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_2K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_4K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_8K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_16K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_32K) ||
+        (FvInfo->FvAttributes & EFI_FVB_ALIGNMENT_64K)
+      )
+     ) {
+    Error (
+      NULL,
+      0,
+      0,
+      "illegal combination of alignment attributes",
+      "if %s is not %s, no individual alignments can be %s",
+      EFI_FVB_ALIGNMENT_CAP_STRING,
+      TRUE_STRING,
+      TRUE_STRING
+      );
+    return EFI_ABORTED;
+  }
+  //
+  // Read block maps
+  //
+  for (Index = 0; Index < MAX_NUMBER_OF_FV_BLOCKS; Index++) {
+    //
+    // Read the number of blocks
+    //
+    Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_NUM_BLOCKS_STRING, Index, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Update the number of blocks
+      //
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        Error (NULL, 0, 0, Value, "invalid value for %s", EFI_NUM_BLOCKS_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvBlocks[Index].NumBlocks = (UINT32) Value64;
+    } else {
+      //
+      // If there is no number of blocks, but there is a size, then we have a mismatched pair
+      // and should return an error.
+      //
+      Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_BLOCK_SIZE_STRING, Index, Value);
+      if (!EFI_ERROR (Status)) {
+        Error (NULL, 0, 0, "must specify both", "%s and %s", EFI_NUM_BLOCKS_STRING, EFI_BLOCK_SIZE_STRING);
+        return EFI_ABORTED;
+      } else {
+        //
+        // We are done
+        //
+        break;
+      }
+    }
+    //
+    // Read the size of blocks
+    //
+    Status = FindToken (InfFile, OPTIONS_SECTION_STRING, EFI_BLOCK_SIZE_STRING, Index, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Update the number of blocks
+      //
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        Error (NULL, 0, 0, Value, "invalid value specified for %s", EFI_BLOCK_SIZE_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvBlocks[Index].BlockLength = (UINT32) Value64;
+    } else {
+      //
+      // There is a number of blocks, but there is no size, so we have a mismatched pair
+      // and should return an error.
+      //
+      Error (NULL, 0, 0, "must specify both", "%s and %s", EFI_NUM_BLOCKS_STRING, EFI_BLOCK_SIZE_STRING);
+      return EFI_ABORTED;
+    }
+  }
+  //
+  // Read files
+  //
+  for (Index = 0; Index < MAX_NUMBER_OF_FILES_IN_FV; Index++) {
+    //
+    // Read the number of blocks
+    //
+    Status = FindToken (InfFile, FILES_SECTION_STRING, EFI_FILE_NAME_STRING, Index, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Add the file
+      //
+      strcpy (FvInfo->FvFiles[Index], Value);
+    } else {
+      break;
+    }
+  }
+
+  if (FindSection (InfFile, COMPONENT_SECTION_STRING)) {
+    Index = 0;
+    //
+    // Read component FV_VARIABLE
+    //
+    Status = FindToken (InfFile, COMPONENT_SECTION_STRING, EFI_NV_VARIABLE_STRING, 0, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Add the component
+      //
+      strcpy (FvInfo->FvComponents[Index].ComponentName, EFI_NV_VARIABLE_STRING);
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        printf ("ERROR: %s is not a valid integer.\n", EFI_NV_VARIABLE_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvComponents[Index].Size = (UINTN) Value64;
+    } else {
+      printf ("WARNING: Could not read %s.\n", EFI_NV_VARIABLE_STRING);
+    }
+
+    Index++;
+    //
+    // Read component FV_EVENT_LOG
+    //
+    Status = FindToken (InfFile, COMPONENT_SECTION_STRING, EFI_NV_EVENT_LOG_STRING, 0, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Add the component
+      //
+      strcpy (FvInfo->FvComponents[Index].ComponentName, EFI_NV_EVENT_LOG_STRING);
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        printf ("ERROR: %s is not a valid integer.\n", EFI_NV_EVENT_LOG_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvComponents[Index].Size = (UINTN) Value64;
+    } else {
+      printf ("WARNING: Could not read %s.\n", EFI_NV_EVENT_LOG_STRING);
+    }
+
+    Index++;
+    //
+    // Read component FV_FTW_WORKING
+    //
+    Status = FindToken (InfFile, COMPONENT_SECTION_STRING, EFI_NV_FTW_WORKING_STRING, 0, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Add the component
+      //
+      strcpy (FvInfo->FvComponents[Index].ComponentName, EFI_NV_FTW_WORKING_STRING);
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        printf ("ERROR: %s is not a valid integer.\n", EFI_NV_FTW_WORKING_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvComponents[Index].Size = (UINTN) Value64;
+    } else {
+      printf ("WARNING: Could not read %s.\n", EFI_NV_FTW_WORKING_STRING);
+    }
+
+    Index++;
+    //
+    // Read component FV_FTW_SPARE
+    //
+    Status = FindToken (InfFile, COMPONENT_SECTION_STRING, EFI_NV_FTW_SPARE_STRING, 0, Value);
+
+    if (Status == EFI_SUCCESS) {
+      //
+      // Add the component
+      //
+      strcpy (FvInfo->FvComponents[Index].ComponentName, EFI_NV_FTW_SPARE_STRING);
+      Status = AsciiStringToUint64 (Value, FALSE, &Value64);
+      if (EFI_ERROR (Status)) {
+        printf ("ERROR: %s is not a valid integer.\n", EFI_NV_FTW_SPARE_STRING);
+        return EFI_ABORTED;
+      }
+
+      FvInfo->FvComponents[Index].Size = (UINTN) Value64;
+    } else {
+      printf ("WARNING: Could not read %s.\n", EFI_NV_FTW_SPARE_STRING);
+    }
+  }
+  //
+  // Compute size for easy access later
+  //
+  FvInfo->Size = 0;
+  for (Index = 0; FvInfo->FvBlocks[Index].NumBlocks; Index++) {
+    FvInfo->Size += FvInfo->FvBlocks[Index].NumBlocks * FvInfo->FvBlocks[Index].BlockLength;
+  }
+
+  return EFI_SUCCESS;
+}
+
+VOID
+UpdateFfsFileState (
+  IN EFI_FFS_FILE_HEADER          *FfsFile,
+  IN EFI_FIRMWARE_VOLUME_HEADER   *FvHeader
+  )
+/*++
+
+Routine Description:
+
+  This function changes the FFS file attributes based on the erase polarity
+  of the FV.
+
+Arguments:
+
+  FfsFile   File header.
+  FvHeader  FV header.
+
+Returns:
+
+  None
+
+--*/
+{
+  if (FvHeader->Attributes & EFI_FVB_ERASE_POLARITY) {
+    FfsFile->State = (UINT8)~(FfsFile->State);
+  }
+}
+
+EFI_STATUS
+ReadFfsAlignment (
+  IN EFI_FFS_FILE_HEADER    *FfsFile,
+  IN OUT UINT32             *Alignment
+  )
+/*++
+
+Routine Description:
+
+  This function determines the alignment of the FFS input file from the file
+  attributes.
+
+Arguments:
+
+  FfsFile       FFS file to parse
+  Alignment     The minimum required alignment of the FFS file, in bytes
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              An error occurred.
+
+--*/
+{
+  //
+  // Verify input parameters.
+  //
+  if (FfsFile == NULL || Alignment == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  switch ((FfsFile->Attributes >> 3) & 0x07) {
+
+  case 0:
+    //
+    // 1 byte alignment
+    //
+    *Alignment = (1 << 0);
+    break;
+
+  case 1:
+    //
+    // 16 byte alignment
+    //
+    *Alignment = (1 << 4);
+    break;
+
+  case 2:
+    //
+    // 128 byte alignment
+    //
+    *Alignment = (1 << 7);
+    break;
+
+  case 3:
+    //
+    // 512 byte alignment
+    //
+    *Alignment = (1 << 9);
+    break;
+
+  case 4:
+    //
+    // 1K byte alignment
+    //
+    *Alignment = (1 << 10);
+    break;
+
+  case 5:
+    //
+    // 4K byte alignment
+    //
+    *Alignment = (1 << 12);
+    break;
+
+  case 6:
+    //
+    // 32K byte alignment
+    //
+    *Alignment = (1 << 15);
+    break;
+
+  case 7:
+    //
+    // 64K byte alignment
+    //
+    *Alignment = (1 << 16);
+    break;
+
+  default:
+    Error (NULL, 0, 0, "nvalid file attribute calculated, this is most likely a utility error", NULL);
+    return EFI_ABORTED;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddPadFile (
+  IN OUT MEMORY_FILE  *FvImage,
+  IN UINT32           DataAlignment
+  )
+/*++
+
+Routine Description:
+
+  This function adds a pad file to the FV image if it required to align the
+  data of the next file.
+
+Arguments:
+
+  FvImage         The memory image of the FV to add it to.  The current offset
+                  must be valid.
+  DataAlignment   The data alignment of the next FFS file.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_OUT_OF_RESOURCES     Insufficient resources exist in the FV to complete
+                           the pad file add.
+
+--*/
+{
+  EFI_FFS_FILE_HEADER *PadFile;
+  EFI_GUID            PadFileGuid;
+  UINTN               PadFileSize;
+
+  //
+  // Verify input parameters.
+  //
+  if (FvImage == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Basic assumption is we start from an 8 byte aligned address
+  // and our file header is a multiple of 8 bytes
+  //
+  assert ((UINTN) FvImage->CurrentFilePointer % 8 == 0);
+  assert (sizeof (EFI_FFS_FILE_HEADER) % 8 == 0);
+
+  //
+  // Check if a pad file is necessary
+  //
+  if (((UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + sizeof (EFI_FFS_FILE_HEADER)) % DataAlignment == 0) {
+    return EFI_SUCCESS;
+  }
+  //
+  // Write pad file header
+  //
+  PadFile = (EFI_FFS_FILE_HEADER *) FvImage->CurrentFilePointer;
+
+  //
+  // Verify that we have enough space for the file header
+  //
+  if ((UINTN) (PadFile + sizeof (EFI_FFS_FILE_HEADER)) >= (UINTN) FvImage->Eof) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+#ifdef __GNUC__
+  {
+    uuid_t tmp_id;
+    uuid_generate (tmp_id);
+    memcpy (&PadFileGuid, tmp_id, sizeof (EFI_GUID));
+  }
+#else
+  UuidCreate (&PadFileGuid);
+#endif
+  memset (PadFile, 0, sizeof (EFI_FFS_FILE_HEADER));
+  memcpy (&PadFile->Name, &PadFileGuid, sizeof (EFI_GUID));
+  PadFile->Type       = EFI_FV_FILETYPE_FFS_PAD;
+  PadFile->Attributes = 0;
+
+  //
+  // Calculate the pad file size
+  //
+  //
+  // This is the earliest possible valid offset (current plus pad file header
+  // plus the next file header)
+  //
+  PadFileSize = (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage + (sizeof (EFI_FFS_FILE_HEADER) * 2);
+
+  //
+  // Add whatever it takes to get to the next aligned address
+  //
+  while ((PadFileSize % DataAlignment) != 0) {
+    PadFileSize++;
+  }
+  //
+  // Subtract the next file header size
+  //
+  PadFileSize -= sizeof (EFI_FFS_FILE_HEADER);
+
+  //
+  // Subtract the starting offset to get size
+  //
+  PadFileSize -= (UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage;
+
+  //
+  // Write pad file size (calculated size minus next file header size)
+  //
+  PadFile->Size[0]  = (UINT8) (PadFileSize & 0xFF);
+  PadFile->Size[1]  = (UINT8) ((PadFileSize >> 8) & 0xFF);
+  PadFile->Size[2]  = (UINT8) ((PadFileSize >> 16) & 0xFF);
+
+  //
+  // Fill in checksums and state, they must be 0 for checksumming.
+  //
+  PadFile->IntegrityCheck.Checksum.Header = 0;
+  PadFile->IntegrityCheck.Checksum.File   = 0;
+  PadFile->State                          = 0;
+  PadFile->IntegrityCheck.Checksum.Header = CalculateChecksum8 ((UINT8 *) PadFile, sizeof (EFI_FFS_FILE_HEADER));
+  if (PadFile->Attributes & FFS_ATTRIB_CHECKSUM) {
+    PadFile->IntegrityCheck.Checksum.File = CalculateChecksum8 ((UINT8 *) PadFile, PadFileSize);
+  } else {
+    PadFile->IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+  }
+
+  PadFile->State = EFI_FILE_HEADER_CONSTRUCTION | EFI_FILE_HEADER_VALID | EFI_FILE_DATA_VALID;
+  UpdateFfsFileState (
+    (EFI_FFS_FILE_HEADER *) PadFile,
+    (EFI_FIRMWARE_VOLUME_HEADER *) FvImage->FileImage
+    );
+
+  //
+  // Verify that we have enough space (including the padding
+  //
+  if ((UINTN) (PadFile + sizeof (EFI_FFS_FILE_HEADER)) >= (UINTN) FvImage->Eof) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Update the current FV pointer
+  //
+  FvImage->CurrentFilePointer += PadFileSize;
+
+  return EFI_SUCCESS;
+}
+
+BOOLEAN
+IsVtfFile (
+  IN EFI_FFS_FILE_HEADER    *FileBuffer
+  )
+/*++
+
+Routine Description:
+
+  This function checks the header to validate if it is a VTF file
+
+Arguments:
+
+  FileBuffer     Buffer in which content of a file has been read.
+
+Returns:
+
+  TRUE    If this is a VTF file
+  FALSE   If this is not a VTF file
+
+--*/
+{
+  EFI_GUID  VtfGuid = EFI_FFS_VOLUME_TOP_FILE_GUID;
+  if (!memcmp (&FileBuffer->Name, &VtfGuid, sizeof (EFI_GUID))) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+EFI_STATUS
+FfsRebaseImageRead (
+  IN     VOID    *FileHandle,
+  IN     UINTN   FileOffset,
+  IN OUT UINT32  *ReadSize,
+  OUT    VOID    *Buffer
+  )
+/*++
+
+Routine Description:
+
+  Support routine for the PE/COFF Loader that reads a buffer from a PE/COFF file
+
+Arguments:
+
+  FileHandle - The handle to the PE/COFF file
+
+  FileOffset - The offset, in bytes, into the file to read
+
+  ReadSize   - The number of bytes to read from the file starting at FileOffset
+
+  Buffer     - A pointer to the buffer to read the data into.
+
+Returns:
+
+  EFI_SUCCESS - ReadSize bytes of data were read into Buffer from the PE/COFF file starting at FileOffset
+
+--*/
+{
+  CHAR8   *Destination8;
+  CHAR8   *Source8;
+  UINT32  Length;
+
+  Destination8  = Buffer;
+  Source8       = (CHAR8 *) ((UINTN) FileHandle + FileOffset);
+  Length        = *ReadSize;
+  while (Length--) {
+    *(Destination8++) = *(Source8++);
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+RebaseFfsFile (
+  IN OUT EFI_FFS_FILE_HEADER    *FfsFile,
+  IN EFI_PHYSICAL_ADDRESS       BaseAddress
+  )
+/*++
+
+Routine Description:
+
+  This function determines if a file is XIP and should be rebased.  It will
+  rebase any PE32 sections found in the file using the base address.
+
+Arguments:
+
+  FfsFile           A pointer to Ffs file image.
+  BaseAddress       The base address to use for rebasing the file image.
+
+Returns:
+
+  EFI_SUCCESS             The image was properly rebased.
+  EFI_INVALID_PARAMETER   An input parameter is invalid.
+  EFI_ABORTED             An error occurred while rebasing the input file image.
+  EFI_OUT_OF_RESOURCES    Could not allocate a required resource.
+
+--*/
+{
+  EFI_STATUS                            Status;
+  PE_COFF_LOADER_IMAGE_CONTEXT          ImageContext;
+  UINTN                                 MemoryImagePointer;
+  UINTN                                 MemoryImagePointerAligned;
+
+  EFI_PHYSICAL_ADDRESS                  ImageAddress;
+  UINT64                                ImageSize;
+  EFI_PHYSICAL_ADDRESS                  EntryPoint;
+
+  UINT32                                Pe32FileSize;
+  UINT32                                NewPe32BaseAddress;
+
+  UINTN                                 Index;
+  EFI_FILE_SECTION_POINTER              CurrentPe32Section;
+  UINT8                                 FileGuidString[80];
+
+  //
+  // Verify input parameters
+  //
+  if (FfsFile == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Convert the GUID to a string so we can at least report which file
+  // if we find an error.
+  //
+  PrintGuidToBuffer (&FfsFile->Name, FileGuidString, sizeof (FileGuidString), TRUE);
+
+  //
+  // Do some nominal checks on the file, then check for XIP.
+  //
+  Status = VerifyFfsFile (FfsFile);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "invalid FFS file", FileGuidString);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (FfsFile->Type != EFI_FV_FILETYPE_SECURITY_CORE &&
+      FfsFile->Type != EFI_FV_FILETYPE_PEI_CORE &&
+      FfsFile->Type != EFI_FV_FILETYPE_PEIM
+      ) {
+    //
+    // File is not XIP, so don't rebase
+    //
+    return EFI_SUCCESS;
+  }
+  //
+  // Rebase each PE32 section
+  //
+  for (Index = 1;; Index++) {
+    Status = GetSectionByType (FfsFile, EFI_SECTION_PE32, Index, &CurrentPe32Section);
+    if (EFI_ERROR (Status)) {
+      break;
+    }
+    //
+    // Calculate the PE32 base address, the FFS file base plus the offset of the PE32 section
+    //
+    NewPe32BaseAddress = ((UINT32) BaseAddress) + ((UINTN) CurrentPe32Section.Pe32Section - (UINTN) FfsFile);
+
+    //
+    // Initialize context
+    //
+    memset (&ImageContext, 0, sizeof (ImageContext));
+    ImageContext.Handle     = (VOID *) ((UINTN) CurrentPe32Section.Pe32Section + sizeof (EFI_PE32_SECTION));
+    ImageContext.ImageRead  = (PE_COFF_LOADER_READ_FILE) FfsRebaseImageRead;
+
+    Status                  = PeCoffLoaderGetImageInfo (&ImageContext);
+
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "GetImageInfo() failed", FileGuidString);
+      return Status;
+    }
+    //
+    // Allocate a buffer for the image to be loaded into.
+    //
+    Pe32FileSize              = GetLength (CurrentPe32Section.Pe32Section->CommonHeader.Size);
+    MemoryImagePointer        = (UINTN) (malloc (Pe32FileSize + 0x1000));
+    MemoryImagePointerAligned = (MemoryImagePointer + 0x0FFF) & (-1 << 12);
+    if (MemoryImagePointerAligned == 0) {
+      Error (NULL, 0, 0, "memory allocation failure", NULL);
+      return EFI_OUT_OF_RESOURCES;
+    }
+
+    //
+    // bugbug
+    //
+    ImageContext.ImageAddress = MemoryImagePointerAligned;
+    Status = PeCoffLoaderLoadImage (&ImageContext);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "LoadImage() failure", FileGuidString);
+      free ((VOID *) MemoryImagePointer);
+      return Status;
+    }
+
+    Status = PeCoffLoaderRelocateImage (&ImageContext);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "RelocateImage() failure", FileGuidString);
+      free ((VOID *) MemoryImagePointer);
+      return Status;
+    }
+
+    ImageAddress  = ImageContext.ImageAddress;
+    ImageSize     = ImageContext.ImageSize;
+    EntryPoint    = ImageContext.EntryPoint;
+
+    if (ImageSize > Pe32FileSize) {
+      Error (
+        NULL,
+        0,
+        0,
+        "rebased PE32 is larger than original PE32 image",
+        "0x%X > 0x%X on file %s",
+        ImageSize,
+        Pe32FileSize,
+        FileGuidString
+        );
+      free ((VOID *) MemoryImagePointer);
+      return EFI_ABORTED;
+    }
+
+    memcpy (CurrentPe32Section.Pe32Section, (VOID *) MemoryImagePointerAligned, Pe32FileSize);
+
+    free ((VOID *) MemoryImagePointer);
+  }
+  //
+  // the above for loop will always exit with EFI_NOT_FOUND if it completes
+  // normally.  If Index == 1 at exit, then no PE32 sections were found.  If it
+  // exits with any other error code, then something broke...
+  //
+  if (Status != EFI_NOT_FOUND) {
+    Error (NULL, 0, 0, "failed to parse PE32 section", FileGuidString);
+    return Status;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddSymFile (
+  IN UINT64               BaseAddress,
+  IN EFI_FFS_FILE_HEADER  *FfsFile,
+  IN OUT MEMORY_FILE      *SymImage,
+  IN CHAR8                *SourceFileName
+  )
+/*++
+
+Routine Description:
+
+  This function adds the SYM tokens in the source file to the destination file.
+  The SYM tokens are updated to reflect the base address.
+
+Arguments:
+
+  BaseAddress     The base address for the new SYM tokens.
+  FfsFile         Pointer to the beginning of the FFS file in question.
+  SymImage        The memory file to update with symbol information.
+  SourceFileName  The source file.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              An error occurred.
+
+--*/
+{
+  FILE                      *SourceFile;
+
+  CHAR8                     Buffer[_MAX_PATH];
+  CHAR8                     Type[_MAX_PATH];
+  CHAR8                     Address[_MAX_PATH];
+  CHAR8                     Section[_MAX_PATH];
+  CHAR8                     Token[_MAX_PATH];
+  CHAR8                     SymFileName[_MAX_PATH];
+  CHAR8                     CodeModuleName[_MAX_PATH];
+  CHAR8                     *Ptr;
+
+  UINT64                    TokenAddress;
+
+  EFI_STATUS                Status;
+  EFI_FILE_SECTION_POINTER  Pe32Section;
+  UINT32                    EntryPoint;
+  UINT32                    BaseOfCode;
+  UINT16                    MachineType;
+  EFI_TE_IMAGE_HEADER       *TeHdr;
+
+  TeHdr = NULL;
+  //
+  // Verify input parameters.
+  //
+  if (BaseAddress == 0 || FfsFile == NULL || SymImage == NULL || SourceFileName == NULL) {
+    Error (NULL, 0, 0, "invalid parameter passed to AddSymFile()", NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Check if we want to add this file
+  //
+  //
+  // Get the file name
+  //
+  strcpy (Buffer, SourceFileName);
+
+  //
+  // Copy the file name for the path of the sym file and truncate the name portion.
+  //
+  strcpy (SymFileName, Buffer);
+  Ptr = strrchr (SymFileName, '\\');
+  assert (Ptr);
+  Ptr[0] = 0;
+
+  //
+  // Find the file extension and make it lower case
+  //
+  Ptr = strrchr (SymFileName, '.');
+  if (Ptr != NULL) {
+    strlwr (Ptr);
+  }
+  //
+  // Check if it is PEI file
+  //
+  if (strstr (Buffer, ".pei") != NULL) {
+    //
+    // Find the human readable portion
+    //
+    if (!strtok (Buffer, "-") ||
+        !strtok (NULL, "-") ||
+        !strtok (NULL, "-") ||
+        !strtok (NULL, "-") ||
+        !strtok (NULL, "-") ||
+        !strcpy (Buffer, strtok (NULL, "."))
+          ) {
+      Error (NULL, 0, 0, "failed to find human readable portion of the file name in AddSymFile()", NULL);
+      return EFI_ABORTED;
+    }
+    //
+    // Save code module name
+    //
+    strcpy (CodeModuleName, Buffer);
+
+    //
+    // Add the symbol file name and extension to the file path.
+    //
+    strcat (Buffer, ".sym");
+    strcat (SymFileName, "\\");
+    strcat (SymFileName, Buffer);
+  } else {
+    //
+    // Only handle PEIM files.
+    //
+    return EFI_SUCCESS;
+  }
+  //
+  // Find PE32 section
+  //
+  Status = GetSectionByType (FfsFile, EFI_SECTION_PE32, 1, &Pe32Section);
+
+  //
+  // BUGBUG: Assume if no PE32 section it is PIC and hardcode base address
+  //
+  if (Status == EFI_NOT_FOUND) {
+    Status = GetSectionByType (FfsFile, EFI_SECTION_TE, 1, &Pe32Section);
+    if (Status == EFI_NOT_FOUND) {
+      BaseOfCode = 0x60;
+    } else {
+      TeHdr       = (EFI_TE_IMAGE_HEADER *) ((UINTN) Pe32Section.Pe32Section + sizeof (EFI_COMMON_SECTION_HEADER));
+      BaseOfCode  = TeHdr->BaseOfCode - TeHdr->StrippedSize;
+    }
+  } else if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "could not parse a PE32 section from the PEI file", NULL);
+    return Status;
+  } else {
+    Status = GetPe32Info (
+              (VOID *) ((UINTN) Pe32Section.Pe32Section + sizeof (EFI_SECTION_PE32)),
+              &EntryPoint,
+              &BaseOfCode,
+              &MachineType
+              );
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "GetPe32Info() could not get PE32 entry point for PEI file", NULL);
+      return Status;
+    }
+  }
+  //
+  // Open the source file
+  //
+  SourceFile = fopen (SymFileName, "r");
+  if (SourceFile == NULL) {
+    //
+    // SYM files are not required.
+    //
+    return EFI_SUCCESS;
+  }
+  //
+  // Read the first line
+  //
+  if (fgets (Buffer, _MAX_PATH, SourceFile) == NULL) {
+    Buffer[0] = 0;
+  }
+  //
+  // Make sure it matches the expected sym format
+  //
+  if (strcmp (Buffer, "TEXTSYM format | V1.0\n")) {
+    fclose (SourceFile);
+    Error (NULL, 0, 0, "AddSymFile() found unexpected sym format in input file", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // Read in the file
+  //
+  while (feof (SourceFile) == 0) {
+    //
+    // Read a line
+    //
+    if (fscanf (
+          SourceFile,
+          "%s | %s | %s | %s\n",
+          Type,
+          Address,
+          Section,
+          Token
+          ) == 4) {
+      //
+      // If the token starts with "??" ignore it
+      //
+      if (Token[0] == '?' && Token[1] == '?') {
+        continue;
+      }
+      //
+      // Get the token address
+      //
+      AsciiStringToUint64 (Address, TRUE, &TokenAddress);
+
+      //
+      // Add the base address
+      //
+      TokenAddress += BaseAddress;
+
+      //
+      // If PE32 then find the start of code.  For PIC it is hardcoded.
+      //
+      if (TeHdr == NULL && Pe32Section.Pe32Section) {
+        //
+        // Add the offset of the PE32 section
+        //
+        TokenAddress += (UINTN) Pe32Section.Pe32Section - (UINTN) FfsFile;
+
+        //
+        // Add the size of the PE32 section header
+        //
+        TokenAddress += sizeof (EFI_PE32_SECTION);
+      } else if (TeHdr != NULL) {
+        //
+        // Add the Te section and FfsHeader
+        //
+        //
+        //  BUGBUG: Don't know why this is 0x28 bytes.
+        //
+        TokenAddress += (UINTN) TeHdr - (UINTN) FfsFile + 0x28;
+      } else {
+        //
+        // BUGBUG: Don't know why this is 0x28 bytes.
+        //
+        TokenAddress += 0x28;
+      }
+      //
+      // Add the beginning of the code
+      //
+      TokenAddress += BaseOfCode;
+
+      sprintf (
+        Buffer,
+        "%s | %016I64X | %s | _%s%s\n",
+        Type,
+        TokenAddress,
+        Section,
+        CodeModuleName,
+        Token
+        );
+      memcpy (SymImage->CurrentFilePointer, Buffer, strlen (Buffer) + 1);
+      SymImage->CurrentFilePointer = (UINT8 *) (((UINTN) SymImage->CurrentFilePointer) + strlen (Buffer) + 1);
+    }
+  }
+
+  fclose (SourceFile);
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddFile (
+  IN OUT MEMORY_FILE          *FvImage,
+  IN FV_INFO                  *FvInfo,
+  IN UINTN                    Index,
+  IN OUT EFI_FFS_FILE_HEADER  **VtfFileImage,
+  IN OUT MEMORY_FILE          *SymImage
+  )
+/*++
+
+Routine Description:
+
+  This function adds a file to the FV image.  The file will pad to the
+  appropriate alignment if required.
+
+Arguments:
+
+  FvImage       The memory image of the FV to add it to.  The current offset
+                must be valid.
+  FvInfo        Pointer to information about the FV.
+  Index         The file in the FvInfo file list to add.
+  VtfFileImage  A pointer to the VTF file within the FvImage.  If this is equal
+                to the end of the FvImage then no VTF previously found.
+  SymImage      The memory image of the Sym file to update if symbols are present.
+                The current offset must be valid.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              An error occurred.
+  EFI_OUT_OF_RESOURCES     Insufficient resources exist to complete the add.
+
+--*/
+{
+  FILE                  *NewFile;
+  UINTN                 FileSize;
+  UINT8                 *FileBuffer;
+  UINTN                 NumBytesRead;
+  UINT32                CurrentFileAlignment;
+  EFI_STATUS            Status;
+  EFI_PHYSICAL_ADDRESS  CurrentFileBaseAddress;
+  UINT8                 VtfHeaderChecksum;
+  UINT8                 VtfFileChecksum;
+  UINT8                 FileState;
+  EFI_FFS_FILE_TAIL     TailValue;
+  UINT32                TailSize;
+  //
+  // Verify input parameters.
+  //
+  if (FvImage == NULL || FvInfo == NULL || FvInfo->FvFiles[Index][0] == 0 || VtfFileImage == NULL || SymImage == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Read the file to add
+  //
+  NewFile = fopen (FvInfo->FvFiles[Index], "rb");
+
+  if (NewFile == NULL) {
+    Error (NULL, 0, 0, FvInfo->FvFiles[Index], "failed to open file for reading");
+    return EFI_ABORTED;
+  }
+  //
+  // Get the file size
+  //
+#ifdef __GNUC__
+  {
+    struct stat stat_buf;
+    fstat(fileno(NewFile), &stat_buf);
+    FileSize = stat_buf.st_size;
+  }
+#else
+  FileSize = _filelength (fileno (NewFile));
+#endif
+
+  //
+  // Read the file into a buffer
+  //
+  FileBuffer = malloc (FileSize);
+  if (FileBuffer == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  NumBytesRead = fread (FileBuffer, sizeof (UINT8), FileSize, NewFile);
+
+  //
+  // Done with the file, from this point on we will just use the buffer read.
+  //
+  fclose (NewFile);
+
+  //
+  // Verify read successful
+  //
+  if (NumBytesRead != sizeof (UINT8) * FileSize) {
+    free (FileBuffer);
+    Error (NULL, 0, 0, FvInfo->FvFiles[Index], "failed to read input file contents");
+    return EFI_ABORTED;
+  }
+  //
+  // Verify space exists to add the file
+  //
+  if (FileSize > (UINTN) ((UINTN) *VtfFileImage - (UINTN) FvImage->CurrentFilePointer)) {
+    Error (NULL, 0, 0, FvInfo->FvFiles[Index], "insufficient space remains to add the file");
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Update the file state based on polarity of the FV.
+  //
+  UpdateFfsFileState (
+    (EFI_FFS_FILE_HEADER *) FileBuffer,
+    (EFI_FIRMWARE_VOLUME_HEADER *) FvImage->FileImage
+    );
+
+  //
+  // If we have a VTF file, add it at the top.
+  //
+  if (IsVtfFile ((EFI_FFS_FILE_HEADER *) FileBuffer)) {
+    if ((UINTN) *VtfFileImage == (UINTN) FvImage->Eof) {
+      //
+      // No previous VTF, add this one.
+      //
+      *VtfFileImage = (EFI_FFS_FILE_HEADER *) (UINTN) ((UINTN) FvImage->FileImage + FvInfo->Size - FileSize);
+      //
+      // Sanity check. The file MUST align appropriately
+      //
+      if ((((UINTN) *VtfFileImage) & 0x07) != 0) {
+        Error (NULL, 0, 0, "VTF file does not align on 8-byte boundary", NULL);
+      }
+      //
+      // copy VTF File Header
+      //
+      memcpy (*VtfFileImage, FileBuffer, sizeof (EFI_FFS_FILE_HEADER));
+
+      //
+      // Copy VTF body
+      //
+      memcpy (
+        (UINT8 *) *VtfFileImage + sizeof (EFI_FFS_FILE_HEADER),
+        FileBuffer + sizeof (EFI_FFS_FILE_HEADER),
+        FileSize - sizeof (EFI_FFS_FILE_HEADER)
+        );
+
+      //
+      // re-calculate the VTF File Header
+      //
+      FileState = (*VtfFileImage)->State;
+      (*VtfFileImage)->State = 0;
+      *(UINT32 *) ((*VtfFileImage)->Size) = FileSize;
+      (*VtfFileImage)->IntegrityCheck.Checksum.Header = 0;
+      (*VtfFileImage)->IntegrityCheck.Checksum.File = 0;
+
+      VtfHeaderChecksum = CalculateChecksum8 ((UINT8 *) *VtfFileImage, sizeof (EFI_FFS_FILE_HEADER));
+      (*VtfFileImage)->IntegrityCheck.Checksum.Header = VtfHeaderChecksum;
+      //
+      // Determine if it has a tail
+      //
+      if ((*VtfFileImage)->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+        TailSize = sizeof (EFI_FFS_FILE_TAIL);
+      } else {
+        TailSize = 0;
+      }
+
+      if ((*VtfFileImage)->Attributes & FFS_ATTRIB_CHECKSUM) {
+        VtfFileChecksum = CalculateChecksum8 ((UINT8 *) *VtfFileImage, FileSize - TailSize);
+        (*VtfFileImage)->IntegrityCheck.Checksum.File = VtfFileChecksum;
+      } else {
+        (*VtfFileImage)->IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+      }
+      //
+      // If it has a file tail, update it
+      //
+      if ((*VtfFileImage)->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+        TailValue = (EFI_FFS_FILE_TAIL) (~((*VtfFileImage)->IntegrityCheck.TailReference));
+        *(EFI_FFS_FILE_TAIL *) (((UINTN) (*VtfFileImage) + GetLength ((*VtfFileImage)->Size) - sizeof (EFI_FFS_FILE_TAIL))) = TailValue;
+      }
+      (*VtfFileImage)->State = FileState;
+      free (FileBuffer);
+      return EFI_SUCCESS;
+    } else {
+      //
+      // Already found a VTF file.
+      //
+      Error (NULL, 0, 0, "multiple VTF files are illegal in a single FV", NULL);
+      free (FileBuffer);
+      return EFI_ABORTED;
+    }
+  }
+  //
+  // Check if alignment is required
+  //
+  Status = ReadFfsAlignment ((EFI_FFS_FILE_HEADER *) FileBuffer, &CurrentFileAlignment);
+  if (EFI_ERROR (Status)) {
+    printf ("ERROR: Could not determine alignment of file %s.\n", FvInfo->FvFiles[Index]);
+    free (FileBuffer);
+    return EFI_ABORTED;
+  }
+  //
+  // Add pad file if necessary
+  //
+  Status = AddPadFile (FvImage, CurrentFileAlignment);
+  if (EFI_ERROR (Status)) {
+    printf ("ERROR: Could not align the file data properly.\n");
+    free (FileBuffer);
+    return EFI_ABORTED;
+  }
+  //
+  // Add file
+  //
+  if ((FvImage->CurrentFilePointer + FileSize) < FvImage->Eof) {
+    //
+    // Copy the file
+    //
+    memcpy (FvImage->CurrentFilePointer, FileBuffer, FileSize);
+
+    //
+    // If the file is XIP, rebase
+    //
+    CurrentFileBaseAddress = FvInfo->BaseAddress + ((UINTN) FvImage->CurrentFilePointer - (UINTN) FvImage->FileImage);
+    //
+    //    Status = RebaseFfsFile ((EFI_FFS_FILE_HEADER*) FvImage->CurrentFilePointer, CurrentFileBaseAddress);
+    //    if (EFI_ERROR(Status)) {
+    //      printf ("ERROR: Could not rebase the file %s.\n", FvInfo->FvFiles[Index]);
+    //      return EFI_ABORTED;
+    //    }
+    //
+    // Update Symbol file
+    //
+    Status = AddSymFile (
+              CurrentFileBaseAddress,
+              (EFI_FFS_FILE_HEADER *) FvImage->CurrentFilePointer,
+              SymImage,
+              FvInfo->FvFiles[Index]
+              );
+    assert (!EFI_ERROR (Status));
+
+    //
+    // Update the current pointer in the FV image
+    //
+    FvImage->CurrentFilePointer += FileSize;
+  } else {
+    printf ("ERROR: The firmware volume is out of space, could not add file %s.\n", FvInfo->FvFiles[Index]);
+    return EFI_ABORTED;
+  }
+  //
+  // Make next file start at QWord Boundry
+  //
+  while (((UINTN) FvImage->CurrentFilePointer & 0x07) != 0) {
+    FvImage->CurrentFilePointer++;
+  }
+  //
+  // Free allocated memory.
+  //
+  free (FileBuffer);
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddVariableBlock (
+  IN UINT8                    *FvImage,
+  IN UINTN                    Size,
+  IN FV_INFO                  *FvInfo
+  )
+{
+  EFI_FIRMWARE_VOLUME_HEADER  *FvHeader;
+  VARIABLE_STORE_HEADER       *VarStoreHeader;
+  //
+  // Variable block should exclude FvHeader. Since the length of
+  // FvHeader depends on the block map, which is variable length,
+  // we could only decide the actual variable block length here.
+  //
+  FvHeader                  = (EFI_FIRMWARE_VOLUME_HEADER *) FvImage;
+  FvImage                   = FvImage + FvHeader->HeaderLength;
+
+  VarStoreHeader            = (VARIABLE_STORE_HEADER *) FvImage;
+
+  VarStoreHeader->Signature = VARIABLE_STORE_SIGNATURE;
+  VarStoreHeader->Size      = Size - FvHeader->HeaderLength;
+  VarStoreHeader->Format    = VARIABLE_STORE_FORMATTED;
+  VarStoreHeader->State     = VARIABLE_STORE_HEALTHY;
+  VarStoreHeader->Reserved  = 0;
+  VarStoreHeader->Reserved1 = 0;
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddEventLogBlock (
+  IN UINT8                    *FvImage,
+  IN UINTN                    Size,
+  IN FV_INFO                  *FvInfo
+  )
+{
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddFTWWorkingBlock (
+  IN UINT8                    *FvImage,
+  IN UINTN                    Size,
+  IN FV_INFO                  *FvInfo
+  )
+{
+  EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *FTWHeader;
+  UINT32                                  Crc32;
+
+  Crc32     = 0;
+  FTWHeader = (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER *) FvImage;
+  memcpy (&FTWHeader->Signature, &(FvInfo->FvGuid), sizeof (EFI_GUID));
+  FTWHeader->WriteQueueSize = Size - sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER);
+  CalculateCrc32 (FvImage, sizeof (EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER), &Crc32);
+  FTWHeader->Crc = Crc32;
+  if (FvInfo->FvAttributes & EFI_FVB_ERASE_POLARITY) {
+    FTWHeader->WorkingBlockValid    = 0;
+    FTWHeader->WorkingBlockInvalid  = 1;
+  } else {
+    FTWHeader->WorkingBlockValid    = 1;
+    FTWHeader->WorkingBlockInvalid  = 0;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+AddFTWSpareBlock (
+  IN UINT8                    *FvImage,
+  IN UINTN                    Size,
+  IN FV_INFO                  *FvInfo
+  )
+{
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GenNonFFSFv (
+  IN UINT8                    *FvImage,
+  IN FV_INFO                  *FvInfo
+  )
+/*++
+
+Routine Description:
+
+  This function generate the non FFS FV image, such as the working block
+  and spare block. How each component of the FV is built is component
+  specific.
+
+Arguments:
+
+  FvImage       The memory image of the FV to add it to.  The current offset
+                must be valid.
+  FvInfo        Pointer to information about the FV.
+
+Returns:
+
+  EFI_SUCCESS              The function completed successfully.
+  EFI_INVALID_PARAMETER    One of the input parameters was invalid.
+  EFI_ABORTED              An error occurred.
+  EFI_OUT_OF_RESOURCES     Insufficient resources exist to complete the add.
+
+--*/
+{
+  UINTN                       Index;
+  EFI_FIRMWARE_VOLUME_HEADER  *FvHeader;
+  UINT64                      TotalSize;
+
+  FvHeader  = (EFI_FIRMWARE_VOLUME_HEADER *) FvImage;
+  TotalSize = 0;
+
+  for (Index = 0; FvInfo->FvComponents[Index].Size != 0; Index++) {
+    if (stricmp (FvInfo->FvComponents[Index].ComponentName, EFI_NV_VARIABLE_STRING) == 0) {
+      AddVariableBlock (FvImage, FvInfo->FvComponents[Index].Size, FvInfo);
+    } else if (stricmp (FvInfo->FvComponents[Index].ComponentName, EFI_NV_EVENT_LOG_STRING) == 0) {
+      AddEventLogBlock (FvImage, FvInfo->FvComponents[Index].Size, FvInfo);
+    } else if (stricmp (FvInfo->FvComponents[Index].ComponentName, EFI_NV_FTW_WORKING_STRING) == 0) {
+      AddFTWWorkingBlock (FvImage, FvInfo->FvComponents[Index].Size, FvInfo);
+    } else if (stricmp (FvInfo->FvComponents[Index].ComponentName, EFI_NV_FTW_SPARE_STRING) == 0) {
+      AddFTWSpareBlock (FvImage, FvInfo->FvComponents[Index].Size, FvInfo);
+    } else {
+      printf ("Error. Unknown Non-FFS block %s \n", FvInfo->FvComponents[Index].ComponentName);
+      return EFI_ABORTED;
+    }
+
+    FvImage   = FvImage + FvInfo->FvComponents[Index].Size;
+    TotalSize = TotalSize + FvInfo->FvComponents[Index].Size;
+  }
+  //
+  // Index and TotalSize is zero mean there's no component, so this is an empty fv
+  //
+  if ((Index != 0 || TotalSize != 0) && TotalSize != FvInfo->Size) {
+    printf ("Error. Component size does not sum up to FV size.\n");
+    return EFI_ABORTED;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+PadFvImage (
+  IN MEMORY_FILE          *FvImage,
+  IN EFI_FFS_FILE_HEADER  *VtfFileImage
+  )
+/*++
+
+Routine Description:
+
+  This function places a pad file between the last file in the FV and the VTF
+  file if the VTF file exists.
+
+Arguments:
+
+  FvImage       Memory file for the FV memory image
+  VtfFileImage  The address of the VTF file.  If this is the end of the FV
+                image, no VTF exists and no pad file is needed.
+
+Returns:
+
+  EFI_SUCCESS             Completed successfully.
+  EFI_INVALID_PARAMETER   One of the input parameters was NULL.
+
+--*/
+{
+  EFI_FFS_FILE_HEADER *PadFile;
+  UINTN               FileSize;
+
+  //
+  // If there is no VTF or the VTF naturally follows the previous file without a
+  // pad file, then there's nothing to do
+  //
+  if ((UINTN) VtfFileImage == (UINTN) FvImage->Eof || (void *) FvImage->CurrentFilePointer == (void *) VtfFileImage) {
+    return EFI_SUCCESS;
+  }
+  //
+  // Pad file starts at beginning of free space
+  //
+  PadFile = (EFI_FFS_FILE_HEADER *) FvImage->CurrentFilePointer;
+
+  //
+  // write header
+  //
+  memset (PadFile, 0, sizeof (EFI_FFS_FILE_HEADER));
+  memcpy (&PadFile->Name, &DefaultFvPadFileNameGuid, sizeof (EFI_GUID));
+  PadFile->Type       = EFI_FV_FILETYPE_FFS_PAD;
+  PadFile->Attributes = 0;
+
+  //
+  // FileSize includes the EFI_FFS_FILE_HEADER
+  //
+  FileSize          = (UINTN) VtfFileImage - (UINTN) FvImage->CurrentFilePointer;
+  PadFile->Size[0]  = (UINT8) (FileSize & 0x000000FF);
+  PadFile->Size[1]  = (UINT8) ((FileSize & 0x0000FF00) >> 8);
+  PadFile->Size[2]  = (UINT8) ((FileSize & 0x00FF0000) >> 16);
+
+  //
+  // Fill in checksums and state, must be zero during checksum calculation.
+  //
+  PadFile->IntegrityCheck.Checksum.Header = 0;
+  PadFile->IntegrityCheck.Checksum.File   = 0;
+  PadFile->State                          = 0;
+  PadFile->IntegrityCheck.Checksum.Header = CalculateChecksum8 ((UINT8 *) PadFile, sizeof (EFI_FFS_FILE_HEADER));
+  if (PadFile->Attributes & FFS_ATTRIB_CHECKSUM) {
+    PadFile->IntegrityCheck.Checksum.File = CalculateChecksum8 ((UINT8 *) PadFile, FileSize);
+  } else {
+    PadFile->IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+  }
+
+  PadFile->State = EFI_FILE_HEADER_CONSTRUCTION | EFI_FILE_HEADER_VALID | EFI_FILE_DATA_VALID;
+
+  UpdateFfsFileState (
+    (EFI_FFS_FILE_HEADER *) PadFile,
+    (EFI_FIRMWARE_VOLUME_HEADER *) FvImage->FileImage
+    );
+  //
+  // Update the current FV pointer
+  //
+  FvImage->CurrentFilePointer = FvImage->Eof;
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+UpdateResetVector (
+  IN MEMORY_FILE            *FvImage,
+  IN FV_INFO                *FvInfo,
+  IN EFI_FFS_FILE_HEADER    *VtfFile
+  )
+/*++
+
+Routine Description:
+
+  This parses the FV looking for the PEI core and then plugs the address into
+  the SALE_ENTRY point of the BSF/VTF for IPF and does BUGBUG TBD action to
+  complete an IA32 Bootstrap FV.
+
+Arguments:
+
+  FvImage       Memory file for the FV memory image
+  FvInfo        Information read from INF file.
+  VtfFile       Pointer to the VTF file in the FV image.
+
+Returns:
+
+  EFI_SUCCESS             Function Completed successfully.
+  EFI_ABORTED             Error encountered.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+  EFI_NOT_FOUND           PEI Core file not found.
+
+--*/
+{
+  EFI_FFS_FILE_HEADER       *PeiCoreFile;
+  EFI_FFS_FILE_HEADER       *SecCoreFile;
+  EFI_STATUS                Status;
+  EFI_FILE_SECTION_POINTER  Pe32Section;
+  UINT32                    EntryPoint;
+  UINT32                    BaseOfCode;
+  UINT16                    MachineType;
+  EFI_PHYSICAL_ADDRESS      PeiCorePhysicalAddress;
+  EFI_PHYSICAL_ADDRESS      SecCorePhysicalAddress;
+  EFI_PHYSICAL_ADDRESS      *SecCoreEntryAddressPtr;
+  UINT32                    *Ia32ResetAddressPtr;
+  UINT8                     *BytePointer;
+  UINT8                     *BytePointer2;
+  UINT16                    *WordPointer;
+  UINT16                    CheckSum;
+  UINTN                     Index;
+  EFI_FFS_FILE_STATE        SavedState;
+  EFI_FFS_FILE_TAIL         TailValue;
+  UINT32                    TailSize;
+  UINT64                    FitAddress;
+  FIT_TABLE                 *FitTablePtr;
+
+  //
+  // Verify input parameters
+  //
+  if (FvImage == NULL || FvInfo == NULL || VtfFile == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Initialize FV library
+  //
+  InitializeFvLib (FvImage->FileImage, (UINTN) FvImage->Eof - (UINTN) FvImage->FileImage);
+
+  //
+  // Verify VTF file
+  //
+  Status = VerifyFfsFile (VtfFile);
+  if (EFI_ERROR (Status)) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Find the PEI Core
+  //
+  Status = GetFileByType (EFI_FV_FILETYPE_PEI_CORE, 1, &PeiCoreFile);
+  if (EFI_ERROR (Status) || PeiCoreFile == NULL) {
+    Error (NULL, 0, 0, "could not find the PEI core in the FV", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // PEI Core found, now find PE32 section
+  //
+  Status = GetSectionByType (PeiCoreFile, EFI_SECTION_PE32, 1, &Pe32Section);
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "could not find PE32 section in PEI core file", NULL);
+    return EFI_ABORTED;
+  }
+
+  Status = GetPe32Info (
+            (VOID *) ((UINTN) Pe32Section.Pe32Section + sizeof (EFI_SECTION_PE32)),
+            &EntryPoint,
+            &BaseOfCode,
+            &MachineType
+            );
+  if (EFI_ERROR (Status)) {
+    Error (NULL, 0, 0, "could not get PE32 entry point for PEI core", NULL);
+    return EFI_ABORTED;
+  }
+  //
+  // Physical address is FV base + offset of PE32 + offset of the entry point
+  //
+  PeiCorePhysicalAddress = FvInfo->BaseAddress;
+  PeiCorePhysicalAddress += (UINTN) Pe32Section.Pe32Section + sizeof (EFI_SECTION_PE32) - (UINTN) FvImage->FileImage;
+  PeiCorePhysicalAddress += EntryPoint;
+
+  if (MachineType == EFI_IMAGE_MACHINE_IA64) {
+    //
+    // Update PEI_CORE address
+    //
+    //
+    // Set the uncached attribute bit in the physical address
+    //
+    PeiCorePhysicalAddress |= 0x8000000000000000ULL;
+
+    //
+    // Check if address is aligned on a 16 byte boundary
+    //
+    if (PeiCorePhysicalAddress & 0xF) {
+      printf (
+        "ERROR: PEI_CORE entry point is not aligned on a 16 byte boundary, address specified is %Xh.\n",
+        PeiCorePhysicalAddress
+        );
+      return EFI_ABORTED;
+    }
+    //
+    // First Get the FIT table address
+    //
+    FitAddress  = (*(UINT64 *) (FvImage->Eof - IPF_FIT_ADDRESS_OFFSET)) & 0xFFFFFFFF;
+
+    FitTablePtr = (FIT_TABLE *) (FvImage->FileImage + (FitAddress - FvInfo->BaseAddress));
+
+    Status      = UpdatePeiCoreEntryInFit (FitTablePtr, PeiCorePhysicalAddress);
+
+    if (!EFI_ERROR (Status)) {
+      UpdateFitCheckSum (FitTablePtr);
+    }
+    //
+    // Find the Sec Core
+    //
+    Status = GetFileByType (EFI_FV_FILETYPE_SECURITY_CORE, 1, &SecCoreFile);
+    if (EFI_ERROR (Status) || SecCoreFile == NULL) {
+      Error (NULL, 0, 0, "could not find the Sec core in the FV", NULL);
+      return EFI_ABORTED;
+    }
+    //
+    // Sec Core found, now find PE32 section
+    //
+    Status = GetSectionByType (SecCoreFile, EFI_SECTION_PE32, 1, &Pe32Section);
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "could not find PE32 section in SEC core file", NULL);
+      return EFI_ABORTED;
+    }
+
+    Status = GetPe32Info (
+              (VOID *) ((UINTN) Pe32Section.Pe32Section + sizeof (EFI_SECTION_PE32)),
+              &EntryPoint,
+              &BaseOfCode,
+              &MachineType
+              );
+    if (EFI_ERROR (Status)) {
+      Error (NULL, 0, 0, "could not get PE32 entry point for SEC core", NULL);
+      return EFI_ABORTED;
+    }
+    //
+    // Physical address is FV base + offset of PE32 + offset of the entry point
+    //
+    SecCorePhysicalAddress = FvInfo->BaseAddress;
+    SecCorePhysicalAddress += (UINTN) Pe32Section.Pe32Section + sizeof (EFI_SECTION_PE32) - (UINTN) FvImage->FileImage;
+    SecCorePhysicalAddress += EntryPoint;
+
+    //
+    // Update SEC_CORE address
+    //
+    //
+    // Set the uncached attribute bit in the physical address
+    //
+    SecCorePhysicalAddress |= 0x8000000000000000ULL;
+
+    //
+    // Update the address
+    //
+    SecCoreEntryAddressPtr  = (EFI_PHYSICAL_ADDRESS *) ((UINTN) FvImage->Eof - IPF_SALE_ENTRY_ADDRESS_OFFSET);
+    *SecCoreEntryAddressPtr = SecCorePhysicalAddress;
+
+    //
+    // Check if address is aligned on a 16 byte boundary
+    //
+    if (SecCorePhysicalAddress & 0xF) {
+      printf (
+        "ERROR: SALE_ENTRY entry point is not aligned on a 16 byte boundary, address specified is %Xh.\n",
+        SecCorePhysicalAddress
+        );
+      return EFI_ABORTED;
+    }
+  } else if (MachineType == EFI_IMAGE_MACHINE_IA32) {
+    //
+    // Get the location to update
+    //
+    Ia32ResetAddressPtr = (UINT32 *) ((UINTN) FvImage->Eof - IA32_PEI_CORE_ENTRY_OFFSET);
+
+    //
+    // Write lower 32 bits of physical address
+    //
+    *Ia32ResetAddressPtr = (UINT32) PeiCorePhysicalAddress;
+
+    //
+    // Update the BFV base address
+    //
+    Ia32ResetAddressPtr   = (UINT32 *) ((UINTN) FvImage->Eof - 4);
+    *Ia32ResetAddressPtr  = (UINT32) (FvInfo->BaseAddress);
+
+    CheckSum              = 0x0000;
+
+    //
+    // Update the Startup AP in the FVH header block ZeroVector region.
+    //
+    BytePointer   = (UINT8 *) ((UINTN) FvImage->FileImage);
+    BytePointer2  = (FvInfo->Size == 0x10000) ? m64kRecoveryStartupApDataArray : m128kRecoveryStartupApDataArray;
+    for (Index = 0; Index < SIZEOF_STARTUP_DATA_ARRAY; Index++) {
+      *BytePointer++ = *BytePointer2++;
+    }
+    //
+    // Calculate the checksum
+    //
+    WordPointer = (UINT16 *) ((UINTN) FvImage->FileImage);
+    for (Index = 0; Index < SIZEOF_STARTUP_DATA_ARRAY / 2; Index++) {
+      CheckSum = (UINT16) (CheckSum + ((UINT16) *WordPointer));
+      WordPointer++;
+    }
+    //
+    // Update the checksum field
+    //
+    BytePointer = (UINT8 *) ((UINTN) FvImage->FileImage);
+    BytePointer += (SIZEOF_STARTUP_DATA_ARRAY - 2);
+    WordPointer   = (UINT16 *) BytePointer;
+    *WordPointer  = (UINT16) (0x10000 - (UINT32) CheckSum);
+  } else {
+    Error (NULL, 0, 0, "invalid machine type in PEI core", "machine type=0x%X", (UINT32) MachineType);
+    return EFI_ABORTED;
+  }
+  //
+  // Determine if it has an FFS file tail.
+  //
+  if (VtfFile->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+    TailSize = sizeof (EFI_FFS_FILE_TAIL);
+  } else {
+    TailSize = 0;
+  }
+  //
+  // Now update file checksum
+  //
+  SavedState  = VtfFile->State;
+  VtfFile->IntegrityCheck.Checksum.File = 0;
+  VtfFile->State                        = 0;
+  if (VtfFile->Attributes & FFS_ATTRIB_CHECKSUM) {
+    VtfFile->IntegrityCheck.Checksum.File = CalculateChecksum8 (
+                                              (UINT8 *) VtfFile,
+                                              GetLength (VtfFile->Size) - TailSize
+                                              );
+  } else {
+    VtfFile->IntegrityCheck.Checksum.File = FFS_FIXED_CHECKSUM;
+  }
+
+  VtfFile->State = SavedState;
+
+  //
+  // Update tail if present
+  //
+  if (VtfFile->Attributes & FFS_ATTRIB_TAIL_PRESENT) {
+    TailValue = (EFI_FFS_FILE_TAIL) (~(VtfFile->IntegrityCheck.TailReference));
+    *(EFI_FFS_FILE_TAIL *) (((UINTN) (VtfFile) + GetLength (VtfFile->Size) - sizeof (EFI_FFS_FILE_TAIL))) = TailValue;
+  }
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GetPe32Info (
+  IN UINT8                  *Pe32,
+  OUT UINT32                *EntryPoint,
+  OUT UINT32                *BaseOfCode,
+  OUT UINT16                *MachineType
+  )
+/*++
+
+Routine Description:
+
+  Retrieves the PE32 entry point offset and machine type.  See EfiImage.h for
+  machine types.  The entry point offset is from the beginning of the PE32
+  buffer passed in.
+
+Arguments:
+
+  Pe32          Beginning of the PE32.
+  EntryPoint    Offset from the beginning of the PE32 to the image entry point.
+  BaseOfCode    Base address of code.
+  MachineType   Magic number for the machine type.
+
+Returns:
+
+  EFI_SUCCESS             Function completed successfully.
+  EFI_ABORTED             Error encountered.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+  EFI_UNSUPPORTED         The operation is unsupported.
+
+--*/
+{
+  EFI_IMAGE_DOS_HEADER  *DosHeader;
+  EFI_IMAGE_NT_HEADERS  *NtHeader;
+
+  //
+  // Verify input parameters
+  //
+  if (Pe32 == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // First is the DOS header
+  //
+  DosHeader = (EFI_IMAGE_DOS_HEADER *) Pe32;
+
+  //
+  // Verify DOS header is expected
+  //
+  if (DosHeader->e_magic != EFI_IMAGE_DOS_SIGNATURE) {
+    printf ("ERROR: Unknown magic number in the DOS header, 0x%04X.\n", DosHeader->e_magic);
+    return EFI_UNSUPPORTED;
+  }
+  //
+  // Immediately following is the NT header.
+  //
+  NtHeader = (EFI_IMAGE_NT_HEADERS *) ((UINTN) Pe32 + DosHeader->e_lfanew);
+
+  //
+  // Verify NT header is expected
+  //
+  if (NtHeader->Signature != EFI_IMAGE_NT_SIGNATURE) {
+    printf ("ERROR: Unrecognized image signature 0x%08X.\n", NtHeader->Signature);
+    return EFI_UNSUPPORTED;
+  }
+  //
+  // Get output
+  //
+  *EntryPoint   = NtHeader->OptionalHeader.AddressOfEntryPoint;
+  *BaseOfCode   = NtHeader->OptionalHeader.BaseOfCode;
+  *MachineType  = NtHeader->FileHeader.Machine;
+
+  //
+  // Verify machine type is supported
+  //
+  if (*MachineType != EFI_IMAGE_MACHINE_IA32 && *MachineType != EFI_IMAGE_MACHINE_IA64 && *MachineType != EFI_IMAGE_MACHINE_X64 && *MachineType != EFI_IMAGE_MACHINE_EBC) {
+    printf ("ERROR: Unrecognized machine type in the PE32 file.\n");
+    return EFI_UNSUPPORTED;
+  }
+
+  return EFI_SUCCESS;
+}
+//
+// Exposed function implementations (prototypes are defined in GenFvImageLib.h)
+//
+EFI_STATUS
+GenerateFvImage (
+  IN CHAR8    *InfFileImage,
+  IN UINTN    InfFileSize,
+  OUT UINT8   **FvImage,
+  OUT UINTN   *FvImageSize,
+  OUT CHAR8   **FvFileName,
+  OUT UINT8   **SymImage,
+  OUT UINTN   *SymImageSize,
+  OUT CHAR8   **SymFileName
+  )
+/*++
+
+Routine Description:
+
+  This is the main function which will be called from application.
+
+Arguments:
+
+  InfFileImage  Buffer containing the INF file contents.
+  InfFileSize   Size of the contents of the InfFileImage buffer.
+  FvImage       Pointer to the FV image created.
+  FvImageSize   Size of the FV image created and pointed to by FvImage.
+  FvFileName    Requested name for the FV file.
+  SymImage      Pointer to the Sym image created.
+  SymImageSize  Size of the Sym image created and pointed to by SymImage.
+  SymFileName   Requested name for the Sym file.
+
+Returns:
+
+  EFI_SUCCESS             Function completed successfully.
+  EFI_OUT_OF_RESOURCES    Could not allocate required resources.
+  EFI_ABORTED             Error encountered.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+
+--*/
+{
+  EFI_STATUS                  Status;
+  MEMORY_FILE                 InfMemoryFile;
+  MEMORY_FILE                 FvImageMemoryFile;
+  MEMORY_FILE                 SymImageMemoryFile;
+  FV_INFO                     FvInfo;
+  UINTN                       Index;
+  EFI_FIRMWARE_VOLUME_HEADER  *FvHeader;
+  EFI_FFS_FILE_HEADER         *VtfFileImage;
+
+  //
+  // Check for invalid parameter
+  //
+  if (InfFileImage == NULL || FvImage == NULL || FvImageSize == NULL || FvFileName == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Initialize file structures
+  //
+  InfMemoryFile.FileImage           = InfFileImage;
+  InfMemoryFile.CurrentFilePointer  = InfFileImage;
+  InfMemoryFile.Eof                 = InfFileImage + InfFileSize;
+
+  //
+  // Parse the FV inf file for header information
+  //
+  Status = ParseFvInf (&InfMemoryFile, &FvInfo);
+  if (EFI_ERROR (Status)) {
+    printf ("ERROR: Could not parse the input INF file.\n");
+    return EFI_ABORTED;
+  }
+  //
+  // Update the file name return values
+  //
+  strcpy (*FvFileName, FvInfo.FvName);
+  strcpy (*SymFileName, FvInfo.SymName);
+
+  //
+  // Calculate the FV size
+  //
+  *FvImageSize = FvInfo.Size;
+
+  //
+  // Allocate the FV
+  //
+  *FvImage = malloc (*FvImageSize);
+  if (*FvImage == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Allocate space for symbol file storage
+  //
+  *SymImage = malloc (SYMBOL_FILE_SIZE);
+  if (*SymImage == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // Initialize the FV to the erase polarity
+  //
+  if (FvInfo.FvAttributes & EFI_FVB_ERASE_POLARITY) {
+    memset (*FvImage, -1, *FvImageSize);
+  } else {
+    memset (*FvImage, 0, *FvImageSize);
+  }
+  //
+  // Initialize FV header
+  //
+  FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) *FvImage;
+
+  //
+  // Initialize the zero vector to all zeros.
+  //
+  memset (FvHeader->ZeroVector, 0, 16);
+
+  //
+  // Copy the FFS GUID
+  //
+  memcpy (&FvHeader->FileSystemGuid, &FvInfo.FvGuid, sizeof (EFI_GUID));
+
+  FvHeader->FvLength    = *FvImageSize;
+  FvHeader->Signature   = EFI_FVH_SIGNATURE;
+  FvHeader->Attributes  = FvInfo.FvAttributes;
+  FvHeader->Revision    = EFI_FVH_REVISION;
+  FvHeader->Reserved[0] = 0;
+  FvHeader->Reserved[1] = 0;
+  FvHeader->Reserved[2] = 0;
+
+  //
+  // Copy firmware block map
+  //
+  for (Index = 0; FvInfo.FvBlocks[Index].NumBlocks != 0; Index++) {
+    FvHeader->FvBlockMap[Index].NumBlocks   = FvInfo.FvBlocks[Index].NumBlocks;
+    FvHeader->FvBlockMap[Index].BlockLength = FvInfo.FvBlocks[Index].BlockLength;
+  }
+  //
+  // Add block map terminator
+  //
+  FvHeader->FvBlockMap[Index].NumBlocks   = 0;
+  FvHeader->FvBlockMap[Index].BlockLength = 0;
+
+  //
+  // Complete the header
+  //
+  FvHeader->HeaderLength  = (UINT16) (((UINTN) &(FvHeader->FvBlockMap[Index + 1])) - (UINTN) *FvImage);
+  FvHeader->Checksum      = 0;
+  FvHeader->Checksum      = CalculateChecksum16 ((UINT16 *) FvHeader, FvHeader->HeaderLength / sizeof (UINT16));
+
+  //
+  // If there is no FFS file, find and generate each components of the FV
+  //
+  if (FvInfo.FvFiles[0][0] == 0) {
+    Status = GenNonFFSFv (*FvImage, &FvInfo);
+    if (EFI_ERROR (Status)) {
+      printf ("ERROR: Could not generate NonFFS FV.\n");
+      free (*FvImage);
+      return EFI_ABORTED;
+    }
+
+    return EFI_SUCCESS;
+  }
+  //
+  // Initialize our "file" view of the buffer
+  //
+  FvImageMemoryFile.FileImage           = *FvImage;
+  FvImageMemoryFile.CurrentFilePointer  = *FvImage + FvHeader->HeaderLength;
+  FvImageMemoryFile.Eof                 = *FvImage +*FvImageSize;
+
+  //
+  // Initialize our "file" view of the symbol file.
+  //
+  SymImageMemoryFile.FileImage          = *SymImage;
+  SymImageMemoryFile.CurrentFilePointer = *SymImage;
+  SymImageMemoryFile.Eof                = *FvImage + SYMBOL_FILE_SIZE;
+
+  //
+  // Initialize the FV library.
+  //
+  InitializeFvLib (FvImageMemoryFile.FileImage, FvInfo.Size);
+
+  //
+  // Files start on 8 byte alignments, so move to the next 8 byte aligned
+  // address.  For now, just assert if it isn't.  Currently FV header is
+  // always a multiple of 8 bytes.
+  // BUGBUG: Handle this better
+  //
+  assert ((((UINTN) FvImageMemoryFile.CurrentFilePointer) % 8) == 0);
+
+  //
+  // Initialize the VTF file address.
+  //
+  VtfFileImage = (EFI_FFS_FILE_HEADER *) FvImageMemoryFile.Eof;
+
+  //
+  // Add files to FV
+  //
+  for (Index = 0; FvInfo.FvFiles[Index][0] != 0; Index++) {
+    //
+    // Add the file
+    //
+    Status = AddFile (&FvImageMemoryFile, &FvInfo, Index, &VtfFileImage, &SymImageMemoryFile);
+
+    //
+    // Exit if error detected while adding the file
+    //
+    if (EFI_ERROR (Status)) {
+      printf ("ERROR: Could not add file %s.\n", FvInfo.FvFiles[Index]);
+      free (*FvImage);
+      return EFI_ABORTED;
+    }
+  }
+  //
+  // If there is a VTF file, some special actions need to occur.
+  //
+  if ((UINTN) VtfFileImage != (UINTN) FvImageMemoryFile.Eof) {
+    //
+    // Pad from the end of the last file to the beginning of the VTF file.
+    //
+    Status = PadFvImage (&FvImageMemoryFile, VtfFileImage);
+    if (EFI_ERROR (Status)) {
+      printf ("ERROR: Could not create the pad file between the last file and the VTF file.\n");
+      free (*FvImage);
+      return EFI_ABORTED;
+    }
+    //
+    // Update reset vector (SALE_ENTRY for IPF)
+    // Now for IA32 and IA64 platform, the fv which has bsf file must have the 
+    // EndAddress of 0xFFFFFFFF. Thus, only this type fv needs to update the   
+    // reset vector. If the PEI Core is found, the VTF file will probably get  
+    // corrupted by updating the entry point.                                  
+    //
+    if ((FvInfo.BaseAddress + FvInfo.Size) == FV_IMAGES_TOP_ADDRESS) {       
+      Status = UpdateResetVector (&FvImageMemoryFile, &FvInfo, VtfFileImage);
+      if (EFI_ERROR(Status)) {                                               
+        printf ("ERROR: Could not update the reset vector.\n");              
+        free (*FvImage);                                                     
+        return EFI_ABORTED;                                                  
+      }                                                                      
+    }
+  } 
+  //
+  // Determine final Sym file size
+  //
+  *SymImageSize = SymImageMemoryFile.CurrentFilePointer - SymImageMemoryFile.FileImage;
+
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+UpdatePeiCoreEntryInFit (
+  IN FIT_TABLE     *FitTablePtr,
+  IN UINT64        PeiCorePhysicalAddress
+  )
+/*++
+
+Routine Description:
+
+  This function is used to update the Pei Core address in FIT, this can be used by Sec core to pass control from
+  Sec to Pei Core
+
+Arguments:
+
+  FitTablePtr             - The pointer of FIT_TABLE.
+  PeiCorePhysicalAddress  - The address of Pei Core entry.
+
+Returns:
+
+  EFI_SUCCESS             - The PEI_CORE FIT entry was updated successfully.
+  EFI_NOT_FOUND           - Not found the PEI_CORE FIT entry.
+
+--*/
+{
+  FIT_TABLE *TmpFitPtr;
+  UINTN     Index;
+  UINTN     NumFitComponents;
+
+  TmpFitPtr         = FitTablePtr;
+  NumFitComponents  = TmpFitPtr->CompSize;
+
+  for (Index = 0; Index < NumFitComponents; Index++) {
+    if ((TmpFitPtr->CvAndType & FIT_TYPE_MASK) == COMP_TYPE_FIT_PEICORE) {
+      TmpFitPtr->CompAddress = PeiCorePhysicalAddress;
+      return EFI_SUCCESS;
+    }
+
+    TmpFitPtr++;
+  }
+
+  return EFI_NOT_FOUND;
+}
+
+VOID
+UpdateFitCheckSum (
+  IN FIT_TABLE   *FitTablePtr
+  )
+/*++
+
+Routine Description:
+
+  This function is used to update the checksum for FIT.
+
+
+Arguments:
+
+  FitTablePtr             - The pointer of FIT_TABLE.
+
+Returns:
+
+  None.
+
+--*/
+{
+  if ((FitTablePtr->CvAndType & CHECKSUM_BIT_MASK) >> 7) {
+    FitTablePtr->CheckSum = 0;
+    FitTablePtr->CheckSum = CalculateChecksum8 ((UINT8 *) FitTablePtr, FitTablePtr->CompSize * 16);
+  }
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
new file mode 100644
index 0000000000..cc761b8e5a
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLib.h
@@ -0,0 +1,140 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  GenFvImageLib.h
+
+Abstract:
+
+  This file contains describes the public interfaces to the GenFvImage Library.
+  The basic purpose of the library is to create Firmware Volume images.
+
+--*/
+
+#ifndef _EFI_GEN_FV_IMAGE_LIB_H
+#define _EFI_GEN_FV_IMAGE_LIB_H
+
+//
+// Include files
+//
+// #include "Efi2WinNT.h"
+#include "ParseInf.h"
+
+//
+// Following definition is used for FIT in IPF
+//
+#define COMP_TYPE_FIT_PEICORE 0x10
+#define COMP_TYPE_FIT_UNUSED  0x7F
+
+#define FIT_TYPE_MASK         0x7F
+#define CHECKSUM_BIT_MASK     0x80
+
+#pragma pack(1)
+
+typedef struct {
+  UINT64  CompAddress;
+  UINT32  CompSize;
+  UINT16  CompVersion;
+  UINT8   CvAndType;
+  UINT8   CheckSum;
+} FIT_TABLE;
+
+#pragma pack()
+//
+// Exported function prototypes
+//
+EFI_STATUS
+GenerateFvImage (
+  IN CHAR8    *InfFileImage,
+  IN UINTN    InfFileSize,
+  OUT UINT8   **FvImage,
+  OUT UINTN   *FvImageSize,
+  OUT CHAR8   **FvFileName,
+  OUT UINT8   **SymImage,
+  OUT UINTN   *SymImageSize,
+  OUT CHAR8   **SymFileName
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This is the main function which will be called from application.
+
+Arguments:
+
+  InfFileImage  Buffer containing the INF file contents.
+  InfFileSize   Size of the contents of the InfFileImage buffer.
+  FvImage       Pointer to the FV image created.
+  FvImageSize   Size of the FV image created and pointed to by FvImage.
+  FvFileName    Requested name for the FV file.
+  SymImage      Pointer to the Sym image created.
+  SymImageSize  Size of the Sym image created and pointed to by SymImage.
+  SymFileName   Requested name for the Sym file.
+    
+Returns:
+ 
+  EFI_SUCCESS             Function completed successfully.
+  EFI_OUT_OF_RESOURCES    Could not allocate required resources.
+  EFI_ABORTED             Error encountered.
+  EFI_INVALID_PARAMETER   A required parameter was NULL.
+
+--*/
+EFI_STATUS
+UpdatePeiCoreEntryInFit (
+  IN FIT_TABLE     *FitTablePtr,
+  IN UINT64        PeiCorePhysicalAddress
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function is used to update the Pei Core address in FIT, this can be used by Sec core to pass control from
+  Sec to Pei Core
+
+Arguments:
+
+  FitTablePtr             - The pointer of FIT_TABLE.
+  PeiCorePhysicalAddress  - The address of Pei Core entry.
+
+Returns:
+
+  EFI_SUCCESS             - The PEI_CORE FIT entry was updated successfully.
+  EFI_NOT_FOUND           - Not found the PEI_CORE FIT entry.
+
+--*/
+VOID
+UpdateFitCheckSum (
+  IN FIT_TABLE   *FitTablePtr
+  )
+;
+
+/*++
+
+Routine Description:
+
+  This function is used to update the checksum for FIT.
+
+
+Arguments:
+
+  FitTablePtr             - The pointer of FIT_TABLE.
+
+Returns:
+
+  None.
+
+--*/
+#endif
diff --git a/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
new file mode 100644
index 0000000000..f38fe1151a
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/GenFvImageLibInternal.h
@@ -0,0 +1,170 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  
+  GenFvImageLibInternal.h
+
+Abstract:
+
+  This file contains describes the private declarations for the GenFvImage Library.
+  The basic purpose of the library is to create Firmware Volume images.
+
+--*/
+
+#ifndef _EFI_GEN_FV_IMAGE_LIB_INTERNAL_H
+#define _EFI_GEN_FV_IMAGE_LIB_INTERNAL_H
+
+//
+// Include files
+//
+#include "GenFvImageLib.h"
+#include <stdlib.h>
+#include <CommonLib.h>
+#include "FirmwareVolumeHeader.h"
+
+//
+// Private data declarations
+//
+//
+// The maximum number of block map entries supported by the library
+//
+#define MAX_NUMBER_OF_FV_BLOCKS 100
+
+//
+// The maximum number of files in the FV supported by the library
+//
+#define MAX_NUMBER_OF_FILES_IN_FV       1000
+#define MAX_NUMBER_OF_COMPONENTS_IN_FV  10
+
+//
+// INF file strings
+//
+#define OPTIONS_SECTION_STRING            "[options]"
+#define ATTRIBUTES_SECTION_STRING         "[attributes]"
+#define FILES_SECTION_STRING              "[files]"
+#define COMPONENT_SECTION_STRING          "[components]"
+
+#define EFI_FV_BASE_ADDRESS_STRING        "EFI_BASE_ADDRESS"
+#define EFI_FV_FILE_NAME_STRING           "EFI_FILE_NAME"
+#define EFI_SYM_FILE_NAME_STRING          "EFI_SYM_FILE_NAME"
+#define EFI_NUM_BLOCKS_STRING             "EFI_NUM_BLOCKS"
+#define EFI_BLOCK_SIZE_STRING             "EFI_BLOCK_SIZE"
+#define EFI_FV_GUID_STRING                "EFI_FV_GUID"
+
+#define EFI_FVB_READ_DISABLED_CAP_STRING  "EFI_READ_DISABLED_CAP"
+#define EFI_FVB_READ_ENABLED_CAP_STRING   "EFI_READ_ENABLED_CAP"
+#define EFI_FVB_READ_STATUS_STRING        "EFI_READ_STATUS"
+
+#define EFI_FVB_WRITE_DISABLED_CAP_STRING "EFI_WRITE_DISABLED_CAP"
+#define EFI_FVB_WRITE_ENABLED_CAP_STRING  "EFI_WRITE_ENABLED_CAP"
+#define EFI_FVB_WRITE_STATUS_STRING       "EFI_WRITE_STATUS"
+
+#define EFI_FVB_LOCK_CAP_STRING           "EFI_LOCK_CAP"
+#define EFI_FVB_LOCK_STATUS_STRING        "EFI_LOCK_STATUS"
+
+#define EFI_FVB_STICKY_WRITE_STRING       "EFI_STICKY_WRITE"
+#define EFI_FVB_MEMORY_MAPPED_STRING      "EFI_MEMORY_MAPPED"
+#define EFI_FVB_ERASE_POLARITY_STRING     "EFI_ERASE_POLARITY"
+
+#define EFI_FVB_ALIGNMENT_CAP_STRING      "EFI_ALIGNMENT_CAP"
+#define EFI_FVB_ALIGNMENT_2_STRING        "EFI_ALIGNMENT_2"
+#define EFI_FVB_ALIGNMENT_4_STRING        "EFI_ALIGNMENT_4"
+#define EFI_FVB_ALIGNMENT_8_STRING        "EFI_ALIGNMENT_8"
+#define EFI_FVB_ALIGNMENT_16_STRING       "EFI_ALIGNMENT_16"
+#define EFI_FVB_ALIGNMENT_32_STRING       "EFI_ALIGNMENT_32"
+#define EFI_FVB_ALIGNMENT_64_STRING       "EFI_ALIGNMENT_64"
+#define EFI_FVB_ALIGNMENT_128_STRING      "EFI_ALIGNMENT_128"
+#define EFI_FVB_ALIGNMENT_256_STRING      "EFI_ALIGNMENT_256"
+#define EFI_FVB_ALIGNMENT_512_STRING      "EFI_ALIGNMENT_512"
+#define EFI_FVB_ALIGNMENT_1K_STRING       "EFI_ALIGNMENT_1K"
+#define EFI_FVB_ALIGNMENT_2K_STRING       "EFI_ALIGNMENT_2K"
+#define EFI_FVB_ALIGNMENT_4K_STRING       "EFI_ALIGNMENT_4K"
+#define EFI_FVB_ALIGNMENT_8K_STRING       "EFI_ALIGNMENT_8K"
+#define EFI_FVB_ALIGNMENT_16K_STRING      "EFI_ALIGNMENT_16K"
+#define EFI_FVB_ALIGNMENT_32K_STRING      "EFI_ALIGNMENT_32K"
+#define EFI_FVB_ALIGNMENT_64K_STRING      "EFI_ALIGNMENT_64K"
+
+//
+// Component sections
+//
+#define EFI_NV_VARIABLE_STRING    "EFI_NV_VARIABLE"
+#define EFI_NV_EVENT_LOG_STRING   "EFI_NV_EVENT_LOG"
+#define EFI_NV_FTW_WORKING_STRING "EFI_NV_FTW_WORKING"
+#define EFI_NV_FTW_SPARE_STRING   "EFI_NV_FTW_SPARE"
+
+#define EFI_FILE_NAME_STRING      "EFI_FILE_NAME"
+
+#define ONE_STRING                "1"
+#define ZERO_STRING               "0"
+#define TRUE_STRING               "TRUE"
+#define FALSE_STRING              "FALSE"
+#define NULL_STRING               "NULL"
+
+//
+// Defines to calculate the offset for PEI CORE entry points
+//
+#define IA32_PEI_CORE_ENTRY_OFFSET  0x20
+
+//
+// Defines to calculate the FIT table
+//
+#define IPF_FIT_ADDRESS_OFFSET  0x20
+
+//
+// Defines to calculate the offset for SALE_ENTRY
+//
+#define IPF_SALE_ENTRY_ADDRESS_OFFSET 0x18
+
+//
+// Symbol file definitions, current max size if 512K
+//
+#define SYMBOL_FILE_SIZE  0x80000
+
+#define FV_IMAGES_TOP_ADDRESS             0x100000000ULL
+
+//
+// Private data types
+//
+//
+// Component information
+//
+typedef struct {
+  UINTN Size;
+  CHAR8 ComponentName[_MAX_PATH];
+} COMPONENT_INFO;
+
+//
+// FV information holder
+//
+typedef struct {
+  EFI_PHYSICAL_ADDRESS    BaseAddress;
+  EFI_GUID                FvGuid;
+  UINTN                   Size;
+  CHAR8                   FvName[_MAX_PATH];
+  CHAR8                   SymName[_MAX_PATH];
+  EFI_FV_BLOCK_MAP_ENTRY  FvBlocks[MAX_NUMBER_OF_FV_BLOCKS];
+  EFI_FVB_ATTRIBUTES      FvAttributes;
+  CHAR8                   FvFiles[MAX_NUMBER_OF_FILES_IN_FV][_MAX_PATH];
+  COMPONENT_INFO          FvComponents[MAX_NUMBER_OF_COMPONENTS_IN_FV];
+} FV_INFO;
+
+//
+// Private function prototypes
+//
+EFI_STATUS
+ParseFvInf (
+  IN MEMORY_FILE  *InfFile,
+  IN FV_INFO      *FvInfo
+  )
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/GenFvImage/Ia32/PeCoffLoaderEx.c b/Tools/Source/TianoTools/GenFvImage/Ia32/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..0af4340fcb
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/Ia32/PeCoffLoaderEx.c
@@ -0,0 +1,64 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.c
+
+Abstract:
+
+    IA-32 Specific relocation fixups
+
+Revision History
+
+--*/
+
+
+#define EFI_SPECIFICATION_VERSION    0x00000000
+#define EDK_RELEASE_VERSION          0x00020000
+#include <Base.h>
+#include <Library/PeCoffLib.h>
+#include <Library/BaseMemoryLib.h>
+
+
+
+
+RETURN_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup,
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an IA-32 specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  EFI_UNSUPPORTED   - Unsupported now
+
+--*/
+{
+  return RETURN_UNSUPPORTED;
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/Ipf/PeCoffLoaderEx.c b/Tools/Source/TianoTools/GenFvImage/Ipf/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..2a58a62f6d
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/Ipf/PeCoffLoaderEx.c
@@ -0,0 +1,251 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+    PeCoffLoaderEx.c
+
+Abstract:
+
+    Fixes Intel Itanium(TM) specific relocation types
+
+
+Revision History
+
+--*/
+
+#define EFI_SPECIFICATION_VERSION    0x00000000
+#define EDK_RELEASE_VERSION          0x00020000
+#include <Base.h>
+#include <Library/PeCoffLib.h>
+#include <Library/BaseMemoryLib.h>
+
+
+
+
+
+#define EXT_IMM64(Value, Address, Size, InstPos, ValPos)  \
+    Value |= (((UINT64)((*(Address) >> InstPos) & (((UINT64)1 << Size) - 1))) << ValPos)
+
+#define INS_IMM64(Value, Address, Size, InstPos, ValPos)  \
+    *(UINT32*)Address = (*(UINT32*)Address & ~(((1 << Size) - 1) << InstPos)) | \
+          ((UINT32)((((UINT64)Value >> ValPos) & (((UINT64)1 << Size) - 1))) << InstPos)
+
+#define IMM64_IMM7B_INST_WORD_X         3  
+#define IMM64_IMM7B_SIZE_X              7  
+#define IMM64_IMM7B_INST_WORD_POS_X     4  
+#define IMM64_IMM7B_VAL_POS_X           0  
+
+#define IMM64_IMM9D_INST_WORD_X         3  
+#define IMM64_IMM9D_SIZE_X              9  
+#define IMM64_IMM9D_INST_WORD_POS_X     18  
+#define IMM64_IMM9D_VAL_POS_X           7  
+
+#define IMM64_IMM5C_INST_WORD_X         3  
+#define IMM64_IMM5C_SIZE_X              5  
+#define IMM64_IMM5C_INST_WORD_POS_X     13  
+#define IMM64_IMM5C_VAL_POS_X           16  
+
+#define IMM64_IC_INST_WORD_X            3  
+#define IMM64_IC_SIZE_X                 1  
+#define IMM64_IC_INST_WORD_POS_X        12  
+#define IMM64_IC_VAL_POS_X              21  
+
+#define IMM64_IMM41a_INST_WORD_X        1  
+#define IMM64_IMM41a_SIZE_X             10  
+#define IMM64_IMM41a_INST_WORD_POS_X    14  
+#define IMM64_IMM41a_VAL_POS_X          22  
+
+#define IMM64_IMM41b_INST_WORD_X        1  
+#define IMM64_IMM41b_SIZE_X             8  
+#define IMM64_IMM41b_INST_WORD_POS_X    24  
+#define IMM64_IMM41b_VAL_POS_X          32  
+
+#define IMM64_IMM41c_INST_WORD_X        2  
+#define IMM64_IMM41c_SIZE_X             23  
+#define IMM64_IMM41c_INST_WORD_POS_X    0  
+#define IMM64_IMM41c_VAL_POS_X          40  
+
+#define IMM64_SIGN_INST_WORD_X          3  
+#define IMM64_SIGN_SIZE_X               1  
+#define IMM64_SIGN_INST_WORD_POS_X      27  
+#define IMM64_SIGN_VAL_POS_X            63  
+
+RETURN_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup, 
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+
+  Performs an Itanium-based specific relocation fixup
+
+Arguments:
+
+  Reloc      - Pointer to the relocation record
+
+  Fixup      - Pointer to the address to fix up
+
+  FixupData  - Pointer to a buffer to log the fixups
+
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+
+  Status code
+
+--*/
+{
+  UINT64      *F64;
+  UINT64      FixupVal;
+
+  switch ((*Reloc) >> 12) {
+
+    case EFI_IMAGE_REL_BASED_DIR64:
+      F64 = (UINT64 *) Fixup;
+      *F64 = *F64 + (UINT64) Adjust;
+      if (*FixupData != NULL) {
+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
+        *(UINT64 *)(*FixupData) = *F64;
+        *FixupData = *FixupData + sizeof(UINT64);
+      }
+      break;
+
+    case EFI_IMAGE_REL_BASED_IA64_IMM64:
+
+      //
+      // Align it to bundle address before fixing up the
+      // 64-bit immediate value of the movl instruction.
+      //
+
+      Fixup = (CHAR8 *)((UINTN) Fixup & (UINTN) ~(15));
+      FixupVal = (UINT64)0;
+                       
+      // 
+      // Extract the lower 32 bits of IMM64 from bundle
+      //
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM7B_INST_WORD_X,
+                IMM64_IMM7B_SIZE_X,
+                IMM64_IMM7B_INST_WORD_POS_X,
+                IMM64_IMM7B_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM9D_INST_WORD_X,
+                IMM64_IMM9D_SIZE_X,
+                IMM64_IMM9D_INST_WORD_POS_X,
+                IMM64_IMM9D_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM5C_INST_WORD_X,
+                IMM64_IMM5C_SIZE_X,
+                IMM64_IMM5C_INST_WORD_POS_X,
+                IMM64_IMM5C_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IC_INST_WORD_X,
+                IMM64_IC_SIZE_X,
+                IMM64_IC_INST_WORD_POS_X,
+                IMM64_IC_VAL_POS_X
+                );
+
+      EXT_IMM64(FixupVal,
+                (UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X,
+                IMM64_IMM41a_SIZE_X,
+                IMM64_IMM41a_INST_WORD_POS_X,
+                IMM64_IMM41a_VAL_POS_X
+                );
+                       
+      // 
+      // Update 64-bit address
+      //
+      FixupVal += Adjust;
+
+      // 
+      // Insert IMM64 into bundle
+      //
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM7B_INST_WORD_X),
+                IMM64_IMM7B_SIZE_X,
+                IMM64_IMM7B_INST_WORD_POS_X,
+                IMM64_IMM7B_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM9D_INST_WORD_X),
+                IMM64_IMM9D_SIZE_X,
+                IMM64_IMM9D_INST_WORD_POS_X,
+                IMM64_IMM9D_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM5C_INST_WORD_X),
+                IMM64_IMM5C_SIZE_X,
+                IMM64_IMM5C_INST_WORD_POS_X,
+                IMM64_IMM5C_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IC_INST_WORD_X),
+                IMM64_IC_SIZE_X,
+                IMM64_IC_INST_WORD_POS_X,
+                IMM64_IC_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41a_INST_WORD_X),
+                IMM64_IMM41a_SIZE_X,
+                IMM64_IMM41a_INST_WORD_POS_X,
+                IMM64_IMM41a_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41b_INST_WORD_X),
+                IMM64_IMM41b_SIZE_X,
+                IMM64_IMM41b_INST_WORD_POS_X,
+                IMM64_IMM41b_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_IMM41c_INST_WORD_X),
+                IMM64_IMM41c_SIZE_X,
+                IMM64_IMM41c_INST_WORD_POS_X,
+                IMM64_IMM41c_VAL_POS_X
+                );
+
+      INS_IMM64(FixupVal,
+                ((UINT32 *)Fixup + IMM64_SIGN_INST_WORD_X),
+                IMM64_SIGN_SIZE_X,
+                IMM64_SIGN_INST_WORD_POS_X,
+                IMM64_SIGN_VAL_POS_X
+                );
+
+      F64 = (UINT64 *) Fixup;
+      if (*FixupData != NULL) {
+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
+        *(UINT64 *)(*FixupData) = *F64;
+        *FixupData = *FixupData + sizeof(UINT64);
+      }
+      break;
+
+    default:
+      return RETURN_UNSUPPORTED;
+  }
+
+  return RETURN_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/GenFvImage/build.gcc b/Tools/Source/TianoTools/GenFvImage/build.gcc
new file mode 100644
index 0000000000..6cc8a9959f
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/build.gcc
@@ -0,0 +1,3 @@
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ia32/*.c *.c -o GenFvImage_IA32 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  x64/*.c *.c -o GenFvImage_X64 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ipf/*.c *.c -o GenFvImage_IPF -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid
diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
new file mode 100644
index 0000000000..6c9970625e
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenFvImage Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenFvImage"/>
+  <property name="FileSet" value="BasePeCoff.c GenFvImageLib.c GenFvImageExe.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR_IA32" value="${PACKAGE_DIR}/${ToolName}/tmp/Ia32"/>
+  <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${ToolName}/tmp/X64"/>
+  <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${ToolName}/tmp/Ipf"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR_IA32}"/>
+    <mkdir dir="${BUILD_DIR_X64}"/>
+    <mkdir dir="${BUILD_DIR_IPF}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init, GenFvImage, GenFvImage_IA32, GenFvImage_X64, GenFvImage_IPF"/>
+
+  <target name="GenFvImage">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <defineset>
+        <define name="BUILDING_TOOLS"/>
+        <define name="TOOL_BUILD_IA32_TARGET"/>
+      </defineset>
+    
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet} Ia32/PeCoffLoaderEx.c" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${PACKAGE_DIR}/${ToolName}"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+			<linkerarg value="/nodefaultlib:libc.lib"/>
+			<linkerarg value="RpcRT4.Lib"/>
+
+    </cc>
+  </target>
+
+  <target name="GenFvImage_IA32">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" 
+        outfile="${BIN_DIR}/${ToolName}_IA32"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <defineset>
+        <define name="BUILDING_TOOLS"/>
+        <define name="TOOL_BUILD_IA32_TARGET"/>
+      </defineset>
+    
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet} Ia32/PeCoffLoaderEx.c" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${PACKAGE_DIR}/${ToolName}"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+			<linkerarg value="/nodefaultlib:libc.lib"/>
+			<linkerarg value="RpcRT4.Lib"/>
+
+    </cc>
+  </target>
+
+  <target name="GenFvImage_X64">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR_X64}" 
+        outfile="${BIN_DIR}/${ToolName}_X64"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <defineset>
+        <define name="BUILDING_TOOLS"/>
+        <define name="TOOL_BUILD_X64_TARGET"/>
+      </defineset>
+    
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet} x64/PeCoffLoaderEx.c"  
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${PACKAGE_DIR}/${ToolName}"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+			<linkerarg value="/nodefaultlib:libc.lib"/>
+			<linkerarg value="RpcRT4.Lib"/>
+
+    </cc>
+  </target>
+
+  <target name="GenFvImage_IPF">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR_IPF}" 
+        outfile="${BIN_DIR}/${ToolName}_IPF"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <defineset>
+        <define name="BUILDING_TOOLS"/>
+        <define name="TOOL_BUILD_IPF_TARGET"/>
+      </defineset>
+    
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet} Ipf/PeCoffLoaderEx.c"  
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${PACKAGE_DIR}/${ToolName}"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Library"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+			<linkerarg value="/nodefaultlib:libc.lib"/>
+			<linkerarg value="RpcRT4.Lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR_IA32}" includes="*.obj"/>
+      <fileset dir="${BUILD_DIR_X64}" includes="*.obj"/>
+      <fileset dir="${BUILD_DIR_IPF}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${PACKAGE_DIR}/${ToolName}/tmp">
+	    
+      <fileset dir="${BIN_DIR}" includes="${ToolName}_IA32${ext_exe}"/>
+      <fileset dir="${BIN_DIR}" includes="${ToolName}_X64${ext_exe}"/>
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+      <fileset dir="${BIN_DIR}" includes="${ToolName}_IPF${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GenFvImage/x64/PeCoffLoaderEx.c b/Tools/Source/TianoTools/GenFvImage/x64/PeCoffLoaderEx.c
new file mode 100644
index 0000000000..6bcae272e7
--- /dev/null
+++ b/Tools/Source/TianoTools/GenFvImage/x64/PeCoffLoaderEx.c
@@ -0,0 +1,76 @@
+/*++
+
+Copyright 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+
+Module Name:
+
+  PeCoffLoaderEx.c
+
+Abstract:
+
+  x64 Specific relocation fixups
+
+Revision History
+
+--*/
+
+#define EFI_SPECIFICATION_VERSION    0x00000000
+#define EDK_RELEASE_VERSION          0x00020000
+#include <Base.h>
+#include <Library/PeCoffLib.h>
+#include <Library/BaseMemoryLib.h>
+
+
+
+
+RETURN_STATUS
+PeCoffLoaderRelocateImageEx (
+  IN UINT16      *Reloc,
+  IN OUT CHAR8   *Fixup, 
+  IN OUT CHAR8   **FixupData,
+  IN UINT64      Adjust
+  )
+/*++
+
+Routine Description:
+  Performs an x64 specific relocation fixup
+
+Arguments:
+  Reloc      - Pointer to the relocation record
+  Fixup      - Pointer to the address to fix up
+  FixupData  - Pointer to a buffer to log the fixups
+  Adjust     - The offset to adjust the fixup
+
+Returns:
+  None
+
+--*/
+{
+  UINT64      *F64;
+
+  switch ((*Reloc) >> 12) {
+
+    case EFI_IMAGE_REL_BASED_DIR64:
+      F64 = (UINT64 *) Fixup;
+      *F64 = *F64 + (UINT64) Adjust;
+      if (*FixupData != NULL) {
+        *FixupData = ALIGN_POINTER(*FixupData, sizeof(UINT64));
+        *(UINT64 *)(*FixupData) = *F64;
+        *FixupData = *FixupData + sizeof(UINT64);
+      }
+      break;
+
+    default:
+      return RETURN_UNSUPPORTED;
+  }
+
+  return RETURN_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/GenSection/GenSection.c b/Tools/Source/TianoTools/GenSection/GenSection.c
new file mode 100644
index 0000000000..8ae0a9c4ce
--- /dev/null
+++ b/Tools/Source/TianoTools/GenSection/GenSection.c
@@ -0,0 +1,939 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenSection.c
+
+Abstract:
+
+  Creates output file that is a properly formed section per the FV spec.
+
+--*/
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include "FirmwareVolumeImageFormat.h"
+#include "CommonLib.h"
+#include "EfiCompress.h"
+#include "EfiCustomizedCompress.h"
+#include "Crc32.h"
+#include "EfiUtilityMsgs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "GenSection.h"
+
+#include <GuidedSectionExtraction.h>
+
+#define UTILITY_NAME            "GenSection"
+
+#define PARAMETER_NOT_SPECIFIED "Parameter not specified"
+#define MAXIMUM_INPUT_FILE_NUM  10
+
+char      *SectionTypeName[] = {
+  NULL,                                 // 0x00 - reserved
+  "EFI_SECTION_COMPRESSION",            // 0x01
+  "EFI_SECTION_GUID_DEFINED",           // 0x02
+  NULL,                                 // 0x03 - reserved
+  NULL,                                 // 0x04 - reserved
+  NULL,                                 // 0x05 - reserved
+  NULL,                                 // 0x06 - reserved
+  NULL,                                 // 0x07 - reserved
+  NULL,                                 // 0x08 - reserved
+  NULL,                                 // 0x09 - reserved
+  NULL,                                 // 0x0A - reserved
+  NULL,                                 // 0x0B - reserved
+  NULL,                                 // 0x0C - reserved
+  NULL,                                 // 0x0D - reserved
+  NULL,                                 // 0x0E - reserved
+  NULL,                                 // 0x0F - reserved
+  "EFI_SECTION_PE32",                   // 0x10
+  "EFI_SECTION_PIC",                    // 0x11
+  "EFI_SECTION_TE",                     // 0x12
+  "EFI_SECTION_DXE_DEPEX",              // 0x13
+  "EFI_SECTION_VERSION",                // 0x14
+  "EFI_SECTION_USER_INTERFACE",         // 0x15
+  "EFI_SECTION_COMPATIBILITY16",        // 0x16
+  "EFI_SECTION_FIRMWARE_VOLUME_IMAGE",  // 0x17
+  "EFI_SECTION_FREEFORM_SUBTYPE_GUID",  // 0x18
+  "EFI_SECTION_RAW",                    // 0x19
+  NULL,                                 // 0x1A
+  "EFI_SECTION_PEI_DEPEX"               // 0x1B
+};
+
+char      *CompressionTypeName[]    = { "NONE", "STANDARD" };
+char      *GUIDedSectionTypeName[]  = { "CRC32" };
+EFI_GUID  gEfiCrc32SectionGuid      = EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID;
+
+static
+VOID
+PrintUsageMessage (
+  VOID
+  )
+{
+  UINTN SectionType;
+  UINTN DisplayCount;
+
+  printf ("Usage: "UTILITY_NAME "  -i InputFile -o OutputFile -s SectionType [SectionType params]\n\n");
+  printf ("    Where SectionType is one of the following section types:\n\n");
+
+  DisplayCount = 0;
+  for (SectionType = 0; SectionType <= EFI_SECTION_LAST_SECTION_TYPE; SectionType++) {
+    if (SectionTypeName[SectionType] != NULL) {
+      printf ("       %s\n", SectionTypeName[SectionType]);
+    }
+  }
+
+  printf ("\n    and SectionType dependent parameters are as follows:\n\n");
+  printf (
+    "       %s:       -t < %s | %s >\n",
+    SectionTypeName[EFI_SECTION_COMPRESSION],
+    CompressionTypeName[EFI_NOT_COMPRESSED],
+    CompressionTypeName[EFI_STANDARD_COMPRESSION]
+    );
+  printf (
+    "       %s:      -t < %s >\n""                          // Currently only CRC32 is supported\n\n",
+    SectionTypeName[EFI_SECTION_GUID_DEFINED],
+    GUIDedSectionTypeName[EFI_SECTION_CRC32_GUID_DEFINED]
+    );
+  printf (
+    "       %s:           -v VersionNumber\n""                          [-a \"Version string\"]\n\n",
+    SectionTypeName[EFI_SECTION_VERSION]
+    );
+  printf (
+    "       %s:    -a \"Human readable name\"\n\n",
+    SectionTypeName[EFI_SECTION_USER_INTERFACE]
+    );
+}
+
+VOID
+Ascii2UnicodeWriteString (
+  char    *String,
+  FILE    *OutFile,
+  BOOLEAN WriteLangCode
+  )
+{
+  UINTN Index;
+  UINT8 AsciiNull;
+  //
+  // BUGBUG need to get correct language code...
+  //
+  char  *EnglishLangCode = "eng";
+  AsciiNull = 0;
+  //
+  // first write the language code (english only)
+  //
+  if (WriteLangCode) {
+    fwrite (EnglishLangCode, 1, 4, OutFile);
+  }
+  //
+  // Next, write out the string... Convert ASCII to Unicode in the process.
+  //
+  Index = 0;
+  do {
+    fwrite (&String[Index], 1, 1, OutFile);
+    fwrite (&AsciiNull, 1, 1, OutFile);
+  } while (String[Index++] != 0);
+}
+
+STATUS
+GenSectionCommonLeafSection (
+  char    **InputFileName,
+  int     InputFileNum,
+  UINTN   SectionType,
+  FILE    *OutFile
+  )
+/*++
+        
+Routine Description:
+           
+  Generate a leaf section of type other than EFI_SECTION_VERSION
+  and EFI_SECTION_USER_INTERFACE. Input file must be well formed.
+  The function won't validate the input file's contents. For
+  common leaf sections, the input file may be a binary file.
+  The utility will add section header to the file.
+            
+Arguments:
+               
+  InputFileName  - Name of the input file.
+                
+  InputFileNum   - Number of input files. Should be 1 for leaf section.
+
+  SectionType    - A valid section type string
+
+  OutFile        - Output file handle
+
+Returns:
+                       
+  STATUS_ERROR            - can't continue
+  STATUS_SUCCESS          - successful return
+
+--*/
+{
+  UINT64                    InputFileLength;
+  FILE                      *InFile;
+  UINT8                     *Buffer;
+  INTN                      TotalLength;
+  EFI_COMMON_SECTION_HEADER CommonSect;
+  STATUS                    Status;
+
+  if (InputFileNum > 1) {
+    Error (NULL, 0, 0, "invalid parameter", "more than one input file specified");
+    return STATUS_ERROR;
+  } else if (InputFileNum < 1) {
+    Error (NULL, 0, 0, "no input file specified", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // Open the input file
+  //
+  InFile = fopen (InputFileName[0], "rb");
+  if (InFile == NULL) {
+    Error (NULL, 0, 0, InputFileName[0], "failed to open input file");
+    return STATUS_ERROR;
+  }
+
+  Status  = STATUS_ERROR;
+  Buffer  = NULL;
+  //
+  // Seek to the end of the input file so we can determine its size
+  //
+  fseek (InFile, 0, SEEK_END);
+  fgetpos (InFile, &InputFileLength);
+  fseek (InFile, 0, SEEK_SET);
+  //
+  // Fill in the fields in the local section header structure
+  //
+  CommonSect.Type = (EFI_SECTION_TYPE) SectionType;
+  TotalLength     = sizeof (CommonSect) + (INTN) InputFileLength;
+  //
+  // Size must fit in 3 bytes
+  //
+  if (TotalLength >= 0x1000000) {
+    Error (NULL, 0, 0, InputFileName[0], "file size (0x%X) exceeds section size limit", TotalLength);
+    goto Done;
+  }
+  //
+  // Now copy the size into the section header and write out the section header
+  //
+  memcpy (&CommonSect.Size, &TotalLength, 3);
+  fwrite (&CommonSect, sizeof (CommonSect), 1, OutFile);
+  //
+  // Allocate a buffer to read in the contents of the input file. Then
+  // read it in as one block and write it to the output file.
+  //
+  if (InputFileLength != 0) {
+    Buffer = (UINT8 *) malloc ((size_t) InputFileLength);
+    if (Buffer == NULL) {
+      Error (__FILE__, __LINE__, 0, "memory allocation failure", NULL);
+      goto Done;
+    }
+
+    if (fread (Buffer, (size_t) InputFileLength, 1, InFile) != 1) {
+      Error (NULL, 0, 0, InputFileName[0], "failed to read contents of file");
+      goto Done;
+    }
+
+    if (fwrite (Buffer, (size_t) InputFileLength, 1, OutFile) != 1) {
+      Error (NULL, 0, 0, "failed to write to output file", NULL);
+      goto Done;
+    }
+  }
+
+  Status = STATUS_SUCCESS;
+Done:
+  fclose (InFile);
+  if (Buffer != NULL) {
+    free (Buffer);
+  }
+
+  return Status;
+}
+
+EFI_STATUS
+GetSectionContents (
+  char    **InputFileName,
+  int     InputFileNum,
+  UINT8   *FileBuffer,
+  UINTN   *BufferLength
+  )
+/*++
+        
+Routine Description:
+           
+  Get the contents of all section files specified in InputFileName
+  into FileBuffer.
+            
+Arguments:
+               
+  InputFileName  - Name of the input file.
+                
+  InputFileNum   - Number of input files. Should be at least 1.
+
+  FileBuffer     - Output buffer to contain data
+
+  BufferLength   - Actual length of the data 
+
+Returns:
+                       
+  EFI_SUCCESS on successful return
+  EFI_INVALID_PARAMETER if InputFileNum is less than 1
+  EFI_ABORTED if unable to open input file.
+
+--*/
+{
+  UINTN   Size;
+  UINTN   FileSize;
+  INTN    Index;
+  FILE    *InFile;
+
+  if (InputFileNum < 1) {
+    Error (NULL, 0, 0, "must specify at least one input file", NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Size = 0;
+  //
+  // Go through our array of file names and copy their contents
+  // to the output buffer.
+  //
+  for (Index = 0; Index < InputFileNum; Index++) {
+    InFile = fopen (InputFileName[Index], "rb");
+    if (InFile == NULL) {
+      Error (NULL, 0, 0, InputFileName[Index], "failed to open input file");
+      return EFI_ABORTED;
+    }
+
+    fseek (InFile, 0, SEEK_END);
+    FileSize = ftell (InFile);
+    fseek (InFile, 0, SEEK_SET);
+    //
+    // Now read the contents of the file into the buffer
+    //
+    if (FileSize > 0) {
+      if (fread (FileBuffer + Size, (size_t) FileSize, 1, InFile) != 1) {
+        Error (NULL, 0, 0, InputFileName[Index], "failed to read contents of input file");
+        fclose (InFile);
+        return EFI_ABORTED;
+      }
+    }
+
+    fclose (InFile);
+    Size += (UINTN) FileSize;
+    //
+    // make sure section ends on a DWORD boundary
+    //
+    while ((Size & 0x03) != 0) {
+      FileBuffer[Size] = 0;
+      Size++;
+    }
+  }
+
+  *BufferLength = Size;
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GenSectionCompressionSection (
+  char    **InputFileName,
+  int     InputFileNum,
+  UINTN   SectionType,
+  UINTN   SectionSubType,
+  FILE    *OutFile
+  )
+/*++
+        
+Routine Description:
+           
+  Generate an encapsulating section of type EFI_SECTION_COMPRESSION
+  Input file must be already sectioned. The function won't validate
+  the input files' contents. Caller should hand in files already 
+  with section header.
+            
+Arguments:
+               
+  InputFileName  - Name of the input file.
+                
+  InputFileNum   - Number of input files. Should be at least 1.
+
+  SectionType    - Section type to generate. Should be 
+                   EFI_SECTION_COMPRESSION
+
+  SectionSubType - Specify the compression algorithm requested. 
+  
+  OutFile        - Output file handle
+
+Returns:
+                       
+  EFI_SUCCESS           on successful return
+  EFI_INVALID_PARAMETER if InputFileNum is less than 1
+  EFI_ABORTED           if unable to open input file.
+  EFI_OUT_OF_RESOURCES  No resource to complete the operation.
+--*/
+{
+  UINTN                   TotalLength;
+  UINTN                   InputLength;
+  UINTN                   CompressedLength;
+  UINT8                   *FileBuffer;
+  UINT8                   *OutputBuffer;
+  EFI_STATUS              Status;
+  EFI_COMPRESSION_SECTION CompressionSect;
+  COMPRESS_FUNCTION       CompressFunction;
+
+  if (SectionType != EFI_SECTION_COMPRESSION) {
+    Error (NULL, 0, 0, "parameter must be EFI_SECTION_COMPRESSION", NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  InputLength       = 0;
+  FileBuffer        = NULL;
+  OutputBuffer      = NULL;
+  CompressedLength  = 0;
+  FileBuffer        = (UINT8 *) malloc ((1024 * 1024 * 4) * sizeof (UINT8));
+  if (FileBuffer == NULL) {
+    Error (__FILE__, __LINE__, 0, "application error", "failed to allocate memory");
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // read all input file contents into a buffer
+  //
+  Status = GetSectionContents (
+            InputFileName,
+            InputFileNum,
+            FileBuffer,
+            &InputLength
+            );
+  if (EFI_ERROR (Status)) {
+    free (FileBuffer);
+    return Status;
+  }
+
+  CompressFunction = NULL;
+
+  //
+  // Now data is in FileBuffer, compress the data
+  //
+  switch (SectionSubType) {
+  case EFI_NOT_COMPRESSED:
+    CompressedLength = InputLength;
+    break;
+
+  case EFI_STANDARD_COMPRESSION:
+    CompressFunction = (COMPRESS_FUNCTION) Compress;
+    break;
+
+  case EFI_CUSTOMIZED_COMPRESSION:
+    CompressFunction = (COMPRESS_FUNCTION) CustomizedCompress;
+    break;
+
+  default:
+    Error (NULL, 0, 0, "unknown compression type", NULL);
+    free (FileBuffer);
+    return EFI_ABORTED;
+  }
+
+  if (CompressFunction != NULL) {
+
+    Status = CompressFunction (FileBuffer, InputLength, OutputBuffer, &CompressedLength);
+    if (Status == EFI_BUFFER_TOO_SMALL) {
+      OutputBuffer = malloc (CompressedLength);
+      if (!OutputBuffer) {
+        free (FileBuffer);
+        return EFI_OUT_OF_RESOURCES;
+      }
+
+      Status = CompressFunction (FileBuffer, InputLength, OutputBuffer, &CompressedLength);
+    }
+
+    free (FileBuffer);
+    FileBuffer = OutputBuffer;
+
+    if (EFI_ERROR (Status)) {
+      if (FileBuffer != NULL) {
+        free (FileBuffer);
+      }
+
+      return Status;
+    }
+  }
+
+  TotalLength = CompressedLength + sizeof (EFI_COMPRESSION_SECTION);
+  //
+  // Add the section header for the compressed data
+  //
+  CompressionSect.CommonHeader.Type     = (EFI_SECTION_TYPE) SectionType;
+  CompressionSect.CommonHeader.Size[0]  = (UINT8) (TotalLength & 0xff);
+  CompressionSect.CommonHeader.Size[1]  = (UINT8) ((TotalLength & 0xff00) >> 8);
+  CompressionSect.CommonHeader.Size[2]  = (UINT8) ((TotalLength & 0xff0000) >> 16);
+  CompressionSect.CompressionType       = (UINT8) SectionSubType;
+  CompressionSect.UncompressedLength    = InputLength;
+
+  fwrite (&CompressionSect, sizeof (CompressionSect), 1, OutFile);
+  fwrite (FileBuffer, CompressedLength, 1, OutFile);
+  free (FileBuffer);
+  return EFI_SUCCESS;
+}
+
+EFI_STATUS
+GenSectionGuidDefinedSection (
+  char    **InputFileName,
+  int     InputFileNum,
+  UINTN   SectionType,
+  UINTN   SectionSubType,
+  FILE    *OutFile
+  )
+/*++
+        
+Routine Description:
+           
+  Generate an encapsulating section of type EFI_SECTION_GUID_DEFINED
+  Input file must be already sectioned. The function won't validate
+  the input files' contents. Caller should hand in files already 
+  with section header.
+            
+Arguments:
+               
+  InputFileName  - Name of the input file.
+                
+  InputFileNum   - Number of input files. Should be at least 1.
+
+  SectionType    - Section type to generate. Should be 
+                   EFI_SECTION_GUID_DEFINED
+
+  SectionSubType - Specify the authentication algorithm requested. 
+  
+  OutFile        - Output file handle
+
+Returns:
+                       
+  EFI_SUCCESS on successful return
+  EFI_INVALID_PARAMETER if InputFileNum is less than 1
+  EFI_ABORTED if unable to open input file.
+  EFI_OUT_OF_RESOURCES  No resource to complete the operation.
+
+--*/
+{
+  INTN                  TotalLength;
+  INTN                  InputLength;
+  UINT8                 *FileBuffer;
+  UINT32                Crc32Checksum;
+  EFI_STATUS            Status;
+  CRC32_SECTION_HEADER  Crc32GuidSect;
+
+  if (SectionType != EFI_SECTION_GUID_DEFINED) {
+    Error (NULL, 0, 0, "parameter must be EFI_SECTION_GUID_DEFINED", NULL);
+    return EFI_INVALID_PARAMETER;
+  }
+
+  InputLength = 0;
+  FileBuffer  = NULL;
+  FileBuffer  = (UINT8 *) malloc ((1024 * 1024 * 4) * sizeof (UINT8));
+  if (FileBuffer == NULL) {
+    Error (__FILE__, __LINE__, 0, "application error", "failed to allocate memory");
+    return EFI_OUT_OF_RESOURCES;
+  }
+  //
+  // read all input file contents into a buffer
+  //
+  Status = GetSectionContents (
+            InputFileName,
+            InputFileNum,
+            FileBuffer,
+            &InputLength
+            );
+  if (EFI_ERROR (Status)) {
+    free (FileBuffer);
+    return Status;
+  }
+  //
+  // Now data is in FileBuffer, compress the data
+  //
+  switch (SectionSubType) {
+  case EFI_SECTION_CRC32_GUID_DEFINED:
+    Crc32Checksum = 0;
+    CalculateCrc32 (FileBuffer, InputLength, &Crc32Checksum);
+    if (EFI_ERROR (Status)) {
+      free (FileBuffer);
+      return Status;
+    }
+
+    TotalLength = InputLength + CRC32_SECTION_HEADER_SIZE;
+    Crc32GuidSect.GuidSectionHeader.CommonHeader.Type     = (EFI_SECTION_TYPE) SectionType;
+    Crc32GuidSect.GuidSectionHeader.CommonHeader.Size[0]  = (UINT8) (TotalLength & 0xff);
+    Crc32GuidSect.GuidSectionHeader.CommonHeader.Size[1]  = (UINT8) ((TotalLength & 0xff00) >> 8);
+    Crc32GuidSect.GuidSectionHeader.CommonHeader.Size[2]  = (UINT8) ((TotalLength & 0xff0000) >> 16);
+    memcpy (&(Crc32GuidSect.GuidSectionHeader.SectionDefinitionGuid), &gEfiCrc32SectionGuid, sizeof (EFI_GUID));
+    Crc32GuidSect.GuidSectionHeader.Attributes  = EFI_GUIDED_SECTION_AUTH_STATUS_VALID;
+    Crc32GuidSect.GuidSectionHeader.DataOffset  = CRC32_SECTION_HEADER_SIZE;
+    Crc32GuidSect.CRC32Checksum                 = Crc32Checksum;
+
+    break;
+
+  default:
+    Error (NULL, 0, 0, "invalid parameter", "unknown GUID defined type");
+    free (FileBuffer);
+    return EFI_ABORTED;
+  }
+
+  fwrite (&Crc32GuidSect, sizeof (Crc32GuidSect), 1, OutFile);
+  fwrite (FileBuffer, InputLength, 1, OutFile);
+
+  free (FileBuffer);
+
+  return EFI_SUCCESS;
+}
+
+int
+main (
+  int  argc,
+  char *argv[]
+  )
+/*++
+
+Routine Description:
+
+  Main
+
+Arguments:
+
+  command line parameters
+
+Returns:
+
+  EFI_SUCCESS    Section header successfully generated and section concatenated.
+  EFI_ABORTED    Could not generate the section
+  EFI_OUT_OF_RESOURCES  No resource to complete the operation.
+
+--*/
+{
+  INTN                      Index;
+  INTN                      VersionNumber;
+  UINTN                     SectionType;
+  UINTN                     SectionSubType;
+  BOOLEAN                   InputFileRequired;
+  BOOLEAN                   SubTypeRequired;
+  FILE                      *InFile;
+  FILE                      *OutFile;
+  INTN                      InputFileNum;
+
+  char                      **InputFileName;
+  char                      *OutputFileName;
+  char                      AuxString[500] = { 0 };
+
+  char                      *ParamSectionType;
+  char                      *ParamSectionSubType;
+  char                      *ParamLength;
+  char                      *ParamVersion;
+  char                      *ParamDigitalSignature;
+
+  EFI_STATUS                Status;
+  EFI_COMMON_SECTION_HEADER CommonSect;
+
+  InputFileName         = NULL;
+  OutputFileName        = PARAMETER_NOT_SPECIFIED;
+  ParamSectionType      = PARAMETER_NOT_SPECIFIED;
+  ParamSectionSubType   = PARAMETER_NOT_SPECIFIED;
+  ParamLength           = PARAMETER_NOT_SPECIFIED;
+  ParamVersion          = PARAMETER_NOT_SPECIFIED;
+  ParamDigitalSignature = PARAMETER_NOT_SPECIFIED;
+  Status                = EFI_SUCCESS;
+
+  VersionNumber         = 0;
+  SectionType           = 0;
+  SectionSubType        = 0;
+  InputFileRequired     = TRUE;
+  SubTypeRequired       = FALSE;
+  InFile                = NULL;
+  OutFile               = NULL;
+  InputFileNum          = 0;
+  Status                = EFI_SUCCESS;
+
+  SetUtilityName (UTILITY_NAME);
+  if (argc == 1) {
+    PrintUsageMessage ();
+    return STATUS_ERROR;
+  }
+  //
+  // Parse command line
+  //
+  Index = 1;
+  while (Index < argc) {
+    if (strcmpi (argv[Index], "-i") == 0) {
+      //
+      // Input File found
+      //
+      Index++;
+      InputFileName = (char **) malloc (MAXIMUM_INPUT_FILE_NUM * sizeof (char *));
+      if (InputFileName == NULL) {
+        Error (__FILE__, __LINE__, 0, "application error", "failed to allocate memory");
+        return EFI_OUT_OF_RESOURCES;
+      }
+
+      memset (InputFileName, 0, (MAXIMUM_INPUT_FILE_NUM * sizeof (char *)));
+      InputFileName[InputFileNum] = argv[Index];
+      InputFileNum++;
+      Index++;
+      //
+      // Parse subsequent parameters until another switch is encountered
+      //
+      while ((Index < argc) && (argv[Index][0] != '-')) {
+        if ((InputFileNum % MAXIMUM_INPUT_FILE_NUM) == 0) {
+          //
+          // InputFileName buffer too small, need to realloc
+          //
+          InputFileName = (char **) realloc (
+                                      InputFileName,
+                                      (InputFileNum + MAXIMUM_INPUT_FILE_NUM) * sizeof (char *)
+                                      );
+          if (InputFileName == NULL) {
+            Error (__FILE__, __LINE__, 0, "application error", "failed to allocate memory");
+            return EFI_OUT_OF_RESOURCES;
+          }
+
+          memset (&(InputFileName[InputFileNum]), 0, (MAXIMUM_INPUT_FILE_NUM * sizeof (char *)));
+        }
+
+        InputFileName[InputFileNum] = argv[Index];
+        InputFileNum++;
+        Index++;
+      }
+
+    }
+
+    if (strcmpi (argv[Index], "-o") == 0) {
+      //
+      // Output file found
+      //
+      Index++;
+      OutputFileName = argv[Index];
+    } else if (strcmpi (argv[Index], "-s") == 0) {
+      //
+      // Section Type found
+      //
+      Index++;
+      ParamSectionType = argv[Index];
+    } else if (strcmpi (argv[Index], "-t") == 0) {
+      //
+      // Compression or Authentication type
+      //
+      Index++;
+      ParamSectionSubType = argv[Index];
+    } else if (strcmpi (argv[Index], "-l") == 0) {
+      //
+      // Length
+      //
+      Index++;
+      ParamLength = argv[Index];
+    } else if (strcmpi (argv[Index], "-v") == 0) {
+      //
+      // VersionNumber
+      //
+      Index++;
+      ParamVersion = argv[Index];
+    } else if (strcmpi (argv[Index], "-a") == 0) {
+      //
+      // Aux string
+      //
+      Index++;
+      //
+      // Note, the MSVC C-Start parses out and consolidates quoted strings from the command
+      // line.  Quote characters are stripped.  If this tool is ported to other environments
+      // this will need to be taken into account
+      //
+      strncpy (AuxString, argv[Index], 499);
+    } else if (strcmpi (argv[Index], "-d") == 0) {
+      //
+      // Digital signature for EFI_TEST_AUTHENTICAION (must be 0 or 1)
+      //
+      Index++;
+      ParamDigitalSignature = argv[Index];
+    } else if (strcmpi (argv[Index], "-?") == 0) {
+      PrintUsageMessage ();
+      return STATUS_ERROR;
+    } else {
+      Error (NULL, 0, 0, argv[Index], "unknown option");
+      return GetUtilityStatus ();
+    }
+
+    Index++;
+  }
+  //
+  // At this point, all command line parameters are verified as not being totally
+  // bogus.  Next verify the command line parameters are complete and make
+  // sense...
+  //
+  if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_COMPRESSION]) == 0) {
+    SectionType     = EFI_SECTION_COMPRESSION;
+    SubTypeRequired = TRUE;
+    if (stricmp (ParamSectionSubType, CompressionTypeName[EFI_NOT_COMPRESSED]) == 0) {
+      SectionSubType = EFI_NOT_COMPRESSED;
+    } else if (stricmp (ParamSectionSubType, CompressionTypeName[EFI_STANDARD_COMPRESSION]) == 0) {
+      SectionSubType = EFI_STANDARD_COMPRESSION;
+    } else {
+      Error (NULL, 0, 0, ParamSectionSubType, "unknown compression type");
+      PrintUsageMessage ();
+      return GetUtilityStatus ();
+    }
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_GUID_DEFINED]) == 0) {
+    SectionType     = EFI_SECTION_GUID_DEFINED;
+    SubTypeRequired = TRUE;
+    if (stricmp (ParamSectionSubType, GUIDedSectionTypeName[EFI_SECTION_CRC32_GUID_DEFINED]) == 0) {
+      SectionSubType = EFI_SECTION_CRC32_GUID_DEFINED;
+    } else {
+      Error (NULL, 0, 0, ParamSectionSubType, "unknown GUID defined section type", ParamSectionSubType);
+      PrintUsageMessage ();
+      return GetUtilityStatus ();
+    }
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_PE32]) == 0) {
+    SectionType = EFI_SECTION_PE32;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_PIC]) == 0) {
+    SectionType = EFI_SECTION_PIC;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_TE]) == 0) {
+    SectionType = EFI_SECTION_TE;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_DXE_DEPEX]) == 0) {
+    SectionType = EFI_SECTION_DXE_DEPEX;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_VERSION]) == 0) {
+    SectionType       = EFI_SECTION_VERSION;
+    InputFileRequired = FALSE;
+    Index             = sscanf (ParamVersion, "%d", &VersionNumber);
+    if (Index != 1 || VersionNumber < 0 || VersionNumber > 65565) {
+      Error (NULL, 0, 0, ParamVersion, "illegal version number");
+      PrintUsageMessage ();
+      return GetUtilityStatus ();
+    }
+
+    if (strcmp (AuxString, PARAMETER_NOT_SPECIFIED) == 0) {
+      AuxString[0] = 0;
+    }
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_USER_INTERFACE]) == 0) {
+    SectionType       = EFI_SECTION_USER_INTERFACE;
+    InputFileRequired = FALSE;
+    if (strcmp (AuxString, PARAMETER_NOT_SPECIFIED) == 0) {
+      Error (NULL, 0, 0, "user interface string not specified", NULL);
+      PrintUsageMessage ();
+      return GetUtilityStatus ();
+    }
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_COMPATIBILITY16]) == 0) {
+    SectionType = EFI_SECTION_COMPATIBILITY16;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_FIRMWARE_VOLUME_IMAGE]) == 0) {
+    SectionType = EFI_SECTION_FIRMWARE_VOLUME_IMAGE;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_FREEFORM_SUBTYPE_GUID]) == 0) {
+    SectionType = EFI_SECTION_FREEFORM_SUBTYPE_GUID;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_RAW]) == 0) {
+    SectionType = EFI_SECTION_RAW;
+  } else if (stricmp (ParamSectionType, SectionTypeName[EFI_SECTION_PEI_DEPEX]) == 0) {
+    SectionType = EFI_SECTION_PEI_DEPEX;
+  } else {
+    Error (NULL, 0, 0, ParamSectionType, "unknown section type");
+    PrintUsageMessage ();
+    return GetUtilityStatus ();
+  }
+  //
+  // Open output file
+  //
+  OutFile = fopen (OutputFileName, "wb");
+  if (OutFile == NULL) {
+    Error (NULL, 0, 0, OutputFileName, "failed to open output file for writing");
+    if (InFile != NULL) {
+      fclose (InFile);
+    }
+
+    return GetUtilityStatus ();
+  }
+  //
+  // At this point, we've fully validated the command line, and opened appropriate
+  // files, so let's go and do what we've been asked to do...
+  //
+  //
+  // Within this switch, build and write out the section header including any
+  // section type specific pieces.  If there's an input file, it's tacked on later
+  //
+  switch (SectionType) {
+  case EFI_SECTION_COMPRESSION:
+    Status = GenSectionCompressionSection (
+              InputFileName,
+              InputFileNum,
+              SectionType,
+              SectionSubType,
+              OutFile
+              );
+    break;
+
+  case EFI_SECTION_GUID_DEFINED:
+    Status = GenSectionGuidDefinedSection (
+              InputFileName,
+              InputFileNum,
+              SectionType,
+              SectionSubType,
+              OutFile
+              );
+    break;
+
+  case EFI_SECTION_VERSION:
+    CommonSect.Type = (EFI_SECTION_TYPE) SectionType;
+
+    Index           = sizeof (CommonSect);
+    //
+    // 2 characters for the build number
+    //
+    Index += 2;
+    //
+    // Aux string is ascii.. unicode is 2X + 2 bytes for terminating unicode null.
+    //
+    Index += (strlen (AuxString) * 2) + 2;
+    memcpy (&CommonSect.Size, &Index, 3);
+    fwrite (&CommonSect, sizeof (CommonSect), 1, OutFile);
+    fwrite (&VersionNumber, 2, 1, OutFile);
+    Ascii2UnicodeWriteString (AuxString, OutFile, FALSE);
+    break;
+
+  case EFI_SECTION_USER_INTERFACE:
+    CommonSect.Type = (EFI_SECTION_TYPE) SectionType;
+    Index           = sizeof (CommonSect);
+    //
+    // Aux string is ascii.. unicode is 2X + 2 bytes for terminating unicode null.
+    //
+    Index += (strlen (AuxString) * 2) + 2;
+    memcpy (&CommonSect.Size, &Index, 3);
+    fwrite (&CommonSect, sizeof (CommonSect), 1, OutFile);
+    Ascii2UnicodeWriteString (AuxString, OutFile, FALSE);
+    break;
+
+  default:
+    //
+    // All other section types are caught by default (they're all the same)
+    //
+    Status = GenSectionCommonLeafSection (
+              InputFileName,
+              InputFileNum,
+              SectionType,
+              OutFile
+              );
+    break;
+  }
+
+  if (InputFileName != NULL) {
+    free (InputFileName);
+  }
+
+  fclose (OutFile);
+  //
+  // If we had errors, then delete the output file
+  //
+  if (GetUtilityStatus () == STATUS_ERROR) {
+    remove (OutputFileName);
+  }
+
+  return GetUtilityStatus ();
+}
diff --git a/Tools/Source/TianoTools/GenSection/GenSection.h b/Tools/Source/TianoTools/GenSection/GenSection.h
new file mode 100644
index 0000000000..847b3eba08
--- /dev/null
+++ b/Tools/Source/TianoTools/GenSection/GenSection.h
@@ -0,0 +1,43 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GenSection.h 
+
+Abstract:
+
+  Header file for GenSection.
+
+--*/
+
+//
+// Module Coded to Tiano Coding Conventions
+//
+#ifndef _EFI_GEN_SECTION_H
+#define _EFI_GEN_SECTION_H
+
+//
+// External Files Referenced
+//
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include "FirmwareVolumeImageFormat.h"
+
+typedef struct {
+  EFI_GUID_DEFINED_SECTION  GuidSectionHeader;
+  UINT32                    CRC32Checksum;
+} CRC32_SECTION_HEADER;
+
+#define EFI_SECTION_CRC32_GUID_DEFINED  0
+#define CRC32_SECTION_HEADER_SIZE       (sizeof (CRC32_SECTION_HEADER))
+
+#endif
diff --git a/Tools/Source/TianoTools/GenSection/build.gcc b/Tools/Source/TianoTools/GenSection/build.gcc
new file mode 100644
index 0000000000..5ad50a4b1a
--- /dev/null
+++ b/Tools/Source/TianoTools/GenSection/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  *.c -o GenSection -L../Library-mingw -lCommon -lCustomizedCompress
diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
new file mode 100644
index 0000000000..744bff8161
--- /dev/null
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GenSection Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GenSection"/>
+  <property name="FileSet" value="GenSection.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/GuidChk/CommonUtils.h b/Tools/Source/TianoTools/GuidChk/CommonUtils.h
new file mode 100644
index 0000000000..f7a331e5d7
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/CommonUtils.h
@@ -0,0 +1,57 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  CommonUtils.h
+  
+Abstract:
+
+  Common utility defines and structure definitions.
+  
+--*/
+
+#ifndef _COMMON_UTILS_H_
+#define _COMMON_UTILS_H_
+
+//
+// Basic types
+//
+typedef unsigned char UINT8;
+typedef char INT8;
+typedef unsigned short UINT16;
+typedef unsigned int UINT32;
+
+typedef UINT8 BOOLEAN;
+typedef UINT32 STATUS;
+
+#define TRUE            1
+#define FALSE           0
+
+#define STATUS_SUCCESS  0
+#define STATUS_WARNING  1
+#define STATUS_ERROR    2
+
+//
+// Linked list of strings
+//
+typedef struct _STRING_LIST {
+  struct _STRING_LIST *Next;
+  char                *Str;
+} STRING_LIST;
+
+int
+CreateGuidList (
+  INT8    *OutFileName
+  )
+;
+
+#endif // #ifndef _COMMON_UTILS_H_
diff --git a/Tools/Source/TianoTools/GuidChk/FileSearch.c b/Tools/Source/TianoTools/GuidChk/FileSearch.c
new file mode 100644
index 0000000000..8b5b58fddf
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/FileSearch.c
@@ -0,0 +1,285 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  FileSearch.c
+  
+Abstract:
+
+  Module used to support file searches on the system.
+  
+--*/
+
+#include <stdio.h>
+
+#include "CommonUtils.h"
+#include "FileSearch.h"
+#include "UtilsMsgs.h"
+
+//
+// Internal file search flag for sanity checks
+//
+#define FILE_SEARCH_STARTED 0x8000
+#define FILE_SEARCH_INITED  0x4000
+
+static
+BOOLEAN
+FileSearchMeetsCriteria (
+  FILE_SEARCH_DATA    *FSData
+  );
+
+/*****************************************************************************/
+STATUS
+FileSearchInit (
+  FILE_SEARCH_DATA    *FSData
+  )
+{
+  memset ((char *) FSData, 0, sizeof (FILE_SEARCH_DATA));
+  FSData->Handle          = INVALID_HANDLE_VALUE;
+  FSData->FileSearchFlags = FILE_SEARCH_INITED;
+  FSData->FileName[0]     = 0;
+  return STATUS_SUCCESS;
+}
+
+STATUS
+FileSearchStart (
+  FILE_SEARCH_DATA    *FSData,
+  char                *FileMask,
+  UINT32              SearchFlags
+  )
+{
+  BOOLEAN Done;
+
+  //
+  // Save their flags, and set a flag to indicate that they called this
+  // start function so we can perform extended checking in the other
+  // routines we have in this module.
+  //
+  FSData->FileSearchFlags |= (SearchFlags | FILE_SEARCH_STARTED);
+  FSData->FileName[0] = 0;
+
+  //
+  // Begin the search
+  //
+  FSData->Handle = FindFirstFile (FileMask, &(FSData->FindData));
+  if (FSData->Handle == INVALID_HANDLE_VALUE) {
+    return STATUS_ERROR;
+  }
+  //
+  // Keep looping through until we find a file meeting the caller's
+  // criteria per the search flags
+  //
+  Done = FALSE;
+  while (!Done) {
+    //
+    // If we're done (we found a match) copy the file name found and return
+    //
+    Done = FileSearchMeetsCriteria (FSData);
+    if (Done) {
+      return STATUS_SUCCESS;
+    }
+    //
+    // Go on to next file
+    //
+    if (!FindNextFile (FSData->Handle, &(FSData->FindData))) {
+      return STATUS_NOT_FOUND;
+    }
+  }
+  //
+  // Not reached
+  //
+  return STATUS_NOT_FOUND;
+}
+
+//
+// Find the next file meeting their criteria and return it.
+//
+STATUS
+FileSearchFindNext (
+  FILE_SEARCH_DATA    *FSData
+  )
+{
+  BOOLEAN Done;
+
+  Done = FALSE;
+  while (!Done) {
+    if (!FindNextFile (FSData->Handle, &(FSData->FindData))) {
+      return STATUS_NOT_FOUND;
+    }
+    //
+    // See if it matches their criteria
+    //
+    Done = FileSearchMeetsCriteria (FSData);
+    if (Done) {
+      return STATUS_SUCCESS;
+    }
+  }
+  //
+  // Not reached
+  //
+  return STATUS_NOT_FOUND;
+}
+//
+// Perform any cleanup necessary to close down a search
+//
+STATUS
+FileSearchDestroy (
+  FILE_SEARCH_DATA    *FSData
+  )
+{
+  if (FSData->Handle != INVALID_HANDLE_VALUE) {
+    FindClose (FSData->Handle);
+    FSData->Handle = INVALID_HANDLE_VALUE;
+  }
+
+  FSData->FileName[0]     = 0;
+  FSData->FileSearchFlags = 0;
+  return STATUS_SUCCESS;
+}
+
+static
+BOOLEAN
+FileSearchMeetsCriteria (
+  FILE_SEARCH_DATA    *FSData
+  )
+{
+  BOOLEAN     Status;
+  STRING_LIST *StrList;
+  UINT32      ExtLen;
+  UINT32      FileNameLen;
+
+  Status = FALSE;
+
+  //
+  // First clear the flag indicating this is neither a file or a
+  // directory.
+  //
+  FSData->FileFlags &= ~(FILE_SEARCH_DIR | FILE_SEARCH_FILE);
+
+  //
+  // We found a file. See if it matches the user's search criteria. First
+  // check for this being a directory, and they want directories, and
+  // it's not "." and it's not ".."
+  //
+  if ((FSData->FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
+      (FSData->FileSearchFlags & FILE_SEARCH_DIR) &&
+      (strcmp (FSData->FindData.cFileName, ".")) &&
+      (strcmp (FSData->FindData.cFileName, ".."))
+      ) {
+    //
+    // Assume we'll make it past this check
+    //
+    Status = TRUE;
+    //
+    // If they have a list of exclude directories, then check for those
+    //
+    StrList = FSData->ExcludeDirs;
+    while (StrList != NULL) {
+      if (stricmp (FSData->FindData.cFileName, StrList->Str) == 0) {
+        Status = FALSE;
+        break;
+      }
+
+      StrList = StrList->Next;
+    }
+    //
+    // If we didn't fail due to excluded directories, then set the dir flag
+    //
+    if (Status) {
+      FSData->FileFlags |= FILE_SEARCH_DIR;
+    }
+    //
+    // Else check for a file, and they want files....
+    //
+  } else if (((FSData->FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) &&
+           (FSData->FileSearchFlags & FILE_SEARCH_FILE)
+          ) {
+    //
+    // See if it's in our list of excluded files
+    //
+    Status  = TRUE;
+    StrList = FSData->ExcludeFiles;
+    while (StrList != NULL) {
+      if (stricmp (FSData->FindData.cFileName, StrList->Str) == 0) {
+        Status = FALSE;
+        break;
+      }
+
+      StrList = StrList->Next;
+    }
+
+    if (Status) {
+      //
+      // See if it's in our list of excluded file extensions
+      //
+      FileNameLen = strlen (FSData->FindData.cFileName);
+      StrList     = FSData->ExcludeExtensions;
+      while (StrList != NULL) {
+        ExtLen = strlen (StrList->Str);
+        if (stricmp (
+              FSData->FindData.cFileName + FileNameLen - ExtLen,
+              StrList->Str
+              ) == 0) {
+          Status = FALSE;
+          break;
+        }
+
+        StrList = StrList->Next;
+      }
+    }
+
+    if (Status) {
+      FSData->FileFlags |= FILE_SEARCH_FILE;
+    }
+  }
+  //
+  // If it's a match, copy the filename into another field of the structure
+  // for portability.
+  //
+  if (Status) {
+    strcpy (FSData->FileName, FSData->FindData.cFileName);
+  }
+
+  return Status;
+}
+//
+// Exclude a list of subdirectories.
+//
+STATUS
+FileSearchExcludeDirs (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+{
+  FSData->ExcludeDirs = StrList;
+  return STATUS_SUCCESS;
+}
+
+STATUS
+FileSearchExcludeFiles (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+{
+  FSData->ExcludeFiles = StrList;
+  return STATUS_SUCCESS;
+}
+
+STATUS
+FileSearchExcludeExtensions (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+{
+  FSData->ExcludeExtensions = StrList;
+  return STATUS_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/GuidChk/FileSearch.h b/Tools/Source/TianoTools/GuidChk/FileSearch.h
new file mode 100644
index 0000000000..bc40265366
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/FileSearch.h
@@ -0,0 +1,108 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  FileSearch.h
+  
+Abstract:
+
+  Header file to support file searching.
+  
+--*/
+
+#ifndef _FILE_SEARCH_H_
+#define _FILE_SEARCH_H_
+
+//
+// Since the file searching routines are OS dependent, put the
+// necessary include paths in this header file so that the non-OS-dependent
+// files don't need to include these windows-specific header files.
+//
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <direct.h>
+#include <windows.h>
+
+//
+// Return codes of some of the file search routines
+//
+#define STATUS_NOT_FOUND  0x1000
+
+//
+// Flags for what to search for. Also used in the FileFlags return field.
+//
+#define FILE_SEARCH_DIR   0x0001
+#define FILE_SEARCH_FILE  0x0002
+
+//
+// Here's our class definition
+//
+typedef struct {
+  HANDLE          Handle;
+  WIN32_FIND_DATA FindData;
+  UINT32          FileSearchFlags;    // DIRS, FILES, etc
+  UINT32          FileFlags;
+  INT8            FileName[MAX_PATH]; // for portability
+  STRING_LIST     *ExcludeDirs;
+  STRING_LIST     *ExcludeFiles;
+  STRING_LIST     *ExcludeExtensions;
+} FILE_SEARCH_DATA;
+
+//
+// Here's our member functions
+//
+STATUS
+FileSearchInit (
+  FILE_SEARCH_DATA    *FSData
+  )
+;
+
+STATUS
+FileSearchDestroy (
+  FILE_SEARCH_DATA    *FSData
+  )
+;
+
+STATUS
+FileSearchStart (
+  FILE_SEARCH_DATA    *FSData,
+  char                *FileMask,
+  UINT32              SearchFlags
+  )
+;
+
+STATUS
+FileSearchFindNext (
+  FILE_SEARCH_DATA    *FSData
+  )
+;
+
+STATUS
+FileSearchExcludeDirs (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+;
+STATUS
+FileSearchExcludeExtensions (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+;
+STATUS
+FileSearchExcludeFiles (
+  FILE_SEARCH_DATA    *FSData,
+  STRING_LIST         *StrList
+  )
+;
+#endif
diff --git a/Tools/Source/TianoTools/GuidChk/GuidChk.c b/Tools/Source/TianoTools/GuidChk/GuidChk.c
new file mode 100644
index 0000000000..de88405872
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/GuidChk.c
@@ -0,0 +1,2348 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  GuidChk.c 
+  
+Abstract:
+
+  Parse files in a directory and subdirectories to find all guid definitions.
+  Then check them against each other to make sure there are no duplicates.
+  
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "CommonUtils.h"
+#include "FileSearch.h"
+#include "UtilsMsgs.h"
+
+#define MAX_LINE_LEN  180 // we concatenate two lines sometimes
+// Define a structure that correlates filename extensions to an enumerated
+// type.
+//
+typedef struct {
+  INT8  *Extension;
+  INT8  ExtensionCode;
+} FILE_TYPE_TABLE_ENTRY;
+
+#define FILE_EXTENSION_UNKNOWN  0
+#define FILE_EXTENSION_C        1
+#define FILE_EXTENSION_H        2
+#define FILE_EXTENSION_IA32_ASM 3
+#define FILE_EXTENSION_IA32_INC 4
+#define FILE_EXTENSION_IA64_ASM 5
+#define FILE_EXTENSION_IA64_INC 6
+#define FILE_EXTENSION_PKG      7
+#define FILE_EXTENSION_INF      8
+
+FILE_TYPE_TABLE_ENTRY FileTypeTable[] = {
+  ".c",
+  FILE_EXTENSION_C,
+  ".h",
+  FILE_EXTENSION_H,
+  ".inc",
+  FILE_EXTENSION_IA32_INC,
+  ".asm",
+  FILE_EXTENSION_IA32_ASM,
+  ".s",
+  FILE_EXTENSION_IA64_ASM,
+  ".pkg",
+  FILE_EXTENSION_PKG,
+  ".inf",
+  FILE_EXTENSION_INF,
+  ".i",
+  FILE_EXTENSION_IA64_INC,
+  NULL,
+  0
+};
+
+typedef struct EFI_GUID {
+  UINT32  Data1;
+  UINT16  Data2;
+  UINT16  Data3;
+  UINT8   Data4[8];
+} EFI_GUID;
+
+typedef struct {
+  INT8  Data[4];
+  INT8  DataLen;
+} EFI_SIGNATURE;
+
+typedef struct _GUID_RECORD {
+  struct _GUID_RECORD *Next;
+  BOOLEAN             Reported;
+  INT8                *FileName;
+  INT8                *SymName;
+  EFI_GUID            Guid;
+} GUID_RECORD;
+
+typedef struct _SIGNATURE_RECORD {
+  struct _SIGNATURE_RECORD  *Next;
+  BOOLEAN                   Reported;
+  INT8                      *FileName;
+  EFI_SIGNATURE             Signature;
+} SIGNATURE_RECORD;
+
+//
+// Utility options
+//
+typedef struct {
+  INT8        DatabaseOutputFileName[MAX_PATH]; // with -b option
+  STRING_LIST *ExcludeDirs;                     // list of directory names not to process
+  STRING_LIST *ExcludeSubDirs;                  // list of directory names to not process subdirectories (build)
+  STRING_LIST *ExcludeFiles;                    // list of files to exclude (make.inf)
+  STRING_LIST *ExcludeExtensions;               // list of filename extensions to exclude (.inf, .pkg)
+  BOOLEAN     Verbose;
+  BOOLEAN     PrintFound;
+  BOOLEAN     CheckGuids;
+  BOOLEAN     CheckSignatures;
+  BOOLEAN     GuidXReference;
+} OPTIONS;
+
+static
+STATUS
+ProcessArgs (
+  int     Argc,
+  char    *Argv[]
+  );
+
+static
+VOID
+Usage (
+  VOID
+  );
+
+static
+STATUS
+ProcessDirectory (
+  INT8        *Path,
+  INT8        *DirectoryName
+  );
+
+static
+STATUS
+ProcessFile (
+  INT8                *DirectoryName,
+  INT8                *FileName
+  );
+
+static
+UINT32
+GetFileExtension (
+  INT8        *FileName
+  );
+
+static
+UINT32
+SkipWhiteSpace (
+  INT8    *Str
+  );
+
+static
+UINT32
+ValidSymbolName (
+  INT8    *Name
+  );
+
+static
+STATUS
+ProcessCFileGuids (
+  INT8    *FileName
+  );
+
+static
+STATUS
+AddSignature (
+  INT8      *FileName,
+  INT8      *StrDef,
+  UINT32    SigSize
+  );
+
+static
+STATUS
+ProcessCFileSigs (
+  INT8    *FileName
+  );
+
+static
+STATUS
+ProcessINFFileGuids (
+  INT8    *FileName
+  );
+
+static
+STATUS
+ProcessPkgFileGuids (
+  INT8    *FileName
+  );
+
+static
+STATUS
+ProcessIA32FileGuids (
+  INT8    *FileName
+  );
+
+static
+STATUS
+ProcessIA64FileGuids (
+  INT8    *FileName
+  );
+
+static
+BOOLEAN
+IsIA64GuidLine (
+  INT8      *Line,
+  UINT32    *GuidHigh,
+  UINT32    *GuidLow,
+  BOOLEAN   *Low,
+  INT8      *SymName
+  );
+
+static
+STATUS
+AddGuid11 (
+  INT8      *FileName,
+  UINT32    *Data,
+  INT8      *SymName
+  );
+
+static
+STATUS
+AddPkgGuid (
+  INT8      *FileName,
+  UINT32    *Data,
+  UINT64    *Data64
+  );
+
+static
+STATUS
+AddGuid16 (
+  INT8      *FileName,
+  UINT32    *Data
+  );
+
+static
+STATUS
+AddGuid64x2 (
+  INT8      *FileName,
+  UINT32    DataHH,                             // Upper 32-bits of upper 64 bits of guid
+  UINT32    DataHL,                             // Lower 32-bits of upper 64 bits
+  UINT32    DataLH,
+  UINT32    DataLL
+  );
+
+static
+VOID
+FreeGuids (
+  VOID
+  );
+
+static
+VOID
+FreeSigs (
+  VOID
+  );
+
+static
+STATUS
+CheckDuplicates (
+  VOID
+  );
+
+//
+// static
+// VOID
+// ReportGuid (
+//  INT8        *FileName,
+//  GUID_RECORD *FileRecord
+//  );
+//
+static
+VOID
+FreeOptions (
+  VOID
+  );
+
+static
+BOOLEAN
+CheckGuidData (
+  UINT32    *GuidData,
+  UINT32    DataCount
+  );
+
+/**************************** GLOBALS ****************************************/
+static GUID_RECORD      *gGuidList      = NULL;
+static SIGNATURE_RECORD *gSignatureList = NULL;
+static OPTIONS          gOptions;
+
+/*****************************************************************************/
+int
+main (
+  int     Argc,
+  char    *Argv[]
+  )
+{
+  INT8    *Cwd;
+  STATUS  Status;
+
+  SetUtilityName ("GuidChk");
+  //
+  // Get the current working directory and then process the command line
+  // arguments.
+  //
+  Cwd     = _getcwd (NULL, 0);
+  Status  = ProcessArgs (Argc, Argv);
+  if (Status != STATUS_SUCCESS) {
+    return Status;
+  }
+
+  if (gOptions.CheckGuids || gOptions.CheckSignatures) {
+    Status = ProcessDirectory (Cwd, NULL);
+    if (Status == STATUS_SUCCESS) {
+      //
+      // Check for duplicates
+      //
+      Status = CheckDuplicates ();
+    }
+  }
+
+  if (gOptions.DatabaseOutputFileName[0] != 0) {
+    CreateGuidList (gOptions.DatabaseOutputFileName);
+  }
+  //
+  // Free up the memory
+  //
+  free (Cwd);
+  FreeGuids ();
+  FreeSigs ();
+  FreeOptions ();
+  return GetUtilityStatus ();
+}
+
+static
+STATUS
+ProcessArgs (
+  int     Argc,
+  char    *Argv[]
+  )
+{
+  STRING_LIST *StrList;
+
+  memset ((char *) &gOptions, 0, sizeof (gOptions));
+  //
+  // skip over program name
+  //
+  Argc--;
+  Argv++;
+
+  if (Argc == 0) {
+    Usage ();
+    return STATUS_ERROR;
+  }
+
+  while (Argc > 0) {
+    //
+    // Look for options
+    //
+    if ((Argv[0][0] == '-') || (Argv[0][0] == '/')) {
+      switch (Argv[0][1]) {
+      //
+      // Help option
+      //
+      case 'h':
+      case 'H':
+      case '?':
+        Usage ();
+        return STATUS_ERROR;
+        break;
+
+      //
+      // Check guids option
+      //
+      case 'g':
+      case 'G':
+        gOptions.CheckGuids = TRUE;
+        break;
+
+      //
+      // Check signatures option
+      //
+      case 's':
+      case 'S':
+        gOptions.CheckSignatures = TRUE;
+        break;
+
+      //
+      // Print guids found option
+      //
+      case 'p':
+      case 'P':
+        gOptions.PrintFound = TRUE;
+        break;
+
+      //
+      // Exclude files option
+      //
+      case 'f':
+      case 'F':
+        //
+        // Check for another arg
+        //
+        if (Argc < 2) {
+          Error (NULL, 0, 0, Argv[0], "missing argument with option");
+          Usage ();
+          return STATUS_ERROR;
+        }
+
+        StrList = malloc (sizeof (STRING_LIST));
+        if (StrList == NULL) {
+          Error (NULL, 0, 0, "memory allocation failure", NULL);
+          return STATUS_ERROR;
+        }
+
+        memset ((char *) StrList, 0, sizeof (STRING_LIST));
+        StrList->Str          = Argv[1];
+        StrList->Next         = gOptions.ExcludeFiles;
+        gOptions.ExcludeFiles = StrList;
+        Argc--;
+        Argv++;
+        break;
+
+      //
+      // Exclude directories option
+      //
+      case 'd':
+      case 'D':
+        //
+        // Check for another arg
+        //
+        if (Argc < 2) {
+          Error (NULL, 0, 0, Argv[0], "missing argument with option");
+          Usage ();
+          return STATUS_ERROR;
+        }
+
+        StrList = malloc (sizeof (STRING_LIST));
+        if (StrList == NULL) {
+          Error (NULL, 0, 0, "memory allocation failure", NULL);
+          return STATUS_ERROR;
+        }
+
+        memset ((char *) StrList, 0, sizeof (STRING_LIST));
+        StrList->Str          = Argv[1];
+        StrList->Next         = gOptions.ExcludeDirs;
+        gOptions.ExcludeDirs  = StrList;
+        Argc--;
+        Argv++;
+        break;
+
+      //
+      // -u  exclude all subdirectories of a given directory option
+      //
+      case 'u':
+      case 'U':
+        //
+        // Check for another arg
+        //
+        if (Argc < 2) {
+          Error (NULL, 0, 0, Argv[0], "missing argument with option");
+          Usage ();
+          return STATUS_ERROR;
+        }
+
+        StrList = malloc (sizeof (STRING_LIST));
+        if (StrList == NULL) {
+          Error (NULL, 0, 0, "memory allocation failure", NULL);
+          return STATUS_ERROR;
+        }
+
+        memset ((char *) StrList, 0, sizeof (STRING_LIST));
+        StrList->Str            = Argv[1];
+        StrList->Next           = gOptions.ExcludeSubDirs;
+        gOptions.ExcludeSubDirs = StrList;
+        Argc--;
+        Argv++;
+        break;
+
+      //
+      // -e  exclude by filename extension option
+      //
+      case 'e':
+      case 'E':
+        //
+        // Check for another arg
+        //
+        if (Argc < 2) {
+          Error (NULL, 0, 0, Argv[0], "missing argument with option");
+          Usage ();
+          return STATUS_ERROR;
+        }
+
+        StrList = malloc (sizeof (STRING_LIST));
+        if (StrList == NULL) {
+          Error (NULL, 0, 0, "memory allocation failure", NULL);
+          return STATUS_ERROR;
+        }
+
+        memset ((char *) StrList, 0, sizeof (STRING_LIST));
+        //
+        // Let them put a * in front of the filename extension
+        //
+        StrList->Str = Argv[1];
+        if (StrList->Str[0] == '*') {
+          StrList->Str++;
+        }
+
+        StrList->Next               = gOptions.ExcludeExtensions;
+        gOptions.ExcludeExtensions  = StrList;
+        Argc--;
+        Argv++;
+        break;
+
+      //
+      // Print guid with matching symbol name for guid definitions found
+      //
+      case 'x':
+      case 'X':
+        gOptions.GuidXReference = 1;
+        break;
+
+      //
+      // -b   Print the internal database list to a file
+      //
+      case 'b':
+      case 'B':
+        //
+        // Check for one more arg
+        //
+        if (Argc < 2) {
+          Error (NULL, 0, 0, Argv[0], "must specify file name with option");
+          Usage ();
+          return STATUS_ERROR;
+        }
+
+        strcpy (gOptions.DatabaseOutputFileName, Argv[1]);
+        Argc--;
+        Argv++;
+        break;
+
+      default:
+        Error (NULL, 0, 0, Argv[0], "invalid option");
+        Usage ();
+        return STATUS_ERROR;
+      }
+    } else {
+      break;
+    }
+    //
+    // Next arg
+    //
+    Argc--;
+    Argv++;
+  }
+
+  if (Argc > 0) {
+    Error (NULL, 0, 0, Argv[0], "invalid argument");
+    Usage ();
+    return STATUS_ERROR;
+  }
+  //
+  // Have to check signatures, GUIDs, or dump the GUID database.
+  //
+  if ((!gOptions.CheckGuids) && (!gOptions.CheckSignatures) && (gOptions.DatabaseOutputFileName[0] == 0)) {
+    Error (NULL, 0, 0, "nothing to do", "must specify -g, -s, and/or -b");
+    Usage ();
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+//
+// Print usage instructions
+//
+static
+VOID
+Usage (
+  VOID
+  )
+{
+  int   Index;
+  char  *Str[] = {
+    "GuidChk - scan files for duplicate GUID or signature definitions",
+    "",
+    "Usage:  GuidChk {options}\n",
+    "  Options: ",
+    "    -d dirname     exclude searching of a directory",
+    "    -f filename    exclude searching of a file",
+    "    -e extension   exclude searching of files by extension",
+    "    -p             print all GUIDS found",
+    "    -g             check for duplicate guids",
+    "    -s             check for duplicate signatures",
+    "    -x             print guid+defined symbol name",
+    "    -b outfile     write internal GUID+basename list to outfile",
+    "    -u dirname     exclude searching all subdirectories of a directory",
+    "    -h -?          print this help text",
+    " ",
+    "   Example: GuidChk -g -u build -d fv -f make.inf -e .pkg",
+    "",
+    NULL
+  };
+  for (Index = 0; Str[Index] != NULL; Index++) {
+    fprintf (stdout, "%s\n", Str[Index]);
+  }
+}
+//
+// Process an entire directory by name
+//
+static
+STATUS
+ProcessDirectory (
+  INT8          *Path,
+  INT8          *DirectoryName
+  )
+{
+  FILE_SEARCH_DATA  FSData;
+  char              *FileMask;
+  BOOLEAN           Done;
+  UINT32            Len;
+  BOOLEAN           NoSubdirs;
+  STRING_LIST       *SLPtr;
+
+  //
+  // Root directory may be null
+  //
+  if (DirectoryName != NULL) {
+    //
+    // printf ("Processing directory: %s\n", DirectoryName);
+    //
+  }
+  //
+  // Initialize our file searching
+  //
+  FileSearchInit (&FSData);
+
+  //
+  // Exclude some directories, files, and extensions
+  //
+  FileSearchExcludeDirs (&FSData, gOptions.ExcludeDirs);
+  FileSearchExcludeExtensions (&FSData, gOptions.ExcludeExtensions);
+  FileSearchExcludeFiles (&FSData, gOptions.ExcludeFiles);
+  //
+  // See if this directory is in the list of directories that they
+  // don't want to process subdirectories of
+  //
+  NoSubdirs = FALSE;
+  if (DirectoryName != NULL) {
+    for (SLPtr = gOptions.ExcludeSubDirs; SLPtr != NULL; SLPtr = SLPtr->Next) {
+      if (stricmp (SLPtr->Str, DirectoryName) == 0) {
+        //
+        // printf ("not processing subdirectories of %s\n", DirectoryName);
+        //
+        NoSubdirs = TRUE;
+        break;
+      }
+    }
+  }
+  //
+  // Create a filemask of files to search for. We'll append "\*.*" on the
+  // end, so allocate some extra bytes.
+  //
+  Len = strlen (Path) + 10;
+  if (DirectoryName != NULL) {
+    Len += strlen (DirectoryName);
+  }
+
+  FileMask = malloc (Len);
+  if (FileMask == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // Now put it all together
+  //
+  strcpy (FileMask, Path);
+  if ((DirectoryName != NULL) && (strlen (DirectoryName) > 0)) {
+    strcat (FileMask, "\\");
+    strcat (FileMask, DirectoryName);
+  }
+
+  strcat (FileMask, "\\*.*");
+
+  //
+  // Start file searching for files and directories
+  //
+  FileSearchStart (&FSData, FileMask, FILE_SEARCH_FILE | FILE_SEARCH_DIR);
+
+  //
+  // Now hack the "\*.*" off the end of the filemask so we can use it to pass
+  // the full directory path on recursive calls to process directories.
+  //
+  FileMask[strlen (FileMask) - 4] = 0;
+
+  //
+  // Loop until no more files
+  //
+  Done = FALSE;
+  while (!Done) {
+    //
+    // printf ("Found %s...", FSData.FileName);
+    //
+    if (FSData.FileFlags & FILE_SEARCH_DIR) {
+      //
+      // printf ("directory\n");
+      //
+      if (!NoSubdirs) {
+        ProcessDirectory (FileMask, FSData.FileName);
+      }
+    } else if (FSData.FileFlags & FILE_SEARCH_FILE) {
+      //
+      // printf ("file\n");
+      //
+      ProcessFile (FileMask, FSData.FileName);
+    } else {
+      //
+      // printf ("unknown\n");
+      //
+    }
+
+    if (FileSearchFindNext (&FSData) != STATUS_SUCCESS) {
+      Done = TRUE;
+    }
+  }
+  //
+  // Free up allocated memory
+  //
+  free (FileMask);
+
+  //
+  // Free up our file searching
+  //
+  FileSearchDestroy (&FSData);
+
+  return STATUS_SUCCESS;
+}
+//
+// Process a single file.
+//
+static
+STATUS
+ProcessFile (
+  INT8                *DirectoryName,
+  INT8                *FileName
+  )
+{
+  STATUS  Status;
+  UINT32  FileExtension;
+  INT8    FullFileName[MAX_PATH];
+
+  Status = STATUS_SUCCESS;
+
+  sprintf (FullFileName, "%s\\%s", DirectoryName, FileName);
+  //
+  // printf ("Found file: %s\n", FullFileName);
+  //
+  FileExtension = GetFileExtension (FileName);
+
+  //
+  // Process these for GUID checks
+  //
+  if (gOptions.CheckGuids) {
+    switch (FileExtension) {
+    case FILE_EXTENSION_C:
+    case FILE_EXTENSION_H:
+      Status = ProcessCFileGuids (FullFileName);
+      break;
+
+    case FILE_EXTENSION_PKG:
+      Status = ProcessPkgFileGuids (FullFileName);
+      break;
+
+    case FILE_EXTENSION_IA32_INC:
+    case FILE_EXTENSION_IA32_ASM:
+      Status = ProcessIA32FileGuids (FullFileName);
+      break;
+
+    case FILE_EXTENSION_INF:
+      Status = ProcessINFFileGuids (FullFileName);
+      break;
+
+    case FILE_EXTENSION_IA64_INC:
+    case FILE_EXTENSION_IA64_ASM:
+      Status = ProcessIA64FileGuids (FullFileName);
+      break;
+
+    default:
+      //
+      // No errors anyway
+      //
+      Status = STATUS_SUCCESS;
+      break;
+    }
+  }
+
+  if (gOptions.CheckSignatures) {
+    switch (FileExtension) {
+    case FILE_EXTENSION_C:
+    case FILE_EXTENSION_H:
+      Status = ProcessCFileSigs (FullFileName);
+      break;
+
+    default:
+      //
+      // No errors anyway
+      //
+      Status = STATUS_SUCCESS;
+      break;
+    }
+  }
+
+  return Status;
+}
+//
+// Return a code indicating the file name extension.
+//
+static
+UINT32
+GetFileExtension (
+  INT8        *FileName
+  )
+{
+  INT8  *Extension;
+  int   Index;
+
+  //
+  // Look back for a filename extension
+  //
+  for (Extension = FileName + strlen (FileName) - 1; Extension >= FileName; Extension--) {
+    if (*Extension == '.') {
+      for (Index = 0; FileTypeTable[Index].Extension != NULL; Index++) {
+        if (stricmp (FileTypeTable[Index].Extension, Extension) == 0) {
+          return FileTypeTable[Index].ExtensionCode;
+        }
+      }
+    }
+  }
+
+  return FILE_TYPE_UNKNOWN;
+}
+//
+// Process a .pkg file.
+//
+// Look for FFS_FILEGUID=35b898ca-b6a9-49ce-8c72-904735cc49b7
+//
+static
+STATUS
+ProcessPkgFileGuids (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN * 2];
+  INT8    *Cptr;
+  INT8    *Cptr2;
+  UINT32  GuidScan[11];
+  UINT64  Guid64;
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read lines from the file until done
+  //
+  while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+    Cptr = Line;
+    Cptr += SkipWhiteSpace (Line);
+    if (strncmp (Cptr, "FFS_FILEGUID", 12) == 0) {
+      Cptr += 12;
+      Cptr += SkipWhiteSpace (Cptr);
+      if (*Cptr == '=') {
+        Cptr++;
+        Cptr += SkipWhiteSpace (Cptr + 1);
+        //
+        // Blank out dashes on the line.
+        //
+        for (Cptr2 = Cptr; *Cptr2; Cptr2++) {
+          if (*Cptr2 == '-') {
+            *Cptr2 = ' ';
+          }
+        }
+
+        if (sscanf (
+              Cptr,
+              "%X %X %X %X %I64X",
+              &GuidScan[0],
+              &GuidScan[1],
+              &GuidScan[2],
+              &GuidScan[3],
+              &Guid64
+              ) == 5) {
+          AddPkgGuid (FileName, GuidScan, &Guid64);
+        } else {
+          DebugMsg (NULL, 0, 0, FileName, "GUID scan failed");
+        }
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// Process an IA32 assembly file.
+//
+// Look for:
+// FIND_FD_GUID_VAL equ  01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h, 01h
+// PEI_GUID_FileNameGuid_Gmch815  equ  081818181h, 08181h, 08181h, 081h, 081h, 081h, 081h, 081h, 081h, 081h, 081h
+//
+static
+STATUS
+ProcessIA32FileGuids (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN];
+  INT8    *Cptr;
+  INT8    CSave;
+  INT8    *CSavePtr;
+  UINT32  Len;
+  UINT32  GuidData[16];
+  UINT32  Index;
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read lines from the file until done
+  //
+  while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+    Cptr = Line;
+    Cptr += SkipWhiteSpace (Line);
+    //
+    // Look for xxxGUIDyyy equ 01h, 02h, 03h, ...
+    //
+    Len = ValidSymbolName (Cptr);
+    if (Len) {
+      //
+      // Terminate the line after the symbol name, then look for "guid" in
+      // the name.
+      //
+      CSavePtr  = Cptr + Len;
+      CSave     = *CSavePtr;
+      *CSavePtr = 0;
+      while (*Cptr) {
+        if (strnicmp (Cptr, "guid", 4) == 0) {
+          break;
+        }
+
+        Cptr++;
+      }
+      //
+      // If we found the string "guid", continue
+      //
+      if (*Cptr) {
+        //
+        // Restore the character on the line where we null-terminated the symbol
+        //
+        *CSavePtr = CSave;
+        Cptr      = CSavePtr;
+        Len       = SkipWhiteSpace (Cptr);
+        //
+        // Had to be some white space
+        //
+        if (Len) {
+          Cptr += Len;
+          //
+          // now look for "equ"
+          //
+          if (strnicmp (Cptr, "equ", 3) == 0) {
+            Cptr += 3;
+            Cptr += SkipWhiteSpace (Cptr);
+            //
+            // Now scan all the data
+            //
+            for (Index = 0; Index < 16; Index++) {
+              if (sscanf (Cptr, "%X", &GuidData[Index]) != 1) {
+                break;
+              }
+              //
+              // Skip to next
+              //
+              while (isxdigit (*Cptr)) {
+                Cptr++;
+              }
+
+              if ((*Cptr != 'h') && (*Cptr != 'H')) {
+                break;
+              } else {
+                Cptr++;
+                while (*Cptr && (isspace (*Cptr) || (*Cptr == ','))) {
+                  Cptr++;
+                }
+              }
+            }
+            //
+            // Now see which form we had
+            //
+            if (Index == 16) {
+              AddGuid16 (FileName, GuidData);
+            } else if (Index == 11) {
+              AddGuid11 (FileName, GuidData, NULL);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// Found and parsed an IA32 assembly code guid. Save the 16 bytes off in the list
+// of guids.
+//
+static
+STATUS
+AddGuid16 (
+  INT8      *FileName,
+  UINT32    *Data
+  )
+{
+  GUID_RECORD *NewRec;
+  int         Index;
+
+  //
+  // Sanity check the data
+  //
+  if (!CheckGuidData (Data, 16)) {
+    return STATUS_ERROR;
+  }
+  //
+  // Allocate memory for a new guid structure
+  //
+  NewRec = malloc (sizeof (GUID_RECORD));
+  if (NewRec == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) NewRec, 0, sizeof (GUID_RECORD));
+  NewRec->FileName = malloc (strlen (FileName) + 1);
+  if (NewRec->FileName == NULL) {
+    free (NewRec);
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  strcpy (NewRec->FileName, FileName);
+  NewRec->Guid.Data1  = (UINT32) (Data[0] | (Data[1] << 8) | (Data[2] << 16) | (Data[3] << 24));
+  NewRec->Guid.Data2  = (UINT16) (Data[4] | (Data[5] << 8));
+  NewRec->Guid.Data3  = (UINT16) (Data[6] | (Data[7] << 8));
+  for (Index = 0; Index < 8; Index++) {
+    NewRec->Guid.Data4[Index] = (UINT8) Data[Index + 8];
+  }
+  //
+  // Add it to the list
+  //
+  NewRec->Next  = gGuidList;
+  gGuidList     = NewRec;
+
+  //
+  // Report it
+  // ReportGuid (FileName, NewRec);
+  //
+  return STATUS_SUCCESS;
+}
+//
+// Add a GUID defined as GuidLow: 0x1122334455667788
+//                       GuidHi:  0x99AABBCCDDEEFF00
+//
+// These are equivalent:
+// { 0x11223344, 0x5566, 0x7788, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 0x00 }
+//    and:
+// Low: 00FFEEDDCCBBAA99
+// Hi:  7788556611223344
+//
+static
+STATUS
+AddGuid64x2 (
+  INT8      *FileName,
+  UINT32    DataHH, // Upper 32-bits of upper 64 bits of guid
+  UINT32    DataHL, // Lower 32-bits of upper 64 bits
+  UINT32    DataLH,
+  UINT32    DataLL
+  )
+{
+  GUID_RECORD *NewRec;
+  int         Index;
+
+  //
+  // Allocate memory for a new guid structure
+  //
+  NewRec = malloc (sizeof (GUID_RECORD));
+  if (NewRec == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) NewRec, 0, sizeof (GUID_RECORD));
+  NewRec->FileName = malloc (strlen (FileName) + 1);
+  if (NewRec->FileName == NULL) {
+    free (NewRec);
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  strcpy (NewRec->FileName, FileName);
+  NewRec->Guid.Data1  = DataHL;
+  NewRec->Guid.Data2  = (UINT16) DataHH;
+  NewRec->Guid.Data3  = (UINT16) (DataHH >> 16);
+  for (Index = 0; Index < 4; Index++) {
+    NewRec->Guid.Data4[Index] = (UINT8) DataLL;
+    DataLL >>= 8;
+  }
+
+  for (Index = 0; Index < 4; Index++) {
+    NewRec->Guid.Data4[Index + 4] = (UINT8) DataLH;
+    DataLH >>= 8;
+  }
+  //
+  // Add it to the list
+  //
+  NewRec->Next  = gGuidList;
+  gGuidList     = NewRec;
+
+  //
+  // Report it
+  // ReportGuid (FileName, NewRec);
+  //
+  return STATUS_SUCCESS;
+}
+//
+// Process INF files. Look for:
+// FILE_GUID            = 240612B6-A063-11d4-9A3A-0090273FC14D
+//
+static
+STATUS
+ProcessINFFileGuids (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN * 2];
+  INT8    *Cptr;
+  INT8    *Cptr2;
+  UINT32  GuidScan[11];
+  UINT64  Guid64;
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read lines from the file until done
+  //
+  while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+    Cptr = Line;
+    Cptr += SkipWhiteSpace (Line);
+    if (strncmp (Cptr, "FILE_GUID", 9) == 0) {
+      Cptr += 9;
+      Cptr += SkipWhiteSpace (Cptr);
+      if (*Cptr == '=') {
+        Cptr++;
+        Cptr += SkipWhiteSpace (Cptr + 1);
+        //
+        // Blank out dashes on the line.
+        //
+        for (Cptr2 = Cptr; *Cptr2; Cptr2++) {
+          if (*Cptr2 == '-') {
+            *Cptr2 = ' ';
+          }
+        }
+
+        if (sscanf (
+              Cptr,
+              "%X %X %X %X %I64X",
+              &GuidScan[0],
+              &GuidScan[1],
+              &GuidScan[2],
+              &GuidScan[3],
+              &Guid64
+              ) == 5) {
+          AddPkgGuid (FileName, GuidScan, &Guid64);
+        } else {
+          DebugMsg (NULL, 0, 0, FileName, "GUID scan failed");
+        }
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// Parse ('g','m','a','p','a','b','c','d')
+//
+static
+STATUS
+AddSignature (
+  INT8      *FileName,
+  INT8      *StrDef,
+  UINT32    SigSize
+  )
+{
+  SIGNATURE_RECORD  *NewRec;
+  INT8              *Cptr;
+  UINT32            Index;
+  BOOLEAN           Fail;
+
+  //
+  // Allocate memory for the new record
+  //
+  Fail    = FALSE;
+  NewRec  = malloc (sizeof (SIGNATURE_RECORD));
+  if (NewRec == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // Allocate memory to save the file name
+  //
+  NewRec->FileName = malloc (strlen (FileName) + 1);
+  if (NewRec->FileName == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    free (NewRec);
+    return STATUS_ERROR;
+  }
+  //
+  // Fill in the fields
+  //
+  strcpy (NewRec->FileName, FileName);
+  NewRec->Signature.DataLen = (UINT8) SigSize;
+  //
+  // Skip to open parenthesis
+  //
+  Cptr = StrDef;
+  Cptr += SkipWhiteSpace (Cptr);
+  if (*Cptr != '(') {
+    Fail = TRUE;
+    goto Done;
+  }
+
+  Cptr++;
+  //
+  // Skip to first ' and start processing
+  //
+  while (*Cptr && (*Cptr != '\'')) {
+    Cptr++;
+  }
+
+  for (Index = 0; Index < SigSize; Index++) {
+    if (*Cptr == '\'') {
+      Cptr++;
+      NewRec->Signature.Data[Index] = (INT8) *Cptr;
+      //
+      // Skip to closing quote
+      //
+      Cptr++;
+      if (*Cptr != '\'') {
+        Fail = TRUE;
+        break;
+      }
+      //
+      // Skip over closing quote, go to next one
+      //
+      Cptr++;
+      while (*Cptr && (*Cptr != '\'')) {
+        Cptr++;
+      }
+    } else {
+      Fail = TRUE;
+      DebugMsg (NULL, 0, 0, StrDef, "failed to parse signature");
+      break;
+    }
+  }
+
+Done:
+  if (Fail) {
+    free (NewRec->FileName);
+    free (NewRec);
+    return STATUS_ERROR;
+  }
+
+  NewRec->Next    = gSignatureList;
+  gSignatureList  = NewRec;
+  return STATUS_SUCCESS;
+}
+//
+// Look for:
+// #define POOL_HEAD_SIGNATURE         EFI_SIGNATURE_16('p','h')
+// #define GCD_MEMORY_MAP_SIGNATURE    EFI_SIGNATURE_32('g','m','a','p')
+// #define GCD_MEMORY_MAP_SIGNATURE    EFI_SIGNATURE_64('g','m','a','p','a','b','c','d')
+//
+static
+STATUS
+ProcessCFileSigs (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN * 2];
+  INT8    *Cptr;
+  UINT32  Len;
+  UINT32  LineLen;
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read lines from the file until done
+  //
+  while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+    Cptr = Line;
+    Cptr += SkipWhiteSpace (Line);
+    //
+    // look for #define xxxGUIDxxx value
+    //
+    if (*Cptr == '#') {
+      Cptr++;
+      Cptr += SkipWhiteSpace (Cptr);
+      //
+      // Look for "define"
+      //
+      if (!strncmp (Cptr, "define", 6)) {
+        Cptr += 6;
+        //
+        // Better be whitespace
+        //
+        Len = SkipWhiteSpace (Cptr);
+        if (Len) {
+          Cptr += Len;
+          //
+          // See if it's a valid symbol name
+          //
+          Len = ValidSymbolName (Cptr);
+          if (Len) {
+            //
+            // It is a valid symbol name. See if there's a line continuation,
+            // and if so, read one more line.
+            // Skip over the symbol name and look for the string "EFI_SIGNATURE_xx"
+            //
+            LineLen = strlen (Line);
+            if ((Line[LineLen - 1] == '\n') && (Line[LineLen - 2] == '\\')) {
+              fgets (Line + LineLen - 2, sizeof (Line) - LineLen, Fptr);
+            } else if (Line[LineLen - 1] == '\\') {
+              fgets (Line + LineLen - 1, sizeof (Line) - LineLen, Fptr);
+            }
+
+            Cptr += Len;
+            Cptr += SkipWhiteSpace (Cptr);
+            if (strncmp (Cptr, "EFI_SIGNATURE_16", 16) == 0) {
+              AddSignature (FileName, Cptr + 16, 2);
+            } else if (strncmp (Cptr, "EFI_SIGNATURE_32", 16) == 0) {
+              AddSignature (FileName, Cptr + 16, 4);
+            } else if (strncmp (Cptr, "EFI_SIGNATURE_64", 16) == 0) {
+              AddSignature (FileName, Cptr + 16, 8);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// look for #define xxxGUIDyyy { 0x...}
+// xxx EFI_GUID  GuidName = { 0x... };
+//
+static
+STATUS
+ProcessCFileGuids (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN * 2];
+  INT8    *Cptr;
+  INT8    CSave;
+  INT8    *CSavePtr;
+  INT8    *TempCptr;
+  INT8    *SymName;
+  UINT32  Len;
+  UINT32  LineLen;
+  UINT32  GuidScan[11];
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read lines from the file until done
+  //
+  while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+    Cptr = Line;
+    Cptr += SkipWhiteSpace (Line);
+    //
+    // look for #define xxxGUIDxxx value
+    //
+    if (*Cptr == '#') {
+      Cptr++;
+      Cptr += SkipWhiteSpace (Cptr);
+      //
+      // Look for "define"
+      //
+      if (!strncmp (Cptr, "define", 6)) {
+        Cptr += 6;
+        //
+        // Better be whitespace
+        //
+        Len = SkipWhiteSpace (Cptr);
+        if (Len) {
+          Cptr += Len;
+          //
+          // See if it's a valid symbol name
+          //
+          Len = ValidSymbolName (Cptr);
+          if (Len) {
+            //
+            // It is a valid symbol name. See if there's a line continuation,
+            // and if so, read one more line.
+            // Then truncate after the symbol name, look for the string "GUID",
+            // and continue.
+            //
+            SymName = Cptr;
+            LineLen = strlen (Line);
+            if ((Line[LineLen - 1] == '\n') && (Line[LineLen - 2] == '\\')) {
+              fgets (Line + LineLen - 2, sizeof (Line) - LineLen, Fptr);
+            } else if (Line[LineLen - 1] == '\\') {
+              fgets (Line + LineLen - 1, sizeof (Line) - LineLen, Fptr);
+            }
+
+            CSavePtr  = Cptr + Len;
+            CSave     = *CSavePtr;
+            *CSavePtr = 0;
+            while (*Cptr) {
+              if (strncmp (Cptr, "GUID", 4) == 0) {
+                break;
+              }
+
+              Cptr++;
+            }
+            //
+            // If we didn't run out of string, then we found the GUID string.
+            // Now look for { 0x....... }
+            //
+            if (*Cptr) {
+              Cptr      = CSavePtr;
+              *CSavePtr = CSave;
+              Cptr += SkipWhiteSpace (Cptr);
+              if (*Cptr == '{') {
+                *Cptr = 0;
+                Cptr++;
+                //
+                // 0x665E3FF6, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
+                // If you have one suffixed with "L", then it doesn't work. So hack off 'L' characters
+                // in the string.
+                //
+                for (TempCptr = Cptr; *TempCptr; TempCptr++) {
+                  if (*TempCptr == 'L') {
+                    if (*(TempCptr + 1) == ',') {
+                      *TempCptr       = ',';
+                      *(TempCptr + 1) = ' ';
+                    }
+                  }
+                }
+
+                if (sscanf (
+                      Cptr,
+                      "%X, %X, %X, %X, %X, %X, %X, %X, %X, %X, %X",
+                      &GuidScan[0],
+                      &GuidScan[1],
+                      &GuidScan[2],
+                      &GuidScan[3],
+                      &GuidScan[4],
+                      &GuidScan[5],
+                      &GuidScan[6],
+                      &GuidScan[7],
+                      &GuidScan[8],
+                      &GuidScan[9],
+                      &GuidScan[10]
+                      ) == 11) {
+                  AddGuid11 (FileName, GuidScan, SymName);
+                }
+              }
+            }
+          }
+        }
+      }
+      //
+      // Else look for "static EFI_GUID xxxGUIDxxx = { 0x.... };
+      //
+    } else if ((CSavePtr = strstr (Line, "EFI_GUID")) != NULL) {
+      //
+      // Read the next line if line continuation
+      //
+      LineLen = strlen (Line);
+      if ((Line[LineLen - 1] == '\n') && (Line[LineLen - 2] == '\\')) {
+        fgets (Line + LineLen - 2, sizeof (Line) - LineLen, Fptr);
+      } else if (Line[LineLen - 1] == '\\') {
+        fgets (Line + LineLen - 1, sizeof (Line) - LineLen, Fptr);
+      }
+
+      Cptr = CSavePtr + 8;
+      Cptr += SkipWhiteSpace (Cptr);
+      //
+      // Should be variable name next
+      //
+      Len     = ValidSymbolName (Cptr);
+      SymName = Cptr;
+      Cptr += Len;
+      Cptr += SkipWhiteSpace (Cptr);
+      if (*Cptr == '=') {
+        Cptr++;
+        Cptr += SkipWhiteSpace (Cptr);
+        //
+        // Should be open-brace next to define guid
+        //
+        if (*Cptr == '{') {
+          Cptr++;
+          //
+          // 0x665E3FF6, 0x46CC, 0x11d4, 0x9A, 0x38, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }
+          //
+          if (sscanf (
+                Cptr,
+                "%X, %X, %X, %X, %X, %X, %X, %X, %X, %X, %X",
+                &GuidScan[0],
+                &GuidScan[1],
+                &GuidScan[2],
+                &GuidScan[3],
+                &GuidScan[4],
+                &GuidScan[5],
+                &GuidScan[6],
+                &GuidScan[7],
+                &GuidScan[8],
+                &GuidScan[9],
+                &GuidScan[10]
+                ) == 11) {
+            AddGuid11 (FileName, GuidScan, Cptr);
+            //
+            // printf ("Found guid: %s", Cptr);
+            //
+          }
+        }
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// Process Intel Itanium(TM) GUID definitions. Look for:
+// #define Cs870MemoryTestPEIMGuidL 0x9C2403386E1C8FAA
+// #define Cs870MemoryTestPEIMGuidH 0xE89E95C6180342f0
+// in either order.
+// This function assumes no blank lines between definitions.
+//
+static
+STATUS
+ProcessIA64FileGuids (
+  INT8    *FileName
+  )
+{
+  FILE    *Fptr;
+  INT8    Line[MAX_LINE_LEN];
+  UINT32  Guid1H;
+  UINT32  Guid1L;
+  UINT32  Guid2H;
+  UINT32  Guid2L;
+  INT8    SymName1[MAX_LINE_LEN];
+  INT8    SymName2[MAX_LINE_LEN];
+  BOOLEAN Done;
+  BOOLEAN LowFirst;
+  BOOLEAN FoundLow;
+
+  if ((Fptr = fopen (FileName, "r")) == NULL) {
+    Error (NULL, 0, 0, FileName, "could not open input file for reading");
+    return STATUS_ERROR;
+  }
+
+  Done = FALSE;
+  if (fgets (Line, sizeof (Line), Fptr) == NULL) {
+    Done = 1;
+  }
+  //
+  // Read lines from the file until done. Since the guid definition takes
+  // two lines, we read lines in different places to recover gracefully
+  // from mismatches. For example, if you thought you found the first half,
+  // but the next line had a symbol mismatch, then you have to process the
+  // line again in case it's the start of a new definition.
+  //
+  while (!Done) {
+    //
+    // Check current line for GUID definition. Assume low define first.
+    //
+    if (IsIA64GuidLine (Line, &Guid1H, &Guid1L, &FoundLow, SymName1)) {
+      //
+      // Might have to swap guids later. Save off if we found the LOW first
+      //
+      if (FoundLow) {
+        LowFirst = TRUE;
+      } else {
+        LowFirst = FALSE;
+      }
+      //
+      // Read the next line and try for the rest of the guid definition
+      //
+      if (fgets (Line, sizeof (Line), Fptr) == NULL) {
+        Done = 1;
+      } else {
+        if (IsIA64GuidLine (Line, &Guid2H, &Guid2L, &FoundLow, SymName2)) {
+          //
+          // Found another. If the symbol names match, then save it off.
+          //
+          if (strcmp (SymName1, SymName2) == 0) {
+            //
+            // Yea, found one. Save it off.
+            //
+            if (LowFirst) {
+              AddGuid64x2 (FileName, Guid2H, Guid2L, Guid1H, Guid1L);
+            } else {
+              AddGuid64x2 (FileName, Guid1H, Guid1L, Guid2H, Guid2L);
+            }
+            //
+            // Read the next line for processing
+            //
+            if (fgets (Line, sizeof (Line), Fptr) == NULL) {
+              Done = 1;
+            }
+          } else {
+            //
+            // Don't get another line so that we reprocess this line in case it
+            // contains the start of a new definition.
+            // fprintf (stdout, "Symbol name mismatch: %s: %s != %s\n",
+            //    FileName, SymName1, SymName2);
+            //
+          }
+        } else {
+          //
+          // Second line was not a guid definition. Get the next line from the
+          // file.
+          //
+          if (fgets (Line, sizeof (Line), Fptr) == NULL) {
+            Done = 1;
+          }
+        }
+      }
+    } else {
+      //
+      // Not a guid define line. Next.
+      //
+      if (fgets (Line, sizeof (Line), Fptr) == NULL) {
+        Done = 1;
+      }
+    }
+  }
+
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+//
+// Given a line from an Itanium-based assembly file, check the line for a guid
+// defininition. One of either:
+// #define Cs870MemoryTestPEIMGuidL 0x9C2403386E1C8FAA
+// #define Cs870MemoryTestPEIMGuidH 0xE89E95C6180342f0
+// Return the defined value as two 32-bit values, and whether it's a high
+// or low guid.
+//
+static
+BOOLEAN
+IsIA64GuidLine (
+  INT8      *Line,
+  UINT32    *GuidHigh,
+  UINT32    *GuidLow,
+  BOOLEAN   *FoundLow,
+  INT8      *SymName
+  )
+{
+  INT8    *Cptr;
+  INT8    CSave;
+  INT8    *CSavePtr;
+  INT8    *SymStart;
+  UINT32  Len;
+
+  Cptr = Line;
+  Cptr += SkipWhiteSpace (Cptr);
+  //
+  // look for #define xxxGUID[L|H] 0xHexValue
+  //
+  if (*Cptr == '#') {
+    Cptr++;
+    Cptr += SkipWhiteSpace (Cptr);
+    //
+    // Look for "define"
+    //
+    if (!strncmp (Cptr, "define", 6)) {
+      Cptr += 6;
+      //
+      // Better be whitespace
+      //
+      Len = SkipWhiteSpace (Cptr);
+      if (Len) {
+        Cptr += Len;
+        //
+        // See if it's a valid symbol name
+        //
+        Len = ValidSymbolName (Cptr);
+        if (Len) {
+          //
+          // Save the start so we can copy it to their string if later checks are ok
+          //
+          SymStart = Cptr;
+          //
+          // It is a valid symbol name, look for the string GuidL or GuidH
+          //
+          CSavePtr  = Cptr + Len;
+          CSave     = *CSavePtr;
+          *CSavePtr = 0;
+          while (*Cptr) {
+            if (strncmp (Cptr, "GuidL", 5) == 0) {
+              *FoundLow = 1;
+              break;
+            } else if (strncmp (Cptr, "GuidH", 5) == 0) {
+              *FoundLow = 0;
+              break;
+            }
+
+            Cptr++;
+          }
+          //
+          // If we didn't run out of string, then we found the GUID string.
+          // Restore the null character we inserted above and continue.
+          // Now look for  0x.......
+          //
+          if (*Cptr) {
+            //
+            // Return symbol name less the "L" or "H"
+            //
+            strcpy (SymName, SymStart);
+            SymName[strlen (SymName) - 1] = 0;
+            Cptr                          = CSavePtr;
+            *CSavePtr                     = CSave;
+            Cptr += SkipWhiteSpace (Cptr);
+            if ((*Cptr == '0') && (*(Cptr + 1) == 'x')) {
+              //
+              // skip over "0x"
+              //
+              Cptr += 2;
+              //
+              // 0x0123456789ABCDEF -- null terminate after 8 characters,
+              // scan, replace the character and scan at that point.
+              //
+              CSave       = *(Cptr + 8);
+              *(Cptr + 8) = 0;
+              if (sscanf (Cptr, "%X", GuidHigh) == 1) {
+                *(Cptr + 8) = CSave;
+                if (sscanf (Cptr + 8, "%X", GuidLow) == 1) {
+                  return TRUE;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return FALSE;
+}
+//
+// Look at the characters in the string and determine if it's a valid
+// symbol name. Basically [a-zA-Z_][a-zA-Z_0-9]*
+//
+static
+UINT32
+ValidSymbolName (
+  INT8    *Name
+  )
+{
+  int Len;
+
+  Len = 0;
+
+  //
+  // Test first character
+  //
+  if (((*Name >= 'a') && (*Name <= 'z')) || ((*Name >= 'A') && (*Name <= 'Z')) || (*Name == '_')) {
+    Name++;
+    Len = 1;
+    while (*Name) {
+      if (((*Name >= 'a') && (*Name <= 'z')) ||
+          ((*Name >= 'A') && (*Name <= 'Z')) ||
+          ((*Name >= '0') && (*Name <= '9')) ||
+          (*Name == '_')
+          ) {
+        Name++;
+        Len++;
+      } else {
+        break;
+      }
+    }
+  }
+
+  return Len;
+}
+
+static
+UINT32
+SkipWhiteSpace (
+  INT8    *Str
+  )
+{
+  UINT32  Len;
+  Len = 0;
+  while (isspace (*Str) && *Str) {
+    Len++;
+    Str++;
+  }
+
+  return Len;
+}
+//
+// found FFS_FILEGUID=35b898ca-b6a9-49ce-8c72-904735cc49b7
+//
+static
+STATUS
+AddPkgGuid (
+  INT8      *FileName,
+  UINT32    *Data,
+  UINT64    *Data64
+  )
+{
+  GUID_RECORD *NewRec;
+  int         Index;
+
+  //
+  // Sanity check the data
+  //
+  if ((Data[1] | Data[2] | Data[3]) & 0xFFFF0000) {
+    Error (NULL, 0, 0, "out of range value for GUID data word(s) [1] - [3]", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // More checks for Data64?
+  // Allocate memory for a new one guid structure
+  //
+  NewRec = malloc (sizeof (GUID_RECORD));
+  if (NewRec == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) NewRec, 0, sizeof (GUID_RECORD));
+  NewRec->FileName = malloc (strlen (FileName) + 1);
+  if (NewRec->FileName == NULL) {
+    free (NewRec);
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  strcpy (NewRec->FileName, FileName);
+  NewRec->Guid.Data1    = Data[0];
+  NewRec->Guid.Data2    = (UINT16) Data[1];
+  NewRec->Guid.Data3    = (UINT16) Data[2];
+  NewRec->Guid.Data4[0] = (UINT8) Data[3];
+  NewRec->Guid.Data4[1] = (UINT8) (Data[3] >> 8);
+  for (Index = 2; Index < 8; Index++) {
+    NewRec->Guid.Data4[Index] = (UINT8) *Data64;
+    *Data64 >>= 8;
+  }
+  //
+  // Add it to the list
+  //
+  NewRec->Next  = gGuidList;
+  gGuidList     = NewRec;
+
+  //
+  // Report it
+  // ReportGuid (FileName, NewRec);
+  //
+  return STATUS_SUCCESS;
+}
+//
+// Add a guid consisting of 11 fields to our list of guids
+//
+static
+STATUS
+AddGuid11 (
+  INT8      *FileName,
+  UINT32    *Data,
+  INT8      *SymName
+  )
+{
+  GUID_RECORD *NewRec;
+  int         Index;
+
+  //
+  // Sanity check the data
+  //
+  if (!CheckGuidData (Data, 11)) {
+    return STATUS_ERROR;
+  }
+  //
+  // Allocate memory for a new one guid structure
+  //
+  NewRec = malloc (sizeof (GUID_RECORD));
+  if (NewRec == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) NewRec, 0, sizeof (GUID_RECORD));
+  NewRec->FileName = malloc (strlen (FileName) + 1);
+  if (NewRec->FileName == NULL) {
+    free (NewRec);
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  strcpy (NewRec->FileName, FileName);
+  if (SymName != NULL) {
+    NewRec->SymName = malloc (strlen (SymName) + 1);
+    if (NewRec->SymName == NULL) {
+      free (NewRec);
+      Error (NULL, 0, 0, "memory allocation failure", NULL);
+      return STATUS_ERROR;
+    }
+  }
+
+  strcpy (NewRec->SymName, SymName);
+
+  NewRec->Guid.Data1  = Data[0];
+  NewRec->Guid.Data2  = (UINT16) Data[1];
+  NewRec->Guid.Data3  = (UINT16) Data[2];
+  for (Index = 0; Index < 8; Index++) {
+    NewRec->Guid.Data4[Index] = (UINT8) Data[3 + Index];
+  }
+  //
+  // Add it to the list
+  //
+  NewRec->Next  = gGuidList;
+  gGuidList     = NewRec;
+
+  //
+  // Report it
+  // ReportGuid (FileName, NewRec);
+  //
+  return STATUS_SUCCESS;
+}
+//
+// For debug purposes, print each guid found
+//
+// static
+// VOID
+// ReportGuid (
+//  INT8        *FileName,
+// GUID_RECORD *NewGuid
+//  )
+// {
+//  //fprintf (stdout, "%s: 0x%08X\n", FileName, NewGuid->Guid.Data1);
+// }
+//
+// Free up memory we allocated to keep track of guids defined.
+//
+static
+VOID
+FreeGuids (
+  VOID
+  )
+{
+  GUID_RECORD *NextRec;
+  while (gGuidList != NULL) {
+    NextRec = gGuidList->Next;
+    if (gGuidList->FileName != NULL) {
+      free (gGuidList->FileName);
+    }
+
+    if (gGuidList->SymName != NULL) {
+      free (gGuidList->SymName);
+    }
+
+    free (gGuidList);
+    gGuidList = NextRec;
+  }
+}
+
+static
+VOID
+FreeSigs (
+  VOID
+  )
+{
+  SIGNATURE_RECORD  *NextRec;
+  while (gSignatureList != NULL) {
+    NextRec = gSignatureList->Next;
+    if (gSignatureList->FileName != NULL) {
+      free (gSignatureList->FileName);
+    }
+
+    free (gSignatureList);
+    gSignatureList = NextRec;
+  }
+}
+//
+// Scan through all guids defined and compare each for duplicates.
+//
+static
+STATUS
+CheckDuplicates (
+  VOID
+  )
+{
+  GUID_RECORD       *CurrentFile;
+
+  GUID_RECORD       *TempFile;
+  SIGNATURE_RECORD  *CurrentSig;
+  SIGNATURE_RECORD  *TempSig;
+  STATUS            Status;
+  int               Index;
+  int               DupCount;
+  int               Len;
+  BOOLEAN           Same;
+  UINT32            GuidSum;
+  INT8              *SymName;
+
+  Status = STATUS_SUCCESS;
+
+  //
+  // If we're checking guids.....
+  //
+  if (gOptions.CheckGuids) {
+    //
+    // If -p option, print all guids found
+    //
+    if (gOptions.PrintFound) {
+      CurrentFile = gGuidList;
+      while (CurrentFile != NULL) {
+        fprintf (
+          stdout,
+          "GUID:  0x%08X 0x%04X 0x%04X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X %s\n",
+          (UINT32) CurrentFile->Guid.Data1,
+          (UINT32) CurrentFile->Guid.Data2,
+          (UINT32) CurrentFile->Guid.Data3,
+          (UINT32) CurrentFile->Guid.Data4[0],
+          (UINT32) CurrentFile->Guid.Data4[1],
+          (UINT32) CurrentFile->Guid.Data4[2],
+          (UINT32) CurrentFile->Guid.Data4[3],
+          (UINT32) CurrentFile->Guid.Data4[4],
+          (UINT32) CurrentFile->Guid.Data4[5],
+          (UINT32) CurrentFile->Guid.Data4[6],
+          (UINT32) CurrentFile->Guid.Data4[7],
+          CurrentFile->FileName
+          );
+        CurrentFile = CurrentFile->Next;
+      }
+    }
+
+    if (gOptions.GuidXReference) {
+      CurrentFile = gGuidList;
+      while (CurrentFile != NULL) {
+        //
+        // If no symbol name, print "unknown"
+        //
+        SymName = CurrentFile->SymName;
+        if (SymName == NULL) {
+          SymName = "unknown";
+        }
+
+        fprintf (
+          stdout,
+          "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X %s\n",
+          (UINT32) CurrentFile->Guid.Data1,
+          (UINT32) CurrentFile->Guid.Data2,
+          (UINT32) CurrentFile->Guid.Data3,
+          (UINT32) CurrentFile->Guid.Data4[0],
+          (UINT32) CurrentFile->Guid.Data4[1],
+          (UINT32) CurrentFile->Guid.Data4[2],
+          (UINT32) CurrentFile->Guid.Data4[3],
+          (UINT32) CurrentFile->Guid.Data4[4],
+          (UINT32) CurrentFile->Guid.Data4[5],
+          (UINT32) CurrentFile->Guid.Data4[6],
+          (UINT32) CurrentFile->Guid.Data4[7],
+          SymName
+          );
+        CurrentFile = CurrentFile->Next;
+      }
+    }
+    //
+    // Now go through all guids and report duplicates.
+    //
+    CurrentFile = gGuidList;
+    while (CurrentFile != NULL) {
+      DupCount  = 0;
+      TempFile  = CurrentFile->Next;
+      while (TempFile) {
+        //
+        // Compare the guids
+        //
+        if ((CurrentFile->Guid.Data1 == TempFile->Guid.Data1) &&
+            (CurrentFile->Guid.Data2 == TempFile->Guid.Data2) &&
+            (CurrentFile->Guid.Data3 == TempFile->Guid.Data3)
+            ) {
+          //
+          // OR in all the guid bytes so we can ignore NULL-guid definitions.
+          //
+          GuidSum = CurrentFile->Guid.Data1 | CurrentFile->Guid.Data2 | CurrentFile->Guid.Data3;
+          Same    = TRUE;
+          for (Index = 0; Index < 8; Index++) {
+            GuidSum |= CurrentFile->Guid.Data4[Index];
+            if (CurrentFile->Guid.Data4[Index] != TempFile->Guid.Data4[Index]) {
+              Same = FALSE;
+              break;
+            }
+          }
+          //
+          // If they're the same, and the guid was non-zero, print a message.
+          //
+          if (Same && GuidSum) {
+            if (DupCount == 0) {
+              Error (NULL, 0, 0, "duplicate GUIDS found", NULL);
+              fprintf (stdout, "   FILE1: %s\n", CurrentFile->FileName);
+            }
+
+            DupCount++;
+            fprintf (stdout, "   FILE%d: %s\n", DupCount + 1, TempFile->FileName);
+            //
+            // Flag it as reported so we don't report it again if there's three or more
+            //
+            TempFile->Reported = TRUE;
+          }
+        }
+        //
+        // Next one
+        //
+        TempFile = TempFile->Next;
+      }
+      //
+      // Print the guid if we found duplicates
+      //
+      if (DupCount) {
+        fprintf (
+          stdout,
+          "   GUID:  0x%08X 0x%04X 0x%04X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
+          (UINT32) CurrentFile->Guid.Data1,
+          (UINT32) CurrentFile->Guid.Data2,
+          (UINT32) CurrentFile->Guid.Data3,
+          (UINT32) CurrentFile->Guid.Data4[0],
+          (UINT32) CurrentFile->Guid.Data4[1],
+          (UINT32) CurrentFile->Guid.Data4[2],
+          (UINT32) CurrentFile->Guid.Data4[3],
+          (UINT32) CurrentFile->Guid.Data4[4],
+          (UINT32) CurrentFile->Guid.Data4[5],
+          (UINT32) CurrentFile->Guid.Data4[6],
+          (UINT32) CurrentFile->Guid.Data4[7]
+          );
+        //
+        // return STATUS_ERROR;
+        //
+      }
+      //
+      // Find the next one that hasn't been reported
+      //
+      do {
+        CurrentFile = CurrentFile->Next;
+      } while ((CurrentFile != NULL) && (CurrentFile->Reported));
+    }
+  }
+
+  if (gOptions.CheckSignatures) {
+    //
+    // Print ones found if specified
+    //
+    if (gOptions.PrintFound) {
+      CurrentSig = gSignatureList;
+      while (CurrentSig != NULL) {
+        Len = CurrentSig->Signature.DataLen;
+        for (Index = 0; Index < Len; Index++) {
+          fprintf (stdout, "%c", CurrentSig->Signature.Data[Index]);
+        }
+
+        fprintf (stdout, "  %s\n", CurrentSig->FileName);
+        CurrentSig = CurrentSig->Next;
+      }
+    }
+
+    CurrentSig = gSignatureList;
+    while (CurrentSig != NULL) {
+      DupCount  = 0;
+      TempSig   = CurrentSig->Next;
+      Len       = CurrentSig->Signature.DataLen;
+      while (TempSig) {
+        //
+        // Check for same length, then do string compare
+        //
+        if (Len == TempSig->Signature.DataLen) {
+          if (strncmp (CurrentSig->Signature.Data, TempSig->Signature.Data, Len) == 0) {
+            //
+            // Print header message if first failure for this sig
+            //
+            if (DupCount == 0) {
+              Error (NULL, 0, 0, "duplicate signatures found", NULL);
+              fprintf (stdout, "   FILE1: %s\n", CurrentSig->FileName);
+            }
+
+            DupCount++;
+            fprintf (stdout, "   FILE%d: %s\n", DupCount + 1, TempSig->FileName);
+            TempSig->Reported = TRUE;
+          }
+        }
+
+        TempSig = TempSig->Next;
+      }
+
+      if (DupCount) {
+        fprintf (stdout, "   SIG:   ");
+        for (Index = 0; Index < Len; Index++) {
+          fprintf (stdout, "%c", CurrentSig->Signature.Data[Index]);
+        }
+
+        fprintf (stdout, "\n");
+      }
+      //
+      // On to the next one that hasn't been reported
+      //
+      do {
+        CurrentSig = CurrentSig->Next;
+      } while ((CurrentSig != NULL) && (CurrentSig->Reported));
+    }
+  }
+
+  return Status;
+}
+
+static
+VOID
+FreeOptions (
+  VOID
+  )
+/*++
+
+Routine Description:
+  Free up any memory we allocated when processing command-line options.
+
+Arguments:
+  None.
+
+Returns:
+  NA
+
+Notes:
+  We don't free up the ->Str fields because we did not allocate them.
+  Instead, we just set the pointer to point to the actual parameter
+  from the command line.
+
+--*/
+{
+  STRING_LIST *Ptr;
+  while (gOptions.ExcludeDirs != NULL) {
+    Ptr = gOptions.ExcludeDirs->Next;
+    //
+    // free (gOptions.ExcludeDirs->Str);
+    //
+    free (gOptions.ExcludeDirs);
+    gOptions.ExcludeDirs = Ptr;
+  }
+
+  while (gOptions.ExcludeSubDirs != NULL) {
+    Ptr = gOptions.ExcludeSubDirs->Next;
+    //
+    // free (gOptions.ExcludeSubDirs->Str);
+    //
+    free (gOptions.ExcludeSubDirs);
+    gOptions.ExcludeSubDirs = Ptr;
+  }
+
+  while (gOptions.ExcludeExtensions != NULL) {
+    Ptr = gOptions.ExcludeExtensions->Next;
+    //
+    // free (gOptions.ExcludeExtensions->Str);
+    //
+    free (gOptions.ExcludeExtensions);
+    gOptions.ExcludeExtensions = Ptr;
+  }
+
+  while (gOptions.ExcludeFiles != NULL) {
+    Ptr = gOptions.ExcludeFiles->Next;
+    //
+    // free (gOptions.ExcludeFiles->Str);
+    //
+    free (gOptions.ExcludeFiles);
+    gOptions.ExcludeFiles = Ptr;
+  }
+}
+//
+// Given an array of 32-bit data, validate the data for the given number of
+// guid data. For example, it might have been scanned as 16 bytes of data, or
+// 11 fields of data.
+//
+static
+BOOLEAN
+CheckGuidData (
+  UINT32    *Data,
+  UINT32    DataCount
+  )
+{
+  UINT32  Index;
+
+  if (DataCount == 16) {
+    for (Index = 0; Index < 16; Index++) {
+      if (Data[Index] &~0xFF) {
+        return FALSE;
+      }
+    }
+
+    return TRUE;
+  } else if (DataCount == 11) {
+    //
+    // Data[0] never out of range (32-bit)
+    //
+    if ((Data[1] | Data[2]) &~0xFFFF) {
+      //
+      // Error ("Out of range value for GUID data word(s) [1] and/or [2]");
+      //
+      return FALSE;
+    }
+
+    for (Index = 0; Index < 8; Index++) {
+      if (Data[Index + 3] &~0xFF) {
+        //
+        // Error ("Out of range value for GUID data byte(s) [4] - [11]");
+        //
+        return FALSE;
+      }
+    }
+
+    return TRUE;
+  }
+
+  return FALSE;
+}
diff --git a/Tools/Source/TianoTools/GuidChk/GuidList.c b/Tools/Source/TianoTools/GuidChk/GuidList.c
new file mode 100644
index 0000000000..0e8afde72c
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/GuidList.c
@@ -0,0 +1,188 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  GuidList.c  
+
+Abstract:
+
+  Utility to create a GUID-to-name listing file that can
+  be used by other utilities. Basic operation is to take the
+  table of name+GUIDs that we have compiled into this utility,
+  and create a text file that can be parsed by other utilities
+  to do replacement of "name" with "GUID".
+
+Notes:
+  To add a new GUID to this database:
+    1. Add a "#include EFI_GUID_DEFINITION(name)" statement below
+    2. Modify the mGuidList[] array below to add the new GUID name
+
+  The only issue that may come up is that, if the source GUID file
+  is not in the standard GUID directory, then this utility won't
+  compile because the #include fails. In this case you'd need
+  to define a new macro (if it's in a standard place) or modify
+  this utility's makefile to add the path to your new .h file.
+
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <UgaDraw.h>
+#include "EfiUtilityMsgs.h"
+
+#include <Apriori.h>
+#include <AcpiTableStorage.h>
+// #include <Bmp.h>
+
+#define GUID_XREF(varname, guid) { \
+    #varname, #guid, guid \
+  }
+
+#define NULL_GUID \
+  { \
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 \
+  }
+
+typedef struct {
+  INT8      *VariableName;
+  INT8      *DefineName;
+  EFI_GUID  Guid;
+} GUID_LIST;
+
+//
+// This is our table of all GUIDs we want to print out to create
+// a GUID-to-name cross reference.
+// Use the #defined name from the GUID definition's source .h file.
+//
+static GUID_LIST  mGuidList[] = {
+  GUID_XREF(gAprioriGuid, EFI_APRIORI_GUID),
+  GUID_XREF(gEfiAcpiTableStorageGuid, EFI_ACPI_TABLE_STORAGE_GUID),
+  // FIXME The next line was removed in the port to R9.
+  // GUID_XREF(gEfiDefaultBmpLogoGuid, EFI_DEFAULT_BMP_LOGO_GUID),
+  GUID_XREF(gEfiAcpiTableStorageGuid, EFI_ACPI_TABLE_STORAGE_GUID),
+  //
+  // Terminator
+  //
+  {
+    NULL,
+    NULL,
+    NULL_GUID
+  }
+};
+
+void
+PrintGuidText (
+  FILE      *OutFptr,
+  INT8      *VariableName,
+  INT8      *DefineName,
+  EFI_GUID  *Guid
+  );
+
+int
+CreateGuidList (
+  INT8    *OutFileName
+  )
+/*++
+
+Routine Description:
+  Print our GUID/name list to the specified output file.
+  
+Arguments:
+  OutFileName  - name of the output file to write our results to.
+
+Returns:
+  0       if successful
+  nonzero otherwise
+  
+--*/
+{
+  FILE  *OutFptr;
+  int   Index;
+
+  //
+  // Open output file for writing. If the name is NULL, then write to stdout
+  //
+  if (OutFileName != NULL) {
+    OutFptr = fopen (OutFileName, "w");
+    if (OutFptr == NULL) {
+      Error (NULL, 0, 0, OutFileName, "failed to open output file for writing");
+      return STATUS_ERROR;
+    }
+  } else {
+    OutFptr = stdout;
+  }
+
+  for (Index = 0; mGuidList[Index].VariableName != NULL; Index++) {
+    PrintGuidText (OutFptr, mGuidList[Index].VariableName, mGuidList[Index].DefineName, &mGuidList[Index].Guid);
+  }
+  //
+  // Close the output file if they specified one.
+  //
+  if (OutFileName != NULL) {
+    fclose (OutFptr);
+  }
+
+  return STATUS_SUCCESS;
+}
+
+void
+PrintGuidText (
+  FILE      *OutFptr,
+  INT8      *VariableName,
+  INT8      *DefineName,
+  EFI_GUID  *Guid
+  )
+/*++
+
+Routine Description:
+  Print a GUID/name combo in INF-style format
+
+  guid-guid-guid-guid DEFINE_NAME gName
+
+Arguments:
+  OutFptr       - file pointer to which to write the output
+  VariableName  - the GUID variable's name
+  DefineName    - the name used in the #define
+  Guid          - pointer to the GUID value
+
+Returns:
+  NA
+
+--*/
+{
+  if (OutFptr == NULL) {
+    OutFptr = stdout;
+  }
+
+  fprintf (
+    OutFptr,
+    "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X %s %s\n",
+    Guid->Data1,
+    Guid->Data2,
+    Guid->Data3,
+    Guid->Data4[0],
+    Guid->Data4[1],
+    Guid->Data4[2],
+    Guid->Data4[3],
+    Guid->Data4[4],
+    Guid->Data4[5],
+    Guid->Data4[6],
+    Guid->Data4[7],
+    DefineName,
+    VariableName
+    );
+}
diff --git a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
new file mode 100644
index 0000000000..b9fcab0f72
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.c
@@ -0,0 +1,490 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  UtilsMsgs.c
+  
+Abstract:
+
+  EFI tools utility functions to display warning, error, and informational
+  messages.
+  
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdarg.h>
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include "EfiUtilityMsgs.h"
+
+#define MAX_LINE_LEN  200
+
+//
+// Declare module globals for keeping track of the the utility's
+// name and other settings.
+//
+static STATUS mStatus             = STATUS_SUCCESS;
+static INT8   mUtilityName[50]    = { 0 };
+static INT8   *mSourceFileName    = NULL;
+static UINT32 mSourceFileLineNum  = 0;
+static UINT32 mErrorCount         = 0;
+static UINT32 mWarningCount       = 0;
+static UINT32 mDebugMsgMask       = 0;
+
+static
+void
+PrintMessage (
+  INT8    *Type,
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  va_list List
+  );
+
+void
+Error (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Prints an error message.
+  
+Arguments:
+  All arguments are optional, though the printed message may be useless if
+  at least something valid is not specified.
+  
+  FileName - name of the file or application. If not specified, then the
+             utilty name (as set by the utility calling SetUtilityName()
+             earlier) is used. Otherwise "Unknown utility" is used.
+  
+  LineNumber - the line number of error, typically used by parsers. If the
+               utility is not a parser, then 0 should be specified. Otherwise
+               the FileName and LineNumber info can be used to cause
+               MS Visual Studio to jump to the error.
+               
+  MessageCode - an application-specific error code that can be referenced in
+              other documentation. 
+
+  Text        - the text in question, typically used by parsers.
+  
+  MsgFmt - the format string for the error message. Can contain formatting
+           controls for use with the varargs.
+           
+Returns:
+  None.
+  
+Notes:
+  We print the following (similar to the Warn() and Debug() 
+  W
+  Typical error/warning message format:
+
+  bin\VfrCompile.cpp(330) : error C2660: 'AddVfrDataStructField' : function does not take 2 parameters
+
+  BUGBUG -- these three utility functions are almost identical, and
+  should be modified to share code.
+
+  Visual Studio does not find error messages with:
+  
+     " error :"
+     " error 1:"
+     " error c1:"
+     " error 1000:"
+     " error c100:"
+
+  It does find:
+     " error c1000:"     
+--*/
+{
+  va_list List;
+  mErrorCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("error", FileName, LineNumber, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_ERROR) {
+    mStatus = STATUS_ERROR;
+  }
+}
+
+void
+ParserError (
+  UINT32  MessageCode,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a parser error, using the source file name and line number
+  set by a previous call to SetParserPosition().
+
+Arguments:
+  MessageCode   - application-specific error code
+  Text          - text to print in the error message
+  MsgFmt        - format string to print at the end of the error message
+  ...
+
+Returns:
+  NA
+
+--*/
+{
+  va_list List;
+  mErrorCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("error", mSourceFileName, mSourceFileLineNum, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_ERROR) {
+    mStatus = STATUS_ERROR;
+  }
+}
+
+void
+ParserWarning (
+  UINT32  ErrorCode,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a parser warning, using the source file name and line number
+  set by a previous call to SetParserPosition().
+
+Arguments:
+  ErrorCode     - application-specific error code
+  OffendingText - text to print in the warning message
+  MsgFmt        - format string to print at the end of the warning message
+  ...
+
+Returns:
+  NA
+
+--*/
+{
+  va_list List;
+  mWarningCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("warning", mSourceFileName, mSourceFileLineNum, ErrorCode, OffendingText, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_WARNING) {
+    mStatus = STATUS_WARNING;
+  }
+}
+
+void
+Warning (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a warning message.
+
+Arguments:
+  FileName    - name of the file where the warning was detected, or the name
+                of the application that detected the warning
+  
+  LineNumber  - the line number where the warning was detected (parsers).
+                0 should be specified if the utility is not a parser.
+               
+  MessageCode - an application-specific warning code that can be referenced in
+                other documentation. 
+
+  Text        - the text in question (parsers)
+  
+  MsgFmt      - the format string for the warning message. Can contain formatting
+                controls for use with varargs.
+                
+  ...
+           
+Returns:
+  None.
+
+--*/
+{
+  va_list List;
+  mWarningCount++;
+  va_start (List, MsgFmt);
+  PrintMessage ("warning", FileName, LineNumber, MessageCode, Text, MsgFmt, List);
+  va_end (List);
+  //
+  // Set status accordingly
+  //
+  if (mStatus < STATUS_WARNING) {
+    mStatus = STATUS_WARNING;
+  }
+}
+
+void
+DebugMsg (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MsgMask,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  ...
+  )
+/*++
+
+Routine Description:
+  Print a warning message.
+
+Arguments:
+  FileName    - typically the name of the utility printing the debug message, but
+                can be the name of a file being parsed.
+  
+  LineNumber  - the line number in FileName (parsers) 
+               
+  MsgMask     - an application-specific bitmask that, in combination with mDebugMsgMask,
+                determines if the debug message gets printed.
+
+  Text        - the text in question (parsers)
+  
+  MsgFmt      - the format string for the debug message. Can contain formatting
+                controls for use with varargs.
+          
+  ... 
+Returns:
+  None.
+
+--*/
+{
+  va_list List;
+  //
+  // If the debug mask is not applicable, then do nothing.
+  //
+  if ((MsgMask != 0) && ((mDebugMsgMask & MsgMask) == 0)) {
+    return ;
+  }
+
+  va_start (List, MsgFmt);
+  PrintMessage ("debug", FileName, LineNumber, 0, Text, MsgFmt, List);
+  va_end (List);
+}
+
+static
+void
+PrintMessage (
+  INT8    *Type,
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MessageCode,
+  INT8    *Text,
+  INT8    *MsgFmt,
+  va_list List
+  )
+/*++
+
+Routine Description:
+  Worker routine for all the utility printing services. Prints the message in
+  a format that Visual Studio will find when scanning build outputs for
+  errors or warnings.
+
+Arguments:
+  Type        - "warning" or "error" string to insert into the message to be
+                printed. The first character of this string (converted to uppercase)
+                is used to preceed the MessageCode value in the output string.
+
+  FileName    - name of the file where the warning was detected, or the name
+                of the application that detected the warning
+  
+  LineNumber  - the line number where the warning was detected (parsers).
+                0 should be specified if the utility is not a parser.
+               
+  MessageCode - an application-specific warning code that can be referenced in
+                other documentation. 
+
+  Text        - part of the message to print
+  
+  MsgFmt      - the format string for the message. Can contain formatting
+                controls for use with varargs.
+
+  List        - Variable function parameter list.           
+Returns:
+  None.
+
+Notes:
+  If FileName == NULL then this utility will use the string passed into SetUtilityName(). 
+  
+  LineNumber is only used if the caller is a parser, in which case FileName refers to the
+  file being parsed.
+
+  Text and MsgFmt are both optional, though it would be of little use calling this function with
+  them both NULL.
+
+  Output will typically be of the form:
+    <FileName>(<LineNumber>) : <Type> <Type[0]><MessageCode>: <Text> : <MsgFmt>
+
+    Parser (LineNumber != 0)
+      VfrCompile.cpp(330) : error E2660: AddVfrDataStructField : function does not take 2 parameters
+    Generic utility (LineNumber == 0) 
+      UtilityName : error E1234 : Text string : MsgFmt string and args
+
+--*/
+{
+  INT8  Line[MAX_LINE_LEN];
+  INT8  Line2[MAX_LINE_LEN];
+  INT8  *Cptr;
+  //
+  // If given a filename, then add it (and the line number) to the string.
+  // If there's no filename, then use the program name if provided.
+  //
+  if (FileName != NULL) {
+    Cptr = FileName;
+  } else if (mUtilityName[0] != 0) {
+    Cptr = mUtilityName;
+  } else {
+    Cptr = "Unknown utility";
+  }
+
+  strcpy (Line, Cptr);
+  if (LineNumber != 0) {
+    sprintf (Line2, "(%d)", LineNumber);
+    strcat (Line, Line2);
+  }
+  //
+  // Have to print an error code or Visual Studio won't find the
+  // message for you. It has to be decimal digits too.
+  //
+  sprintf (Line2, " : %s %c%04d", Type, toupper (Type[0]), MessageCode);
+  strcat (Line, Line2);
+  fprintf (stdout, "%s", Line);
+  //
+  // If offending text was provided, then print it
+  //
+  if (Text != NULL) {
+    fprintf (stdout, ": %s ", Text);
+  }
+  //
+  // Print formatted message if provided
+  //
+  if (MsgFmt != NULL) {
+    vsprintf (Line2, MsgFmt, List);
+    fprintf (stdout, ": %s", Line2);
+  }
+
+  fprintf (stdout, "\n");
+}
+
+void
+ParserSetPosition (
+  INT8    *SourceFileName,
+  UINT32  LineNum
+  )
+/*++
+
+Routine Description:
+  Set the position in a file being parsed. This can be used to 
+  print error messages deeper down in a parser.
+
+Arguments:
+  SourceFileName - name of the source file being parsed
+  LineNum        - line number of the source file being parsed
+
+Returns:
+  NA
+
+--*/
+{
+  mSourceFileName     = SourceFileName;
+  mSourceFileLineNum  = LineNum;
+}
+
+void
+SetUtilityName (
+  INT8    *UtilityName
+  )
+/*++
+
+Routine Description:
+  All printed error/warning/debug messages follow the same format, and
+  typically will print a filename or utility name followed by the error
+  text. However if a filename is not passed to the print routines, then
+  they'll print the utility name if you call this function early in your
+  app to set the utility name.
+  
+Arguments:
+  UtilityName  -  name of the utility, which will be printed with all
+                  error/warning/debug messags.
+
+Returns:
+  NA
+  
+--*/
+{
+  //
+  // Save the name of the utility in our local variable. Make sure its
+  // length does not exceed our buffer.
+  //
+  if (UtilityName != NULL) {
+    if (strlen (UtilityName) >= sizeof (mUtilityName)) {
+      Error (UtilityName, 0, 0, "application error", "utility name length exceeds internal buffer size");
+      strncpy (mUtilityName, UtilityName, sizeof (mUtilityName) - 1);
+      mUtilityName[sizeof (mUtilityName) - 1] = 0;
+      return ;
+    } else {
+      strcpy (mUtilityName, UtilityName);
+    }
+  } else {
+    Error (NULL, 0, 0, "application error", "SetUtilityName() called with NULL utility name");
+  }
+}
+
+STATUS
+GetUtilityStatus (
+  VOID
+  )
+/*++
+
+Routine Description:
+  When you call Error() or Warning(), this module keeps track of it and
+  sets a local mStatus to STATUS_ERROR or STATUS_WARNING. When the utility
+  exits, it can call this function to get the status and use it as a return
+  value.
+  
+Arguments:
+  None.
+
+Returns:
+  Worst-case status reported, as defined by which print function was called.
+  
+--*/
+{
+  return mStatus;
+}
diff --git a/Tools/Source/TianoTools/GuidChk/UtilsMsgs.h b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.h
new file mode 100644
index 0000000000..5f6c7010b4
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/UtilsMsgs.h
@@ -0,0 +1,106 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:  
+
+  UtilsMsgs.h
+  
+Abstract:
+
+  Prototypes for the EFI tools utility functions.
+  
+--*/
+
+#ifndef _UTILS_MESSAGES_H_
+#define _UTILS_MESSAGES_H_
+
+STATUS
+GetUtilityStatus (
+  VOID
+  )
+;
+
+//
+// If someone prints an error message and didn't specify a source file name,
+// then we print the utility name instead. However they must tell us the
+// utility name early on via this function.
+//
+VOID
+SetUtilityName (
+  INT8 *ProgramName
+  )
+;
+
+void
+Error (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  ErrorCode,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+;
+
+void
+Warning (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  ErrorCode,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+;
+
+void
+DebugMsg (
+  INT8    *FileName,
+  UINT32  LineNumber,
+  UINT32  MsgLevel,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+;
+
+void
+SetDebugMsgMask (
+  UINT32    MsgMask
+  )
+;
+
+void
+ParserSetPosition (
+  INT8    *SourceFileName,
+  UINT32  LineNum
+  )
+;
+
+void
+ParserError (
+  UINT32  ErrorCode,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+;
+
+void
+ParserWarning (
+  UINT32  ErrorCode,
+  INT8    *OffendingText,
+  INT8    *MsgFmt,
+  ...
+  )
+;
+
+#endif
diff --git a/Tools/Source/TianoTools/GuidChk/build.gcc b/Tools/Source/TianoTools/GuidChk/build.gcc
new file mode 100644
index 0000000000..0d56b6bf2b
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -I../Common/ -I/workspace/mdk/MdePkg/Include/Guid -I/workspace/mdk/MdePkg/Include/Protocol/ -I/workspace/mdk/MdePkg/Include/Common/ -I/workspace/mdk/MdePkg/Include/ -I/workspace/mdk/MdePkg/Include/Ia32 -I. GuidChk.c  GuidList.c  UtilsMsgs.c -o GuidChk.exe
diff --git a/Tools/Source/TianoTools/GuidChk/build.xml b/Tools/Source/TianoTools/GuidChk/build.xml
new file mode 100644
index 0000000000..f131f79369
--- /dev/null
+++ b/Tools/Source/TianoTools/GuidChk/build.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK GuidChk Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="GuidChk"/>
+  <property name="FileSet" value="*.c *.h"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Guid"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_131.txt b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_131.txt
new file mode 100644
index 0000000000..500d84f2e8
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_131.txt
@@ -0,0 +1,522 @@
+CHANGES FROM 1.31
+
+This file contains the migration of PCCTS from 1.31 in the order that
+changes were made.  1.32b7 is the last beta before full 1.32.
+Terence Parr, Parr Research Corporation 1995.
+
+
+======================================================================
+1.32b1
+Added Russell Quong to banner, changed banner for output slightly
+Fixed it so that you have before / after actions for C++ in class def
+Fixed bug in optimizer that made it sometimes forget to set internal
+        token pointers.  Only showed up when a {...} was in the "wrong spot".
+
+======================================================================
+1.32b2
+Added fixes by Dave Seidel for PC compilers in 32 bit mode (config.h
+and set.h).
+
+======================================================================
+1.32b3
+Fixed hideous bug in code generator for wildcard and for ~token op.
+
+from Dave Seidel
+
+   Added pcnames.bat
+   1. in antlr/main.c: change strcasecmp() to stricmp()
+
+   2. in dlg/output.c: use DLEXER_C instead on "DLexer.C"
+
+   3. in h/PBlackBox.h: use <iostream.h> instead of <stream.h>
+
+======================================================================
+1.32b4
+When the -ft option was used, any path prefix screwed up
+the gate on the .h files
+
+Fixed yet another bug due to the optimizer.
+
+The exception handling thing was a bit wacko:
+
+a : ( A B )? A B
+  | A C
+  ;
+  exception ...
+
+caused an exception if "A C" was the input.  In other words,
+it found that A C didn't match the (A B)? pred and caused
+an exception rather than trying the next alt.  All I did
+was to change the zzmatch_wsig() macros.
+
+Fixed some problems in gen.c relating to the name of token
+class bit sets in the output.
+
+Added the tremendously cool generalized predicate.  For the
+moment, I'll give this bried description.
+
+a : <<predicate>>? blah
+  | foo
+  ;
+
+This implies that (assuming blah and foo are syntactically
+ambiguous) "predicate" indicates the semantic validity of
+applying "blah".  If "predicate" is false, "foo" is attempted.
+
+Previously, you had to say:
+
+a : <<LA(1)==ID ? predicate : 1>>? ID
+  | ID
+  ;
+
+Now, you can simply use "predicate" without the ?: operator
+if you turn on ANTLR command line option: "-prc on".  This
+tells ANTLR to compute that all by itself.  It computes n
+tokens of lookahead where LT(n) or LATEXT(n) is the farthest
+ahead you look.
+
+If you give a predicate using "-prc on" that is followed
+by a construct that can recognize more than one n-sequence,
+you will get a warning from ANTLR.  For example,
+
+a : <<isTypeName(LT(1)->getText())>>? (ID|INT)
+  ;
+
+This is wrong because the predicate will be applied to INTs
+as well as ID's.  You should use this syntax to make
+the predicate more specific:
+
+a : (ID)? => <<isTypeName(LT(1)->getText())>>? (ID|INT)
+  ;
+
+which says "don't apply the predicate unless ID is the
+current lookahead context".
+
+You cannot currently have anything in the "(context)? =>"
+except sequences such as:
+
+( LPAREN ID | LPAREN SCOPE )? => <<pred>>?
+
+I haven't tested this THAT much, but it does work for the
+C++ grammar.
+
+======================================================================
+1.32b5
+
+Added getLine() to the ANTLRTokenBase and DLGBasedToken classes
+left line() for backward compatibility.
+----
+Removed SORCERER_TRANSFORM from the ast.h stuff.
+-------
+Fixed bug in code gen of ANTLR such that nested syn preds work more
+efficiently now.  The ANTLRTokenBuffer was getting very large
+with nested predicates.
+------
+Memory leak is now gone from ANTLRTokenBuf; all tokens are deleted.
+For backward compatibility reasons, you have to say parser->deleteTokens()
+or mytokenbuffer->deleteTokens() but later it will be the default mode.
+Say this after the parser is constructed. E.g.,
+
+    ParserBlackBox<DLGLexer, MyParser, ANTLRToken> p(stdin);
+    p.parser()->deleteTokens();
+    p.parser()->start_symbol();
+
+
+==============================
+1.32b6
+
+Changed so that deleteTokens() will do a delete ((ANTLRTokenBase *))
+on the ptr.  This gets the virtual destructor.
+
+Fixed some weird things in the C++ header files (a few return types).
+
+Made the AST routines correspond to the book and SORCERER stuff.
+
+New token stuff:  See testcpp/14/test.g
+
+ANTLR accepts a #pragma gc_tokens which says
+[1]     Generate label = copy(LT(1)) instead of label=LT(1) for
+        all labeled token references.
+[2]     User now has to define ANTLRTokenPtr (as a class or a typedef
+        to just a pointer) as well as the ANTLRToken class itself.
+		See the example.
+
+To delete tokens in token buffer, use deleteTokens() message on parser.
+
+        All tokens that fall off the ANTLRTokenBuffer get deleted
+        which is what currently happens when deleteTokens() message
+        has been sent to token buffer.
+
+We always generate ANTLRTokenPtr instead of 'ANTLRToken *' now.
+Then if no pragma set, ANTLR generates a
+
+        class ANTLRToken;
+        typedef ANTLRToken *ANTLRTokenPtr;
+
+in each file.
+
+Made a warning for x:rule_ref <<$x>>; still no warning for $i's, however.
+class BB {
+
+a : x:b y:A <<$x
+$y>>
+  ;
+
+b : B;
+
+}
+generates
+Antlr parser generator   Version 1.32b6   1989-1995
+test.g, line 3: error: There are no token ptrs for rule references: '$x'
+
+===================
+1.32b7:
+
+[With respect to token object garbage collection (GC), 1.32b7
+ backtracks from 1.32b6, but results in better and less intrusive GC.
+ This is the last beta version before full 1.32.]
+
+BIGGEST CHANGES:
+
+o	The "#pragma gc_tokens" is no longer used.
+
+o	.C files are now .cpp files (hence, makefiles will have to
+	be changed; or you can rerun genmk).  This is a good move,
+	but causes some backward incompatibility problems.  You can
+	avoid this by changing CPP_FILE_SUFFIX to ".C" in pccts/h/config.h.
+
+o	The token object class hierarchy has been flattened to include
+	only three classes: ANTLRAbstractToken, ANTLRCommonToken, and
+	ANTLRCommonNoRefCountToken.  The common token now does garbage
+	collection via ref counting.
+
+o	"Smart" pointers are now used for garbage collection.  That is,
+	ANTLRTokenPtr is used instead of "ANTLRToken *".
+
+o	The antlr.1 man page has been cleaned up slightly.
+
+o	The SUN C++ compiler now complains less about C++ support code.
+
+o	Grammars which subclass ANTLRCommonToken must wrap all token
+	pointer references in mytoken(token_ptr).  This is the only
+	serious backward incompatibility.  See below.
+
+
+MINOR CHANGES:
+
+--------------------------------------------------------
+1	deleteTokens()
+
+The deleteTokens() message to the parser or token buffer has been changed
+to one of:
+
+    void noGarbageCollectTokens()   { inputTokens->noGarbageCollectTokens(); }
+    void garbageCollectTokens()     { inputTokens->garbageCollectTokens(); }
+
+The token buffer deletes all non-referenced tokens by default now.
+
+--------------------------------------------------------
+2	makeToken()
+
+The makeToken() message returns a new type.  The function should look
+like:
+
+    virtual ANTLRAbstractToken *makeToken(ANTLRTokenType tt,
+                                          ANTLRChar *txt,
+                                          int line)
+    {
+        ANTLRAbstractToken *t = new ANTLRCommonToken(tt,txt);
+        t->setLine(line);
+        return t;
+    }
+
+--------------------------------------------------------
+3	TokenType
+
+Changed TokenType-> ANTLRTokenType  (often forces changes in AST defs due
+to #[] constructor called to AST(tokentype, string)).
+
+--------------------------------------------------------
+4	AST()
+
+You must define AST(ANTLRTokenPtr t) now in your AST class definition.
+You might also have to include ATokPtr.h above the definition; e.g.,
+if AST is defined in a separate file, such as AST.h, it's a good idea
+to include ATOKPTR_H (ATokPtr.h).  For example,
+
+	#include ATOKPTR_H
+	class AST : public ASTBase {
+	protected:
+	    ANTLRTokenPtr token;
+	public:
+	    AST(ANTLRTokenPtr t) { token = t; }
+	    void preorder_action() {
+	        char *s = token->getText();
+	        printf(" %s", s);
+	    }
+	};
+
+Note the use of smart pointers rather than "ANTLRToken *".
+
+--------------------------------------------------------
+5	SUN C++
+
+From robertb oakhill.sps.mot.com Bob Bailey. Changed ANTLR C++ output
+to avoid an error in Sun C++ 3.0.1.  Made "public" return value
+structs created to hold multiple return values public.
+
+--------------------------------------------------------
+6	genmk
+
+Fixed genmk so that target List.* is not included anymore.  It's
+called SList.* anyway.
+
+--------------------------------------------------------
+7	\r vs \n
+
+Scott Vorthmann <vorth cmu.edu> fixed antlr.g in ANTLR so that \r
+is allowed as the return character as well as \n.
+
+--------------------------------------------------------
+8	Exceptions
+
+Bug in exceptions attached to labeled token/tokclass references.  Didn't gen
+code for exceptions.  This didn't work:
+
+a : "help" x:ID
+  ;
+        exception[x]
+        catch MismatchedToken : <<printf("eh?\n");>>
+
+Now ANTLR generates (which is kinda big, but necessary):
+
+        if ( !_match_wsig(ID) ) {
+                if ( guessing ) goto fail;
+                _signal=MismatchedToken;
+                switch ( _signal ) {
+                case MismatchedToken :
+                        printf("eh?\n");
+                        _signal = NoSignal;
+                        break;
+                default :
+                        goto _handler;
+                }
+        }
+
+which implies that you can recover and continue parsing after a missing/bad
+token reference.
+
+--------------------------------------------------------
+9	genmk
+
+genmk now correctly uses config file for CPP_FILE_SUFFIX stuff.
+
+--------------------------------------------------------
+10	general cleanup / PURIFY
+
+Anthony Green <green vizbiz.com> suggested a bunch of good general
+clean up things for the code; he also suggested a few things to
+help out the "PURIFY" memory allocation checker.
+
+--------------------------------------------------------
+11	$-variable references.
+
+Manuel ORNATO indicated that a $-variable outside of a rule caused
+ANTLR to crash.  I fixed this.
+
+12	Tom Moog suggestion
+
+Fail action of semantic predicate needs "{}" envelope.  FIXED.
+
+13	references to LT(1).
+
+I have enclosed all assignments such as:
+
+             _t22 = (ANTLRTokenPtr)LT(1);
+
+in "if ( !guessing )" so that during backtracking the reference count
+for token objects is not increased.
+
+
+TOKEN OBJECT GARBAGE COLLECTION
+
+1	INTRODUCTION
+
+The class ANTLRCommonToken is now garbaged collected through a "smart"
+pointer called ANTLRTokenPtr using reference counting.  Any token
+object not referenced by your grammar actions is destroyed by the
+ANTLRTokenBuffer when it must make room for more token objects.
+Referenced tokens are then destroyed in your parser when local
+ANTLRTokenPtr objects are deleted.  For example,
+
+a : label:ID ;
+
+would be converted to something like:
+
+void yourclass::a(void)
+{
+	zzRULE;
+	ANTLRTokenPtr label=NULL;	// used to be ANTLRToken *label;
+        zzmatch(ID);
+        label = (ANTLRTokenPtr)LT(1);
+	consume();
+	...
+}
+
+When the "label" object is destroyed (it's just a pointer to your
+input token object LT(1)), it decrements the reference count on the
+object created for the ID.  If the count goes to zero, the object
+pointed by label is deleted.
+
+To correctly manage the garbage collection, you should use
+ANTLRTokenPtr instead of "ANTLRToken *".  Most ANTLR support code
+(visible to the user) has been modified to use the smart pointers.
+
+***************************************************************
+Remember that any local objects that you create are not deleted when a
+lonjmp() is executed.  Unfortunately, the syntactic predicates (...)?
+use setjmp()/longjmp().  There are some situations when a few tokens
+will "leak".
+***************************************************************
+
+2	DETAILS
+
+o	The default is to perform token object garbage collection.
+	You may use parser->noGarbageCollectTokens() to turn off
+	garbage collection.
+
+
+o	The type ANTLRTokenPtr is always defined now (automatically).
+	If you do not wish to use smart pointers, you will have to
+	redefined ANTLRTokenPtr by subclassing, changing the header
+	file or changing ANTLR's code generation (easy enough to
+	do in gen.c).
+
+o	If you don't use ParserBlackBox, the new initialization sequence is:
+
+	    ANTLRTokenPtr aToken = new ANTLRToken;
+	    scan.setToken(mytoken(aToken));
+
+	where mytoken(aToken) gets an ANTLRToken * from the smart pointer.
+
+o	Define C++ preprocessor symbol DBG_REFCOUNTTOKEN to see a bunch of
+	debugging stuff for reference counting if you suspect something.
+
+
+3	WHY DO I HAVE TO TYPECAST ALL MY TOKEN POINTERS NOW??????
+
+If you subclass ANTLRCommonToken and then attempt to refer to one of
+your token members via a token pointer in your grammar actions, the
+C++ compiler will complain that your token object does not have that
+member.  For example, if you used to do this
+
+<<
+class ANTLRToken : public ANTLRCommonToken {
+        int muck;
+	...
+};
+>>
+
+class Foo {
+a : t:ID << t->muck = ...; >> ;
+}
+
+Now, you must do change the t->muck reference to:
+
+a : t:ID << mytoken(t)->muck = ...; >> ;
+
+in order to downcast 't' to be an "ANTLRToken *" not the
+"ANTLRAbstractToken *" resulting from ANTLRTokenPtr::operator->().
+The macro is defined as:
+
+/*
+ * Since you cannot redefine operator->() to return one of the user's
+ * token object types, we must down cast.  This is a drag.  Here's
+ * a macro that helps.  template: "mytoken(a-smart-ptr)->myfield".
+ */
+#define mytoken(tp) ((ANTLRToken *)(tp.operator->()))
+
+You have to use macro mytoken(grammar-label) now because smart
+pointers are not specific to a parser's token objects.  In other
+words, the ANTLRTokenPtr class has a pointer to a generic
+ANTLRAbstractToken not your ANTLRToken; the ANTLR support code must
+use smart pointers too, but be able to work with any kind of
+ANTLRToken.  Sorry about this, but it's C++'s fault not mine.  Some
+nebulous future version of the C++ compilers should obviate the need
+to downcast smart pointers with runtime type checking (and by allowing
+different return type of overridden functions).
+
+A way to have backward compatible code is to shut off the token object
+garbage collection; i.e., use parser->noGarbageCollectTokens() and
+change the definition of ANTLRTokenPtr (that's why you get source code
+<wink>).
+
+
+PARSER EXCEPTION HANDLING
+
+I've noticed some weird stuff with the exception handling.  I intend
+to give this top priority for the "book release" of ANTLR.
+
+==========
+1.32 Full Release
+
+o	Changed Token class hierarchy to be (Thanks to Tom Moog):
+
+        ANTLRAbstractToken
+          ANTLRRefCountToken
+             ANTLRCommonToken
+          ANTLRNoRefCountCommonToken
+
+o	Added virtual panic() to ANTLRAbstractToken.  Made ANTLRParser::panic()
+	virtual also.
+
+o	Cleaned up the dup() stuff in AST hierarchy to use shallowCopy() to
+	make node copies.  John Farr at Medtronic suggested this.  I.e.,
+	if you want to use dup() with either ANTLR or SORCERER or -transform
+	mode with SORCERER, you must defined shallowCopy() as:
+
+	virtual PCCTS_AST *shallowCopy()
+	{
+	    return new AST;
+	    p->setDown(NULL);
+	    p->setRight(NULL);
+	    return p;
+	}
+
+	or
+
+	virtual PCCTS_AST *shallowCopy()
+	{
+	    return new AST(*this);
+	}
+	
+	if you have defined a copy constructor such as
+
+	AST(const AST &t)	// shallow copy constructor
+	{
+		token = t.token;
+		iconst = t.iconst;
+		setDown(NULL);
+		setRight(NULL);
+	}
+
+o	Added a warning with -CC and -gk are used together.  This is broken,
+	hence a warning is appropriate.
+
+o	Added warning when #-stuff is used w/o -gt option.
+
+o	Updated MPW installation.
+
+o	"Miller, Philip W." <MILLERPW f1groups.fsd.jhuapl.edu> suggested
+	that genmk be use RENAME_OBJ_FLAG RENAME_EXE_FLAG instead of
+	hardcoding "-o" in genmk.c.
+
+o	made all exit() calls use EXIT_SUCCESS or EXIT_FAILURE.
+
+===========================================================================
+1.33
+
+EXIT_FAILURE and EXIT_SUCCESS were not always defined.  I had to modify
+a bunch of files to use PCCTS_EXIT_XXX, which forces a new version.  Sorry
+about that.
+
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133.txt b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133.txt
new file mode 100644
index 0000000000..2128c4ff25
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133.txt
@@ -0,0 +1,2448 @@
+=======================================================================
+List of Implemented Fixes and Changes for Maintenance Releases of PCCTS
+=======================================================================
+
+                               DISCLAIMER
+
+ The software and these notes are provided "as is".  They may include
+ typographical or technical errors and their authors disclaims all
+ liability of any kind or nature for damages due to error, fault,
+ defect, or deficiency regardless of cause.  All warranties of any
+ kind, either express or implied, including, but not limited to, the
+ implied  warranties of merchantability and fitness for a particular
+ purpose are disclaimed.
+
+
+        -------------------------------------------------------
+        Note:  Items #153 to #1 are now in a separate file named
+                CHANGES_FROM_133_BEFORE_MR13.txt
+        -------------------------------------------------------
+        
+#312. (Changed in MR33) Bug caused by change #299.
+
+	In change #299 a warning message was suppressed when there was
+	no LT(1) in a semantic predicate and max(k,ck) was 1.  The 
+	changed caused the code which set a default predicate depth for
+	the semantic predicate to be left as 0 rather than set to 1.
+	
+	This manifested as an error at line #1559 of mrhost.c
+	
+	Reported by Peter Dulimov.
+	    
+#311. (Changed in MR33) Added sorcer/lib to Makefile.
+
+    Reported by Dale Martin.
+            
+#310. (Changed in MR32) In C mode zzastPush was spelled zzastpush in one case.
+
+    Reported by Jean-Claude Durand
+    
+#309. (Changed in MR32) Renamed baseName because of VMS name conflict
+
+    Renamed baseName to pcctsBaseName to avoid library name conflict with
+    VMS library routine.  Reported by Jean-Fran�ois PI�RONNE.
+    
+#308. (Changed in MR32) Used "template" as name of formal in C routine
+
+	In astlib.h routine ast_scan a formal was named "template".  This caused
+	problems when the C code was compiled with a C++ compiler.  Reported by
+	Sabyasachi Dey.
+            
+#307. (Changed in MR31) Compiler dependent bug in function prototype generation
+    
+    The code which generated function prototypes contained a bug which
+    was compiler/optimization dependent.  Under some circumstance an
+    extra character would be included in portions of a function prototype.
+    
+    Reported by David Cook.
+    
+#306. (Changed in MR30) Validating predicate following a token
+
+    A validating predicate which immediately followed a token match 
+    consumed the token after the predicate rather than before.  Prior
+    to this fix (in the following example) isValidTimeScaleValue() in
+    the predicate would test the text for TIMESCALE rather than for
+    NUMBER:
+     
+		time_scale :
+    		TIMESCALE
+    		<<isValidTimeScaleValue(LT(1)->getText())>>?
+    		ts:NUMBER
+    		( us:MICROSECOND << tVal = ...>>
+    		| ns:NANOSECOND << tVal = ...  >>
+    		)
+	
+	Reported by Adalbert Perbandt.
+	
+#305. (Changed in MR30) Alternatives with guess blocks inside (...)* blocks.
+
+	In MR14 change #175 fixed a bug in the prediction expressions for guess
+	blocks which were of the form (alpha)? beta.  Unfortunately, this
+	resulted in a new bug as exemplified by the example below, which computed
+	the first set for r as {B} rather than {B C}:
+	
+					r : ( (A)? B
+					    | C
+						)*
+  
+    This example doesn't make any sense as A is not a prefix of B, but it
+    illustrates the problem.  This bug did not appear for:
+    
+    				r : ( (A)?
+    				    | C
+    				    )*
+
+	because it does not use the (alpha)? beta form.
+
+	Item #175 fixed an asymmetry in ambiguity messages for the following
+	constructs which appear to have identical ambiguities (between repeating
+	the loop vs. exiting the loop).  MR30 retains this fix, but the implementation
+	is slightly different.
+	
+	          r_star : ( (A B)? )* A ;
+	          r_plus : ( (A B)? )+ A ;
+
+    Reported by Arpad Beszedes (beszedes inf.u-szeged.hu).
+    
+#304. (Changed in MR30) Crash when mismatch between output value counts.
+
+	For a rule such as:
+	
+		r1 : r2>[i,j];
+		r2 >[int i, int j] : A;
+		
+	If there were extra actuals for the reference to rule r2 from rule r1
+	there antlr would crash.  This bug was introduced by change #276.
+
+	Reported by Sinan Karasu.
+	
+#303. (Changed in MR30) DLGLexerBase::replchar
+
+	DLGLexerBase::replchar and the C mode routine zzreplchar did not work 
+	properly when the new character was 0.
+      
+    Reported with fix by Philippe Laporte
+
+#302. (Changed in MR28) Fix significant problems in initial release of MR27.
+
+#301. (Changed in MR27) Default tab stops set to 2 spaces.
+
+    To have antlr generate true tabs rather than spaces, use "antlr -tab 0".
+    To generate 4 spaces per tab stop use "antlr -tab 4"
+    
+#300. (Changed in MR27)
+
+	Consider the following methods of constructing an AST from ID:
+	
+        rule1!
+                : id:ID << #0 = #[id]; >> ;
+        
+        rule2!
+                : id:ID << #0 = #id; >> ;
+        
+        rule3
+                : ID ;
+        
+        rule4
+                : id:ID << #0 = #id; >> ;
+        
+    For rule_2, the AST corresponding to id would always be NULL.  This
+    is because the user explicitly suppressed AST construction using the
+    "!" operator on the rule.  In MR27 the use of an AST expression
+    such as #id overrides the "!" operator and forces construction of
+    the AST.
+    
+    This fix does not apply to C mode ASTs when the ASTs are referenced
+    using numbers rather than symbols.
+
+	For C mode, this requires that the (optional) function/macro zzmk_ast
+	be defined.  This functions copies information from an attribute into
+	a previously allocated AST.
+
+    Reported by Jan Langer (jan langernetz.de)
+
+#299. (Changed in MR27) Don't warn if k=1 and semantic predicate missing LT(i)
+
+    If a semantic does not have a reference to LT(i) or (C mode LATEXT(i))
+    then pccts doesn't know how many lookahead tokens to use for context.
+    However, if max(k,ck) is 1 then there is really only one choice and
+    the warning is unnecessary.
+    
+#298. (Changed in MR27) Removed "register" for lastpos in dlgauto.c zzgettok
+
+#297. (Changed in MR27) Incorrect prototypes when used with classic C
+
+    There were a number of errors in function headers when antlr was
+    built with compilers that do not have __STDC__ or __cplusplus set.
+    
+    The functions which have variable length argument lists now use
+    PCCTS_USE_STDARG rather than __USE_PROTOTYPES__ to determine
+    whether to use stdargs or varargs.
+
+#296. (Changed in MR27) Complex return types in rules.
+
+    The following return type was not properly handled when 
+    unpacking a struct with containing multiple return values:
+    
+      rule > [int i, IIR_Bool (IIR_Decl::*constraint)()] : ...    
+
+    Instead of using "constraint", the program got lost and used
+    an empty string.
+    
+    Reported by P.A. Wilsey.
+
+#295. (Changed in MR27) Extra ";" following zzGUESS_DONE sometimes.
+
+    Certain constructs with guess blocks in MR23 led to extra ";"
+    preceding the "else" clause of an "if".
+
+    Reported by P.A. Wilsey.
+    
+#294. (Changed in MR27) Infinite loop in antlr for nested blocks
+
+    An oversight in detecting an empty alternative sometimes led
+    to an infinite loop in antlr when it encountered a rule with
+    nested blocks and guess blocks.
+    
+    Reported by P.A. Wilsey.
+    
+#293. (Changed in MR27) Sorcerer optimization of _t->type()
+
+    Sorcerer generated code may contain many calls to _t->type() in a
+    single statement.  This change introduces a temporary variable
+    to eliminate unnnecesary function calls.
+
+    Change implemented by Tom Molteno (tim videoscript.com).
+
+#292. (Changed in MR27)
+
+    WARNING:  Item #267 changes the signature of methods in the AST class.
+
+    **** Be sure to revise your AST functions of the same name  ***
+
+#291. (Changed in MR24)
+
+    Fix to serious code generation error in MR23 for (...)+ block.
+
+#290. (Changed in MR23) 
+
+    Item #247 describes a change in the way {...} blocks handled
+    an error.  Consider:
+
+            r1 : {A} b ;
+            b  : B;
+                
+                with input "C".
+
+    Prior to change #247, the error would resemble "expected B -
+    found C".  This is correct but incomplete, and therefore
+    misleading.  In #247 it was changed to "expected A, B - found
+    C".  This was fine, except for users of parser exception
+    handling because the exception was generated in the epilogue 
+    for {...} block rather than in rule b.  This made it difficult
+    for users of parser exception handling because B was not
+    expected in that context. Those not using parser exception
+    handling didn't notice the difference.
+
+    The current change restores the behavior prior to #247 when
+    parser exceptions are present, but retains the revised behavior
+    otherwise.  This change should be visible only when exceptions
+    are in use and only for {...} blocks and sub-blocks of the form
+    (something|something | something | epsilon) where epsilon represents
+    an empty production and it is the last alternative of a sub-block.
+    In contrast, (something | epsilon | something) should generate the
+    same code as before, even when exceptions are used.
+    
+    Reported by Philippe Laporte (philippe at transvirtual.com).
+
+#289. (Changed in MR23) Bug in matching complement of a #tokclass
+
+    Prior to MR23 when a #tokclass was matched in both its complemented form
+    and uncomplemented form, the bit set generated for its first use was used
+    for both cases.  However, the prediction expression was correctly computed
+    in both cases.  This meant that the second case would never be matched
+    because, for the second appearance, the prediction expression and the 
+    set to be matched would be complements of each other.
+        
+    Consider:
+        
+                #token A "a"
+                #token B "b"
+                #token C "c"
+                #tokclass AB {A B}
+                
+                r1 : AB    /* alt 1x */
+                   | ~AB   /* alt 1y */
+                   ;
+        
+    Prior to MR23, this resulted in alternative 1y being unreachable.  Had it
+    been written:
+        
+                r2 : ~AB  /* alt 2x */
+                   : AB   /* alt 2y */
+                   
+    then alternative 2y would have become unreachable.        
+        
+    This bug was only for the case of complemented #tokclass.  For complemented
+    #token the proper code was generated.           
+        
+#288. (Changed in MR23) #errclass not restricted to choice points
+
+    The #errclass directive is supposed to allow a programmer to define
+    print strings which should appear in syntax error messages as a replacement
+    for some combinations of tokens. For instance:
+    
+            #errclass Operator {PLUS MINUS TIMES DIVIDE}
+            
+    If a syntax message includes all four of these tokens, and there is no
+    "better" choice of error class, the word "Operator" will be used rather
+    than a list of the four token names.
+        
+    Prior to MR23 the #errclass definitions were used only at choice points
+    (which call the FAIL macro). In other cases where there was no choice
+    (e.g. where a single token or token class were matched) the #errclass
+    information was not used.
+
+    With MR23 the #errclass declarations are used for syntax error messages
+    when matching a #tokclass, a wildcard (i.e. "*"), or the complement of a
+    #token or #tokclass (e.g. ~Operator).
+
+    Please note that #errclass may now be defined using #tokclass names 
+    (see Item #284).
+
+    Reported by Philip A. Wilsey.
+
+#287. (Changed in MR23) Print name for #tokclass
+
+    Item #148 describes how to give a print name to a #token so that,for
+    example, #token ID could have the expression "identifier" in syntax
+    error messages.  This has been extended to #tokclass:
+    
+            #token ID("identifier")  "[a-zA-Z]+"
+            #tokclass Primitive("primitive type") 
+                                    {INT, FLOAT, CHAR, FLOAT, DOUBLE, BOOL} 
+
+    This is really a cosmetic change, since #tokclass names do not appear
+    in any error messages.
+        
+#286. (Changed in MR23) Makefile change to use of cd
+
+    In cases where a pccts subdirectory name matched a directory identified
+    in a $CDPATH environment variable the build would fail.  All makefile
+    cd commands have been changed from "cd xyz" to "cd ./xyz" in order
+    to avoid this problem.
+        
+#285. (Changed in MR23) Check for null pointers in some dlg structures
+
+    An invalid regular expression can cause dlg to build an invalid
+    structure to represent the regular expression even while it issues 
+    error messages.  Additional pointer checks were added.
+
+    Reported by Robert Sherry.
+
+#284. (Changed in MR23) Allow #tokclass in #errclass definitions
+
+    Previously, a #tokclass reference in the definition of an
+    #errclass was not handled properly. Instead of being expanded
+    into the set of tokens represented by the #tokclass it was
+    treated somewhat like an #errclass.  However, in a later phase
+    when all #errclass were expanded into the corresponding tokens
+    the #tokclass reference was not expanded (because it wasn't an
+    #errclass).  In effect the reference was ignored.
+
+    This has been fixed.
+
+    Problem reported by Mike Dimmick (mike dimmick.demon.co.uk).
+
+#283. (Changed in MR23) Option -tmake invoke's parser's tmake 
+
+    When the string #(...) appears in an action antlr replaces it with
+    a call to ASTBase::tmake(...) to construct an AST.  It is sometimes
+    useful to change the tmake routine so that it has access to information
+    in the parser - something which is not possible with a static method
+    in an application where they may be multiple parsers active.
+
+    The antlr option -tmake replaces the call to ASTBase::tmake with a call
+    to a user supplied tmake routine.
+   
+#282. (Changed in MR23) Initialization error for DBG_REFCOUNTTOKEN
+
+    When the pre-processor symbol DBG_REFCOUNTTOKEN is defined 
+    incorrect code is generated to initialize ANTLRRefCountToken::ctor and
+    dtor.
+
+    Fix reported by Sven Kuehn (sven sevenkuehn.de).
+   
+#281. (Changed in MR23) Addition of -noctor option for Sorcerer
+
+    Added a -noctor option to suppress generation of the blank ctor
+    for users who wish to define their own ctor.
+
+    Contributed by Jan Langer (jan langernetz.de).
+
+#280. (Changed in MR23) Syntax error message for EOF token
+
+    The EOF token now receives special treatment in syntax error messages
+    because there is no text matched by the eof token.  The token name
+    of the eof token is used unless it is "@" - in which case the string
+    "<eof>" is used.
+
+    Problem reported by Erwin Achermann (erwin.achermann switzerland.org).
+
+#279. (Changed in MR23) Exception groups
+
+    There was a bug in the way that exception groups were attached to
+    alternatives which caused problems when there was a block contained
+    in an alternative.  For instance, in the following rule;
+
+        statement : IF S { ELSE S } 
+                        exception ....
+        ;
+
+    the exception would be attached to the {...} block instead of the 
+    entire alternative because it was attached, in error, to the last
+    alternative instead of the last OPEN alternative.
+
+    Reported by Ty Mordane (tymordane hotmail.com).
+    
+#278. (Changed in MR23) makefile changes
+
+    Contributed by Tomasz Babczynski (faster lab05-7.ict.pwr.wroc.pl).
+
+    The -cfile option is not absolutely needed: when extension of
+    source file is one of the well-known C/C++ extensions it is 
+    treated as C/C++ source
+
+    The gnu make defines the CXX variable as the default C++ compiler
+    name, so I added a line to copy this (if defined) to the CCC var.
+
+    Added a -sor option: after it any -class command defines the class
+    name for sorcerer, not for ANTLR.  A file extended with .sor is 
+    treated as sorcerer input.  Because sorcerer can be called multiple
+    times, -sor option can be repeated.  Any files and classes (one class
+    per group) after each -sor makes one tree parser.
+
+    Not implemented:
+
+        1. Generate dependences for user c/c++ files.
+        2. Support for -sor in c mode not.
+
+    I have left the old genmk program in the directory as genmk_old.c.
+
+#277. (Changed in MR23) Change in macro for failed semantic predicates
+
+    In the past, a semantic predicate that failed generated a call to
+    the macro zzfailed_pred:
+
+        #ifndef zzfailed_pred
+        #define zzfailed_pred(_p) \
+          if (guessing) { \
+            zzGUESS_FAIL; \
+          } else { \
+            something(_p)
+          }
+        #endif
+
+    If a user wished to use the failed action option for semantic predicates:
+
+        rule : <<my_predicate>>? [my_fail_action] A
+             | ...
+
+           
+    the code for my_fail_action would have to contain logic for handling
+    the guess part of the zzfailed_pred macro.  The user should not have
+    to be aware of the guess logic in writing the fail action.
+
+    The zzfailed_pred has been rewritten to have three arguments:
+
+            arg 1: the stringized predicate of the semantic predicate
+            arg 2: 0 => there is no user-defined fail action
+                   1 => there is a user-defined fail action
+            arg 3: the user-defined fail action (if defined)
+                   otherwise a no-operation
+
+    The zzfailed_pred macro is now defined as:
+
+        #ifndef zzfailed_pred
+        #define zzfailed_pred(_p,_hasuseraction,_useraction) \
+          if (guessing) { \
+            zzGUESS_FAIL; \
+          } else { \
+            zzfailed_pred_action(_p,_hasuseraction,_useraction) \
+          }
+        #endif
+
+
+    With zzfailed_pred_action defined as:
+
+        #ifndef zzfailed_pred_action
+        #define zzfailed_pred_action(_p,_hasuseraction,_useraction) \
+            if (_hasUserAction) { _useraction } else { failedSemanticPredicate(_p); }
+        #endif
+
+    In C++ mode failedSemanticPredicate() is a virtual function.
+    In C mode the default action is a fprintf statement.
+
+    Suggested by Erwin Achermann (erwin.achermann switzerland.org).
+
+#276. (Changed in MR23) Addition of return value initialization syntax
+
+    In an attempt to reduce the problems caused by the PURIFY macro I have
+    added new syntax for initializing the return value of rules and the
+    antlr option "-nopurify".
+
+    A rule with a single return argument:
+
+        r1 > [Foo f = expr] :
+
+    now generates code that resembles:
+
+        Foo r1(void) {
+          Foo _retv = expr;
+          ...
+        }
+  
+    A rule with more than one return argument:
+
+        r2 > [Foo f = expr1, Bar b = expr2 ] :
+
+    generates code that resembles:
+
+        struct _rv1 {
+            Foo f;
+            Bar b;
+        }
+
+        _rv1 r2(void) {
+          struct _rv1 _retv;
+          _retv.f = expr1;
+          _retv.b = expr2;
+          ...
+        }
+
+    C++ style comments appearing in the initialization list may cause problems.
+
+#275. (Changed in MR23) Addition of -nopurify option to antlr
+
+    A long time ago the PURIFY macro was introduced to initialize
+    return value arguments and get rid of annying messages from program
+    that checked for unitialized variables.
+
+    This has caused significant annoyance for C++ users that had
+    classes with virtual functions or non-trivial contructors because
+    it would zero the object, including the pointer to the virtual
+    function table.  This could be defeated by redefining
+    the PURIFY macro to be empty, but it was a constant surprise to
+    new C++ users of pccts.
+
+    I would like to remove it, but I fear that some existing programs
+    depend on it and would break.  My temporary solution is to add
+    an antlr option -nopurify which disables generation of the PURIFY
+    macro call.
+
+    The PURIFY macro should be avoided in favor of the new syntax
+    for initializing return arguments described in item #275.
+
+    To avoid name clash, the PURIFY macro has been renamed PCCTS_PURIFY.
+
+#274. (Changed in MR23) DLexer.cpp renamed to DLexer.h
+      (Changed in MR23) ATokPtr.cpp renamed to ATokPtrImpl.h
+
+    These two files had .cpp extensions but acted like .h files because
+    there were included in other files. This caused problems for many IDE.
+    I have renamed them.  The ATokPtrImpl.h was necessary because there was
+    already an ATokPtr.h.
+
+#273. (Changed in MR23) Default win32 library changed to multi-threaded DLL
+
+    The model used for building the Win32 debug and release libraries has changed
+    to multi-threaded DLL.
+
+    To make this change in your MSVC 6 project:
+
+        Project -> Settings
+        Select the C++ tab in the right pane of the dialog box
+        Select "Category: Code Generation"
+        Under "Use run-time library" select one of the following:
+
+            Multi-threaded DLL
+            Debug Multi-threaded DLL
+           
+    Suggested by Bill Menees (bill.menees gogallagher.com) 
+    
+#272. (Changed in MR23) Failed semantic predicate reported via virtual function
+
+    In the past, a failed semantic predicated reported the problem via a
+    macro which used fprintf().  The macro now expands into a call on 
+    the virtual function ANTLRParser::failedSemanticPredicate().
+
+#271. (Changed in MR23) Warning for LT(i), LATEXT(i) in token match actions
+
+    An bug (or at least an oddity) is that a reference to LT(1), LA(1),
+    or LATEXT(1) in an action which immediately follows a token match
+    in a rule refers to the token matched, not the token which is in
+    the lookahead buffer.  Consider:
+
+        r : abc <<action alpha>> D <<action beta>> E;
+
+    In this case LT(1) in action alpha will refer to the next token in
+    the lookahead buffer ("D"), but LT(1) in action beta will refer to
+    the token matched by D - the preceding token.
+
+    A warning has been added for users about this when an action
+    following a token match contains a reference to LT(1), LA(1), or LATEXT(1).
+
+    This behavior should be changed, but it appears in too many programs
+    now.  Another problem, perhaps more significant, is that the obvious
+    fix (moving the consume() call to before the action) could change the 
+    order in which input is requested and output appears in existing programs.
+
+    This problem was reported, along with a fix by Benjamin Mandel
+    (beny sd.co.il).  However, I felt that changing the behavior was too
+    dangerous for existing code.
+
+#270. (Changed in MR23) Removed static objects from PCCTSAST.cpp
+
+    There were some statically allocated objects in PCCTSAST.cpp
+    These were changed to non-static.
+
+#269. (Changed in MR23) dlg output for initializing static array
+
+    The output from dlg contains a construct similar to the
+    following:
+   
+        struct XXX {
+          static const int size;
+          static int array1[5];
+        };
+
+        const int XXX::size = 4;
+        int XXX::array1[size+1];
+
+    
+    The problem is that although the expression "size+1" used in
+    the definition of array1 is equal to 5 (the expression used to
+    declare array), it is not considered equivalent by some compilers.
+
+    Reported with fix by Volker H. Simonis (simonis informatik.uni-tuebingen.de)
+
+#268. (Changed in MR23) syn() routine output when k > 1
+
+    The syn() routine is supposed to print out the text of the
+    token causing the syntax error.  It appears that it always
+    used the text from the first lookahead token rather than the
+    appropriate one.  The appropriate one is computed by comparing
+    the token codes of lookahead token i (for i = 1 to k) with
+    the FIRST(i) set.
+    
+    This has been corrected in ANTLRParser::syn().
+
+    Reported by Bill Menees (bill.menees gogallagher.com) 
+
+#267. (Changed in MR23) AST traversal functions client data argument
+
+    The AST traversal functions now take an extra (optional) parameter
+    which can point to client data:
+
+        preorder_action(void* pData = NULL)
+        preorder_before_action(void* pData = NULL)
+        preorder_after_action(void* pData = NULL)
+
+    ****       Warning: this changes the AST signature.         ***
+    **** Be sure to revise your AST functions of the same name  ***
+
+    Bill Menees (bill.menees gogallagher.com) 
+    
+#266. (Changed in MR23) virtual function printMessage()
+
+    Bill Menees (bill.menees gogallagher.com) has completed the
+    tedious taks of replacing all calls to fprintf() with calls
+    to the virtual function printMessage().  For classes which
+    have a pointer to the parser it forwards the printMessage()
+    call to the parser's printMessage() routine.
+
+    This should make it significanly easier to redirect pccts
+    error and warning messages.
+
+#265. (Changed in MR23) Remove "labase++" in C++ mode
+
+    In C++ mode labase++ is called when a token is matched.
+    It appears that labase is not used in C++ mode at all, so
+    this code has been commented out.
+    
+#264. (Changed in MR23) Complete rewrite of ParserBlackBox.h
+
+    The parser black box (PBlackBox.h) was completely rewritten
+    by Chris Uzdavinis (chris atdesk.com) to improve its robustness.
+
+#263. (Changed in MR23) -preamble and -preamble_first rescinded
+
+    Changes for item #253 have been rescinded.
+
+#262. (Changed in MR23) Crash with -alpha option during traceback
+
+    Under some circumstances a -alpha traceback was started at the
+    "wrong" time.  As a result, internal data structures were not
+    initialized.
+
+    Reported by Arpad Beszedes (beszedes inf.u-szeged.hu).
+
+#261. (Changed in MR23) Defer token fetch for C++ mode
+
+    Item #216 has been revised to indicate that use of the defer fetch
+    option (ZZDEFER_FETCH) requires dlg option -i.
+
+#260. (MR22) Raise default lex buffer size from 8,000 to 32,000 bytes.
+
+    ZZLEXBUFSIZE is the size (in bytes) of the buffer used by dlg 
+    generated lexers.  The default value has been raised to 32,000 and
+    the value used by antlr, dlg, and sorcerer has also been raised to
+    32,000.
+
+#259. (MR22) Default function arguments in C++ mode.
+
+    If a rule is declared:
+
+            rr [int i = 0] : ....
+
+    then the declaration generated by pccts resembles:
+
+            void rr(int i = 0);
+
+    however, the definition must omit the default argument:
+
+            void rr(int i) {...}
+
+    In the past the default value was not omitted.  In MR22
+    the generated code resembles:
+
+            void rr(int i /* = 0 */ ) {...}
+
+    Implemented by Volker H. Simonis (simonis informatik.uni-tuebingen.de)
+
+
+    Note: In MR23 this was changed so that nested C style comments
+    ("/* ... */") would not cause problems.
+
+#258. (MR22)  Using a base class for your parser
+
+    In item #102 (MR10) the class statement was extended to allow one
+    to specify a base class other than ANTLRParser for the generated
+    parser.  It turned out that this was less than useful because
+    the constructor still specified ANTLRParser as the base class.
+
+    The class statement now uses the first identifier appearing after
+    the ":" as the name of the base class.  For example:
+
+        class MyParser : public FooParser {
+
+    Generates in MyParser.h:
+
+            class MyParser : public FooParser {
+
+    Generates in MyParser.cpp something that resembles:
+
+            MyParser::MyParser(ANTLRTokenBuffer *input) :
+                                         FooParser(input,1,0,0,4)
+            {
+                token_tbl = _token_tbl;
+                traceOptionValueDefault=1;    // MR10 turn trace ON
+            }
+
+    The base class constructor must have a signature similar to
+    that of ANTLRParser.
+
+#257. (MR21a) Removed dlg statement that -i has no effect in C++ mode.
+
+    This was incorrect.
+
+#256. (MR21a) Malformed syntax graph causes crash after error message.
+
+    In the past, certain kinds of errors in the very first grammar
+    element could cause the construction of a malformed graph 
+    representing the grammar.  This would eventually result in a
+    fatal internal error.  The code has been changed to be more
+    resistant to this particular error.
+
+#255. (MR21a) ParserBlackBox(FILE* f) 
+
+    This constructor set openByBlackBox to the wrong value.
+
+    Reported by Kees Bakker (kees_bakker tasking.nl).
+
+#254. (MR21a) Reporting syntax error at end-of-file
+
+    When there was a syntax error at the end-of-file the syntax
+    error routine would substitute "<eof>" for the programmer's
+    end-of-file symbol.  This substitution is now done only when
+    the programmer does not define his own end-of-file symbol
+    or the symbol begins with the character "@".
+
+    Reported by Kees Bakker (kees_bakker tasking.nl).
+
+#253. (MR21) Generation of block preamble (-preamble and -preamble_first)
+
+        *** This change was rescinded by item #263 ***
+
+    The antlr option -preamble causes antlr to insert the code
+    BLOCK_PREAMBLE at the start of each rule and block.  It does
+    not insert code before rules references, token references, or
+    actions.  By properly defining the macro BLOCK_PREAMBLE the
+    user can generate code which is specific to the start of blocks.
+
+    The antlr option -preamble_first is similar, but inserts the
+    code BLOCK_PREAMBLE_FIRST(PreambleFirst_123) where the symbol
+    PreambleFirst_123 is equivalent to the first set defined by
+    the #FirstSetSymbol described in Item #248.
+
+    I have not investigated how these options interact with guess
+    mode (syntactic predicates).
+
+#252. (MR21) Check for null pointer in trace routine
+
+    When some trace options are used when the parser is generated
+    without the trace enabled, the current rule name may be a
+    NULL pointer.  A guard was added to check for this in
+    restoreState.
+
+    Reported by Douglas E. Forester (dougf projtech.com).
+
+#251. (MR21) Changes to #define zzTRACE_RULES
+
+    The macro zzTRACE_RULES was being use to pass information to
+    AParser.h.  If this preprocessor symbol was not properly
+    set the first time AParser.h was #included, the declaration
+    of zzTRACEdata would be omitted (it is used by the -gd option).
+    Subsequent #includes of AParser.h would be skipped because of 
+    the #ifdef guard, so the declaration of zzTracePrevRuleName would
+    never be made.  The result was that proper compilation was very 
+    order dependent.
+
+    The declaration of zzTRACEdata was made unconditional and the
+    problem of removing unused declarations will be left to optimizers.
+    
+    Diagnosed by Douglas E. Forester (dougf projtech.com).
+
+#250. (MR21) Option for EXPERIMENTAL change to error sets for blocks
+
+    The antlr option -mrblkerr turns on an experimental feature
+    which is supposed to provide more accurate syntax error messages
+    for k=1, ck=1 grammars.  When used with k>1 or ck>1 grammars the
+    behavior should be no worse than the current behavior.
+
+    There is no problem with the matching of elements or the computation
+    of prediction expressions in pccts.  The task is only one of listing
+    the most appropriate tokens in the error message.  The error sets used
+    in pccts error messages are approximations of the exact error set when
+    optional elements in (...)* or (...)+ are involved.  While entirely
+    correct, the error messages are sometimes not 100% accurate.  
+
+    There is also a minor philosophical issue.  For example, suppose the
+    grammar expects the token to be an optional A followed by Z, and it 
+    is X.  X, of course, is neither A nor Z, so an error message is appropriate.
+    Is it appropriate to say "Expected Z" ?  It is correct, it is accurate,
+    but it is not complete.  
+
+    When k>1 or ck>1 the problem of providing the exactly correct
+    list of tokens for the syntax error messages ends up becoming
+    equivalent to evaluating the prediction expression for the
+    alternatives twice. However, for k=1 ck=1 grammars the prediction
+    expression can be computed easily and evaluated cheaply, so I
+    decided to try implementing it to satisfy a particular application.
+    This application uses the error set in an interactive command language
+    to provide prompts which list the alternatives available at that
+    point in the parser.  The user can then enter additional tokens to
+    complete the command line.  To do this required more accurate error 
+    sets then previously provided by pccts.
+
+    In some cases the default pccts behavior may lead to more robust error
+    recovery or clearer error messages then having the exact set of tokens.
+    This is because (a) features like -ge allow the use of symbolic names for
+    certain sets of tokens, so having extra tokens may simply obscure things
+    and (b) the error set is use to resynchronize the parser, so a good
+    choice is sometimes more important than having the exact set.
+
+    Consider the following example:
+
+            Note:  All examples code has been abbreviated
+            to the absolute minimum in order to make the
+            examples concise.
+
+        star1 : (A)* Z;
+
+    The generated code resembles:
+
+           old                new (with -mrblkerr)
+        --//-----------         --------------------
+        for (;;) {            for (;;) {
+            match(A);           match(A);
+        }                     }
+        match(Z);             if (! A and ! Z) then
+                                FAIL(...{A,Z}...);
+                              }
+                              match(Z);
+
+
+        With input X
+            old message: Found X, expected Z
+            new message: Found X, expected A, Z
+
+    For the example:
+
+        star2 : (A|B)* Z;
+
+           old                      new (with -mrblkerr)
+        -------------               --------------------
+        for (;;) {                  for (;;) {
+          if (!A and !B) break;       if (!A and !B) break;
+          if (...) {                  if (...) {
+            <same ...>                  <same ...>
+          }                           }
+          else {                      else {
+            FAIL(...{A,B,Z}...)         FAIL(...{A,B}...);
+          }                           }
+        }                           }
+        match(B);                   if (! A and ! B and !Z) then
+                                        FAIL(...{A,B,Z}...);
+                                    }
+                                    match(B);
+
+        With input X
+            old message: Found X, expected Z
+            new message: Found X, expected A, B, Z
+        With input A X
+            old message: Found X, expected Z
+            new message: Found X, expected A, B, Z
+
+            This includes the choice of looping back to the
+            star block.
+
+    The code for plus blocks:
+
+        plus1 : (A)+ Z;
+
+    The generated code resembles:
+
+           old                  new (with -mrblkerr)
+        -------------           --------------------
+        do {                    do {
+          match(A);               match(A);
+        } while (A)             } while (A)
+        match(Z);               if (! A and ! Z) then
+                                  FAIL(...{A,Z}...);
+                                }
+                                match(Z);
+
+        With input A X
+            old message: Found X, expected Z
+            new message: Found X, expected A, Z
+
+            This includes the choice of looping back to the
+            plus block.
+
+    For the example:
+
+        plus2 : (A|B)+ Z;
+
+           old                    new (with -mrblkerr)
+        -------------             --------------------
+        do {                        do {
+          if (A) {                    <same>
+            match(A);                 <same>
+          } else if (B) {             <same>
+            match(B);                 <same>
+          } else {                    <same>
+            if (cnt > 1) break;       <same>
+            FAIL(...{A,B,Z}...)         FAIL(...{A,B}...);
+          }                           }
+          cnt++;                      <same>
+        }                           }
+
+        match(Z);                   if (! A and ! B and !Z) then
+                                        FAIL(...{A,B,Z}...);
+                                    }
+                                    match(B);
+
+        With input X
+            old message: Found X, expected A, B, Z
+            new message: Found X, expected A, B
+        With input A X
+            old message: Found X, expected Z
+            new message: Found X, expected A, B, Z
+
+            This includes the choice of looping back to the
+            star block.
+    
+#249. (MR21) Changes for DEC/VMS systems
+
+    Jean-Fran�ois Pi�ronne (jfp altavista.net) has updated some
+    VMS related command files and fixed some minor problems related
+    to building pccts under the DEC/VMS operating system.  For DEC/VMS
+    users the most important differences are:
+
+        a.  Revised makefile.vms
+        b.  Revised genMMS for genrating VMS style makefiles.
+
+#248. (MR21) Generate symbol for first set of an alternative
+
+    pccts can generate a symbol which represents the tokens which may
+    appear at the start of a block:
+
+        rr : #FirstSetSymbol(rr_FirstSet)  ( Foo | Bar ) ;
+
+    This will generate the symbol rr_FirstSet of type SetWordType with
+    elements Foo and Bar set. The bits can be tested using code similar 
+    to the following:
+
+        if (set_el(Foo, &rr_FirstSet)) { ...
+
+    This can be combined with the C array zztokens[] or the C++ routine
+    tokenName() to get the print name of the token in the first set.
+
+    The size of the set is given by the newly added enum SET_SIZE, a 
+    protected member of the generated parser's class.  The number of
+    elements in the generated set will not be exactly equal to the 
+    value of SET_SIZE because of synthetic tokens created by #tokclass,
+    #errclass, the -ge option, and meta-tokens such as epsilon, and
+    end-of-file.
+
+    The #FirstSetSymbol must appear immediately before a block
+    such as (...)+, (...)*, and {...}, and (...).  It may not appear
+    immediately before a token, a rule reference, or action.  However
+    a token or rule reference can be enclosed in a (...) in order to
+    make the use of #pragma FirstSetSymbol legal.
+
+            rr_bad : #FirstSetSymbol(rr_bad_FirstSet) Foo;   //  Illegal
+
+            rr_ok :  #FirstSetSymbol(rr_ok_FirstSet) (Foo);  //  Legal
+    
+    Do not confuse FirstSetSymbol sets with the sets used for testing
+    lookahead. The sets used for FirstSetSymbol have one element per bit,
+    so the number of bytes  is approximately the largest token number
+    divided by 8.  The sets used for testing lookahead store 8 lookahead 
+    sets per byte, so the length of the array is approximately the largest
+    token number.
+
+    If there is demand, a similar routine for follow sets can be added.
+
+#247. (MR21) Misleading error message on syntax error for optional elements.
+
+        ===================================================
+        The behavior has been revised when parser exception
+        handling is used.  See Item #290
+        ===================================================
+
+    Prior to MR21, tokens which were optional did not appear in syntax
+    error messages if the block which immediately followed detected a 
+    syntax error.
+
+    Consider the following grammar which accepts Number, Word, and Other:
+
+            rr : {Number} Word;
+
+    For this rule the code resembles:
+
+            if (LA(1) == Number) {
+                match(Number);
+                consume();
+            }
+            match(Word);
+
+    Prior to MR21, the error message for input "$ a" would be:
+
+            line 1: syntax error at "$" missing Word
+
+    With MR21 the message will be:
+
+            line 1: syntax error at "$" expecting Word, Number.
+
+    The generate code resembles:
+
+            if ( (LA(1)==Number) ) {
+                zzmatch(Number);
+                consume();
+            }
+            else {
+                if ( (LA(1)==Word) ) {
+                    /* nothing */
+                }
+                else {
+                    FAIL(... message for both Number and Word ...);
+                }
+            }
+            match(Word);
+        
+    The code generated for optional blocks in MR21 is slightly longer
+    than the previous versions, but it should give better error messages.
+
+    The code generated for:
+
+            { a | b | c }
+
+    should now be *identical* to:
+
+            ( a | b | c | )
+
+    which was not the case prior to MR21.
+
+    Reported by Sue Marvin (sue siara.com).
+
+#246. (Changed in MR21) Use of $(MAKE) for calls to make
+
+    Calls to make from the makefiles were replaced with $(MAKE)
+    because of problems when using gmake.
+
+    Reported with fix by Sunil K.Vallamkonda (sunil siara.com).
+
+#245. (Changed in MR21) Changes to genmk
+
+    The following command line options have been added to genmk:
+
+        -cfiles ... 
+            
+            To add a user's C or C++ files into makefile automatically.
+            The list of files must be enclosed in apostrophes.  This
+            option may be specified multiple times.
+
+        -compiler ...
+    
+            The name of the compiler to use for $(CCC) or $(CC).  The
+            default in C++ mode is "CC".  The default in C mode is "cc".
+
+        -pccts_path ...
+
+            The value for $(PCCTS), the pccts directory.  The default
+            is /usr/local/pccts.
+
+    Contributed by Tomasz Babczynski (t.babczynski ict.pwr.wroc.pl).
+
+#244. (Changed in MR21) Rename variable "not" in antlr.g
+
+    When antlr.g is compiled with a C++ compiler, a variable named
+    "not" causes problems.  Reported by Sinan Karasu
+    (sinan.karasu boeing.com).
+
+#243  (Changed in MR21) Replace recursion with iteration in zzfree_ast
+
+    Another refinement to zzfree_ast in ast.c to limit recursion.
+
+    NAKAJIMA Mutsuki (muc isr.co.jp).
+
+
+#242.  (Changed in MR21) LineInfoFormatStr
+
+    Added an #ifndef/#endif around LineInfoFormatStr in pcctscfg.h.
+
+#241. (Changed in MR21) Changed macro PURIFY to a no-op
+
+                ***********************
+                *** NOT IMPLEMENTED ***
+                ***********************
+
+        The PURIFY macro was changed to a no-op because it was causing 
+        problems when passing C++ objects.
+    
+        The old definition:
+    
+            #define PURIFY(r,s)     memset((char *) &(r),'\\0',(s));
+    
+        The new definition:
+    
+            #define PURIFY(r,s)     /* nothing */
+#endif
+
+#240. (Changed in MR21) sorcerer/h/sorcerer.h _MATCH and _MATCHRANGE
+
+    Added test for NULL token pointer.
+
+    Suggested by Peter Keller (keller ebi.ac.uk)
+
+#239. (Changed in MR21) C++ mode AParser::traceGuessFail
+
+    If tracing is turned on when the code has been generated
+    without trace code, a failed guess generates a trace report
+    even though there are no other trace reports.  This
+    make the behavior consistent with other parts of the
+    trace system.
+
+    Reported by David Wigg (wiggjd sbu.ac.uk).
+
+#238. (Changed in MR21) Namespace version #include files
+
+    Changed reference from CStdio to cstdio (and other
+    #include file names) in the namespace version of pccts.
+    Should have known better.
+
+#237. (Changed in MR21) ParserBlackBox(FILE*)
+    
+    In the past, ParserBlackBox would close the FILE in the dtor
+    even though it was not opened by ParserBlackBox.  The problem
+    is that there were two constructors, one which accepted a file   
+    name and did an fopen, the other which accepted a FILE and did
+    not do an fopen.  There is now an extra member variable which
+    remembers whether ParserBlackBox did the open or not.
+
+    Suggested by Mike Percy (mpercy scires.com).
+
+#236. (Changed in MR21) tmake now reports down pointer problem
+
+    When ASTBase::tmake attempts to update the down pointer of 
+    an AST it checks to see if the down pointer is NULL.  If it
+    is not NULL it does not do the update and returns NULL.
+    An attempt to update the down pointer is almost always a
+    result of a user error.  This can lead to difficult to find
+    problems during tree construction.
+
+    With this change, the routine calls a virtual function
+    reportOverwriteOfDownPointer() which calls panic to
+    report the problem.  Users who want the old behavior can
+    redefined the virtual function in their AST class.
+
+    Suggested by Sinan Karasu (sinan.karasu boeing.com)
+
+#235. (Changed in MR21) Made ANTLRParser::resynch() virtual
+
+    Suggested by Jerry Evans (jerry swsl.co.uk).
+
+#234. (Changed in MR21) Implicit int for function return value
+
+    ATokenBuffer:bufferSize() did not specify a type for the
+    return value.
+
+    Reported by Hai Vo-Ba (hai fc.hp.com).
+
+#233. (Changed in MR20) Converted to MSVC 6.0
+
+    Due to external circumstances I have had to convert to MSVC 6.0
+    The MSVC 5.0 project files (.dsw and .dsp) have been retained as
+    xxx50.dsp and xxx50.dsw.  The MSVC 6.0 files are named xxx60.dsp
+    and xxx60.dsw (where xxx is the related to the directory/project).
+
+#232. (Changed in MR20) Make setwd bit vectors protected in parser.h
+
+    The access for the setwd array in the parser header was not
+    specified.  As a result, it would depend on the code which 
+    preceded it.  In MR20 it will always have access "protected".
+
+    Reported by Piotr Eljasiak (eljasiak zt.gdansk.tpsa.pl).
+
+#231. (Changed in MR20) Error in token buffer debug code.
+
+    When token buffer debugging is selected via the pre-processor
+    symbol DEBUG_TOKENBUFFER there is an erroneous check in
+    AParser.cpp:
+
+        #ifdef DEBUG_TOKENBUFFER
+            if (i >= inputTokens->bufferSize() ||
+                inputTokens->minTokens() < LLk )     /* MR20 Was "<=" */
+        ...
+        #endif
+
+    Reported by David Wigg (wiggjd sbu.ac.uk).
+
+#230. (Changed in MR20) Fixed problem with #define for -gd option
+
+    There was an error in setting zzTRACE_RULES for the -gd (trace) option.
+
+    Reported by Gary Funck (gary intrepid.com).
+
+#229. (Changed in MR20) Additional "const" for literals
+
+    "const" was added to the token name literal table.
+    "const" was added to some panic() and similar routine
+
+#228. (Changed in MR20) dlg crashes on "()"
+
+    The following token defintion will cause DLG to crash.
+
+        #token "()"
+
+    When there is a syntax error in a regular expression
+    many of the dlg routines return a structure which has
+    null pointers.  When this is accessed by callers it
+    generates the crash.
+
+    I have attempted to fix the more common cases.
+
+    Reported by  Mengue Olivier (dolmen bigfoot.com).
+
+#227. (Changed in MR20) Array overwrite
+
+    Steveh Hand (sassth unx.sas.com) reported a problem which
+    was traced to a temporary array which was not properly
+    resized for deeply nested blocks.  This has been fixed.
+
+#226. (Changed in MR20) -pedantic conformance
+   
+    G. Hobbelt (i_a mbh.org) and THM made many, many minor 
+    changes to create prototypes for all the functions and
+    bring antlr, dlg, and sorcerer into conformance with
+    the gcc -pedantic option.
+
+    This may require uses to add pccts/h/pcctscfg.h to some
+    files or makefiles in order to have __USE_PROTOS defined.
+
+#225  (Changed in MR20) AST stack adjustment in C mode
+
+    The fix in #214 for AST stack adjustment in C mode missed 
+    some cases.
+
+    Reported with fix by Ger Hobbelt (i_a mbh.org).
+
+#224  (Changed in MR20) LL(1) and LL(2) with #pragma approx
+
+    This may take a record for the oldest, most trival, lexical
+    error in pccts.  The regular expressions for LL(1) and LL(2)
+    lacked an escape for the left and right parenthesis.
+
+    Reported by Ger Hobbelt (i_a mbh.org).
+
+#223  (Changed in MR20) Addition of IBM_VISUAL_AGE directory
+
+    Build files for antlr, dlg, and sorcerer under IBM Visual Age 
+    have been contributed by Anton Sergeev (ags mlc.ru).  They have
+    been placed in the pccts/IBM_VISUAL_AGE directory.
+
+#222  (Changed in MR20) Replace __STDC__ with __USE_PROTOS
+
+    Most occurrences of __STDC__ replaced with __USE_PROTOS due to
+    complaints from several users.
+
+#221  (Changed in MR20) Added #include for DLexerBase.h to PBlackBox.
+
+    Added #include for DLexerBase.h to PBlackBox.
+
+#220  (Changed in MR19) strcat arguments reversed in #pred parse
+
+    The arguments to strcat are reversed when creating a print
+    name for a hash table entry for use with #pred feature.
+
+    Problem diagnosed and fix reported by Scott Harrington 
+    (seh4 ix.netcom.com).
+
+#219. (Changed in MR19) C Mode routine zzfree_ast
+
+    Changes to reduce use of recursion for AST trees with only right
+    links or only left links in the C mode routine zzfree_ast.
+
+    Implemented by SAKAI Kiyotaka (ksakai isr.co.jp).
+
+#218. (Changed in MR19) Changes to support unsigned char in C mode
+
+    Changes to antlr.h and err.h to fix omissions in use of zzchar_t
+
+    Implemented by SAKAI Kiyotaka (ksakai isr.co.jp).
+
+#217. (Changed in MR19) Error message when dlg -i and -CC options selected
+    
+    *** This change was rescinded by item #257 ***
+
+    The parsers generated by pccts in C++ mode are not able to support the
+    interactive lexer option (except, perhaps, when using the deferred fetch
+    parser option.(Item #216).
+
+    DLG now warns when both -i and -CC are selected.
+
+    This warning was suggested by David Venditti (07751870267-0001 t-online.de).
+
+#216. (Changed in MR19) Defer token fetch for C++ mode
+
+    Implemented by Volker H. Simonis (simonis informatik.uni-tuebingen.de)
+
+    Normally, pccts keeps the lookahead token buffer completely filled.
+    This requires max(k,ck) tokens of lookahead.  For some applications
+    this can cause deadlock problems.  For example, there may be cases
+    when the parser can't tell when the input has been completely consumed
+    until the parse is complete, but the parse can't be completed because 
+    the input routines are waiting for additional tokens to fill the
+    lookahead buffer.
+    
+    When the ANTLRParser class is built with the pre-processor option 
+    ZZDEFER_FETCH defined, the fetch of new tokens by consume() is deferred
+    until LA(i) or LT(i) is called. 
+
+    To test whether this option has been built into the ANTLRParser class
+    use "isDeferFetchEnabled()".
+
+    Using the -gd trace option with the default tracein() and traceout()
+    routines will defeat the effort to defer the fetch because the
+    trace routines print out information about the lookahead token at
+    the start of the rule.
+    
+    Because the tracein and traceout routines are virtual it is 
+    easy to redefine them in your parser:
+
+        class MyParser {
+        <<
+            virtual void tracein(ANTLRChar * ruleName)
+                { fprintf(stderr,"Entering: %s\n", ruleName); }
+            virtual void traceout(ANTLRChar * ruleName)
+                { fprintf(stderr,"Leaving: %s\n", ruleName); }
+        >>
+ 
+    The originals for those routines are pccts/h/AParser.cpp
+ 
+    This requires use of the dlg option -i (interactive lexer).
+
+    This is implemented only for C++ mode.
+
+    This is experimental.  The interaction with guess mode (syntactic
+    predicates)is not known.
+
+#215. (Changed in MR19) Addition of reset() to DLGLexerBase
+
+    There was no obvious way to reset the lexer for reuse.  The
+    reset() method now does this.
+
+    Suggested by David Venditti (07751870267-0001 t-online.de).
+
+#214. (Changed in MR19)  C mode: Adjust AST stack pointer at exit
+
+    In C mode the AST stack pointer needs to be reset if there will
+    be multiple calls to the ANTLRx macros.
+
+    Reported with fix by Paul D. Smith (psmith baynetworks.com).
+
+#213. (Changed in MR18)  Fatal error with -mrhoistk (k>1 hoisting)
+
+    When rearranging code I forgot to un-comment a critical line of
+    code that handles hoisting of predicates with k>1 lookahead.  This
+    is now fixed.
+
+    Reported by Reinier van den Born (reinier vnet.ibm.com).
+
+#212. (Changed in MR17)  Mac related changes by Kenji Tanaka
+
+    Kenji Tanaka (kentar osa.att.ne.jp) has made a number of changes for
+    Macintosh users.
+
+    a.  The following Macintosh MPW files aid in installing pccts on Mac:
+
+            pccts/MPW_Read_Me
+
+            pccts/install68K.mpw
+            pccts/installPPC.mpw
+
+            pccts/antlr/antlr.r
+            pccts/antlr/antlr68K.make
+            pccts/antlr/antlrPPC.make
+
+            pccts/dlg/dlg.r
+            pccts/dlg/dlg68K.make
+            pccts/dlg/dlgPPC.make
+
+            pccts/sorcerer/sor.r
+            pccts/sorcerer/sor68K.make
+            pccts/sorcerer/sorPPC.make
+    
+       They completely replace the previous Mac installation files.
+            
+    b. The most significant is a change in the MAC_FILE_CREATOR symbol
+       in pcctscfg.h:
+
+        old: #define MAC_FILE_CREATOR 'MMCC'   /* Metrowerks C/C++ Text files */
+        new: #define MAC_FILE_CREATOR 'CWIE'   /* Metrowerks C/C++ Text files */
+
+    c.  Added calls to special_fopen_actions() where necessary.
+
+#211. (Changed in MR16a)  C++ style comment in dlg
+
+    This has been fixed.
+
+#210. (Changed in MR16a)  Sor accepts \r\n, \r, or \n for end-of-line
+
+    A user requested that Sorcerer be changed to accept other forms
+    of end-of-line.
+
+#209. (Changed in MR16) Name of files changed.
+
+        Old:  CHANGES_FROM_1.33
+        New:  CHANGES_FROM_133.txt
+
+        Old:  KNOWN_PROBLEMS
+        New:  KNOWN_PROBLEMS.txt
+
+#208. (Changed in MR16) Change in use of pccts #include files
+
+    There were problems with MS DevStudio when mixing Sorcerer and
+    PCCTS in the same source file.  The problem is caused by the
+    redefinition of setjmp in the MS header file setjmp.h.  In
+    setjmp.h the pre-processor symbol setjmp was redefined to be
+    _setjmp.  A later effort to execute #include <setjmp.h> resulted 
+    in an effort to #include <_setjmp.h>.  I'm not sure whether this
+    is a bug or a feature.  In any case, I decided to fix it by
+    avoiding the use of pre-processor symbols in #include statements
+    altogether.  This has the added benefit of making pre-compiled
+    headers work again.
+
+    I've replaced statements:
+
+        old: #include PCCTS_SETJMP_H
+        new: #include "pccts_setjmp.h"
+
+    Where pccts_setjmp.h contains:
+
+            #ifndef __PCCTS_SETJMP_H__
+            #define __PCCTS_SETJMP_H__
+    
+            #ifdef PCCTS_USE_NAMESPACE_STD
+            #include <Csetjmp>
+            #else
+            #include <setjmp.h>
+            #endif
+
+            #endif
+        
+    A similar change has been made for other standard header files
+    required by pccts and sorcerer: stdlib.h, stdarg.h, stdio.h, etc.
+
+    Reported by Jeff Vincent (JVincent novell.com) and Dale Davis
+    (DalDavis spectrace.com).
+
+#207. (Changed in MR16) dlg reports an invalid range for: [\0x00-\0xff]
+
+     -----------------------------------------------------------------
+     Note from MR23:  This fix does not work.  I am investigating why.
+     -----------------------------------------------------------------
+
+    dlg will report that this is an invalid range.
+
+    Diagnosed by Piotr Eljasiak (eljasiak no-spam.zt.gdansk.tpsa.pl):
+
+        I think this problem is not specific to unsigned chars
+        because dlg reports no error for the range [\0x00-\0xfe].
+
+        I've found that information on range is kept in field
+        letter (unsigned char) of Attrib struct. Unfortunately
+        the letter value internally is for some reasons increased
+        by 1, so \0xff is represented here as 0.
+
+        That's why dlg complains about the range [\0x00-\0xff] in
+        dlg_p.g:
+
+        if ($$.letter > $2.letter) {
+          error("invalid range  ", zzline);
+        } 
+
+    The fix is:
+
+        if ($$.letter > $2.letter && 255 != $$2.letter) {
+          error("invalid range  ", zzline);
+        } 
+
+#206. (Changed in MR16) Free zzFAILtext in ANTLRParser destructor
+
+    The ANTLRParser destructor now frees zzFAILtext.
+
+    Problem and fix reported by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#205. (Changed in MR16) DLGStringReset argument now const
+
+    Changed: void DLGStringReset(DLGChar *s) {...}
+    To:      void DLGStringReset(const DLGChar *s) {...}
+
+    Suggested by Dale Davis (daldavis spectrace.com)
+
+#204. (Changed in MR15a) Change __WATCOM__ to __WATCOMC__ in pcctscfg.h
+    
+    Reported by Oleg Dashevskii (olegdash my-dejanews.com).
+
+#203. (Changed in MR15) Addition of sorcerer to distribution kit
+
+    I have finally caved in to popular demand.  The pccts 1.33mr15
+    kit will include sorcerer.  The separate sorcerer kit will be
+    discontinued.
+
+#202. (Changed) in MR15) Organization of MS Dev Studio Projects in Kit
+
+    Previously there was one workspace that contained projects for
+    all three parts of pccts: antlr, dlg, and sorcerer.  Now each
+    part (and directory) has its own workspace/project and there
+    is an additional workspace/project to build a library from the
+    .cpp files in the pccts/h directory.
+
+    The library build will create pccts_debug.lib or pccts_release.lib
+    according to the configuration selected.  
+
+    If you don't want to build pccts 1.33MR15 you can download a
+    ready-to-run kit for win32 from http://www.polhode.com/win32.zip.
+    The ready-to-run for win32 includes executables, a pre-built static
+    library for the .cpp files in the pccts/h directory, and a  sample
+    application
+
+    You will need to define the environment variable PCCTS to point to
+    the root of the pccts directory hierarchy.
+
+#201. (Changed in MR15) Several fixes by K.J. Cummings (cummings peritus.com)
+
+      Generation of SETJMP rather than SETJMP_H in gen.c.
+
+      (Sor B19) Declaration of ref_vars_inits for ref_var_inits in
+      pccts/sorcerer/sorcerer.h.
+
+#200. (Changed in MR15) Remove operator=() in AToken.h
+
+      User reported that WatCom couldn't handle use of
+      explicit operator =().  Replace with equivalent
+      using cast operator.
+
+#199. (Changed in MR15) Don't allow use of empty #tokclass
+
+      Change antlr.g to disallow empty #tokclass sets.
+
+      Reported by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#198. Revised ANSI C grammar due to efforts by Manuel Kessler
+
+      Manuel Kessler (mlkessler cip.physik.uni-wuerzburg.de)
+
+          Allow trailing ... in function parameter lists.
+          Add bit fields.
+          Allow old-style function declarations.
+          Support cv-qualified pointers.
+          Better checking of combinations of type specifiers.
+          Release of memory for local symbols on scope exit.
+          Allow input file name on command line as well as by redirection.
+
+              and other miscellaneous tweaks.
+
+      This is not part of the pccts distribution kit. It must be
+      downloaded separately from:
+
+            http://www.polhode.com/ansi_mr15.zip
+
+#197. (Changed in MR14) Resetting the lookahead buffer of the parser
+
+      Explanation and fix by Sinan Karasu (sinan.karasu boeing.com)
+
+      Consider the code used to prime the lookahead buffer LA(i)
+      of the parser when init() is called:
+
+        void
+        ANTLRParser::
+        prime_lookahead()
+        {
+            int i;
+            for(i=1;i<=LLk; i++) consume();
+            dirty=0;
+            //lap = 0;      // MR14 - Sinan Karasu (sinan.karusu boeing.com)
+            //labase = 0;   // MR14
+            labase=lap;     // MR14
+        }
+
+      When the parser is instantiated, lap=0,labase=0 is set.
+
+      The "for" loop runs LLk times. In consume(), lap = lap +1 (mod LLk) is
+      computed.  Therefore, lap(before the loop) == lap (after the loop).
+
+      Now the only problem comes in when one does an init() of the parser
+      after an Eof has been seen. At that time, lap could be non zero.
+      Assume it was lap==1. Now we do a prime_lookahead(). If LLk is 2,
+      then
+
+        consume()
+        {
+            NLA = inputTokens->getToken()->getType();
+            dirty--;
+            lap = (lap+1)&(LLk-1);
+        }
+
+      or expanding NLA,
+
+        token_type[lap&(LLk-1)]) = inputTokens->getToken()->getType();
+        dirty--;
+        lap = (lap+1)&(LLk-1);
+
+      so now we prime locations 1 and 2.  In prime_lookahead it used to set
+      lap=0 and labase=0.  Now, the next token will be read from location 0,
+      NOT 1 as it should have been.
+
+      This was never caught before, because if a parser is just instantiated,
+      then lap and labase are 0, the offending assignment lines are
+      basically no-ops, since the for loop wraps around back to 0.
+
+#196. (Changed in MR14) Problems with "(alpha)? beta" guess
+
+    Consider the following syntactic predicate in a grammar
+    with 2 tokens of lookahead (k=2 or ck=2):
+
+        rule  : ( alpha )? beta ;
+        alpha : S t ;
+        t     : T U
+              | T
+              ;
+        beta  : S t Z ;
+
+    When antlr computes the prediction expression with one token
+    of lookahead for alts 1 and 2 of rule t it finds an ambiguity.
+
+    Because the grammar has a lookahead of 2 it tries to compute
+    two tokens of lookahead for alts 1 and 2 of t.  Alt 1 clearly
+    has a lookahead of (T U).  Alt 2 is one token long so antlr
+    tries to compute the follow set of alt 2, which means finding
+    the things which can follow rule t in the context of (alpha)?.
+    This cannot be computed, because alpha is only part of a rule,
+    and antlr can't tell what part of beta is matched by alpha and
+    what part remains to be matched.  Thus it impossible for antlr
+    to  properly determine the follow set of rule t.
+
+    Prior to 1.33MR14, the follow of (alpha)? was computed as
+    FIRST(beta) as a result of the internal representation of
+    guess blocks.
+
+    With MR14 the follow set will be the empty set for that context.
+
+    Normally, one expects a rule appearing in a guess block to also
+    appear elsewhere.  When the follow context for this other use
+    is "ored" with the empty set, the context from the other use
+    results, and a reasonable follow context results.  However if
+    there is *no* other use of the rule, or it is used in a different
+    manner then the follow context will be inaccurate - it was
+    inaccurate even before MR14, but it will be inaccurate in a
+    different way.
+
+    For the example given earlier, a reasonable way to rewrite the
+    grammar:
+
+        rule  : ( alpha )? beta
+        alpha : S t ;
+        t     : T U
+              | T
+              ;
+        beta  : alpha Z ;
+
+    If there are no other uses of the rule appearing in the guess
+    block it will generate a test for EOF - a workaround for
+    representing a null set in the lookahead tests.
+
+    If you encounter such a problem you can use the -alpha option
+    to get additional information:
+
+    line 2: error: not possible to compute follow set for alpha
+              in an "(alpha)? beta" block.
+
+    With the antlr -alpha command line option the following information
+    is inserted into the generated file:
+
+    #if 0
+
+      Trace of references leading to attempt to compute the follow set of
+      alpha in an "(alpha)? beta" block. It is not possible for antlr to
+      compute this follow set because it is not known what part of beta has
+      already been matched by alpha and what part remains to be matched.
+
+      Rules which make use of the incorrect follow set will also be incorrect
+
+         1 #token T              alpha/2   line 7     brief.g
+         2 end alpha             alpha/3   line 8     brief.g
+         2 end (...)? block at   start/1   line 2     brief.g
+
+    #endif
+
+    At the moment, with the -alpha option selected the program marks
+    any rules which appear in the trace back chain (above) as rules with
+    possible problems computing follow set.
+
+    Reported by Greg Knapen (gregory.knapen bell.ca).
+
+#195. (Changed in MR14) #line directive not at column 1
+
+      Under certain circunstances a predicate test could generate
+      a #line directive which was not at column 1.
+
+      Reported with fix by David K�gedal  (davidk lysator.liu.se)
+      (http://www.lysator.liu.se/~davidk/).
+
+#194. (Changed in MR14) (C Mode only) Demand lookahead with #tokclass
+
+      In C mode with the demand lookahead option there is a bug in the
+      code which handles matches for #tokclass (zzsetmatch and
+      zzsetmatch_wsig).
+
+      The bug causes the lookahead pointer to get out of synchronization
+      with the current token pointer.
+
+      The problem was reported with a fix by Ger Hobbelt (hobbelt axa.nl).
+
+#193. (Changed in MR14) Use of PCCTS_USE_NAMESPACE_STD
+
+      The pcctscfg.h now contains the following definitions:
+
+        #ifdef PCCTS_USE_NAMESPACE_STD
+        #define PCCTS_STDIO_H     <Cstdio>
+        #define PCCTS_STDLIB_H    <Cstdlib>
+        #define PCCTS_STDARG_H    <Cstdarg>
+        #define PCCTS_SETJMP_H    <Csetjmp>
+        #define PCCTS_STRING_H    <Cstring>
+        #define PCCTS_ASSERT_H    <Cassert>
+        #define PCCTS_ISTREAM_H   <istream>
+        #define PCCTS_IOSTREAM_H  <iostream>
+        #define PCCTS_NAMESPACE_STD     namespace std {}; using namespace std;
+        #else
+        #define PCCTS_STDIO_H     <stdio.h>
+        #define PCCTS_STDLIB_H    <stdlib.h>
+        #define PCCTS_STDARG_H    <stdarg.h>
+        #define PCCTS_SETJMP_H    <setjmp.h>
+        #define PCCTS_STRING_H    <string.h>
+        #define PCCTS_ASSERT_H    <assert.h>
+        #define PCCTS_ISTREAM_H   <istream.h>
+        #define PCCTS_IOSTREAM_H  <iostream.h>
+        #define PCCTS_NAMESPACE_STD
+        #endif
+
+      The runtime support in pccts/h uses these pre-processor symbols
+      consistently.
+
+      Also, antlr and dlg have been changed to generate code which uses
+      these pre-processor symbols rather than having the names of the
+      #include files hard-coded in the generated code.
+
+      This required the addition of "#include pcctscfg.h" to a number of
+      files in pccts/h.
+
+      It appears that this sometimes causes problems for MSVC 5 in
+      combination with the "automatic" option for pre-compiled headers.
+      In such cases disable the "automatic" pre-compiled headers option.
+
+      Suggested by Hubert Holin (Hubert.Holin Bigfoot.com).
+
+#192. (Changed in MR14) Change setText() to accept "const ANTLRChar *"
+
+      Changed ANTLRToken::setText(ANTLRChar *) to setText(const ANTLRChar *).
+      This allows literal strings to be used to initialize tokens.  Since
+      the usual token implementation (ANTLRCommonToken)  makes a copy of the
+      input string, this was an unnecessary limitation.
+
+      Suggested by Bob McWhirter (bob netwrench.com).
+
+#191. (Changed in MR14) HP/UX aCC compiler compatibility problem
+
+      Needed to explicitly declare zzINF_DEF_TOKEN_BUFFER_SIZE and
+      zzINF_BUFFER_TOKEN_CHUNK_SIZE as ints in pccts/h/AParser.cpp.
+
+      Reported by David Cook (dcook bmc.com).
+
+#190. (Changed in MR14) IBM OS/2 CSet compiler compatibility problem
+
+      Name conflict with "_cs" in pccts/h/ATokenBuffer.cpp
+
+      Reported by David Cook (dcook bmc.com).
+
+#189. (Changed in MR14) -gxt switch in C mode
+
+      The -gxt switch in C mode didn't work because of incorrect
+      initialization.
+
+      Reported by Sinan Karasu (sinan boeing.com).
+
+#188. (Changed in MR14) Added pccts/h/DLG_stream_input.h
+
+      This is a DLG stream class based on C++ istreams.
+
+      Contributed by Hubert Holin (Hubert.Holin Bigfoot.com).
+
+#187. (Changed in MR14) Rename config.h to pcctscfg.h
+
+      The PCCTS configuration file has been renamed from config.h to
+      pcctscfg.h.  The problem with the original name is that it led
+      to name collisions when pccts parsers were combined with other
+      software.
+
+      All of the runtime support routines in pccts/h/* have been
+      changed to use the new name.  Existing software can continue
+      to use pccts/h/config.h. The contents of pccts/h/config.h is
+      now just "#include "pcctscfg.h".
+
+      I don't have a record of the user who suggested this.
+
+#186. (Changed in MR14) Pre-processor symbol DllExportPCCTS class modifier
+
+      Classes in the C++ runtime support routines are now declared:
+
+        class DllExportPCCTS className ....
+
+      By default, the pre-processor symbol is defined as the empty
+      string.  This if for use by MSVC++ users to create DLL classes.
+
+      Suggested by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#185. (Changed in MR14) Option to not use PCCTS_AST base class for ASTBase
+
+      Normally, the ASTBase class is derived from PCCTS_AST which contains
+      functions useful to Sorcerer.  If these are not necessary then the
+      user can define the pre-processor symbol "PCCTS_NOT_USING_SOR" which
+      will cause the ASTBase class to replace references to PCCTS_AST with
+      references to ASTBase where necessary.
+
+      The class ASTDoublyLinkedBase will contain a pure virtual function
+      shallowCopy() that was formerly defined in class PCCTS_AST.
+
+      Suggested by Bob McWhirter (bob netwrench.com).
+
+#184. (Changed in MR14) Grammars with no tokens generate invalid tokens.h
+
+      Reported by Hubert Holin (Hubert.Holin bigfoot.com).
+
+#183. (Changed in MR14) -f to specify file with names of grammar files
+
+      In DEC/VMS it is difficult to specify very long command lines.
+      The -f option allows one to place the names of the grammar files
+      in a data file in order to bypass limitations of the DEC/VMS
+      command language interpreter.
+
+      Addition supplied by Bernard Giroud (b_giroud decus.ch).
+
+#182. (Changed in MR14) Output directory option for DEC/VMS
+
+      Fix some problems with the -o option under DEC/VMS.
+
+      Fix supplied by Bernard Giroud (b_giroud decus.ch).
+
+#181. (Changed in MR14) Allow chars > 127 in DLGStringInput::nextChar()
+
+      Changed DLGStringInput to cast the character using (unsigned char)
+      so that languages with character codes greater than 127 work
+      without changes.
+
+      Suggested by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#180. (Added in MR14) ANTLRParser::getEofToken()
+
+      Added "ANTLRToken ANTLRParser::getEofToken() const" to match the
+      setEofToken routine.
+
+      Requested by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#179. (Fixed in MR14) Memory leak for BufFileInput subclass of DLGInputStream
+
+      The BufFileInput class described in Item #142 neglected to release
+      the allocated buffer when an instance was destroyed.
+
+      Reported by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#178. (Fixed in MR14) Bug in "(alpha)? beta" guess blocks first sets
+
+      In 1.33 vanilla, and all maintenance releases prior to MR14
+      there is a bug in the handling of guess blocks which use the
+      "long" form:
+
+                  (alpha)? beta
+
+      inside a (...)*, (...)+, or {...} block.
+
+      This problem does *not* apply to the case where beta is omitted
+      or when the syntactic predicate is on the leading edge of an
+      alternative.
+
+      The problem is that both alpha and beta are stored in the
+      syntax diagram, and that some analysis routines would fail
+      to skip the alpha portion when it was not on the leading edge.
+      Consider the following grammar with -ck 2:
+
+                r : ( (A)? B )* C D
+
+                  | A B      /* forces -ck 2 computation for old antlr    */
+                             /*              reports ambig for alts 1 & 2 */
+
+                  | B C      /* forces -ck 2 computation for new antlr    */
+                             /*              reports ambig for alts 1 & 3 */
+                  ;
+
+      The prediction expression for the first alternative should be
+      LA(1)={B C} LA(2)={B C D}, but previous versions of antlr
+      would compute the prediction expression as LA(1)={A C} LA(2)={B D}
+
+      Reported by Arpad Beszedes (beszedes inf.u-szeged.hu) who provided
+      a very clear example of the problem and identified the probable cause.
+
+#177. (Changed in MR14) #tokdefs and #token with regular expression
+
+      In MR13 the change described by Item #162 caused an existing
+      feature of antlr to fail.  Prior to the change it was possible
+      to give regular expression definitions and actions to tokens
+      which were defined via the #tokdefs directive.
+
+      This now works again.
+
+      Reported by Manfred Kogler (km cast.uni-linz.ac.at).
+
+#176. (Changed in MR14) Support for #line in antlr source code
+
+      Note: this was implemented by Arpad Beszedes (beszedes inf.u-szeged.hu).
+
+      In 1.33MR14 it is possible for a pre-processor to generate #line
+      directives in the antlr source and have those line numbers and file
+      names used in antlr error messages and in the #line directives
+      generated by antlr.
+
+      The #line directive may appear in the following forms:
+
+            #line ll "sss" xx xx ...
+
+      where ll represents a line number, "sss" represents the name of a file
+      enclosed in quotation marks, and xxx are arbitrary integers.
+
+      The following form (without "line") is not supported at the moment:
+
+            # ll "sss" xx xx ...
+
+      The result:
+
+        zzline
+
+            is replaced with ll from the # or #line directive
+
+        FileStr[CurFile]
+
+            is updated with the contents of the string (if any)
+            following the line number
+
+      Note
+      ----
+      The file-name string following the line number can be a complete
+      name with a directory-path. Antlr generates the output files from
+      the input file name (by replacing the extension from the file-name
+      with .c or .cpp).
+
+      If the input file (or the file-name from the line-info) contains
+      a path:
+
+        "../grammar.g"
+
+      the generated source code will be placed in "../grammar.cpp" (i.e.
+      in the parent directory).  This is inconvenient in some cases
+      (even the -o switch can not be used) so the path information is
+      removed from the #line directive.  Thus, if the line-info was
+
+        #line 2 "../grammar.g"
+
+      then the current file-name will become "grammar.g"
+
+      In this way, the generated source code according to the grammar file
+      will always be in the current directory, except when the -o switch
+      is used.
+
+#175. (Changed in MR14) Bug when guess block appears at start of (...)*
+
+      In 1.33 vanilla and all maintenance releases prior to 1.33MR14
+      there is a bug when a guess block appears at the start of a (...)+.
+      Consider the following k=1 (ck=1) grammar:
+
+            rule :
+                  ( (STAR)? ZIP )* ID ;
+
+      Prior to 1.33MR14, the generated code resembled:
+
+        ...
+        zzGUESS_BLOCK
+        while ( 1 ) {
+            if ( ! LA(1)==STAR) break;
+            zzGUESS
+            if ( !zzrv ) {
+                zzmatch(STAR);
+                zzCONSUME;
+                zzGUESS_DONE
+                zzmatch(ZIP);
+                zzCONSUME;
+            ...
+
+      Note that the routine uses STAR for the prediction expression
+      rather than ZIP.  With 1.33MR14 the generated code resembles:
+
+        ...
+        while ( 1 ) {
+            if ( ! LA(1)==ZIP) break;
+        ...
+
+      This problem existed only with (...)* blocks and was caused
+      by the slightly more complicated graph which represents (...)*
+      blocks.  This caused the analysis routine to compute the first
+      set for the alpha part of the "(alpha)? beta" rather than the
+      beta part.
+
+      Both (...)+ and {...} blocks handled the guess block correctly.
+
+      Reported by Arpad Beszedes (beszedes inf.u-szeged.hu) who provided
+      a very clear example of the problem and identified the probable cause.
+
+#174. (Changed in MR14) Bug when action precedes syntactic predicate
+
+      In 1.33 vanilla, and all maintenance releases prior to MR14,
+      there was a bug when a syntactic predicate was immediately
+      preceded by an action.  Consider the following -ck 2 grammar:
+
+            rule :
+                   <<int i;>>
+                   (alpha)? beta C
+                 | A B
+                 ;
+
+            alpha : A ;
+            beta  : A B;
+
+      Prior to MR14, the code generated for the first alternative
+      resembled:
+
+        ...
+        zzGUESS
+        if ( !zzrv && LA(1)==A && LA(2)==A) {
+            alpha();
+            zzGUESS_DONE
+            beta();
+            zzmatch(C);
+            zzCONSUME;
+        } else {
+        ...
+
+      The prediction expression (i.e. LA(1)==A && LA(2)==A) is clearly
+      wrong because LA(2) should be matched to B (first[2] of beta is {B}).
+
+      With 1.33MR14 the prediction expression is:
+
+        ...
+        if ( !zzrv && LA(1)==A && LA(2)==B) {
+            alpha();
+            zzGUESS_DONE
+            beta();
+            zzmatch(C);
+            zzCONSUME;
+        } else {
+        ...
+
+      This will only affect users in which alpha is shorter than
+      than max(k,ck) and there is an action immediately preceding
+      the syntactic predicate.
+
+      This problem was reported by reported by Arpad Beszedes
+      (beszedes inf.u-szeged.hu) who provided a very clear example
+      of the problem and identified the presence of the init-action
+      as the likely culprit.
+
+#173. (Changed in MR13a) -glms for Microsoft style filenames with -gl
+
+      With the -gl option antlr generates #line directives using the
+      exact name of the input files specified on the command line.
+      An oddity of the Microsoft C and C++ compilers is that they
+      don't accept file names in #line directives containing "\"
+      even though these are names from the native file system.
+
+      With -glms option, the "\" in file names appearing in #line
+      directives is replaced with a "/" in order to conform to
+      Microsoft compiler requirements.
+
+      Reported by Erwin Achermann (erwin.achermann switzerland.org).
+
+#172. (Changed in MR13) \r\n in antlr source counted as one line
+
+      Some MS software uses \r\n to indicate a new line.  Antlr
+      now recognizes this in counting lines.
+
+      Reported by Edward L. Hepler (elh ece.vill.edu).
+
+#171. (Changed in MR13) #tokclass L..U now allowed
+
+      The following is now allowed:
+
+            #tokclass ABC { A..B C }
+
+      Reported by Dave Watola (dwatola amtsun.jpl.nasa.gov)
+
+#170. (Changed in MR13) Suppression for predicates with lookahead depth >1
+
+      In MR12 the capability for suppression of predicates with lookahead
+      depth=1 was introduced.  With MR13 this had been extended to
+      predicates with lookahead depth > 1 and released for use by users
+      on an experimental basis.
+
+      Consider the following grammar with -ck 2 and the predicate in rule
+      "a" with depth 2:
+
+            r1  : (ab)* "@"
+                ;
+
+            ab  : a
+                | b
+                ;
+
+            a   : (A B)? => <<p(LATEXT(2))>>? A B C
+                ;
+
+            b   : A B C
+                ;
+
+      Normally, the predicate would be hoisted into rule r1 in order to
+      determine whether to call rule "ab".  However it should *not* be
+      hoisted because, even if p is false, there is a valid alternative
+      in rule b.  With "-mrhoistk on" the predicate will be suppressed.
+
+      If "-info p" command line option is present the following information
+      will appear in the generated code:
+
+                while ( (LA(1)==A)
+        #if 0
+
+        Part (or all) of predicate with depth > 1 suppressed by alternative
+            without predicate
+
+        pred  <<  p(LATEXT(2))>>?
+                  depth=k=2  ("=>" guard)  rule a  line 8  t1.g
+          tree context:
+            (root = A
+               B
+            )
+
+        The token sequence which is suppressed: ( A B )
+        The sequence of references which generate that sequence of tokens:
+
+           1 to ab          r1/1       line 1     t1.g
+           2 ab             ab/1       line 4     t1.g
+           3 to b           ab/2       line 5     t1.g
+           4 b              b/1        line 11    t1.g
+           5 #token A       b/1        line 11    t1.g
+           6 #token B       b/1        line 11    t1.g
+
+        #endif
+
+      A slightly more complicated example:
+
+            r1  : (ab)* "@"
+                ;
+
+            ab  : a
+                | b
+                ;
+
+            a   : (A B)? => <<p(LATEXT(2))>>? (A  B | D E)
+                ;
+
+            b   : <<q(LATEXT(2))>>? D E
+                ;
+
+
+      In this case, the sequence (D E) in rule "a" which lies behind
+      the guard is used to suppress the predicate with context (D E)
+      in rule b.
+
+                while ( (LA(1)==A || LA(1)==D)
+            #if 0
+
+            Part (or all) of predicate with depth > 1 suppressed by alternative
+                without predicate
+
+            pred  <<  q(LATEXT(2))>>?
+                              depth=k=2  rule b  line 11  t2.g
+              tree context:
+                (root = D
+                   E
+                )
+
+            The token sequence which is suppressed: ( D E )
+            The sequence of references which generate that sequence of tokens:
+
+               1 to ab          r1/1       line 1     t2.g
+               2 ab             ab/1       line 4     t2.g
+               3 to a           ab/1       line 4     t2.g
+               4 a              a/1        line 8     t2.g
+               5 #token D       a/1        line 8     t2.g
+               6 #token E       a/1        line 8     t2.g
+
+            #endif
+            &&
+            #if 0
+
+            pred  <<  p(LATEXT(2))>>?
+                              depth=k=2  ("=>" guard)  rule a  line 8  t2.g
+              tree context:
+                (root = A
+                   B
+                )
+
+            #endif
+
+            (! ( LA(1)==A && LA(2)==B ) || p(LATEXT(2)) )  {
+                ab();
+                ...
+
+#169. (Changed in MR13) Predicate test optimization for depth=1 predicates
+
+      When the MR12 generated a test of a predicate which had depth 1
+      it would use the depth >1 routines, resulting in correct but
+      inefficient behavior.  In MR13, a bit test is used.
+
+#168. (Changed in MR13) Token expressions in context guards
+
+      The token expressions appearing in context guards such as:
+
+            (A B)? => <<test(LT(1))>>?  someRule
+
+      are computed during an early phase of antlr processing.  As
+      a result, prior to MR13, complex expressions such as:
+
+            ~B
+            L..U
+            ~L..U
+            TokClassName
+            ~TokClassName
+
+      were not computed properly.  This resulted in incorrect
+      context being computed for such expressions.
+
+      In MR13 these context guards are verified for proper semantics
+      in the initial phase and then re-evaluated after complex token
+      expressions have been computed in order to produce the correct
+      behavior.
+
+      Reported by Arpad Beszedes (beszedes inf.u-szeged.hu).
+
+#167. (Changed in MR13) ~L..U
+
+      Prior to MR13, the complement of a token range was
+      not properly computed.
+
+#166. (Changed in MR13) token expression L..U
+
+      The token U was represented as an unsigned char, restricting
+      the use of L..U to cases where U was assigned a token number
+      less than 256.  This is corrected in MR13.
+
+#165. (Changed in MR13) option -newAST
+
+      To create ASTs from an ANTLRTokenPtr antlr usually calls
+      "new AST(ANTLRTokenPtr)".  This option generates a call
+      to "newAST(ANTLRTokenPtr)" instead.  This allows a user
+      to define a parser member function to create an AST object.
+
+      Similar changes for ASTBase::tmake and ASTBase::link were not
+      thought necessary since they do not create AST objects, only
+      use existing ones.
+
+#164. (Changed in MR13) Unused variable _astp
+
+      For many compilations, we have lived with warnings about
+      the unused variable _astp.  It turns out that this varible
+      can *never* be used because the code which references it was
+      commented out.
+
+      This investigation was sparked by a note from Erwin Achermann
+      (erwin.achermann switzerland.org).
+
+#163. (Changed in MR13) Incorrect makefiles for testcpp examples
+
+      All the examples in pccts/testcpp/* had incorrect definitions
+      in the makefiles for the symbol "CCC".  Instead of CCC=CC they
+      had CC=$(CCC).
+
+      There was an additional problem in testcpp/1/test.g due to the
+      change in ANTLRToken::getText() to a const member function
+      (Item #137).
+
+      Reported by Maurice Mass (maas cuci.nl).
+
+#162. (Changed in MR13) Combining #token with #tokdefs
+
+      When it became possible to change the print-name of a
+      #token (Item #148) it became useful to give a #token
+      statement whose only purpose was to giving a print name
+      to the #token.  Prior to this change this could not be
+      combined with the #tokdefs feature.
+
+#161. (Changed in MR13) Switch -gxt inhibits generation of tokens.h
+
+#160. (Changed in MR13) Omissions in list of names for remap.h
+
+      When a user selects the -gp option antlr creates a list
+      of macros in remap.h to rename some of the standard
+      antlr routines from zzXXX to userprefixXXX.
+
+      There were number of omissions from the remap.h name
+      list related to the new trace facility.  This was reported,
+      along with a fix, by Bernie Solomon (bernard ug.eds.com).
+
+#159. (Changed in MR13) Violations of classic C rules
+
+      There were a number of violations of classic C style in
+      the distribution kit.  This was reported, along with fixes,
+      by Bernie Solomon (bernard ug.eds.com).
+
+#158. (Changed in MR13) #header causes problem for pre-processors
+
+      A user who runs the C pre-processor on antlr source suggested
+      that another syntax be allowed.  With MR13 such directives
+      such as #header, #pragma, etc. may be written as "\#header",
+      "\#pragma", etc.  For escaping pre-processor directives inside
+      a #header use something like the following:
+
+            \#header
+            <<
+                \#include <stdio.h>
+            >>
+
+#157. (Fixed in MR13) empty error sets for rules with infinite recursion
+
+      When the first set for a rule cannot be computed due to infinite
+      left recursion and it is the only alternative for a block then
+      the error set for the block would be empty.  This would result
+      in a fatal error.
+
+      Reported by Darin Creason (creason genedax.com)
+
+#156. (Changed in MR13) DLGLexerBase::getToken() now public
+
+#155. (Changed in MR13) Context behind predicates can suppress
+
+      With -mrhoist enabled the context behind a guarded predicate can
+      be used to suppress other predicates.  Consider the following grammar:
+
+        r0 : (r1)+;
+
+        r1  : rp
+            | rq
+            ;
+        rp  : <<p LATEXT(1)>>? B ;
+        rq : (A)? => <<q LATEXT(1)>>? (A|B);
+
+      In earlier versions both predicates "p" and "q" would be hoisted into
+      rule r0. With MR12c predicate p is suppressed because the context which
+      follows predicate q includes "B" which can "cover" predicate "p".  In
+      other words, in trying to decide in r0 whether to call r1, it doesn't
+      really matter whether p is false or true because, either way, there is
+      a valid choice within r1.
+
+#154. (Changed in MR13) Making hoist suppression explicit using <<nohoist>>
+
+      A common error, even among experienced pccts users, is to code
+      an init-action to inhibit hoisting rather than a leading action.
+      An init-action does not inhibit hoisting.
+
+      This was coded:
+
+        rule1 : <<;>> rule2
+
+      This is what was meant:
+
+        rule1 : <<;>> <<;>> rule2
+
+      With MR13, the user can code:
+
+        rule1 : <<;>> <<nohoist>> rule2
+
+      The following will give an error message:
+
+        rule1 : <<nohoist>> rule2
+
+      If the <<nohoist>> appears as an init-action rather than a leading
+      action an error message is issued.  The meaning of an init-action
+      containing "nohoist" is unclear: does it apply to just one
+      alternative or to all alternatives ?
+
+
+
+
+
+
+
+
+        -------------------------------------------------------
+        Note:  Items #153 to #1 are now in a separate file named
+                CHANGES_FROM_133_BEFORE_MR13.txt
+        -------------------------------------------------------
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
new file mode 100644
index 0000000000..bba5ecdd64
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/CHANGES_FROM_133_BEFORE_MR13.txt
@@ -0,0 +1,3666 @@
+
+    ------------------------------------------------------------
+           This is the second part of a two part file.
+      This is a list of changes to pccts 1.33 prior to MR13
+       For more recent information see CHANGES_FROM_133.txt
+    ------------------------------------------------------------
+
+                               DISCLAIMER
+
+ The software and these notes are provided "as is".  They may include
+ typographical or technical errors and their authors disclaims all
+ liability of any kind or nature for damages due to error, fault,
+ defect, or deficiency regardless of cause.  All warranties of any
+ kind, either express or implied, including, but not limited to, the
+ implied  warranties of merchantability and fitness for a particular
+ purpose are disclaimed.
+
+
+#153. (Changed in MR12b) Bug in computation of -mrhoist suppression set
+
+      Consider the following grammar with k=1 and "-mrhoist on":
+
+            r1  : (A)? => ((p>>? x      /* l1 */
+                | r2                    /* l2 */
+                ;
+            r2  :  A                    /* l4 */
+                | (B)? => <<q>>? y      /* l5 */
+                ;
+
+      In earlier versions the mrhoist routine would see that both l1 and
+      l2 contained predicates and would assume that this prevented either
+      from acting to suppress the other predicate.  In the example above
+      it didn't realize the A at line l4 is capable of suppressing the
+      predicate at l1 even though alt l2 contains (indirectly) a predicate.
+
+      This is fixed  in MR12b.
+
+      Reported by Reinier van den Born (reinier@vnet.ibm.com)
+
+#153. (Changed in MR12a) Bug in computation of -mrhoist suppression set
+
+      An oversight similar to that described in Item #152 appeared in
+      the computation of the set that "covered" a predicate.  If a
+      predicate expression included a term such as p=AND(q,r) the context
+      of p was taken to be context(q) & context(r), when it should have
+      been context(q) | context(r).  This is fixed in MR12a.
+
+#152. (Changed in MR12) Bug in generation of predicate expressions
+
+      The primary purpose for MR12 is to make quite clear that MR11 is
+      obsolete and to fix the bug related to predicate expressions.
+
+      In MR10 code was added to optimize the code generated for
+      predicate expression tests.  Unfortunately, there was a
+      significant oversight in the code which resulted in a bug in
+      the generation of code for predicate expression tests which
+      contained predicates combined using AND:
+
+            r0 : (r1)* "@" ;
+            r1 : (AAA)? => <<p LATEXT(1)>>? r2 ;
+            r2 : (BBB)? => <<q LATEXT(1)>>? Q
+               | (BBB)? => <<r LATEXT(1)>>? Q
+               ;
+
+      In MR11 (and MR10 when using "-mrhoist on") the code generated
+      for r0 to predict r1 would be equivalent to:
+
+        if ( LA(1)==Q &&
+                (LA(1)==AAA && LA(1)==BBB) &&
+                    ( p && ( q || r )) ) {
+
+      This is incorrect because it expresses the idea that LA(1)
+      *must* be AAA in order to attempt r1, and *must* be BBB to
+      attempt r2.  The result was that r1 became unreachable since
+      both condition can not be simultaneously true.
+
+      The general philosophy of code generation for predicates
+      can be summarized as follows:
+
+            a. If the context is true don't enter an alt
+               for which the corresponding predicate is false.
+
+               If the context is false then it is okay to enter
+               the alt without evaluating the predicate at all.
+
+            b. A predicate created by ORing of predicates has
+               context which is the OR of their individual contexts.
+
+            c. A predicate created by ANDing of predicates has
+               (surprise) context which is the OR of their individual
+               contexts.
+
+            d. Apply these rules recursively.
+
+            e. Remember rule (a)
+
+      The correct code should express the idea that *if* LA(1) is
+      AAA then p must be true to attempt r1, but if LA(1) is *not*
+      AAA then it is okay to attempt r1, provided that *if* LA(1) is
+      BBB then one of q or r must be true.
+
+        if ( LA(1)==Q &&
+                ( !(LA(1)==AAA || LA(1)==BBB) ||
+                    ( ! LA(1) == AAA || p) &&
+                    ( ! LA(1) == BBB || q || r ) ) ) {
+
+      I believe this is fixed in MR12.
+
+      Reported by Reinier van den Born (reinier@vnet.ibm.com)
+
+#151a. (Changed in MR12) ANTLRParser::getLexer()
+
+      As a result of several requests, I have added public methods to
+      get a pointer to the lexer belonging to a parser.
+
+            ANTLRTokenStream *ANTLRParser::getLexer() const
+
+                Returns a pointer to the lexer being used by the
+                parser.  ANTLRTokenStream is the base class of
+                DLGLexer
+
+            ANTLRTokenStream *ANTLRTokenBuffer::getLexer() const
+
+                Returns a pointer to the lexer being used by the
+                ANTLRTokenBuffer.  ANTLRTokenStream is the base
+                class of DLGLexer
+
+      You must manually cast the ANTLRTokenStream to your program's
+      lexer class. Because the name of the lexer's class is not fixed.
+      Thus it is impossible to incorporate it into the DLGLexerBase
+      class.
+
+#151b.(Changed in MR12) ParserBlackBox member getLexer()
+
+      The template class ParserBlackBox now has a member getLexer()
+      which returns a pointer to the lexer.
+
+#150. (Changed in MR12) syntaxErrCount and lexErrCount now public
+
+      See Item #127 for more information.
+
+#149. (Changed in MR12) antlr option -info o (letter o for orphan)
+
+      If there is more than one rule which is not referenced by any
+      other rule then all such rules are listed.  This is useful for
+      alerting one to rules which are not used, but which can still
+      contribute to ambiguity.  For example:
+
+            start : a Z ;
+            unused: a A ;
+            a     : (A)+ ;
+
+      will cause an ambiguity report for rule "a" which will be
+      difficult to understand if the user forgets about rule "unused"
+      simply because it is not used in the grammar.
+
+#148. (Changed in MR11) #token names appearing in zztokens,token_tbl
+
+      In a #token statement like the following:
+
+            #token Plus "\+"
+
+      the string "Plus" appears in the zztokens array (C mode) and
+      token_tbl (C++ mode).  This string is used in most error
+      messages.  In MR11 one has the option of using some other string,
+      (e.g.  "+") in those tables.
+
+      In MR11 one can write:
+
+            #token Plus ("+")             "\+"
+            #token RP   ("(")             "\("
+            #token COM  ("comment begin") "/\*"
+
+      A #token statement is allowed to appear in more than one #lexclass
+      with different regular expressions.  However, the token name appears
+      only once in the zztokens/token_tbl array.  This means that only
+      one substitute can be specified for a given #token name.  The second
+      attempt to define a substitute name (different from the first) will
+      result in an error message.
+
+#147. (Changed in MR11) Bug in follow set computation
+
+      There is a bug in 1.33 vanilla and all maintenance releases
+      prior to MR11 in the computation of the follow set.  The bug is
+      different than that described in Item #82 and probably more
+      common.  It was discovered in the ansi.g grammar while testing
+      the "ambiguity aid" (Item #119). The search for a bug started
+      when the ambiguity aid was unable to discover the actual source
+      of an ambiguity reported by antlr.
+
+      The problem appears when an optimization of the follow set
+      computation is used inappropriately.  The result is that the
+      follow set used is the "worst case".  In other words, the error
+      can lead to false reports of ambiguity.  The good news is that
+      if you have a grammar in which you have addressed all reported
+      ambiguities you are ok.  The bad news is that you may have spent
+      time fixing ambiguities that were not real, or used k=2 when
+      ck=2 might have been sufficient, and so on.
+
+      The following grammar demonstrates the problem:
+
+        ------------------------------------------------------------
+            expr          :   ID ;
+
+            start         :   stmt SEMI ;
+
+            stmt          :   CASE expr COLON
+                          |   expr SEMI
+                          |   plain_stmt
+                          ;
+
+            plain_stmt    :   ID COLON ;
+        ------------------------------------------------------------
+
+      When compiled with k=1 and ck=2 it will report:
+
+         warning: alts 2 and 3 of the rule itself ambiguous upon
+                                             { IDENTIFIER }, { COLON }
+
+      When antlr analyzes "stmt" it computes the first[1] set of all
+      alternatives.  It finds an ambiguity between alts 2 and 3 for ID.
+      It then computes the first[2] set for alternatives 2 and 3 to resolve
+      the ambiguity.  In computing the first[2] set of "expr" (which is
+      only one token long) it needs to determine what could follow "expr".
+      Under a certain combination of circumstances antlr forgets that it
+      is trying to analyze "stmt" which can only be followed by SEMI and
+      adds to the first[2] set of "expr" the "global" follow set (including
+      "COLON") which could follow "expr" (under other conditions) in the
+      phrase "CASE expr COLON".
+
+#146. (Changed in MR11) Option -treport for locating "difficult" alts
+
+      It can be difficult to determine which alternatives are causing
+      pccts to work hard to resolve an ambiguity.  In some cases the
+      ambiguity is successfully resolved after much CPU time so there
+      is no message at all.
+
+      A rough measure of the amount of work being peformed which is
+      independent of the CPU speed and system load is the number of
+      tnodes created.  Using "-info t" gives information about the
+      total number of tnodes created and the peak number of tnodes.
+
+        Tree Nodes:  peak 1300k  created 1416k  lost 0
+
+      It also puts in the generated C or C++ file the number of tnodes
+      created for a rule (at the end of the rule).  However this
+      information is not sufficient to locate the alternatives within
+      a rule which are causing the creation of tnodes.
+
+      Using:
+
+             antlr -treport 100000 ....
+
+      causes antlr to list on stdout any alternatives which require the
+      creation of more than 100,000 tnodes, along with the lookahead sets
+      for those alternatives.
+
+      The following is a trivial case from the ansi.g grammar which shows
+      the format of the report.  This report might be of more interest
+      in cases where 1,000,000 tuples were created to resolve the ambiguity.
+
+      -------------------------------------------------------------------------
+        There were 0 tuples whose ambiguity could not be resolved
+             by full lookahead
+        There were 157 tnodes created to resolve ambiguity between:
+
+          Choice 1: statement/2  line 475  file ansi.g
+          Choice 2: statement/3  line 476  file ansi.g
+
+            Intersection of lookahead[1] sets:
+
+               IDENTIFIER
+
+            Intersection of lookahead[2] sets:
+
+               LPARENTHESIS     COLON            AMPERSAND        MINUS
+               STAR             PLUSPLUS         MINUSMINUS       ONESCOMPLEMENT
+               NOT              SIZEOF           OCTALINT         DECIMALINT
+               HEXADECIMALINT   FLOATONE         FLOATTWO         IDENTIFIER
+               STRING           CHARACTER
+      -------------------------------------------------------------------------
+
+#145. (Documentation)  Generation of Expression Trees
+
+      Item #99 was misleading because it implied that the optimization
+      for tree expressions was available only for trees created by
+      predicate expressions and neglected to mention that it required
+      the use of "-mrhoist on".  The optimization applies to tree
+      expressions created for grammars with k>1 and for predicates with
+      lookahead depth >1.
+
+      In MR11 the optimized version is always used so the -mrhoist on
+      option need not be specified.
+
+#144. (Changed in MR11) Incorrect test for exception group
+
+      In testing for a rule's exception group the label a pointer
+      is compared against '\0'.  The intention is "*pointer".
+
+      Reported by Jeffrey C. Fried (Jeff@Fried.net).
+
+#143. (Changed in MR11) Optional ";" at end of #token statement
+
+      Fixes problem of:
+
+            #token X "x"
+
+            <<
+                parser action
+            >>
+
+      Being confused with:
+
+            #token X "x" <<lexical action>>
+
+#142. (Changed in MR11) class BufFileInput subclass of DLGInputStream
+
+      Alexey Demakov (demakov@kazbek.ispras.ru) has supplied class
+      BufFileInput derived from DLGInputStream which provides a
+      function lookahead(char *string) to test characters in the
+      input stream more than one character ahead.
+
+      The default amount of lookahead is specified by the constructor
+      and defaults to 8 characters.  This does *not* include the one
+      character of lookahead maintained internally by DLG in member "ch"
+      and which is not available for testing via BufFileInput::lookahead().
+
+      This is a useful class for overcoming the one-character-lookahead
+      limitation of DLG without resorting to a lexer capable of
+      backtracking (like flex) which is not integrated with antlr as is
+      DLG.
+
+      There are no restrictions on copying or using BufFileInput.* except
+      that the authorship and related information must be retained in the
+      source code.
+
+      The class is located in pccts/h/BufFileInput.* of the kit.
+
+#141. (Changed in MR11) ZZDEBUG_CONSUME for ANTLRParser::consume()
+
+      A debug aid has been added to file ANTLRParser::consume() in
+      file AParser.cpp:
+
+            #ifdef ZZDEBUG_CONSUME_ACTION
+                zzdebug_consume_action();
+            #endif
+
+      Suggested by Sramji Ramanathan (ps@kumaran.com).
+
+#140. (Changed in MR11) #pred to define predicates
+
+      +---------------------------------------------------+
+      | Note: Assume "-prc on" for this entire discussion |
+      +---------------------------------------------------+
+
+      A problem with predicates is that each one is regarded as
+      unique and capable of disambiguating cases where two
+      alternatives have identical lookahead.  For example:
+
+        rule : <<pred(LATEXT(1))>>? A
+             | <<pred(LATEXT(1))>>? A
+             ;
+
+      will not cause any error messages or warnings to be issued
+      by earlier versions of pccts.  To compare the text of the
+      predicates is an incomplete solution.
+
+      In 1.33MR11 I am introducing the #pred statement in order to
+      solve some problems with predicates.  The #pred statement allows
+      one to give a symbolic name to a "predicate literal" or a
+      "predicate expression" in order to refer to it in other predicate
+      expressions or in the rules of the grammar.
+
+      The predicate literal associated with a predicate symbol is C
+      or C++ code which can be used to test the condition.  A
+      predicate expression defines a predicate symbol in terms of other
+      predicate symbols using "!", "&&", and "||".  A predicate symbol
+      can be defined in terms of a predicate literal, a predicate
+      expression, or *both*.
+
+      When a predicate symbol is defined with both a predicate literal
+      and a predicate expression, the predicate literal is used to generate
+      code, but the predicate expression is used to check for two
+      alternatives with identical predicates in both alternatives.
+
+      Here are some examples of #pred statements:
+
+        #pred  IsLabel       <<isLabel(LATEXT(1))>>?
+        #pred  IsLocalVar    <<isLocalVar(LATEXT(1))>>?
+        #pred  IsGlobalVar   <<isGlobalVar(LATEXT(1)>>?
+        #pred  IsVar         <<isVar(LATEXT(1))>>?       IsLocalVar || IsGlobalVar
+        #pred  IsScoped      <<isScoped(LATEXT(1))>>?    IsLabel || IsLocalVar
+
+      I hope that the use of EBNF notation to describe the syntax of the
+      #pred statement will not cause problems for my readers (joke).
+
+        predStatement : "#pred"
+                            CapitalizedName
+                              (
+                                  "<<predicate_literal>>?"
+                                | "<<predicate_literal>>?"  predOrExpr
+                                | predOrExpr
+                              )
+                      ;
+
+        predOrExpr    : predAndExpr ( "||" predAndExpr ) * ;
+
+        predAndExpr   : predPrimary ( "&&" predPrimary ) * ;
+
+        predPrimary   : CapitalizedName
+                      | "!" predPrimary
+                      | "(" predOrExpr ")"
+                      ;
+
+      What is the purpose of this nonsense ?
+
+      To understand how predicate symbols help, you need to realize that
+      predicate symbols are used in two different ways with two different
+      goals.
+
+        a. Allow simplification of predicates which have been combined
+           during predicate hoisting.
+
+        b. Allow recognition of identical predicates which can't disambiguate
+           alternatives with common lookahead.
+
+      First we will discuss goal (a).  Consider the following rule:
+
+            rule0: rule1
+                 | ID
+                 | ...
+                 ;
+
+            rule1: rule2
+                 | rule3
+                 ;
+
+            rule2: <<isX(LATEXT(1))>>? ID ;
+            rule3: <<!isX(LATEXT(1)>>? ID ;
+
+      When the predicates in rule2 and rule3 are combined by hoisting
+      to create a prediction expression for rule1 the result is:
+
+            if ( LA(1)==ID
+                && ( isX(LATEXT(1) || !isX(LATEXT(1) ) ) { rule1(); ...
+
+      This is inefficient, but more importantly, can lead to false
+      assumptions that the predicate expression distinguishes the rule1
+      alternative with some other alternative with lookahead ID.  In
+      MR11 one can write:
+
+            #pred IsX     <<isX(LATEXT(1))>>?
+
+            ...
+
+            rule2: <<IsX>>? ID  ;
+            rule3: <<!IsX>>? ID ;
+
+      During hoisting MR11 recognizes this as a special case and
+      eliminates the predicates.  The result is a prediction
+      expression like the following:
+
+            if ( LA(1)==ID ) { rule1(); ...
+
+      Please note that the following cases which appear to be equivalent
+      *cannot* be simplified by MR11 during hoisting because the hoisting
+      logic only checks for a "!" in the predicate action, not in the
+      predicate expression for a predicate symbol.
+
+        *Not* equivalent and is not simplified during hoisting:
+
+            #pred IsX      <<isX(LATEXT(1))>>?
+            #pred NotX     <<!isX(LATEXT(1))>>?
+            ...
+            rule2: <<IsX>>? ID  ;
+            rule3: <<NotX>>? ID ;
+
+        *Not* equivalent and is not simplified during hoisting:
+
+            #pred IsX      <<isX(LATEXT(1))>>?
+            #pred NotX     !IsX
+            ...
+            rule2: <<IsX>>? ID  ;
+            rule3: <<NotX>>? ID ;
+
+      Now we will discuss goal (b).
+
+      When antlr discovers that there is a lookahead ambiguity between
+      two alternatives it attempts to resolve the ambiguity by searching
+      for predicates in both alternatives.  In the past any predicate
+      would do, even if the same one appeared in both alternatives:
+
+            rule: <<p(LATEXT(1))>>? X
+                | <<p(LATEXT(1))>>? X
+                ;
+
+      The #pred statement is a start towards solving this problem.
+      During ambiguity resolution (*not* predicate hoisting) the
+      predicates for the two alternatives are expanded and compared.
+      Consider the following example:
+
+            #pred Upper     <<isUpper(LATEXT(1))>>?
+            #pred Lower     <<isLower(LATEXT(1))>>?
+            #pred Alpha     <<isAlpha(LATEXT(1))>>?  Upper || Lower
+
+            rule0: rule1
+                 | <<Alpha>>? ID
+                 ;
+
+            rule1:
+                 | rule2
+                 | rule3
+                 ...
+                 ;
+
+            rule2: <<Upper>>? ID;
+            rule3: <<Lower>>? ID;
+
+      The definition of #pred Alpha expresses:
+
+            a. to test the predicate use the C code "isAlpha(LATEXT(1))"
+
+            b. to analyze the predicate use the information that
+               Alpha is equivalent to the union of Upper and Lower,
+
+      During ambiguity resolution the definition of Alpha is expanded
+      into "Upper || Lower" and compared with the predicate in the other
+      alternative, which is also "Upper || Lower".  Because they are
+      identical MR11 will report a problem.
+
+    -------------------------------------------------------------------------
+      t10.g, line 5: warning: the predicates used to disambiguate rule rule0
+             (file t10.g alt 1 line 5 and alt 2 line 6)
+             are identical when compared without context and may have no
+             resolving power for some lookahead sequences.
+    -------------------------------------------------------------------------
+
+      If you use the "-info p" option the output file will contain:
+
+    +----------------------------------------------------------------------+
+    |#if 0                                                                 |
+    |                                                                      |
+    |The following predicates are identical when compared without          |
+    |  lookahead context information.  For some ambiguous lookahead        |
+    |  sequences they may not have any power to resolve the ambiguity.     |
+    |                                                                      |
+    |Choice 1: rule0/1  alt 1  line 5  file t10.g                          |
+    |                                                                      |
+    |  The original predicate for choice 1 with available context          |
+    |    information:                                                      |
+    |                                                                      |
+    |    OR expr                                                           |
+    |                                                                      |
+    |      pred  <<  Upper>>?                                              |
+    |                        depth=k=1  rule rule2  line 14  t10.g         |
+    |        set context:                                                  |
+    |           ID                                                         |
+    |                                                                      |
+    |      pred  <<  Lower>>?                                              |
+    |                        depth=k=1  rule rule3  line 15  t10.g         |
+    |        set context:                                                  |
+    |           ID                                                         |
+    |                                                                      |
+    |  The predicate for choice 1 after expansion (but without context     |
+    |    information):                                                     |
+    |                                                                      |
+    |    OR expr                                                           |
+    |                                                                      |
+    |      pred  <<  isUpper(LATEXT(1))>>?                                 |
+    |                        depth=k=1  rule   line 1  t10.g               |
+    |                                                                      |
+    |      pred  <<  isLower(LATEXT(1))>>?                                 |
+    |                        depth=k=1  rule   line 2  t10.g               |
+    |                                                                      |
+    |                                                                      |
+    |Choice 2: rule0/2  alt 2  line 6  file t10.g                          |
+    |                                                                      |
+    |  The original predicate for choice 2 with available context          |
+    |    information:                                                      |
+    |                                                                      |
+    |  pred  <<  Alpha>>?                                                  |
+    |                    depth=k=1  rule rule0  line 6  t10.g              |
+    |    set context:                                                      |
+    |       ID                                                             |
+    |                                                                      |
+    |  The predicate for choice 2 after expansion (but without context     |
+    |    information):                                                     |
+    |                                                                      |
+    |  OR expr                                                             |
+    |                                                                      |
+    |    pred  <<  isUpper(LATEXT(1))>>?                                   |
+    |                      depth=k=1  rule   line 1  t10.g                 |
+    |                                                                      |
+    |    pred  <<  isLower(LATEXT(1))>>?                                   |
+    |                      depth=k=1  rule   line 2  t10.g                 |
+    |                                                                      |
+    |                                                                      |
+    |#endif                                                                |
+    +----------------------------------------------------------------------+
+
+      The comparison of the predicates for the two alternatives takes
+      place without context information, which means that in some cases
+      the predicates will be considered identical even though they operate
+      on disjoint lookahead sets.  Consider:
+
+            #pred Alpha
+
+            rule1: <<Alpha>>? ID
+                 | <<Alpha>>? Label
+                 ;
+
+      Because the comparison of predicates takes place without context
+      these will be considered identical.  The reason for comparing
+      without context is that otherwise it would be necessary to re-evaluate
+      the entire predicate expression for each possible lookahead sequence.
+      This would require more code to be written and more CPU time during
+      grammar analysis, and it is not yet clear whether anyone will even make
+      use of the new #pred facility.
+
+      A temporary workaround might be to use different #pred statements
+      for predicates you know have different context.  This would avoid
+      extraneous warnings.
+
+      The above example might be termed a "false positive".  Comparison
+      without context will also lead to "false negatives".  Consider the
+      following example:
+
+            #pred Alpha
+            #pred Beta
+
+            rule1: <<Alpha>>? A
+                 | rule2
+                 ;
+
+            rule2: <<Alpha>>? A
+                 | <<Beta>>?  B
+                 ;
+
+      The predicate used for alt 2 of rule1 is (Alpha || Beta).  This
+      appears to be different than the predicate Alpha used for alt1.
+      However, the context of Beta is B.  Thus when the lookahead is A
+      Beta will have no resolving power and Alpha will be used for both
+      alternatives.  Using the same predicate for both alternatives isn't
+      very helpful, but this will not be detected with 1.33MR11.
+
+      To properly handle this the predicate expression would have to be
+      evaluated for each distinct lookahead context.
+
+      To determine whether two predicate expressions are identical is
+      difficult.  The routine may fail to identify identical predicates.
+
+      The #pred feature also compares predicates to see if a choice between
+      alternatives which is resolved by a predicate which makes the second
+      choice unreachable.  Consider the following example:
+
+            #pred A         <<A(LATEXT(1)>>?
+            #pred B         <<B(LATEXT(1)>>?
+            #pred A_or_B    A || B
+
+            r   : s
+                | t
+                ;
+            s   : <<A_or_B>>? ID
+                ;
+            t   : <<A>>? ID
+                ;
+
+        ----------------------------------------------------------------------------
+        t11.g, line 5: warning: the predicate used to disambiguate the
+               first choice of  rule r
+             (file t11.g alt 1 line 5 and alt 2 line 6)
+             appears to "cover" the second predicate when compared without context.
+             The second predicate may have no resolving power for some lookahead
+               sequences.
+        ----------------------------------------------------------------------------
+
+#139. (Changed in MR11) Problem with -gp in C++ mode
+
+      The -gp option to add a prefix to rule names did not work in
+      C++ mode.  This has been fixed.
+
+      Reported by Alexey Demakov (demakov@kazbek.ispras.ru).
+
+#138. (Changed in MR11) Additional makefiles for non-MSVC++ MS systems
+
+      Sramji Ramanathan (ps@kumaran.com) has supplied makefiles for
+      building antlr and dlg with Win95/NT development tools that
+      are not based on MSVC5.  They are pccts/antlr/AntlrMS.mak and
+      pccts/dlg/DlgMS.mak.
+
+      The first line of the makefiles require a definition of PCCTS_HOME.
+
+      These are in additiion to the AntlrMSVC50.* and DlgMSVC50.*
+      supplied by Jeff Vincent (JVincent@novell.com).
+
+#137. (Changed in MR11) Token getType(), getText(), getLine() const members
+
+      --------------------------------------------------------------------
+      If you use ANTLRCommonToken this change probably does not affect you.
+      --------------------------------------------------------------------
+
+      For a long time it has bothered me that these accessor functions
+      in ANTLRAbstractToken were not const member functions.  I have
+      refrained from changing them because it require users to modify
+      existing token class definitions which are derived directly
+      from ANTLRAbstractToken.  I think it is now time.
+
+      For those who are not used to C++, a "const member function" is a
+      member function which does not modify its own object - the thing
+      to which "this" points. This is quite different from a function
+      which does not modify its arguments
+
+      Most token definitions based on ANTLRAbstractToken have something like
+      the following in order to create concrete definitions of the pure
+      virtual methods in ANTLRAbstractToken:
+
+        class MyToken : public ANTLRAbstractToken {
+            ...
+            ANTLRTokenType getType() {return _type; }
+            int getLine()            {return _line; }
+            ANTLRChar * getText()    {return _text; }
+            ...
+        }
+
+      The required change is simply to put "const" following the function
+      prototype in the header (.h file) and the definition file (.cpp if
+      it is not inline):
+
+        class MyToken : public ANTLRAbstractToken {
+            ...
+            ANTLRTokenType getType() const {return _type; }
+            int getLine() const            {return _line; }
+            ANTLRChar * getText() const    {return _text; }
+            ...
+        }
+
+      This was originally proposed a long time ago by Bruce
+      Guenter (bruceg@qcc.sk.ca).
+
+#136. (Changed in MR11) Added getLength() to ANTLRCommonToken
+
+      Classes ANTLRCommonToken and ANTLRCommonTokenNoRefCountToken
+      now have a member function:
+
+            int getLength() const { return strlen(getText()) }
+
+      Suggested by Sramji Ramanathan (ps@kumaran.com).
+
+#135. (Changed in MR11) Raised antlr's own default ZZLEXBUFSIZE to 8k
+
+#134a. (ansi_mr10.zip)  T.J. Parr's ANSI C grammar made 1.33MR11 compatible
+
+       There is a typographical error in the definition of BITWISEOREQ:
+
+        #token BITWISEOREQ "!=" should be "\|="
+
+       When this change is combined with the bugfix to the follow set cache
+       problem (Item #147) and a minor rearrangement of the grammar
+       (Item #134b) it becomes a k=1 ck=2 grammar.
+
+#134b. (ansi_mr10.zip)  T.J. Parr's ANSI C grammar made 1.33MR11 compatible
+
+      The following changes were made in the ansi.g grammar (along with
+      using -mrhoist on):
+
+        ansi.g
+        ======
+        void tracein(char *)     ====>    void tracein(const char *)
+        void traceout(char *)    ====>    void traceout(const char *)
+
+        <LT(1)->getType()==IDENTIFIER ? isTypeName(LT(1)->getText()) : 1>>?
+        ====> <<isTypeName(LT(1)->getText())>>?
+
+        <<(LT(1)->getType()==LPARENTHESIS && LT(2)->getType()==IDENTIFIER) ? \
+                        isTypeName(LT(2)->getText()) : 1>>?
+        ====> (LPARENTHESIS IDENTIFIER)? => <<isTypeName(LT(2)->getText())>>?
+
+        <<(LT(1)->getType()==LPARENTHESIS && LT(2)->getType()==IDENTIFIER) ? \
+                        isTypeName(LT(2)->getText()) : 1>>?
+        ====> (LPARENTHESIS IDENTIFIER)? => <<isTypeName(LT(2)->getText())>>?
+
+        added to init(): traceOptionValueDefault=0;
+        added to init(): traceOption(-1);
+
+        change rule "statement":
+
+            statement
+                :   plain_label_statement
+                |   case_label_statement
+                |   <<;>> expression SEMICOLON
+                |   compound_statement
+                |   selection_statement
+                |   iteration_statement
+                |   jump_statement
+                |   SEMICOLON
+                ;
+
+            plain_label_statement
+                :   IDENTIFIER COLON statement
+                ;
+
+            case_label_statement
+                :   CASE constant_expression COLON statement
+                |   DEFAULT COLON statement
+            ;
+
+        support.cpp
+        ===========
+        void tracein(char *)     ====>    void tracein(const char *)
+        void traceout(char *)    ====>    void traceout(const char *)
+
+        added to tracein():  ANTLRParser::tracein(r);  // call superclass method
+        added to traceout(): ANTLRParser::traceout(r); // call superclass method
+
+        Makefile
+        ========
+        added to AFLAGS: -mrhoist on -prc on
+
+#133. (Changed in 1.33MR11) Make trace options public in ANTLRParser
+
+      In checking T.J. Parr's ANSI C grammar for compatibility with
+      1.33MR11 discovered that it was inconvenient to have the
+      trace facilities with protected access.
+
+#132. (Changed in 1.33MR11) Recognition of identical predicates in alts
+
+      Prior to 1.33MR11, there would be no ambiguity warning when the
+      very same predicate was used to disambiguate both alternatives:
+
+        test: ref B
+            | ref C
+            ;
+
+        ref : <<pred(LATEXT(1)>>? A
+
+      In 1.33MR11 this will cause the warning:
+
+        warning: the predicates used to disambiguate rule test
+            (file v98.g alt 1 line 1 and alt 2 line 2)
+             are identical and have no resolving power
+
+        -----------------  Note  -----------------
+
+          This is different than the following case
+
+                test: <<pred(LATEXT(1))>>? A B
+                    | <<pred(LATEXT(1)>>?  A C
+                    ;
+
+          In this case there are two distinct predicates
+          which have exactly the same text.  In the first
+          example there are two references to the same
+          predicate.  The problem represented by this
+          grammar will be addressed later.
+
+#131. (Changed in 1.33MR11) Case insensitive command line options
+
+      Command line switches like "-CC" and keywords like "on", "off",
+      and "stdin" are no longer case sensitive in antlr, dlg, and sorcerer.
+
+#130. (Changed in 1.33MR11) Changed ANTLR_VERSION to int from string
+
+      The ANTLR_VERSION was not an integer, making it difficult to
+      perform conditional compilation based on the antlr version.
+
+      Henceforth, ANTLR_VERSION will be:
+
+            (base_version * 10000) + release number
+
+            thus 1.33MR11 will be: 133*100+11 = 13311
+
+      Suggested by Rainer Janssen (Rainer.Janssen@Informatik.Uni-Oldenburg.DE).
+
+#129. (Changed in 1.33MR11) Addition of ANTLR_VERSION to <parserName>.h
+
+      The following code is now inserted into <parserName>.h amd
+      stdpccts.h:
+
+            #ifndef ANTLR_VERSION
+            #define ANTLR_VERSION 13311
+            #endif
+
+      Suggested by Rainer Janssen (Rainer.Janssen@Informatik.Uni-Oldenburg.DE)
+
+#128. (Changed in 1.33MR11) Redundant predicate code in (<<pred>>? ...)+
+
+      Prior to 1.33MR11, the following grammar would generate
+      redundant tests for the "while" condition.
+
+        rule2 : (<<pred>>? X)+ X
+              | B
+              ;
+
+      The code would resemble:
+
+            if (LA(1)==X) {
+                if (pred) {
+                    do {
+                        if (!pred) {zzfailed_pred("  pred");}
+                        zzmatch(X); zzCONSUME;
+                    } while (LA(1)==X && pred && pred);
+            } else {...
+
+      With 1.33MR11 the redundant predicate test is omitted.
+
+#127. (Changed in 1.33MR11)
+
+                    Count Syntax Errors     Count DLG Errors
+                    -------------------     ----------------
+
+       C++ mode     ANTLRParser::           DLGLexerBase::
+                      syntaxErrCount          lexErrCount
+       C mode       zzSyntaxErrCount        zzLexErrCount
+
+       The C mode variables are global and initialized to 0.
+       They are *not* reset to 0 automatically when antlr is
+       restarted.
+
+       The C++ mode variables are public.  They are initialized
+       to 0 by the constructors.  They are *not* reset to 0 by the
+       ANTLRParser::init() method.
+
+       Suggested by Reinier van den Born (reinier@vnet.ibm.com).
+
+#126. (Changed in 1.33MR11) Addition of #first <<...>>
+
+       The #first <<...>> inserts the specified text in the output
+       files before any other #include statements required by pccts.
+       The only things before the #first text are comments and
+       a #define ANTLR_VERSION.
+
+       Requested by  and Esa Pulkkinen (esap@cs.tut.fi) and Alexin
+       Zoltan (alexin@inf.u-szeged.hu).
+
+#125. (Changed in 1.33MR11) Lookahead for (guard)? && <<p>>? predicates
+
+       When implementing the new style of guard predicate (Item #113)
+       in 1.33MR10 I decided to temporarily ignore the problem of
+       computing the "narrowest" lookahead context.
+
+       Consider the following k=1 grammar:
+
+            start : a
+                  | b
+                  ;
+
+            a     : (A)? && <<pred1(LATEXT(1))>>? ab ;
+            b     : (B)? && <<pred2(LATEXT(1))>>? ab ;
+
+            ab    : A | B ;
+
+       In MR10 the context for both "a" and "b" was {A B} because this is
+       the first set of rule "ab".  Normally, this is not a problem because
+       the predicate which follows the guard inhibits any ambiguity report
+       by antlr.
+
+       In MR11 the first set for rule "a" is {A} and for rule "b" it is {B}.
+
+#124. A Note on the New "&&" Style Guarded Predicates
+
+        I've been asked several times, "What is the difference between
+        the old "=>" style guard predicates and the new style "&&" guard
+        predicates, and how do you choose one over the other" ?
+
+        The main difference is that the "=>" does not apply the
+        predicate if the context guard doesn't match, whereas
+        the && form always does.  What is the significance ?
+
+        If you have a predicate which is not on the "leading edge"
+        it cannot be hoisted.  Suppose you need a predicate that
+        looks at LA(2).  You must introduce it manually.  The
+        classic example is:
+
+            castExpr :
+                     LP typeName RP
+                     | ....
+                     ;
+
+            typeName : <<isTypeName(LATEXT(1))>>?  ID
+                     | STRUCT ID
+                     ;
+
+        The problem  is that typeName isn't on the leading edge
+        of castExpr, so the predicate isTypeName won't be hoisted into
+        castExpr to help make a decision on which production to choose.
+
+        The *first* attempt to fix it is this:
+
+            castExpr :
+                     <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+        Unfortunately, this won't work because it ignores
+        the problem of STRUCT.  The solution is to apply
+        isTypeName() in castExpr if LA(2) is an ID and
+        don't apply it when LA(2) is STRUCT:
+
+            castExpr :
+                     (LP ID)? => <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+        In conclusion, the "=>" style guarded predicate is
+        useful when:
+
+            a. the tokens required for the predicate
+               are not on the leading edge
+            b. there are alternatives in the expression
+               selected by the predicate for which the
+               predicate is inappropriate
+
+        If (b) were false, then one could use a simple
+        predicate (assuming "-prc on"):
+
+            castExpr :
+                     <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+            typeName : <<isTypeName(LATEXT(1))>>?  ID
+                     ;
+
+        So, when do you use the "&&" style guarded predicate ?
+
+        The new-style "&&" predicate should always be used with
+        predicate context.  The context guard is in ADDITION to
+        the automatically computed context.  Thus it useful for
+        predicates which depend on the token type for reasons
+        other than context.
+
+        The following example is contributed by Reinier van den Born
+        (reinier@vnet.ibm.com).
+
+ +-------------------------------------------------------------------------+
+ | This grammar has two ways to call functions:                            |
+ |                                                                         |
+ |  - a "standard" call syntax with parens and comma separated args        |
+ |  - a shell command like syntax (no parens and spacing separated args)   |
+ |                                                                         |
+ | The former also allows a variable to hold the name of the function,     |
+ | the latter can also be used to call external commands.                  |
+ |                                                                         |
+ | The grammar (simplified) looks like this:                               |
+ |                                                                         |
+ |   fun_call   :     ID "(" { expr ("," expr)* } ")"                      |
+ |                                  /* ID is function name */              |
+ |              | "@" ID "(" { expr ("," expr)* } ")"                      |
+ |                                  /* ID is var containing fun name */    |
+ |              ;                                                          |
+ |                                                                         |
+ |   command    : ID expr*          /* ID is function name */              |
+ |              | path expr*        /* path is external command name */    |
+ |              ;                                                          |
+ |                                                                         |
+ |   path       : ID                /* left out slashes and such */        |
+ |              | "@" ID            /* ID is environment var */            |
+ |              ;                                                          |
+ |                                                                         |
+ |   expr       : ....                                                     |
+ |              | "(" expr ")";                                            |
+ |                                                                         |
+ |   call       : fun_call                                                 |
+ |              | command                                                  |
+ |              ;                                                          |
+ |                                                                         |
+ | Obviously the call is wildly ambiguous. This is more or less how this   |
+ | is to be resolved:                                                      |
+ |                                                                         |
+ |    A call begins with an ID or an @ followed by an ID.                  |
+ |                                                                         |
+ |    If it is an ID and if it is an ext. command name  -> command         |
+ |                       if followed by a paren         -> fun_call        |
+ |                       otherwise                      -> command         |
+ |                                                                         |
+ |    If it is an @  and if the ID is a var name        -> fun_call        |
+ |                       otherwise                      -> command         |
+ |                                                                         |
+ | One can implement these rules quite neatly using && predicates:         |
+ |                                                                         |
+ |   call       : ("@" ID)? && <<isVarName(LT(2))>>? fun_call              |
+ |              | (ID)?     && <<isExtCmdName>>?     command               |
+ |              | (ID "(")?                          fun_call              |
+ |              |                                    command               |
+ |              ;                                                          |
+ |                                                                         |
+ | This can be done better, so it is not an ideal example, but it          |
+ | conveys the principle.                                                  |
+ +-------------------------------------------------------------------------+
+
+#123. (Changed in 1.33MR11) Correct definition of operators in ATokPtr.h
+
+        The return value of operators in ANTLRTokenPtr:
+
+        changed: unsigned ... operator !=(...)
+             to: int ... operator != (...)
+        changed: unsigned ... operator ==(...)
+             to: int ... operator == (...)
+
+        Suggested by R.A. Nelson (cowboy@VNET.IBM.COM)
+
+#122. (Changed in 1.33MR11)  Member functions to reset DLG in C++ mode
+
+         void DLGFileReset(FILE *f) { input = f; found_eof = 0; }
+         void DLGStringReset(DLGChar *s) { input = s; p = &input[0]; }
+
+        Supplied by R.A. Nelson (cowboy@VNET.IBM.COM)
+
+#121. (Changed in 1.33MR11)  Another attempt to fix -o (output dir) option
+
+      Another attempt is made to improve the -o option of antlr, dlg,
+      and sorcerer.  This one by JVincent (JVincent@novell.com).
+
+      The current rule:
+
+        a. If -o  is not specified than any explicit directory
+           names are retained.
+
+        b. If -o is specified than the -o directory name overrides any
+           explicit directory names.
+
+        c. The directory name of the grammar file is *not* stripped
+           to create the main output file.  However it is stil subject
+           to override by the -o directory name.
+
+#120. (Changed in 1.33MR11) "-info f" output to stdout rather than stderr
+
+      Added option 0 (e.g. "-info 0") which is a noop.
+
+#119. (Changed in 1.33MR11) Ambiguity aid for grammars
+
+      The user can ask for additional information on ambiguities reported
+      by antlr to stdout.  At the moment, only one ambiguity report can
+      be created in an antlr run.
+
+      This feature is enabled using the "-aa" (Ambiguity Aid)  option.
+
+      The following options control the reporting of ambiguities:
+
+          -aa ruleName       Selects reporting by name of rule
+          -aa lineNumber     Selects reporting by line number
+                               (file name not compared)
+
+          -aam               Selects "multiple" reporting for a token
+                             in the intersection set of the
+                             alternatives.
+
+                             For instance, the token ID may appear dozens
+                             of times in various paths as the program
+                             explores the rules which are reachable from
+                             the point of an ambiguity. With option -aam
+                             every possible path the search program
+                             encounters is reported.
+
+                             Without -aam only the first encounter is
+                             reported.  This may result in incomplete
+                             information, but the information may be
+                             sufficient and much shorter.
+
+          -aad depth         Selects the depth of the search.
+                             The default value is 1.
+
+                             The number of paths to be searched, and the
+                             size of the report can grow geometrically
+                             with the -ck value if a full search for all
+                             contributions to the source of the ambiguity
+                             is explored.
+
+                             The depth represents the number of tokens
+                             in the lookahead set which are matched against
+                             the set of ambiguous tokens.  A depth of 1
+                             means that the search stops when a lookahead
+                             sequence of just one token is matched.
+
+                             A k=1 ck=6 grammar might generate 5,000 items
+                             in a report if a full depth 6 search is made
+                             with the Ambiguity Aid.  The source of the
+                             problem may be in the first token and obscured
+                             by the volume of data - I hesitate to call
+                             it information.
+
+                             When the user selects a depth > 1, the search
+                             is first performed at depth=1 for both
+                             alternatives, then depth=2 for both alternatives,
+                             etc.
+
+      Sample output for rule grammar in antlr.g itself:
+
+  +---------------------------------------------------------------------+
+  | Ambiguity Aid                                                       |
+  |                                                                     |
+  |   Choice 1: grammar/70                 line 632  file a.g           |
+  |   Choice 2: grammar/82                 line 644  file a.g           |
+  |                                                                     |
+  |   Intersection of lookahead[1] sets:                                |
+  |                                                                     |
+  |      "\}"             "class"          "#errclass"      "#tokclass" |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:1  ("#errclass")                        |
+  |  1 in (...)* block                grammar/70       line 632   a.g   |
+  |  2 to error                       grammar/73       line 635   a.g   |
+  |  3 error                          error/1          line 894   a.g   |
+  |  4 #token "#errclass"             error/2          line 895   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:2  ("#tokclass")                        |
+  |  2 to tclass                      grammar/74       line 636   a.g   |
+  |  3 tclass                         tclass/1         line 937   a.g   |
+  |  4 #token "#tokclass"             tclass/2         line 938   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:3  ("class")                            |
+  |  2 to class_def                   grammar/75       line 637   a.g   |
+  |  3 class_def                      class_def/1      line 669   a.g   |
+  |  4 #token "class"                 class_def/3      line 671   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:4  ("\}")                               |
+  |  2 #token "\}"                    grammar/76       line 638   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:5  ("#errclass")                        |
+  |  1 in (...)* block                grammar/83       line 645   a.g   |
+  |  2 to error                       grammar/93       line 655   a.g   |
+  |  3 error                          error/1          line 894   a.g   |
+  |  4 #token "#errclass"             error/2          line 895   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:6  ("#tokclass")                        |
+  |  2 to tclass                      grammar/94       line 656   a.g   |
+  |  3 tclass                         tclass/1         line 937   a.g   |
+  |  4 #token "#tokclass"             tclass/2         line 938   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:7  ("class")                            |
+  |  2 to class_def                   grammar/95       line 657   a.g   |
+  |  3 class_def                      class_def/1      line 669   a.g   |
+  |  4 #token "class"                 class_def/3      line 671   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:8  ("\}")                               |
+  |  2 #token "\}"                    grammar/96       line 658   a.g   |
+  +---------------------------------------------------------------------+
+
+      For a linear lookahead set ambiguity (where k=1 or for k>1 but
+      when all lookahead sets [i] with i<k all have degree one) the
+      reports appear in the following order:
+
+        for (depth=1 ; depth <= "-aad depth" ; depth++) {
+          for (alternative=1; alternative <=2 ; alternative++) {
+            while (matches-are-found) {
+              group++;
+              print-report
+            };
+          };
+       };
+
+      For reporting a k-tuple ambiguity, the reports appear in the
+      following order:
+
+        for (depth=1 ; depth <= "-aad depth" ; depth++) {
+          while (matches-are-found) {
+            for (alternative=1; alternative <=2 ; alternative++) {
+              group++;
+              print-report
+            };
+          };
+       };
+
+      This is because matches are generated in different ways for
+      linear lookahead and k-tuples.
+
+#118. (Changed in 1.33MR11) DEC VMS makefile and VMS related changes
+
+      Revised makefiles for DEC/VMS operating system for antlr, dlg,
+      and sorcerer.
+
+      Reduced names of routines with external linkage to less than 32
+      characters to conform to DEC/VMS linker limitations.
+
+      Jean-Francois Pieronne discovered problems with dlg and antlr
+      due to the VMS linker not being case sensitive for names with
+      external linkage.  In dlg the problem was with "className" and
+      "ClassName".  In antlr the problem was with "GenExprSets" and
+      "genExprSets".
+
+      Added genmms, a version of genmk for the DEC/VMS version of make.
+      The source is in directory pccts/support/DECmms.
+
+      All VMS contributions by Jean-Francois Pieronne (jfp@iname.com).
+
+#117. (Changed in 1.33MR10) new EXPERIMENTAL predicate hoisting code
+
+      The hoisting of predicates into rules to create prediction
+      expressions is a problem in antlr.  Consider the following
+      example (k=1 with -prc on):
+
+        start   : (a)* "@" ;
+        a       : b | c ;
+        b       : <<isUpper(LATEXT(1))>>? A ;
+        c       : A ;
+
+      Prior to 1.33MR10 the code generated for "start" would resemble:
+
+        while {
+            if (LA(1)==A &&
+                    (!LA(1)==A || isUpper())) {
+              a();
+            }
+        };
+
+      This code is wrong because it makes rule "c" unreachable from
+      "start".  The essence of the problem is that antlr fails to
+      recognize that there can be a valid alternative within "a" even
+      when the predicate <<isUpper(LATEXT(1))>>? is false.
+
+      In 1.33MR10 with -mrhoist the hoisting of the predicate into
+      "start" is suppressed because it recognizes that "c" can
+      cover all the cases where the predicate is false:
+
+        while {
+            if (LA(1)==A) {
+              a();
+            }
+        };
+
+      With the antlr "-info p" switch the user will receive information
+      about the predicate suppression in the generated file:
+
+      --------------------------------------------------------------
+        #if 0
+
+        Hoisting of predicate suppressed by alternative without predicate.
+        The alt without the predicate includes all cases where
+            the predicate is false.
+
+           WITH predicate: line 7  v1.g
+           WITHOUT predicate: line 7  v1.g
+
+        The context set for the predicate:
+
+             A
+
+        The lookahead set for the alt WITHOUT the semantic predicate:
+
+             A
+
+        The predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 9  v1.g
+            set context:
+               A
+            tree context: null
+
+        Chain of referenced rules:
+
+            #0  in rule start (line 5 v1.g) to rule a
+            #1  in rule a (line 7 v1.g)
+
+        #endif
+      --------------------------------------------------------------
+
+      A predicate can be suppressed by a combination of alternatives
+      which, taken together, cover a predicate:
+
+        start   : (a)* "@" ;
+
+        a       : b | ca | cb | cc ;
+
+        b       : <<isUpper(LATEXT(1))>>? ( A | B | C ) ;
+
+        ca      : A ;
+        cb      : B ;
+        cc      : C ;
+
+      Consider a more complex example in which "c" covers only part of
+      a predicate:
+
+        start   : (a)* "@" ;
+
+        a       : b
+                | c
+                ;
+
+        b       : <<isUpper(LATEXT(1))>>?
+                    ( A
+                    | X
+                    );
+
+        c       : A
+                ;
+
+      Prior to 1.33MR10 the code generated for "start" would resemble:
+
+        while {
+            if ( (LA(1)==A || LA(1)==X) &&
+                    (! (LA(1)==A || LA(1)==X) || isUpper()) {
+              a();
+            }
+        };
+
+      With 1.33MR10 and -mrhoist the predicate context is restricted to
+      the non-covered lookahead.  The code resembles:
+
+        while {
+            if ( (LA(1)==A || LA(1)==X) &&
+                  (! (LA(1)==X) || isUpper()) {
+              a();
+            }
+        };
+
+      With the antlr "-info p" switch the user will receive information
+      about the predicate restriction in the generated file:
+
+      --------------------------------------------------------------
+        #if 0
+
+        Restricting the context of a predicate because of overlap
+          in the lookahead set between the alternative with the
+          semantic predicate and one without
+        Without this restriction the alternative without the predicate
+          could not be reached when input matched the context of the
+          predicate and the predicate was false.
+
+           WITH predicate: line 11  v4.g
+           WITHOUT predicate: line 12  v4.g
+
+        The original context set for the predicate:
+
+             A                X
+
+        The lookahead set for the alt WITHOUT the semantic predicate:
+
+             A
+
+        The intersection of the two sets
+
+             A
+
+        The original predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 15  v4.g
+            set context:
+               A                X
+            tree context: null
+
+        The new (modified) form of the predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 15  v4.g
+            set context:
+               X
+            tree context: null
+
+        #endif
+      --------------------------------------------------------------
+
+      The bad news about -mrhoist:
+
+        (a) -mrhoist does not analyze predicates with lookahead
+            depth > 1.
+
+        (b) -mrhoist does not look past a guarded predicate to
+            find context which might cover other predicates.
+
+      For these cases you might want to use syntactic predicates.
+      When a semantic predicate fails during guess mode the guess
+      fails and the next alternative is tried.
+
+      Limitation (a) is illustrated by the following example:
+
+        start    : (stmt)* EOF ;
+
+        stmt     : cast
+                 | expr
+                 ;
+        cast     : <<isTypename(LATEXT(2))>>? LP ID RP ;
+
+        expr     : LP ID RP ;
+
+      This is not much different from the first example, except that
+      it requires two tokens of lookahead context to determine what
+      to do.  This predicate is NOT suppressed because the current version
+      is unable to handle predicates with depth > 1.
+
+      A predicate can be combined with other predicates during hoisting.
+      In those cases the depth=1 predicates are still handled.  Thus,
+      in the following example the isUpper() predicate will be suppressed
+      by line #4 when hoisted from "bizarre" into "start", but will still
+      be present in "bizarre" in order to predict "stmt".
+
+        start    : (bizarre)* EOF ;     // #1
+                                        // #2
+        bizarre  : stmt                 // #3
+                 | A                    // #4
+                 ;
+
+        stmt     : cast
+                 | expr
+                 ;
+
+        cast     : <<isTypename(LATEXT(2))>>? LP ID RP ;
+
+        expr     : LP ID RP ;
+                 | <<isUpper(LATEXT(1))>>? A
+
+      Limitation (b) is illustrated by the following example of a
+      context guarded predicate:
+
+        rule : (A)? <<p>>?          // #1
+                     (A             // #2
+                     |B             // #3
+                     )              // #4
+             | <<q>> B              // #5
+             ;
+
+      Recall that this means that when the lookahead is NOT A then
+      the predicate "p" is ignored and it attempts to match "A|B".
+      Ideally, the "B" at line #3 should suppress predicate "q".
+      However, the current version does not attempt to look past
+      the guard predicate to find context which might suppress other
+      predicates.
+
+      In some cases -mrhoist will lead to the reporting of ambiguities
+      which were not visible before:
+
+        start   : (a)* "@";
+        a       : bc | d;
+        bc      : b  | c ;
+
+        b       : <<isUpper(LATEXT(1))>>? A;
+        c       : A ;
+
+        d       : A ;
+
+      In this case there is a true ambiguity in "a" between "bc" and "d"
+      which can both match "A".  Without -mrhoist the predicate in "b"
+      is hoisted into "a" and there is no ambiguity reported.  However,
+      with -mrhoist, the predicate in "b" is suppressed by "c" (as it
+      should be) making the ambiguity in "a" apparent.
+
+      The motivations for these changes were hoisting problems reported
+      by Reinier van den Born (reinier@vnet.ibm.com) and several others.
+
+#116. (Changed in 1.33MR10) C++ mode: tracein/traceout rule name is (const char *)
+
+      The prototype for C++ mode routine tracein (and traceout) has changed from
+      "char *" to "const char *".
+
+#115. (Changed in 1.33MR10) Using guess mode with exception handlers in C mode
+
+      The definition of the C mode macros zzmatch_wsig and zzsetmatch_wsig
+      neglected to consider guess mode.  When control passed to the rule's
+      parse exception handler the routine would exit without ever closing the
+      guess block. This would lead to unpredictable behavior.
+
+      In 1.33MR10 the behavior of exceptions in C mode and C++ mode should be
+      identical.
+
+#114. (Changed in 1.33MR10) difference in [zz]resynch() between C and C++ modes
+
+      There was a slight difference in the way C and C++ mode resynchronized
+      following a parsing error.  The C routine would sometimes skip an extra
+      token before attempting to resynchronize.
+
+      The C routine was changed to match the C++ routine.
+
+#113. (Changed in 1.33MR10) new context guarded pred: (g)? && <<p>>? expr
+
+      The existing context guarded predicate:
+
+            rule : (guard)? => <<p>>? expr
+                 | next_alternative
+                 ;
+
+      generates code which resembles:
+
+            if (lookahead(expr) && (!guard || pred)) {
+              expr()
+            } else ....
+
+      This is not suitable for some applications because it allows
+      expr() to be invoked when the predicate is false.  This is
+      intentional because it is meant to mimic automatically computed
+      predicate context.
+
+      The new context guarded predicate uses the guard information
+      differently because it has a different goal.  Consider:
+
+            rule : (guard)? && <<p>>? expr
+                 | next_alternative
+                 ;
+
+      The new style of context guarded predicate is equivalent to:
+
+            rule : <<guard==true && pred>>? expr
+                 | next_alternative
+                 ;
+
+      It generates code which resembles:
+
+            if (lookahead(expr) && guard && pred) {
+                expr();
+            } else ...
+
+      Both forms of guarded predicates severely restrict the form of
+      the context guard: it can contain no rule references, no
+      (...)*, no (...)+, and no {...}.  It may contain token and
+      token class references, and alternation ("|").
+
+      Addition for 1.33MR11: in the token expression all tokens must
+      be at the same height of the token tree:
+
+            (A ( B | C))? && ...            is ok (all height 2)
+            (A ( B |  ))? && ...            is not ok (some 1, some 2)
+            (A B C D | E F G H)? && ...     is ok (all height 4)
+            (A B C D | E )? && ...          is not ok (some 4, some 1)
+
+      This restriction is required in order to properly compute the lookahead
+      set for expressions like:
+
+            rule1 : (A B C)? && <<pred>>? rule2 ;
+            rule2 : (A|X) (B|Y) (C|Z);
+
+      This addition was suggested by Rienier van den Born (reinier@vnet.ibm.com)
+
+#112. (Changed in 1.33MR10) failed validation predicate in C guess mode
+
+      John Lilley (jlilley@empathy.com) suggested that failed validation
+      predicates abort a guess rather than reporting a failed error.
+      This was installed in C++ mode (Item #4).  Only now was it noticed
+      that the fix was never installed for C mode.
+
+#111. (Changed in 1.33MR10) moved zzTRACEIN to before init action
+
+      When the antlr -gd switch is present antlr generates calls to
+      zzTRACEIN at the start of a rule and zzTRACEOUT at the exit
+      from a rule.  Prior to 1.33MR10 Tthe call to zzTRACEIN was
+      after the init-action, which could cause confusion because the
+      init-actions were reported with the name of the enclosing rule,
+      rather than the active rule.
+
+#110. (Changed in 1.33MR10) antlr command line copied to generated file
+
+      The antlr command line is now copied to the generated file near
+      the start.
+
+#109. (Changed in 1.33MR10) improved trace information
+
+      The quality of the trace information provided by the "-gd"
+      switch has been improved significantly.  Here is an example
+      of the output from a test program.  It shows the rule name,
+      the first token of lookahead, the call depth, and the guess
+      status:
+
+        exit rule gusxx {"?"} depth 2
+        enter rule gusxx {"?"} depth 2
+        enter rule gus1 {"o"} depth 3 guessing
+        guess done - returning to rule gus1 {"o"} at depth 3
+                    (guess mode continues - an enclosing guess is still active)
+        guess done - returning to rule gus1 {"Z"} at depth 3
+                    (guess mode continues - an enclosing guess is still active)
+        exit rule gus1 {"Z"} depth 3 guessing
+        guess done - returning to rule gusxx {"o"} at depth 2 (guess mode ends)
+        enter rule gus1 {"o"} depth 3
+        guess done - returning to rule gus1 {"o"} at depth 3 (guess mode ends)
+        guess done - returning to rule gus1 {"Z"} at depth 3 (guess mode ends)
+        exit rule gus1 {"Z"} depth 3
+        line 1: syntax error at "Z" missing SC
+            ...
+
+      Rule trace reporting is controlled by the value of the integer
+      [zz]traceOptionValue:  when it is positive tracing is enabled,
+      otherwise it is disabled.  Tracing during guess mode is controlled
+      by the value of the integer [zz]traceGuessOptionValue.  When
+      it is positive AND [zz]traceOptionValue is positive rule trace
+      is reported in guess mode.
+
+      The values of [zz]traceOptionValue and [zz]traceGuessOptionValue
+      can be adjusted by subroutine calls listed below.
+
+      Depending on the presence or absence of the antlr -gd switch
+      the variable [zz]traceOptionValueDefault is set to 0 or 1.  When
+      the parser is initialized or [zz]traceReset() is called the
+      value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
+      The value of [zz]traceGuessOptionValue is always initialzed to 1,
+      but, as noted earlier, nothing will be reported unless
+      [zz]traceOptionValue is also positive.
+
+      When the parser state is saved/restored the value of the trace
+      variables are also saved/restored.  If a restore causes a change in
+      reporting behavior from on to off or vice versa this will be reported.
+
+      When the -gd option is selected, the macro "#define zzTRACE_RULES"
+      is added to appropriate output files.
+
+        C++ mode
+        --------
+        int     traceOption(int delta)
+        int     traceGuessOption(int delta)
+        void    traceReset()
+        int     traceOptionValueDefault
+
+        C mode
+        --------
+        int     zzTraceOption(int delta)
+        int     zzTraceGuessOption(int delta)
+        void    zzTraceReset()
+        int     zzTraceOptionValueDefault
+
+      The argument "delta" is added to the traceOptionValue.  To
+      turn on trace when inside a particular rule one:
+
+        rule : <<traceOption(+1);>>
+               (
+                rest-of-rule
+               )
+               <<traceOption(-1);>>
+       ;  /* fail clause */ <<traceOption(-1);>>
+
+      One can use the same idea to turn *off* tracing within a
+      rule by using a delta of (-1).
+
+      An improvement in the rule trace was suggested by Sramji
+      Ramanathan (ps@kumaran.com).
+
+#108. A Note on Deallocation of Variables Allocated in Guess Mode
+
+                            NOTE
+        ------------------------------------------------------
+        This mechanism only works for heap allocated variables
+        ------------------------------------------------------
+
+      The rewrite of the trace provides the machinery necessary
+      to properly free variables or undo actions following a
+      failed guess.
+
+      The macro zzUSER_GUESS_HOOK(guessSeq,zzrv) is expanded
+      as part of the zzGUESS macro.  When a guess is opened
+      the value of zzrv is 0.  When a longjmp() is executed to
+      undo the guess, the value of zzrv will be 1.
+
+      The macro zzUSER_GUESS_DONE_HOOK(guessSeq) is expanded
+      as part of the zzGUESS_DONE macro.  This is executed
+      whether the guess succeeds or fails as part of closing
+      the guess.
+
+      The guessSeq is a sequence number which is assigned to each
+      guess and is incremented by 1 for each guess which becomes
+      active.  It is needed by the user to associate the start of
+      a guess with the failure and/or completion (closing) of a
+      guess.
+
+      Guesses are nested.  They must be closed in the reverse
+      of the order that they are opened.
+
+      In order to free memory used by a variable during a guess
+      a user must write a routine which can be called to
+      register the variable along with the current guess sequence
+      number provided by the zzUSER_GUESS_HOOK macro. If the guess
+      fails, all variables tagged with the corresponding guess
+      sequence number should be released.  This is ugly, but
+      it would require a major rewrite of antlr 1.33 to use
+      some mechanism other than setjmp()/longjmp().
+
+      The order of calls for a *successful* guess would be:
+
+        zzUSER_GUESS_HOOK(guessSeq,0);
+        zzUSER_GUESS_DONE_HOOK(guessSeq);
+
+      The order of calls for a *failed* guess would be:
+
+        zzUSER_GUESS_HOOK(guessSeq,0);
+        zzUSER_GUESS_HOOK(guessSeq,1);
+        zzUSER_GUESS_DONE_HOOK(guessSeq);
+
+      The default definitions of these macros are empty strings.
+
+      Here is an example in C++ mode.  The zzUSER_GUESS_HOOK and
+      zzUSER_GUESS_DONE_HOOK macros and myGuessHook() routine
+      can be used without change in both C and C++ versions.
+
+      ----------------------------------------------------------------------
+        <<
+
+        #include "AToken.h"
+
+        typedef ANTLRCommonToken ANTLRToken;
+
+        #include "DLGLexer.h"
+
+        int main() {
+
+          {
+            DLGFileInput     in(stdin);
+            DLGLexer         lexer(&in,2000);
+            ANTLRTokenBuffer pipe(&lexer,1);
+            ANTLRCommonToken aToken;
+            P                parser(&pipe);
+
+            lexer.setToken(&aToken);
+            parser.init();
+            parser.start();
+          };
+
+          fclose(stdin);
+          fclose(stdout);
+          return 0;
+        }
+
+        >>
+
+        <<
+        char *s=NULL;
+
+        #undef zzUSER_GUESS_HOOK
+        #define zzUSER_GUESS_HOOK(guessSeq,zzrv) myGuessHook(guessSeq,zzrv);
+        #undef zzUSER_GUESS_DONE_HOOK
+        #define zzUSER_GUESS_DONE_HOOK(guessSeq)   myGuessHook(guessSeq,2);
+
+        void myGuessHook(int guessSeq,int zzrv) {
+          if (zzrv == 0) {
+            fprintf(stderr,"User hook: starting guess #%d\n",guessSeq);
+          } else if (zzrv == 1) {
+            free (s);
+            s=NULL;
+            fprintf(stderr,"User hook: failed guess #%d\n",guessSeq);
+          } else if (zzrv == 2) {
+            free (s);
+            s=NULL;
+            fprintf(stderr,"User hook: ending guess #%d\n",guessSeq);
+          };
+        }
+
+        >>
+
+        #token A    "a"
+        #token      "[\t \ \n]"     <<skip();>>
+
+        class P {
+
+        start : (top)+
+              ;
+
+        top   : (which) ?   <<fprintf(stderr,"%s is a which\n",s); free(s); s=NULL; >>
+              | other       <<fprintf(stderr,"%s is an other\n",s); free(s); s=NULL; >>
+              ; <<if (s != NULL) free(s); s=NULL; >>
+
+        which : which2
+              ;
+
+        which2 : which3
+              ;
+        which3
+              : (label)?         <<fprintf(stderr,"%s is a label\n",s);>>
+              | (global)?        <<fprintf(stderr,"%s is a global\n",s);>>
+              | (exclamation)?   <<fprintf(stderr,"%s is an exclamation\n",s);>>
+              ;
+
+        label :       <<s=strdup(LT(1)->getText());>> A ":" ;
+
+        global :      <<s=strdup(LT(1)->getText());>> A "::" ;
+
+        exclamation : <<s=strdup(LT(1)->getText());>> A "!" ;
+
+        other :       <<s=strdup(LT(1)->getText());>> "other" ;
+
+        }
+      ----------------------------------------------------------------------
+
+      This is a silly example, but illustrates the idea.  For the input
+      "a ::" with tracing enabled the output begins:
+
+      ----------------------------------------------------------------------
+        enter rule "start" depth 1
+        enter rule "top" depth 2
+        User hook: starting guess #1
+        enter rule "which" depth 3 guessing
+        enter rule "which2" depth 4 guessing
+        enter rule "which3" depth 5 guessing
+        User hook: starting guess #2
+        enter rule "label" depth 6 guessing
+        guess failed
+        User hook: failed guess #2
+        guess done - returning to rule "which3" at depth 5 (guess mode continues
+                                                 - an enclosing guess is still active)
+        User hook: ending guess #2
+        User hook: starting guess #3
+        enter rule "global" depth 6 guessing
+        exit rule "global" depth 6 guessing
+        guess done - returning to rule "which3" at depth 5 (guess mode continues
+                                                 - an enclosing guess is still active)
+        User hook: ending guess #3
+        enter rule "global" depth 6 guessing
+        exit rule "global" depth 6 guessing
+        exit rule "which3" depth 5 guessing
+        exit rule "which2" depth 4 guessing
+        exit rule "which" depth 3 guessing
+        guess done - returning to rule "top" at depth 2 (guess mode ends)
+        User hook: ending guess #1
+        enter rule "which" depth 3
+        .....
+      ----------------------------------------------------------------------
+
+      Remember:
+
+        (a) Only init-actions are executed during guess mode.
+        (b) A rule can be invoked multiple times during guess mode.
+        (c) If the guess succeeds the rule will be called once more
+              without guess mode so that normal actions will be executed.
+            This means that the init-action might need to distinguish
+              between guess mode and non-guess mode using the variable
+              [zz]guessing.
+
+#107. (Changed in 1.33MR10) construction of ASTs in guess mode
+
+      Prior to 1.33MR10, when using automatic AST construction in C++
+      mode for a rule, an AST would be constructed for elements of the
+      rule even while in guess mode.  In MR10 this no longer occurs.
+
+#106. (Changed in 1.33MR10) guess variable confusion
+
+      In C++ mode a guess which failed always restored the parser state
+      using zzGUESS_DONE as part of zzGUESS_FAIL. Prior to 1.33MR10,
+      C mode required an explicit call to zzGUESS_DONE after the
+      call to zzGUESS_FAIL.
+
+      Consider:
+
+        rule : (alpha)? beta
+             | ...
+             ;
+
+      The generated code resembles:
+
+            zzGUESS
+            if (!zzrv && LA(1)==ID) {   <==== line #1
+                alpha
+                zzGUESS_DONE
+                beta
+            } else {
+              if (! zzrv) zzGUESS_DONE  <==== line #2a
+              ....
+
+      However, in some cases line #2 was rendered:
+
+              if (guessing) zzGUESS_DONE  <==== line #2b
+
+      This would work for simple test cases, but would fail in
+      some cases where there was a guess while another guess was active.
+      One kind of failure would be to match up the zzGUESS_DONE at line
+      #2b with the "outer" guess which was still active.  The outer
+      guess would "succeed" when only the inner guess should have
+      succeeded.
+
+      In 1.33MR10 the behavior of zzGUESS and zzGUESS_FAIL in C and
+      and C++ mode should be identical.
+
+      The same problem appears in 1.33 vanilla in some places.  For
+      example:
+
+            start : { (sub)? } ;
+
+      or:
+
+            start : (
+                       B
+                    |  ( sub )?
+                    |  C
+                    )+
+                    ;
+
+      generates incorrect code.
+
+      The general principle is:
+
+        (a) use [zz]guessing only when deciding between a call to zzFAIL
+              or zzGUESS_FAIL
+
+        (b) use zzrv in all other cases
+
+      This problem was discovered while testing changes to item #105.
+      I believe this is now fixed.  My apologies.
+
+#105. (Changed in 1.33MR10) guess block as single alt of (...)+
+
+      Prior to 1.33MR10 the following constructs:
+
+        rule_plus : (
+                       (sub)?
+                    )+
+                    ;
+
+        rule_star : (
+                      (sub)?
+                    )*
+                    ;
+
+      generated incorrect code for the guess block (which could result
+      in runtime errors) because of an incorrect optimization of a
+      block with only a single alternative.
+
+      The fix caused some changes to the fix described in Item #49
+      because there are now three code generation sequences for (...)+
+      blocks containing a guess block:
+
+        a. single alternative which is a guess block
+        b. multiple alternatives in which the last is a guess block
+        c. all other cases
+
+      Forms like "rule_star" can have unexpected behavior when there
+      is a syntax error: if the subrule "sub" is not matched *exactly*
+      then "rule_star" will consume no tokens.
+
+      Reported by Esa Pulkkinen (esap@cs.tut.fi).
+
+#104. (Changed in 1.33MR10) -o option for dlg
+
+      There was problem with the code added by item #74 to handle the
+      -o option of dlg.  This should fix it.
+
+#103. (Changed in 1.33MR10) ANDed semantic predicates
+
+      Rescinded.
+
+      The optimization was a mistake.
+      The resulting problem is described in Item #150.
+
+#102. (Changed in 1.33MR10) allow "class parser : .... {"
+
+      The syntax of the class statement ("class parser-name {")
+      has been extended to allow for the specification of base
+      classes.  An arbirtrary number of tokens may now appear
+      between the class name and the "{".  They are output
+      again when the class declaration is generated.  For
+      example:
+
+        class Parser : public MyBaseClassANTLRparser {
+
+      This was suggested by a user, but I don't have a record
+      of who it was.
+
+#101. (Changed in 1.33MR10) antlr -info command line switch
+
+        -info
+
+            p   - extra predicate information in generated file
+
+            t   - information about tnode use:
+                    at the end of each rule in generated file
+                    summary on stderr at end of program
+
+            m   - monitor progress
+                    prints name of each rule as it is started
+                    flushes output at start of each rule
+
+            f   - first/follow set information to stdout
+
+            0   - no operation (added in 1.33MR11)
+
+      The options may be combined and may appear in any order.
+      For example:
+
+        antlr -info ptm -CC -gt -mrhoist on mygrammar.g
+
+#100a. (Changed in 1.33MR10) Predicate tree simplification
+
+      When the same predicates can be referenced in more than one
+      alternative of a block large predicate trees can be formed.
+
+      The difference that these optimizations make is so dramatic
+      that I have decided to use it even when -mrhoist is not selected.
+
+      Consider the following grammar:
+
+        start : ( all )* ;
+
+        all   : a
+              | d
+              | e
+              | f
+              ;
+
+        a     : c A B
+              | c A C
+              ;
+
+        c     : <<AAA(LATEXT(2))>>?
+              ;
+
+        d     : <<BBB(LATEXT(2))>>? B C
+              ;
+
+        e     : <<CCC(LATEXT(2))>>? B C
+              ;
+
+        f     : e X Y
+              ;
+
+      In rule "a" there is a reference to rule "c" in both alternatives.
+      The length of the predicate AAA is k=2 and it can be followed in
+      alternative 1 only by (A B) while in alternative 2 it can be
+      followed only by (A C).  Thus they do not have identical context.
+
+      In rule "all" the alternatives which refer to rules "e" and "f" allow
+      elimination of the duplicate reference to predicate CCC.
+
+      The table below summarized the kind of simplification performed by
+      1.33MR10.  In the table, X and Y stand for single predicates
+      (not trees).
+
+        (OR X (OR Y (OR Z)))  => (OR X Y Z)
+        (AND X (AND Y (AND Z)))  => (AND X Y Z)
+
+        (OR X  (... (OR  X Y) ... ))     => (OR X (... Y ... ))
+        (AND X (... (AND X Y) ... ))     => (AND X (... Y ... ))
+        (OR X  (... (AND X Y) ... ))     => (OR X (...  ... ))
+        (AND X (... (OR  X Y) ... ))     => (AND X (...  ... ))
+
+        (AND X)               => X
+        (OR X)                => X
+
+      In a test with a complex grammar for a real application, a predicate
+      tree with six OR nodes and 12 leaves was reduced to "(OR X Y Z)".
+
+      In 1.33MR10 there is a greater effort to release memory used
+      by predicates once they are no longer in use.
+
+#100b. (Changed in 1.33MR10) Suppression of extra predicate tests
+
+      The following optimizations require that -mrhoist be selected.
+
+      It is relatively easy to optimize the code generated for predicate
+      gates when they are of the form:
+
+            (AND X Y Z ...)
+        or  (OR  X Y Z ...)
+
+      where X, Y, Z, and "..." represent individual predicates (leaves) not
+      predicate trees.
+
+      If the predicate is an AND the contexts of the X, Y, Z, etc. are
+      ANDed together to create a single Tree context for the group and
+      context tests for the individual predicates are suppressed:
+
+            --------------------------------------------------
+            Note: This was incorrect.  The contexts should be
+            ORed together.  This has been fixed.  A more 
+            complete description is available in item #152.
+            ---------------------------------------------------
+
+      Optimization 1:  (AND X Y Z ...)
+
+        Suppose the context for Xtest is LA(1)==LP and the context for
+        Ytest is LA(1)==LP && LA(2)==ID.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    !(LA(1)==LP && LA(1)==LP && LA(2)==ID) ||
+                        ( (! LA(1)==LP || Xtest) &&
+                          (! (LA(1)==LP || LA(2)==ID) || Xtest)
+                        )) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==LP && LA(2)==ID) || (Xtest && Ytest) {...
+
+      Optimization 2: (OR X Y Z ...) with identical contexts
+
+        Suppose the context for Xtest is LA(1)==ID and for Ytest
+        the context is also LA(1)==ID.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==ID || LA(1)==ID) ||
+                        (LA(1)==ID && Xtest) ||
+                        (LA(1)==ID && Ytest) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    (! LA(1)==ID) || (Xtest || Ytest) {...
+
+      Optimization 3: (OR X Y Z ...) with distinct contexts
+
+        Suppose the context for Xtest is LA(1)==ID and for Ytest
+        the context is LA(1)==LP.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==ID || LA(1)==LP) ||
+                        (LA(1)==ID && Xtest) ||
+                        (LA(1)==LP && Ytest) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                        (zzpf=0,
+                            (LA(1)==ID && (zzpf=1) && Xtest) ||
+                            (LA(1)==LP && (zzpf=1) && Ytest) ||
+                            !zzpf) {
+
+            These may appear to be of similar complexity at first,
+            but the non-optimized version contains two tests of each
+            context while the optimized version contains only one
+            such test, as well as eliminating some of the inverted
+            logic (" !(...) || ").
+
+      Optimization 4: Computation of predicate gate trees
+
+        When generating code for the gates of predicate expressions
+        antlr 1.33 vanilla uses a recursive procedure to generate
+        "&&" and "||" expressions for testing the lookahead. As each
+        layer of the predicate tree is exposed a new set of "&&" and
+        "||" expressions on the lookahead are generated.  In many
+        cases the lookahead being tested has already been tested.
+
+        With -mrhoist a lookahead tree is computed for the entire
+        lookahead expression.  This means that predicates with identical
+        context or context which is a subset of another predicate's
+        context disappear.
+
+        This is especially important for predicates formed by rules
+        like the following:
+
+            uppperCaseVowel : <<isUpperCase(LATEXT(1))>>?  vowel;
+            vowel:          : <<isVowel(LATEXT(1))>>? LETTERS;
+
+        These predicates are combined using AND since both must be
+        satisfied for rule upperCaseVowel.  They have identical
+        context which makes this optimization very effective.
+
+      The affect of Items #100a and #100b together can be dramatic.  In
+      a very large (but real world) grammar one particular predicate
+      expression was reduced from an (unreadable) 50 predicate leaves,
+      195 LA(1) terms, and 5500 characters to an (easily comprehensible)
+      3 predicate leaves (all different) and a *single* LA(1) term.
+
+#99.  (Changed in 1.33MR10) Code generation for expression trees
+
+      Expression trees are used for k>1 grammars and predicates with
+      lookahead depth >1.  This optimization must be enabled using
+      "-mrhoist on".  (Clarification added for 1.33MR11).
+
+      In the processing of expression trees, antlr can generate long chains
+      of token comparisons.  Prior to 1.33MR10 there were many redundant
+      parenthesis which caused problems for compilers which could handle
+      expressions of only limited complexity.  For example, to test an
+      expression tree (root R A B C D), antlr would generate something
+      resembling:
+
+        (LA(1)==R && (LA(2)==A || (LA(2)==B || (LA(2)==C || LA(2)==D)))))
+
+      If there were twenty tokens to test then there would be twenty
+      parenthesis at the end of the expression.
+
+      In 1.33MR10 the generated code for tree expressions resembles:
+
+        (LA(1)==R && (LA(2)==A || LA(2)==B || LA(2)==C || LA(2)==D))
+
+      For "complex" expressions the output is indented to reflect the LA
+      number being tested:
+
+        (LA(1)==R
+            && (LA(2)==A || LA(2)==B || LA(2)==C || LA(2)==D
+               || LA(2)==E || LA(2)==F)
+        || LA(1)==S
+            && (LA(2)==G || LA(2)==H))
+
+
+      Suggested by S. Bochnak (S.Bochnak@@microTool.com.pl),
+
+#98.  (Changed in 1.33MR10) Option "-info p"
+
+      When the user selects option "-info p" the program will generate
+      detailed information about predicates.  If the user selects
+      "-mrhoist on" additional detail will be provided explaining
+      the promotion and suppression of predicates.  The output is part
+      of the generated file and sandwiched between #if 0/#endif statements.
+
+      Consider the following k=1 grammar:
+
+        start : ( all ) * ;
+
+        all   : ( a
+                | b
+                )
+                ;
+
+        a     : c B
+              ;
+
+        c     : <<LATEXT(1)>>?
+              | B
+              ;
+
+        b     : <<LATEXT(1)>>? X
+              ;
+
+      Below is an excerpt of the output for rule "start" for the three
+      predicate options (off, on, and maintenance release style hoisting).
+
+      For those who do not wish to use the "-mrhoist on" option for code
+      generation the option can be used in a "diagnostic" mode to provide
+      valuable information:
+
+            a. where one should insert null actions to inhibit hoisting
+            b. a chain of rule references which shows where predicates are
+               being hoisted
+
+      ======================================================================
+      Example of "-info p" with "-mrhoist on"
+      ======================================================================
+        #if 0
+
+        Hoisting of predicate suppressed by alternative without predicate.
+        The alt without the predicate includes all cases where the
+           predicate is false.
+
+           WITH predicate: line 11  v36.g
+           WITHOUT predicate: line 12  v36.g
+
+        The context set for the predicate:
+
+             B
+
+        The lookahead set for alt WITHOUT the semantic predicate:
+
+             B
+
+        The predicate:
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+               B
+            tree context: null
+
+        Chain of referenced rules:
+
+            #0  in rule start (line 1 v36.g) to rule all
+            #1  in rule all (line 3 v36.g) to rule a
+            #2  in rule a (line 8 v36.g) to rule c
+            #3  in rule c (line 11 v36.g)
+
+        #endif
+        &&
+        #if 0
+
+        pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+          set context:
+             X
+          tree context: null
+
+        #endif
+      ======================================================================
+      Example of "-info p"  with the default -prc setting ( "-prc off")
+      ======================================================================
+        #if 0
+
+        OR
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+              nil
+            tree context: null
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+            set context:
+              nil
+            tree context: null
+
+        #endif
+      ======================================================================
+      Example of "-info p" with "-prc on" and "-mrhoist off"
+      ======================================================================
+        #if 0
+
+        OR
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+               B
+            tree context: null
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+            set context:
+               X
+            tree context: null
+
+        #endif
+      ======================================================================
+
+#97.  (Fixed in 1.33MR10) "Predicate applied for more than one ... "
+
+      In 1.33 vanilla, the grammar listed below produced this message for
+      the first alternative (only) of rule "b":
+
+            warning: predicate applied for >1 lookahead 1-sequences
+                [you may only want one lookahead 1-sequence to apply.
+                Try using a context guard '(...)? =>'
+
+      In 1.33MR10 the message is issued for both alternatives.
+
+          top     : (a)*;
+          a       : b | c ;
+
+          b       : <<PPP(LATEXT(1))>>? ( AAA | BBB )
+                  | <<QQQ(LATEXT(1))>>? ( XXX | YYY )
+                  ;
+
+          c       : AAA | XXX;
+
+#96.  (Fixed in 1.33MR10) Guard predicates ignored when -prc off
+
+      Prior to 1.33MR10, guard predicate code was not generated unless
+      "-prc on" was selected.
+
+      This was incorrect, since "-prc off"  (the default) is supposed to
+      disable only AUTOMATIC computation of predicate context, not the
+      programmer specified context supplied by guard predicates.
+
+#95.  (Fixed in 1.33MR10) Predicate guard context length was k, not max(k,ck)
+
+      Prior to 1.33MR10, predicate guards were computed to k tokens rather
+      than max(k,ck).  Consider the following grammar:
+
+        a     : ( A B C)? => <<AAA(LATEXT(1))>>? (A|X) (B|Y) (C|Z) ;
+
+      The code generated by 1.33 vanilla with "-k 1 -ck 3 -prc on"
+      for the predicate in "a" resembles:
+
+        if ( (! LA(1)==A) || AAA(LATEXT(1))) {...
+
+      With 1.33MR10 and the same options the code resembles:
+
+        if ( (! (LA(1)==A && LA(2)==B && LA(3)==C) || AAA(LATEXT(1))) {...
+
+#94.  (Fixed in 1.33MR10) Predicates followed by rule references
+
+      Prior to 1.33MR10, a semantic predicate which referenced a token
+      which was off the end of the rule caused an incomplete context
+      to be computed (with "-prc on") for the predicate under some circum-
+      stances.  In some cases this manifested itself as illegal C code
+      (e.g. "LA(2)==[Ep](1)" in the k=2 examples below:
+
+          all     : ( a ) *;
+
+          a       : <<AAA(LATEXT(2))>>? ID X
+                  | <<BBB(LATEXT(2))>>? Y
+                  | Z
+                  ;
+
+      This might also occur when the semantic predicate was followed
+      by a rule reference which was shorter than the length of the
+      semantic predicate:
+
+        all       : ( a ) *;
+
+        a         : <<AAA(LATEXT(2))>>? ID X
+                  | <<BBB(LATEXT(2))>>? y
+                  | Z
+                  ;
+
+        y         : Y ;
+
+      Depending on circumstance, the resulting context might be too
+      generous because it was too short, or too restrictive because
+      of missing alternatives.
+
+#93.  (Changed in 1.33MR10) Definition of Purify macro
+
+      Ofer Ben-Ami (gremlin@cs.huji.ac.il) has supplied a definition
+      for the Purify macro:
+
+        #define PURIFY(r, s) memset((char *) &(r), '\0', (s));
+
+      Note: This may not be the right thing to do for C++ objects that
+      have constructors.  Reported by Bonny Rais (bonny@werple.net.au).
+
+      For those cases one should #define PURIFY to an empty macro in the
+      #header or #first actions.
+
+#92.  (Fixed in 1.33MR10) Guarded predicates and hoisting
+
+      When a guarded predicate participates in hoisting it is linked into
+      a predicate expression tree.  Prior to 1.33MR10 this link was never
+      cleared and the next time the guard was used to construct a new
+      tree the link could contain a spurious reference to another element
+      which had previosly been joined to it in the semantic predicate tree.
+
+      For example:
+
+        start  : ( all ) *;
+        all    : ( a | b ) ;
+
+        start2 : ( all2 ) *;
+        all2    : ( a ) ;
+
+        a     : (A)? => <<AAA(LATEXT(1))>>?  A ;
+        b     : (B)? => <<BBB(LATEXT(1))>>?  B ;
+
+      Prior to 1.33MR10 the code for "start2" would include a spurious
+      reference to the BBB predicate which was left from constructing
+      the predicate tree for rule "start" (i.e. or(AAA,BBB) ).
+
+      In 1.33MR10 this problem is avoided by cloning the original guard
+      each time it is linked into a predicate tree.
+
+#91.  (Changed in 1.33MR10) Extensive changes to semantic pred hoisting
+
+            ============================================
+            This has been rendered obsolete by Item #117
+            ============================================
+
+#90.  (Fixed in 1.33MR10) Semantic pred with LT(i) and i>max(k,ck)
+
+      There is a bug in antlr 1.33 vanilla and all maintenance releases
+      prior to 1.33MR10 which allows semantic predicates to reference
+      an LT(i) or LATEXT(i) where i is larger than max(k,ck).  When
+      this occurs antlr will attempt to mark the ith element of an array
+      in which there are only max(k,ck) elements.  The result cannot
+      be predicted.
+
+      Using LT(i) or LATEXT(i) for i>max(k,ck) is reported as an error
+      in 1.33MR10.
+
+#89.  Rescinded
+
+#88.  (Fixed in 1.33MR10) Tokens used in semantic predicates in guess mode
+
+        Consider the behavior of a semantic predicate during guess mode:
+
+            rule : a:A (
+                         <<test($a)>>? b:B
+                         | c:C
+                       );
+
+        Prior to MR10 the assignment of the token or attribute to
+        $a did not occur during guess mode, which would cause the
+        semantic predicate to misbehave because $a would be null.
+
+        In 1.33MR10 a semantic predicate with a reference to an
+        element label (such as $a) forces the assignment to take
+        place even in guess mode.
+
+        In order to work, this fix REQUIRES use of the $label format
+        for token pointers and attributes referenced in semantic
+        predicates.
+
+        The fix does not apply to semantic predicates using the
+        numeric form to refer to attributes (e.g. <<test($1)>>?).
+        The user will receive a warning for this case.
+
+        Reported by Rob Trout (trout@mcs.cs.kent.edu).
+
+#87.  (Fixed in 1.33MR10) Malformed guard predicates
+
+      Context guard predicates may contain only references to
+      tokens.  They may not contain references to (...)+ and
+      (...)* blocks.  This is now checked.  This replaces the
+      fatal error message in item #78 with an appropriate
+      (non-fatal) error messge.
+
+      In theory, context guards should be allowed to reference
+      rules.  However, I have not had time to fix this.
+      Evaluation of the guard takes place before all rules have
+      been read, making it difficult to resolve a forward reference
+      to rule "zzz" - it hasn't been read yet !  To postpone evaluation
+      of the guard until all rules have been read is too much
+      for the moment.
+
+#86.  (Fixed in 1.33MR10) Unequal set size in set_sub
+
+      Routine set_sub() in pccts/support/set/set.h  did not work
+      correctly when the sets were of unequal sizes.  Rewrote
+      set_equ to make it simpler and remove unnecessary and
+      expensive calls to set_deg().  This routine was not used
+      in 1.33 vanila.
+
+#85.  (Changed in 1.33MR10) Allow redefinition of MaxNumFiles
+
+      Raised the maximum number of input files to 99 from 20.
+      Put a #ifndef/#endif around the "#define MaxNumFiles 99".
+
+#84.  (Fixed in 1.33MR10) Initialize zzBadTok in macro zzRULE
+
+      Initialize zzBadTok to NULL in zzRULE macro of AParser.h.
+      in order to get rid of warning messages.
+
+#83.  (Fixed in 1.33MR10) False warnings with -w2 for #tokclass
+
+      When -w2 is selected antlr gives inappropriate warnings about
+      #tokclass names not having any associated regular expressions.
+      Since a #tokclass is not a "real" token it will never have an
+      associated regular expression and there should be no warning.
+
+      Reported by Derek Pappas (derek.pappas@eng.sun.com)
+
+#82.  (Fixed in 1.33MR10) Computation of follow sets with multiple cycles
+
+      Reinier van den Born (reinier@vnet.ibm.com) reported a problem
+      in the computation of follow sets by antlr.  The problem (bug)
+      exists in 1.33 vanilla and all maintenance releases prior to 1.33MR10.
+
+      The problem involves the computation of follow sets when there are
+      cycles - rules which have mutual references.  I believe the problem
+      is restricted to cases where there is  more than one cycle AND
+      elements of those cycles have rules in common.  Even when this
+      occurs it may not affect the code generated - but it might.  It
+      might also lead to undetected ambiguities.
+
+      There were no changes in antlr or dlg output from the revised version.
+
+      The following fragment demonstates the problem by giving different
+      follow sets (option -pa) for var_access when built with k=1 and ck=2 on
+      1.33 vanilla and 1.33MR10:
+
+        echo_statement : ECHO ( echo_expr )*
+                       ;
+
+        echo_expr      : ( command )?
+                       | expression
+                       ;
+
+        command        : IDENTIFIER
+                             { concat }
+                       ;
+
+        expression     : operand ( OPERATOR operand )*
+                       ;
+
+        operand        : value
+                       | START command END
+                       ;
+
+        value          : concat
+                       | TYPE operand
+                       ;
+
+        concat         : var_access { CONCAT value }
+                       ;
+
+        var_access     : IDENTIFIER { INDEX }
+
+                       ;
+#81.  (Changed in 1.33MR10) C mode use of attributes and ASTs
+
+       Reported by Isaac Clark (irclark@mindspring.com).
+
+       C mode code ignores attributes returned by rules which are
+       referenced using element labels when ASTs are enabled (-gt option).
+
+         1. start : r:rule t:Token <<$start=$r;>>
+
+                The $r refrence will not work when combined with
+                the -gt option.
+
+         2. start : t:Token         <<$start=$t;>>
+
+                The $t reference works in all cases.
+
+         3. start : rule            <<$0=$1;>>
+
+                Numeric labels work in all cases.
+
+       With MR10 the user will receive an error message for case 1 when
+       the -gt option is used.
+
+#80.  (Fixed in 1.33MR10) (...)? as last alternative of block
+
+        A construct like the following:
+
+            rule : a
+                 | (b)?
+                 ;
+
+        does not make sense because there is no alternative when
+        the guess block fails.  This is now reported as a warning
+        to the user.
+
+        Previously, there was a code generation error for this case:
+        the guess block was not "closed"  when the guess failed.
+        This could cause an infinite loop or other problems.  This
+        is now fixed.
+
+        Example problem:
+
+            #header<<
+            #include <stdio.h>
+            #include "charptr.h"
+            >>
+
+            <<
+            #include "charptr.c"
+            main ()
+            {
+             ANTLR(start(),stdin);
+            }
+            >>
+
+            #token "[\ \t]+"        << zzskip(); >>
+            #token "[\n]"           << zzline++; zzskip(); >>
+
+            #token Word     "[a-z]+"
+            #token Number   "[0-9]+"
+
+
+            start : (test1)?
+                  | (test2)?
+                  ;
+            test1 : (Word Word Word Word)?
+                  | (Word Word Word Number)?
+                  ;
+            test2 : (Word Word Number Word)?
+                  | (Word Word Number Number)?
+            ;
+
+        Test data which caused infinite loop:
+
+            a 1 a a
+
+#79.  (Changed in 1.33MR10) Use of -fh with multiple parsers
+
+        Previously, antlr always used the pre-processor symbol
+        STDPCCTS_H as a gate for the file stdpccts.h.  This
+        caused problems when there were multiple parsers defined
+        because they used the same gate symbol.
+
+        In 1.33MR10, the -fh filename is used to generate the
+        gate file for stdpccts.h.  For instance:
+
+            antlr -fh std_parser1.h
+
+        generates the pre-processor symbol "STDPCCTS_std_parser1_H".
+
+        Reported by Ramanathan Santhanam (ps@kumaran.com).
+
+#78.  (Changed in 1.33MR9) Guard predicates that refer to rules
+
+                ------------------------
+                Please refer to Item #87
+                ------------------------
+
+        Guard predicates are processed during an early phase
+        of antlr (during parsing) before all data structures
+        are completed.
+
+        There is an apparent bug in earlier versions of 1.33
+        which caused guard predicates which contained references
+        to rules (rather than tokens) to reference a structure
+        which hadn't yet been initialized.
+
+        In some cases (perhaps all cases) references to rules
+        in guard predicates resulted in the use of "garbage".
+
+#79.  (Changed in 1.33MR9) Jeff Vincent (JVincent@novell.com)
+
+        Previously, the maximum length file name was set
+        arbitrarily to 300 characters in antlr, dlg, and sorcerer.
+
+        The config.h file now attempts to define the maximum length
+        filename using _MAX_PATH from stdlib.h before falling back
+        to using the value 300.
+
+#78.  (Changed in 1.33MR9) Jeff Vincent (JVincent@novell.com)
+
+        Put #ifndef/#endif around definition of ZZLEXBUFSIZE in
+        antlr.
+
+#77.  (Changed in 1.33MR9) Arithmetic overflow for very large grammars
+
+        In routine HandleAmbiguities() antlr attempts to compute the
+        number of possible elements in a set that is order of
+        number-of-tokens raised to the number-of-lookahead-tokens power.
+        For large grammars or large lookahead (e.g. -ck 7) this can
+        cause arithmetic overflow.
+
+        With 1.33MR9, arithmetic overflow in this computation is reported
+        the first time it happens.  The program continues to run and
+        the program branches based on the assumption that the computed
+        value is larger than any number computed by counting actual cases
+        because 2**31 is larger than the number of bits in most computers.
+
+        Before 1.33MR9 overflow was not reported.  The behavior following
+        overflow is not predictable by anyone but the original author.
+
+                            NOTE
+
+            In 1.33MR10 the warning message is suppressed.
+            The code which detects the overflow allows the
+            computation to continue without an error.  The
+            error message itself made made users worry.
+
+#76.  (Changed in 1.33MR9) Jeff Vincent (JVincent@novell.com)
+
+        Jeff Vincent has convinced me to make ANTLRCommonToken and
+        ANTLRCommonNoRefCountToken use variable length strings
+        allocated from the heap rather than fixed length strings.
+        By suitable definition of setText(), the copy constructor,
+        and operator =() it is possible to maintain "copy" semantics.
+        By "copy" semantics I mean that when a token is copied from
+        an existing token it receives its own, distinct, copy of the
+        text allocated from the heap rather than simply a pointer
+        to the original token's text.
+
+        ============================================================
+                        W * A * R * N * I * N * G
+        ============================================================
+
+        It is possible that this may cause problems for some users.
+        For those users I have included the old version of AToken.h as
+        pccts/h/AToken_traditional.h.
+
+#75.  (Changed in 1.33MR9) Bruce Guenter (bruceg@qcc.sk.ca)
+
+        Make DLGStringInput const correct.  Since this is infrequently
+        subclassed, it should affect few users, I hope.
+
+#74.  (Changed in 1.33MR9) -o (output directory) option
+
+        Antlr does not properly handle the -o output directory option
+        when the filename of the grammar contains a directory part.  For
+        example:
+
+            antlr -o outdir pccts_src/myfile.g
+
+        causes antlr create a file called "outdir/pccts_src/myfile.cpp.
+        It SHOULD create outdir/myfile.cpp
+
+        The suggested code fix has been installed in antlr, dlg, and
+        Sorcerer.
+
+#73.  (Changed in 1.33MR9) Hoisting of semantic predicates and -mrhoist
+
+            ============================================
+            This has been rendered obsolete by Item #117
+            ============================================
+
+#72.  (Changed in 1.33MR9) virtual saveState()/restoreState()/guess_XXX
+
+        The following methods in ANTLRParser were made virtual at
+        the request of S. Bochnak (S.Bochnak@microTool.com.pl):
+
+            saveState() and restoreState()
+            guess(), guess_fail(), and guess_done()
+
+#71.  (Changed in 1.33MR9) Access to omitted command line argument
+
+        If a switch requiring arguments is the last thing on the
+        command line, and the argument is omitted, antlr would core.
+
+            antlr test.g -prc
+
+        instead of
+
+            antlr test.g -prc off
+
+#70.  (Changed in 1.33MR9) Addition of MSVC .dsp and .mak build files
+
+        The following MSVC .dsp and .mak files for pccts and sorcerer
+        were contributed by Stanislaw Bochnak (S.Bochnak@microTool.com.pl)
+        and Jeff Vincent (JVincent@novell.com)
+
+        PCCTS Distribution Kit
+        ----------------------
+        pccts/PCCTSMSVC50.dsw
+
+        pccts/antlr/AntlrMSVC50.dsp
+        pccts/antlr/AntlrMSVC50.mak
+
+        pccts/dlg/DlgMSVC50.dsp
+        pccts/dlg/DlgMSVC50.mak
+
+        pccts/support/msvc.dsp
+
+        Sorcerer Distribution Kit
+        -------------------------
+        pccts/sorcerer/SorcererMSVC50.dsp
+        pccts/sorcerer/SorcererMSVC50.mak
+
+        pccts/sorcerer/lib/msvc.dsp
+
+#69.  (Changed in 1.33MR9) Change "unsigned int" to plain "int"
+
+       Declaration of max_token_num in misc.c as "unsigned int"
+       caused comparison between signed and unsigned ints giving
+       warning message without any special benefit.
+
+#68.  (Changed in 1.33MR9) Add void return for dlg internal_error()
+
+       Get rid of "no return value" message in internal_error()
+       in file dlg/support.c and dlg/dlg.h.
+
+#67.  (Changed in Sor) sor.g: lisp() has no return value
+
+       Added a "void" for the return type.
+
+#66.  (Added to Sor) sor.g: ZZLEXBUFSIZE enclosed in #ifndef/#endif
+
+       A user needed to be able to change the ZZLEXBUFSIZE for
+       sor. Put the definition of ZZLEXBUFSIZE inside #ifndef/#endif
+
+#65.  (Changed in 1.33MR9) PCCTSAST::deepCopy() and ast_dup() bug
+
+       Jeff Vincent (JVincent@novell.com) found that deepCopy()
+       made new copies of only the direct descendents.  No new
+       copies were made of sibling nodes,  Sibling pointers are
+       set to zero by shallowCopy().
+
+           PCCTS_AST::deepCopy() has been changed to make a
+           deep copy in the traditional sense.
+
+           The deepCopy() routine depends on the behavior of
+           shallowCopy().  In all sor examples I've found,
+           shallowCopy() zeroes the right and down pointers.
+
+       Original Tree       Original deepCopy()     Revised deepCopy
+       -------------       -------------------     ----------------
+            a->b->c         A                       A
+            |               |                       |
+            d->e->f         D                       D->E->F
+            |               |                       |
+            g->h->i         G                       G->H->I
+               |                                       |
+               j->k                                    J->K
+
+        While comparing deepCopy() for C++ mode with ast_dup for
+        C mode I found a problem with ast_dup().
+
+           Routine ast_dup() has been changed to make a deep copy
+           in the traditional sense.
+
+       Original Tree       Original ast_dup()      Revised ast_dup()
+       -------------       -------------------     ----------------
+            a->b->c         A->B->C                 A
+            |               |                       |
+            d->e->f         D->E->F                 D->E->F
+            |               |                       |
+            g->h->i         G->H->I                 G->H->I
+               |               |                       |
+               j->k            J->K                    J->K
+
+
+        I believe this affects transform mode sorcerer programs only.
+
+#64.  (Changed in 1.33MR9) anltr/hash.h prototype for killHashTable()
+
+#63.  (Changed in 1.33MR8) h/charptr.h does not zero pointer after free
+
+        The charptr.h routine now zeroes the pointer after free().
+
+        Reported by Jens Tingleff (jensting@imaginet.fr)
+
+#62.  (Changed in 1.33MR8) ANTLRParser::resynch had static variable
+
+        The static variable "consumed" in ANTLRParser::resynch was
+        changed into an instance variable of the class with the
+        name "resynchConsumed".
+
+        Reported by S.Bochnak@microTool.com.pl
+
+#61.  (Changed in 1.33MR8) Using rule>[i,j] when rule has no return values
+
+        Previously, the following code would cause antlr to core when
+        it tried to generate code for rule1 because rule2 had no return
+        values ("upward inheritance"):
+
+            rule1 : <<int i; int j>>
+                    rule2 > [i,j]
+                  ;
+
+            rule2 : Anything ;
+
+        Reported by S.Bochnak@microTool.com.pl
+
+        Verified correct operation of antlr MR8 when missing or extra
+        inheritance arguments for all combinations.  When there are
+        missing or extra arguments code will still be generated even
+        though this might cause the invocation of a subroutine with
+        the wrong number of arguments.
+
+#60.  (Changed in 1.33MR7) Major changes to exception handling
+
+        There were significant problems in the handling of exceptions
+        in 1.33 vanilla.  The general problem is that it can only
+        process one level of exception handler.  For example, a named
+        exception handler, an exception handler for an alternative, or
+        an exception for a subrule  always went to the rule's exception
+        handler if there was no "catch" which matched the exception.
+
+        In 1.33MR7 the exception handlers properly "nest".  If an
+        exception handler does not have a matching "catch" then the
+        nextmost outer exception handler is checked for an appropriate
+        "catch" clause, and so on until an exception handler with an
+        appropriate "catch" is found.
+
+        There are still undesirable features in the way exception
+        handlers are implemented, but I do not have time to fix them
+        at the moment:
+
+            The exception handlers for alternatives are outside the
+            block containing the alternative.  This makes it impossible
+            to access variables declared in a block or to resume the
+            parse by "falling through".  The parse can still be easily
+            resumed in other ways, but not in the most natural fashion.
+
+            This results in an inconsistentcy between named exception
+            handlers and exception handlers for alternatives.  When
+            an exception handler for an alternative "falls through"
+            it goes to the nextmost outer handler - not the "normal
+            action".
+
+        A major difference between 1.33MR7 and 1.33 vanilla is
+        the default action after an exception is caught:
+
+            1.33 Vanilla
+            ------------
+            In 1.33 vanilla the signal value is set to zero ("NoSignal")
+            and the code drops through to the code following the exception.
+            For named exception handlers this is the "normal action".
+            For alternative exception handlers this is the rule's handler.
+
+            1.33MR7
+            -------
+            In 1.33MR7 the signal value is NOT automatically set to zero.
+
+            There are two cases:
+
+                For named exception handlers: if the signal value has been
+                set to zero the code drops through to the "normal action".
+
+                For all other cases the code branches to the nextmost outer
+                exception handler until it reaches the handler for the rule.
+
+        The following macros have been defined for convenience:
+
+            C/C++ Mode Name
+            --------------------
+            (zz)suppressSignal
+                  set signal & return signal arg to 0 ("NoSignal")
+            (zz)setSignal(intValue)
+                  set signal & return signal arg to some value
+            (zz)exportSignal
+                  copy the signal value to the return signal arg
+
+        I'm not sure why PCCTS make a distinction between the local
+        signal value and the return signal argument, but I'm loathe
+        to change the code. The burden of copying the local signal
+        value to the return signal argument can be given to the
+        default signal handler, I suppose.
+
+#59.  (Changed in 1.33MR7) Prototypes for some functions
+
+        Added prototypes for the following functions to antlr.h
+
+            zzconsumeUntil()
+            zzconsumeUntilToken()
+
+#58.  (Changed in 1.33MR7) Added defintion of zzbufsize to dlgauto.h
+
+#57.  (Changed in 1.33MR7) Format of #line directive
+
+        Previously, the -gl directive for line 1234 would
+        resemble:  "# 1234 filename.g".  This caused problems
+        for some compilers/pre-processors.  In MR7 it generates
+        "#line 1234 filename.g".
+
+#56.  (Added in 1.33MR7) Jan Mikkelsen <janm@zeta.org.au>
+
+        Move PURIFY macro invocaton to after rule's init action.
+
+#55.  (Fixed in 1.33MR7) Unitialized variables in ANTLRParser
+
+        Member variables inf_labase and inf_last were not initialized.
+        (See item #50.)
+
+#54.  (Fixed in 1.33MR6) Brad Schick (schick@interacess.com)
+
+        Previously, the following constructs generated the same
+        code:
+
+        rule1 : (A B C)?
+              | something-else
+              ;
+
+        rule2 : (A B C)? ()
+              | something-else
+              ;
+
+        In all versions of pccts rule1 guesses (A B C) and then
+        consume all three tokens if the guess succeeds.  In MR6
+        rule2 guesses (A B C)  but consumes NONE of the tokens
+        when the guess succeeds because "()" matches epsilon.
+
+#53.  (Explanation for 1.33MR6) What happens after an exception is caught ?
+
+        The Book is silent about what happens after an exception
+        is caught.
+
+        The following code fragment prints "Error Action" followed
+        by "Normal Action".
+
+        test : Word ex:Number <<printf("Normal Action\n");>>
+                exception[ex]
+                   catch NoViableAlt:
+                        <<printf("Error Action\n");>>
+        ;
+
+        The reason for "Normal Action" is that the normal flow of the
+        program after a user-written exception handler is to "drop through".
+        In the case of an exception handler for a rule this results in
+        the exection of a "return" statement.  In the case of an
+        exception handler attached to an alternative, rule, or token
+        this is the code that would have executed had there been no
+        exception.
+
+        The user can achieve the desired result by using a "return"
+        statement.
+
+        test : Word ex:Number <<printf("Normal Action\n");>>
+                exception[ex]
+                   catch NoViableAlt:
+                        <<printf("Error Action\n"); return;>>
+        ;
+
+        The most powerful mechanism for recovery from parse errors
+        in pccts is syntactic predicates because they provide
+        backtracking.  Exceptions allow "return", "break",
+        "consumeUntil(...)", "goto _handler", "goto _fail", and
+        changing the _signal value.
+
+#52.  (Fixed in 1.33MR6) Exceptions without syntactic predicates
+
+        The following generates bad code in 1.33 if no syntactic
+        predicates are present in the grammar.
+
+        test : Word ex:Number <<printf("Normal Action\n");>>
+                exception[ex]
+                   catch NoViableAlt:
+                        <<printf("Error Action\n");>>
+
+        There is a reference to a guess variable.  In C mode
+        this causes a compiler error.  In C++ mode it generates
+        an extraneous check on member "guessing".
+
+        In MR6 correct code is generated for both C and C++ mode.
+
+#51.  (Added to 1.33MR6) Exception operator "@" used without exceptions
+
+        In MR6 added a warning when the exception operator "@" is
+        used and no exception group is defined.  This is probably
+        a case where "\@" or "@" is meant.
+
+#50.  (Fixed in 1.33MR6) Gunnar Rxnning (gunnar@candleweb.no)
+                                    http://www.candleweb.no/~gunnar/
+
+        Routines zzsave_antlr_state and zzrestore_antlr_state don't
+        save and restore all the data needed when switching states.
+
+        Suggested patch applied to antlr.h and err.h for MR6.
+
+#49.  (Fixed in 1.33MR6) Sinan Karasu (sinan@boeing.com)
+
+        Generated code failed to turn off guess mode when leaving a
+        (...)+ block which contained a guess block.  The result was
+        an infinite loop.  For example:
+
+                rule : (
+                         (x)?
+                         | y
+                       )+
+
+        Suggested code fix implemented in MR6.  Replaced
+
+            ... else if (zzcnt>1) break;
+
+        with:
+
+          C++ mode:
+              ... else if (zzcnt>1) {if (!zzrv) zzGUESS_DONE; break;};
+          C mode:
+              ... else if (zzcnt>1) {if (zzguessing) zzGUESS_DONE; break;};
+
+#48.  (Fixed in 1.33MR6) Invalid exception element causes core
+
+        A label attached to an invalid construct can cause
+        pccts to crash while processing the exception associated
+        with the label.  For example:
+
+        rule : t:(B C)
+                exception[t] catch MismatchedToken: <<printf(...);>>
+
+        Version MR6 generates the message:
+
+           reference in exception handler to undefined label 't'
+
+#47.  (Fixed in 1.33MR6) Manuel Ornato
+
+        Under some circumstances involving a k >1 or ck >1
+        grammar and a loop block (i.e.  (...)* ) pccts will
+        fail to detect a syntax error and loop indefinitely.
+        The problem did not exist in 1.20, but has existed
+        from 1.23 to the present.
+
+        Fixed in MR6.
+
+        ---------------------------------------------------
+        Complete test program
+        ---------------------------------------------------
+        #header<<
+        #include <stdio.h>
+        #include "charptr.h"
+        >>
+
+        <<
+        #include "charptr.c"
+        main ()
+        {
+         ANTLR(global(),stdin);
+        }
+        >>
+
+        #token "[\ \t]+"        << zzskip(); >>
+        #token "[\n]"           << zzline++; zzskip(); >>
+
+        #token B        "b"
+        #token C        "c"
+        #token D        "d"
+        #token E        "e"
+        #token LP       "\("
+        #token RP       "\)"
+
+        #token ANTLREOF "@"
+
+        global : (
+                   (E liste)
+                 | liste
+                 | listed
+                 )  ANTLREOF
+        ;
+
+        listeb : LP ( B ( B | C )* ) RP ;
+        listec : LP ( C ( B | C )* ) RP ;
+        listed : LP ( D ( B | C )* ) RP ;
+        liste : ( listeb | listec )* ;
+
+        ---------------------------------------------------
+        Sample data causing infinite loop
+        ---------------------------------------------------
+        e (d c)
+        ---------------------------------------------------
+
+#46.  (Fixed in 1.33MR6) Robert Richter
+                (Robert.Richter@infotech.tu-chemnitz.de)
+
+        This item from the list of known problems was
+        fixed by item #18 (below).
+
+#45.  (Fixed in 1.33MR6) Brad Schick (schick@interaccess.com)
+
+        The dependency scanner in VC++ mistakenly sees a
+        reference to an MPW #include file even though properly
+        #ifdef/#endif in config.h.  The suggested workaround
+        has been implemented:
+
+                #ifdef MPW
+                .....
+                #define MPW_CursorCtl_Header <CursorCtl.h>
+                #include MPW_CursorCtl_Header
+                .....
+                #endif
+
+#44.  (Fixed in 1.33MR6) cast malloc() to (char *) in charptr.c
+
+        Added (char *) cast for systems where malloc returns "void *".
+
+#43.  (Added to 1.33MR6) Bruce Guenter (bruceg@qcc.sk.ca)
+
+        Add setLeft() and setUp methods to ASTDoublyLinkedBase
+        for symmetry with setRight() and setDown() methods.
+
+#42.  (Fixed in 1.33MR6) Jeff Katcher (jkatcher@nortel.ca)
+
+        C++ style comment in antlr.c corrected.
+
+#41.  (Added in 1.33MR6) antlr -stdout
+
+        Using "antlr -stdout ..." forces the text that would
+        normally go to the grammar.c or grammar.cpp file to
+        stdout.
+
+#40.  (Added in 1.33MR6) antlr -tab to change tab stops
+
+        Using "antlr -tab number ..." changes the tab stops
+        for the grammar.c or grammar.cpp file.  The number
+        must be between 0 and 8.  Using 0 gives tab characters,
+        values between 1 and 8 give the appropriate number of
+        space characters.
+
+#39.  (Fixed in 1.33MR5) Jan Mikkelsen <janm@zeta.org.au>
+
+        Commas in function prototype still not correct under
+        some circumstances.  Suggested code fix installed.
+
+#38.  (Fixed in 1.33MR5) ANTLRTokenBuffer constructor
+
+        Have ANTLRTokenBuffer ctor initialize member "parser" to null.
+
+#37.  (Fixed in 1.33MR4) Bruce Guenter (bruceg@qcc.sk.ca)
+
+        In ANTLRParser::FAIL(int k,...) released memory pointed to by
+        f[i] (as well as f itself.  Should only free f itself.
+
+#36.  (Fixed in 1.33MR3) Cortland D. Starrett (cort@shay.ecn.purdue.edu)
+
+        Neglected to properly declare isDLGmaxToken() when fixing problem
+        reported by Andreas Magnusson.
+
+        Undo "_retv=NULL;" change which caused problems for return values
+        from rules whose return values weren't pointers.
+
+        Failed to create bin directory if it didn't exist.
+
+#35.  (Fixed in 1.33MR2) Andreas Magnusson
+(Andreas.Magnusson@mailbox.swipnet.se)
+
+        Repair bug introduced by 1.33MR1 for #tokdefs.  The original fix
+        placed "DLGmaxToken=9999" and "DLGminToken=0" in the TokenType enum
+        in order to fix a problem with an aggresive compiler assigning an 8
+        bit enum which might be too narrow.  This caused #tokdefs to assume
+        that there were 9999 real tokens.  The repair to the fix causes antlr to
+        ignore TokenTypes "DLGmaxToken" and "DLGminToken" in a #tokdefs file.
+
+#34.  (Added to 1.33MR1) Add public DLGLexerBase::set_line(int newValue)
+
+        Previously there was no public function for changing the line
+        number maintained by the lexer.
+
+#33.  (Fixed in 1.33MR1) Franklin Chen   (chen@adi.com)
+
+        Accidental use of EXIT_FAILURE rather than PCCTS_EXIT_FAILURE
+        in pccts/h/AParser.cpp.
+
+#32.  (Fixed in 1.33MR1) Franklin Chen   (chen@adi.com)
+
+        In PCCTSAST.cpp lines 405 and 466:  Change
+
+                free (t)
+           to
+                free ( (char *)t );
+
+        to match prototype.
+
+#31.   (Added to 1.33MR1) Pointer to parser in ANTLRTokenBuffer
+                        Pointer to parser in DLGLexerBase
+
+        The ANTLRTokenBuffer class now contains a pointer to the
+        parser which is using it.  This is established by the
+        ANTLRParser constructor calling ANTLRTokenBuffer::
+        setParser(ANTLRParser *p).
+
+        When ANTLRTokenBuffer::setParser(ANTLRParser *p) is
+        called it saves the pointer to the parser and then
+        calls ANTLRTokenStream::setParser(ANTLRParser *p)
+        so that the lexer can also save a pointer to the
+        parser.
+
+        There is also a function getParser() in each class
+        with the obvious purpose.
+
+        It is possible that these functions will return NULL
+        under some circumstances (e.g. a non-DLG lexer is used).
+
+#30.   (Added to 1.33MR1) function tokenName(int token) standard
+
+        The generated parser class now includes the
+        function:
+
+          static const ANTLRChar * tokenName(int token)
+
+        which returns a pointer to the "name" corresponding
+        to the token.
+
+        The base class (ANTLRParser) always includes the
+        member function:
+
+          const ANTLRChar * parserTokenName(int token)
+
+        which can be accessed by objects which have a pointer
+        to an ANTLRParser, but do not know the name of the
+        parser class (e.g. ANTLRTokenBuffer and DLGLexerBase).
+
+#29.   (Added to 1.33MR1) Debugging DLG lexers
+
+        If the pre-processor symbol DEBUG_LEXER is defined
+        then DLexerBase will include code for printing out
+        key information about tokens which are recognized.
+
+        The debug feature of the lexer is controlled by:
+
+          int previousDebugValue=lexer.debugLexer(newValue);
+
+                        a value of 0 disables output
+                        a value of 1 enables output
+
+        Even if the lexer debug code is compiled into DLexerBase
+        it must be enabled before any output is generated.  For
+        example:
+
+           DLGFileInput         in(stdin);
+           MyDLG                lexer(&in,2000);
+
+           lexer.setToken(&aToken);
+
+           #if DEBUG_LEXER
+             lexer.debugLexer(1);       // enable debug information
+           #endif
+
+#28.   (Added to 1.33MR1) More control over DLG header
+
+        Version 1.33MR1 adds the following directives to PCCTS
+        for C++ mode:
+
+          #lexprefix  <<source code>>
+
+                Adds source code to the DLGLexer.h file
+                after the #include "DLexerBase.h" but
+                before the start of the class definition.
+
+          #lexmember  <<source code>>
+
+                Adds source code to the DLGLexer.h file
+                as part of the DLGLexer class body.  It
+                appears immediately after the start of
+                the class and a "public: statement.
+
+#27.   (Fixed in 1.33MR1) Comments in DLG actions
+
+        Previously, DLG would not recognize comments as a special case.
+        Thus, ">>" in the comments would cause errors.  This is fixed.
+
+#26.   (Fixed in 1.33MR1) Removed static variables from error routines
+
+        Previously, the existence of statically allocated variables
+        in some of the parser's member functions posed a danger when
+        there was more than one parser active.
+
+        Replaced with dynamically allocated/freed variables in 1.33MR1.
+
+#25.  (Fixed in 1.33MR1)  Use of string literals in semantic predicates
+
+        Previously, it was not possible to place a string literal in
+        a semantic predicate because it was not properly "stringized"
+        for the report of a failed predicate.
+
+#24.  (Fixed in 1.33MR1)  Continuation lines for semantic predicates
+
+        Previously, it was not possible to continue semantic
+        predicates across a line because it was not properly
+        "stringized" for the report of a failed predicate.
+
+                rule : <<ifXYZ()>>?[ a very
+                                        long statement ]
+
+#23.  (Fixed in 1.33MR1)  {...} envelope for failed semantic predicates
+
+        Previously, there was a code generation error for failed
+        semantic predicates:
+
+          rule : <<xyz()>>?[ stmt1; stmt2; ]
+
+        which generated code which resembled:
+
+          if (! xyz()) stmt1; stmt2;
+
+        It now puts the statements in a {...} envelope:
+
+          if (! xyz()) { stmt1; stmt2; };
+
+#22.  (Fixed in 1.33MR1)  Continuation of #token across lines using "\"
+
+        Previously, it was not possible to continue a #token regular
+        expression across a line.  The trailing "\" and newline caused
+        a newline to be inserted into the regular expression by DLG.
+
+        Fixed in 1.33MR1.
+
+#21.  (Fixed in 1.33MR1)  Use of ">>" (right shift operator in DLG actions
+
+        It is now possible to use the C++ right shift operator ">>"
+        in DLG actions by using the normal escapes:
+
+                #token "shift-right"     << value=value \>\> 1;>>
+
+#20.  (Version 1.33/19-Jan-97 Karl Eccleson <karle@microrobotics.co.uk>
+                            P.A. Keller (P.A.Keller@bath.ac.uk)
+
+        There is a problem due to using exceptions with the -gh option.
+
+        Suggested fix now in 1.33MR1.
+
+#19.  (Fixed in 1.33MR1)             Tom Piscotti and John Lilley
+
+        There were problems suppressing messages to stdin and stdout
+        when running in a window environment because some functions
+        which uses fprint were not virtual.
+
+        Suggested change now in 1.33MR1.
+
+        I believe all functions containing error messages (excluding those
+        indicating internal inconsistency) have been placed in functions
+        which are virtual.
+
+#18.  (Version 1.33/ 22-Nov-96)  John Bair (jbair@iftime.com)
+
+        Under some combination of options a required "return _retv" is
+        not generated.
+
+        Suggested fix now in 1.33MR1.
+
+#17.  (Version 1.33/3-Sep-96) Ron House  (house@helios.usq.edu.au)
+
+        The routine ASTBase::predorder_action omits two "tree->"
+        prefixes, which results in the preorder_action belonging
+        to the wrong node to be invoked.
+
+        Suggested fix now in 1.33MR1.
+
+#16.  (Version 1.33/7-Jun-96)       Eli Sternheim <eli@interhdl.com>
+
+        Routine consumeUntilToken() does not check for end-of-file
+        condition.
+
+        Suggested fix now in 1.33MR1.
+
+#15.  (Version 1.33/8 Apr 96)   Asgeir Olafsson <olafsson@cstar.ac.com>
+
+        Problem with tree duplication of doubly linked ASTs in ASTBase.cpp.
+
+        Suggested fix now in 1.33MR1.
+
+#14.  (Version 1.33/28-Feb-96)   Andreas.Magnusson@mailbox.swipnet.se
+
+        Problem with definition of operator = (const ANTLRTokenPtr rhs).
+
+        Suggested fix now in 1.33MR1.
+
+#13.  (Version 1.33/13-Feb-96) Franklin Chen (chen@adi.com)
+
+        Sun C++ Compiler 3.0.1 can't compile testcpp/1 due to goto in
+        block with destructors.
+
+        Apparently fixed. Can't locate "goto".
+
+#12.  (Version 1.33/10-Nov-95)  Minor problems with 1.33 code
+
+        The following items have been fixed in 1.33MR1:
+
+          1.  pccts/antlr/main.c line 142
+
+                "void" appears in classic C code
+
+          2.  no makefile in support/genmk
+
+          3.  EXIT_FAILURE/_SUCCESS instead of PCCTS_EXIT_FAILURE/_SUCCESS
+
+                pccts/h/PCCTSAST.cpp
+                pccts/h/DLexerBase.cpp
+                pccts/testcpp/6/test.g
+
+          4.  use of "signed int" isn't accepted by AT&T cfront
+
+                pccts/h/PCCTSAST.h line 42
+
+          5.  in call to ANTLRParser::FAIL the var arg err_k is passed as
+              "int" but is declared "unsigned int".
+
+          6.  I believe that a failed validation predicate still does not
+              get put in a "{...}" envelope, despite the release notes.
+
+          7. The #token ">>" appearing in the DLG grammar description
+             causes DLG to generate the string literal "\>\>" which
+             is non-conforming and will cause some compilers to
+             complain (scan.c function act10 line 143 of source code).
+
+#11.  (Version 1.32b6)  Dave Kuhlman     (dkuhlman@netcom.com)
+
+        Problem with file close in gen.c.  Already fixed in 1.33.
+
+#10.  (Version 1.32b6/29-Aug-95)
+
+        pccts/antlr/main.c contains a C++ style comments on lines 149
+        and 176 which causes problems for most C compilers.
+
+         Already fixed in 1.33.
+
+#9.   (Version 1.32b4/14-Mar-95) dlgauto.h #include "config.h"
+
+        The file pccts/h/dlgauto.h should probably contain a #include
+        "config.h" as it uses the #define symbol __USE_PROTOS.
+
+        Added to 1.33MR1.
+
+#8.   (Version 1.32b4/6-Mar-95)  Michael T. Richter (mtr@igs.net)
+
+        In C++ output mode anonymous tokens from in-line regular expressions
+        can create enum values which are too wide for the datatype of the enum
+        assigned by the C++ compiler.
+
+        Fixed in 1.33MR1.
+
+#7.   (Version 1.32b4/6-Mar-95)  C++ does not imply __STDC__
+
+        In err.h the combination of # directives assumes that a C++
+        compiler has __STDC__ defined.  This is not necessarily true.
+
+        This problem also appears in the use of __USE_PROTOS which
+        is appropriate for both Standard C and C++ in antlr/gen.c
+        and antlr/lex.c
+
+        Fixed in 1.33MR1.
+
+#6.   (Version 1.32 ?/15-Feb-95) Name conflict for "TokenType"
+
+        Already fixed in 1.33.
+
+#5.   (23-Jan-95)        Douglas_Cuthbertson.JTIDS@jtids_qmail.hanscom.af.mil
+
+        The fail action following a semantic predicate is not enclosed in
+        "{...}". This can lead to problems when the fail action contains
+        more than one statement.
+
+        Fixed in 1.33MR1.
+
+#4 .  (Version 1.33/31-Mar-96)   jlilley@empathy.com (John Lilley)
+
+        Put briefly, a semantic predicate ought to abort a guess if it fails.
+
+        Correction suggested by J. Lilley has been added to 1.33MR1.
+
+#3 .  (Version 1.33)             P.A.Keller@bath.ac.uk
+
+        Extra commas are placed in the K&R style argument list for rules
+        when using both exceptions and ASTs.
+
+        Fixed in 1.33MR1.
+
+#2.   (Version 1.32b6/2-Oct-95)  Brad Schick <schick@interaccess.com>
+
+        Construct #[] generates zzastnew() in C++ mode.
+
+        Already fixed in 1.33.
+
+#1.   (Version 1.33)     Bob Bailey (robert@oakhill.sps.mot.com)
+
+        Previously, config.h assumed that all PC systems required
+        "short" file names.  The user can now override that
+        assumption with "#define LONGFILENAMES".
+
+        Added to 1.33MR1.
diff --git a/Tools/Source/TianoTools/Pccts/CHANGES_SUMMARY.txt b/Tools/Source/TianoTools/Pccts/CHANGES_SUMMARY.txt
new file mode 100644
index 0000000000..91defae169
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/CHANGES_SUMMARY.txt
@@ -0,0 +1,2049 @@
+======================================================================
+
+                       CHANGES_SUMMARY.TXT
+
+        A QUICK overview of changes from 1.33 in reverse order
+
+  A summary of additions rather than bug fixes and minor code changes.
+
+          Numbers refer to items in CHANGES_FROM_133*.TXT
+             which may contain additional information.
+
+                          DISCLAIMER
+
+ The software and these notes are provided "as is".  They may include
+ typographical or technical errors and their authors disclaims all
+ liability of any kind or nature for damages due to error, fault,
+ defect, or deficiency regardless of cause.  All warranties of any
+ kind, either express or implied, including, but not limited to, the
+ implied  warranties of merchantability and fitness for a particular
+ purpose are disclaimed.
+
+======================================================================
+
+#258. You can specify a user-defined base class for your parser
+
+    The base class must constructor must have a signature similar to
+    that of ANTLRParser.
+
+#253. Generation of block preamble (-preamble and -preamble_first)
+
+    The antlr option -preamble causes antlr to insert the code
+    BLOCK_PREAMBLE at the start of each rule and block.
+
+    The antlr option -preamble_first is similar, but inserts the
+    code BLOCK_PREAMBLE_FIRST(PreambleFirst_123) where the symbol
+    PreambleFirst_123 is equivalent to the first set defined by
+    the #FirstSetSymbol described in Item #248.
+
+#248. Generate symbol for first set of an alternative
+
+        rr : #FirstSetSymbol(rr_FirstSet)  ( Foo | Bar ) ;
+
+#216. Defer token fetch for C++ mode
+
+    When the ANTLRParser class is built with the pre-processor option 
+    ZZDEFER_FETCH defined, the fetch of new tokens by consume() is deferred
+    until LA(i) or LT(i) is called. 
+
+#215. Use reset() to reset DLGLexerBase
+#188. Added pccts/h/DLG_stream_input.h
+#180. Added ANTLRParser::getEofToken()
+#173. -glms for Microsoft style filenames with -gl
+#170. Suppression for predicates with lookahead depth >1
+
+      Consider the following grammar with -ck 2 and the predicate in rule
+      "a" with depth 2:
+
+            r1  : (ab)* "@"
+                ;
+
+            ab  : a
+                | b
+                ;
+
+            a   : (A B)? => <<p(LATEXT(2))>>? A B C
+                ;
+
+            b   : A B C
+                ;
+
+      Normally, the predicate would be hoisted into rule r1 in order to
+      determine whether to call rule "ab".  However it should *not* be
+      hoisted because, even if p is false, there is a valid alternative
+      in rule b.  With "-mrhoistk on" the predicate will be suppressed.
+
+      If "-info p" command line option is present the following information
+      will appear in the generated code:
+
+                while ( (LA(1)==A)
+        #if 0
+
+        Part (or all) of predicate with depth > 1 suppressed by alternative
+            without predicate
+
+        pred  <<  p(LATEXT(2))>>?
+                  depth=k=2  ("=>" guard)  rule a  line 8  t1.g
+          tree context:
+            (root = A
+               B
+            )
+
+        The token sequence which is suppressed: ( A B )
+        The sequence of references which generate that sequence of tokens:
+
+           1 to ab          r1/1       line 1     t1.g
+           2 ab             ab/1       line 4     t1.g
+           3 to b           ab/2       line 5     t1.g
+           4 b              b/1        line 11    t1.g
+           5 #token A       b/1        line 11    t1.g
+           6 #token B       b/1        line 11    t1.g
+
+        #endif
+
+      A slightly more complicated example:
+
+            r1  : (ab)* "@"
+                ;
+
+            ab  : a
+                | b
+                ;
+
+            a   : (A B)? => <<p(LATEXT(2))>>? (A  B | D E)
+                ;
+
+            b   : <<q(LATEXT(2))>>? D E
+                ;
+
+
+      In this case, the sequence (D E) in rule "a" which lies behind
+      the guard is used to suppress the predicate with context (D E)
+      in rule b.
+
+                while ( (LA(1)==A || LA(1)==D)
+            #if 0
+
+            Part (or all) of predicate with depth > 1 suppressed by alternative
+                without predicate
+
+            pred  <<  q(LATEXT(2))>>?
+                              depth=k=2  rule b  line 11  t2.g
+              tree context:
+                (root = D
+                   E
+                )
+
+            The token sequence which is suppressed: ( D E )
+            The sequence of references which generate that sequence of tokens:
+
+               1 to ab          r1/1       line 1     t2.g
+               2 ab             ab/1       line 4     t2.g
+               3 to a           ab/1       line 4     t2.g
+               4 a              a/1        line 8     t2.g
+               5 #token D       a/1        line 8     t2.g
+               6 #token E       a/1        line 8     t2.g
+
+            #endif
+            &&
+            #if 0
+
+            pred  <<  p(LATEXT(2))>>?
+                              depth=k=2  ("=>" guard)  rule a  line 8  t2.g
+              tree context:
+                (root = A
+                   B
+                )
+
+            #endif
+
+            (! ( LA(1)==A && LA(2)==B ) || p(LATEXT(2)) )  {
+                ab();
+                ...
+
+#165. (Changed in MR13) option -newAST
+
+      To create ASTs from an ANTLRTokenPtr antlr usually calls
+      "new AST(ANTLRTokenPtr)".  This option generates a call
+      to "newAST(ANTLRTokenPtr)" instead.  This allows a user
+      to define a parser member function to create an AST object.
+
+#161. (Changed in MR13) Switch -gxt inhibits generation of tokens.h
+
+#158. (Changed in MR13) #header causes problem for pre-processors
+
+      A user who runs the C pre-processor on antlr source suggested
+      that another syntax be allowed.  With MR13 such directives
+      such as #header, #pragma, etc. may be written as "\#header",
+      "\#pragma", etc.  For escaping pre-processor directives inside
+      a #header use something like the following:
+
+            \#header
+            <<
+                \#include <stdio.h>
+            >>
+
+#155. (Changed in MR13) Context behind predicates can suppress
+
+      With -mrhoist enabled the context behind a guarded predicate can
+      be used to suppress other predicates.  Consider the following grammar:
+
+        r0 : (r1)+;
+
+        r1  : rp
+            | rq
+            ;
+        rp  : <<p LATEXT(1)>>? B ;
+        rq : (A)? => <<q LATEXT(1)>>? (A|B);
+
+      In earlier versions both predicates "p" and "q" would be hoisted into
+      rule r0. With MR12c predicate p is suppressed because the context which
+      follows predicate q includes "B" which can "cover" predicate "p".  In
+      other words, in trying to decide in r0 whether to call r1, it doesn't
+      really matter whether p is false or true because, either way, there is
+      a valid choice within r1.
+
+#154. (Changed in MR13) Making hoist suppression explicit using <<nohoist>>
+
+      A common error, even among experienced pccts users, is to code
+      an init-action to inhibit hoisting rather than a leading action.
+      An init-action does not inhibit hoisting.
+
+      This was coded:
+
+        rule1 : <<;>> rule2
+
+      This is what was meant:
+
+        rule1 : <<;>> <<;>> rule2
+
+      With MR13, the user can code:
+
+        rule1 : <<;>> <<nohoist>> rule2
+
+      The following will give an error message:
+
+        rule1 : <<nohoist>> rule2
+
+      If the <<nohoist>> appears as an init-action rather than a leading
+      action an error message is issued.  The meaning of an init-action
+      containing "nohoist" is unclear: does it apply to just one
+      alternative or to all alternatives ?
+
+#151a. Addition of ANTLRParser::getLexer(), ANTLRTokenStream::getLexer()
+
+      You must manually cast the ANTLRTokenStream to your program's
+      lexer class. Because the name of the lexer's class is not fixed.
+      Thus it is impossible to incorporate it into the DLGLexerBase
+      class.
+
+#151b.(Changed in MR12) ParserBlackBox member getLexer()
+
+#150. (Changed in MR12) syntaxErrCount and lexErrCount now public
+
+#149. (Changed in MR12) antlr option -info o (letter o for orphan)
+
+      If there is more than one rule which is not referenced by any
+      other rule then all such rules are listed.  This is useful for
+      alerting one to rules which are not used, but which can still
+      contribute to ambiguity.
+
+#148. (Changed in MR11) #token names appearing in zztokens,token_tbl
+
+      One can write:
+
+            #token Plus ("+")             "\+"
+            #token RP   ("(")             "\("
+            #token COM  ("comment begin") "/\*"
+
+      The string in parenthesis will be used in syntax error messages.
+
+#146. (Changed in MR11) Option -treport for locating "difficult" alts
+
+      It can be difficult to determine which alternatives are causing
+      pccts to work hard to resolve an ambiguity.  In some cases the
+      ambiguity is successfully resolved after much CPU time so there
+      is no message at all.
+
+      A rough measure of the amount of work being peformed which is
+      independent of the CPU speed and system load is the number of
+      tnodes created.  Using "-info t" gives information about the
+      total number of tnodes created and the peak number of tnodes.
+
+        Tree Nodes:  peak 1300k  created 1416k  lost 0
+
+      It also puts in the generated C or C++ file the number of tnodes
+      created for a rule (at the end of the rule).  However this
+      information is not sufficient to locate the alternatives within
+      a rule which are causing the creation of tnodes.
+
+      Using:
+
+             antlr -treport 100000 ....
+
+      causes antlr to list on stdout any alternatives which require the
+      creation of more than 100,000 tnodes, along with the lookahead sets
+      for those alternatives.
+
+      The following is a trivial case from the ansi.g grammar which shows
+      the format of the report.  This report might be of more interest
+      in cases where 1,000,000 tuples were created to resolve the ambiguity.
+
+      -------------------------------------------------------------------------
+        There were 0 tuples whose ambiguity could not be resolved
+             by full lookahead
+        There were 157 tnodes created to resolve ambiguity between:
+
+          Choice 1: statement/2  line 475  file ansi.g
+          Choice 2: statement/3  line 476  file ansi.g
+
+            Intersection of lookahead[1] sets:
+
+               IDENTIFIER
+
+            Intersection of lookahead[2] sets:
+
+               LPARENTHESIS     COLON            AMPERSAND        MINUS
+               STAR             PLUSPLUS         MINUSMINUS       ONESCOMPLEMENT
+               NOT              SIZEOF           OCTALINT         DECIMALINT
+               HEXADECIMALINT   FLOATONE         FLOATTWO         IDENTIFIER
+               STRING           CHARACTER
+      -------------------------------------------------------------------------
+
+#143. (Changed in MR11) Optional ";" at end of #token statement
+
+      Fixes problem of:
+
+            #token X "x"
+
+            <<
+                parser action
+            >>
+
+      Being confused with:
+
+            #token X "x" <<lexical action>>
+
+#142. (Changed in MR11) class BufFileInput subclass of DLGInputStream
+
+      Alexey Demakov (demakov@kazbek.ispras.ru) has supplied class
+      BufFileInput derived from DLGInputStream which provides a
+      function lookahead(char *string) to test characters in the
+      input stream more than one character ahead.
+      The class is located in pccts/h/BufFileInput.* of the kit.
+
+#140. #pred to define predicates
+
+      +---------------------------------------------------+
+      | Note: Assume "-prc on" for this entire discussion |
+      +---------------------------------------------------+
+
+      A problem with predicates is that each one is regarded as
+      unique and capable of disambiguating cases where two
+      alternatives have identical lookahead.  For example:
+
+        rule : <<pred(LATEXT(1))>>? A
+             | <<pred(LATEXT(1))>>? A
+             ;
+
+      will not cause any error messages or warnings to be issued
+      by earlier versions of pccts.  To compare the text of the
+      predicates is an incomplete solution.
+
+      In 1.33MR11 I am introducing the #pred statement in order to
+      solve some problems with predicates.  The #pred statement allows
+      one to give a symbolic name to a "predicate literal" or a
+      "predicate expression" in order to refer to it in other predicate
+      expressions or in the rules of the grammar.
+
+      The predicate literal associated with a predicate symbol is C
+      or C++ code which can be used to test the condition.  A
+      predicate expression defines a predicate symbol in terms of other
+      predicate symbols using "!", "&&", and "||".  A predicate symbol
+      can be defined in terms of a predicate literal, a predicate
+      expression, or *both*.
+
+      When a predicate symbol is defined with both a predicate literal
+      and a predicate expression, the predicate literal is used to generate
+      code, but the predicate expression is used to check for two
+      alternatives with identical predicates in both alternatives.
+
+      Here are some examples of #pred statements:
+
+        #pred  IsLabel       <<isLabel(LATEXT(1))>>?
+        #pred  IsLocalVar    <<isLocalVar(LATEXT(1))>>?
+        #pred  IsGlobalVar   <<isGlobalVar(LATEXT(1)>>?
+        #pred  IsVar         <<isVar(LATEXT(1))>>?       IsLocalVar || IsGlobalVar
+        #pred  IsScoped      <<isScoped(LATEXT(1))>>?    IsLabel || IsLocalVar
+
+      I hope that the use of EBNF notation to describe the syntax of the
+      #pred statement will not cause problems for my readers (joke).
+
+        predStatement : "#pred"
+                            CapitalizedName
+                              (
+                                  "<<predicate_literal>>?"
+                                | "<<predicate_literal>>?"  predOrExpr
+                                | predOrExpr
+                              )
+                      ;
+
+        predOrExpr    : predAndExpr ( "||" predAndExpr ) * ;
+
+        predAndExpr   : predPrimary ( "&&" predPrimary ) * ;
+
+        predPrimary   : CapitalizedName
+                      | "!" predPrimary
+                      | "(" predOrExpr ")"
+                      ;
+
+      What is the purpose of this nonsense ?
+
+      To understand how predicate symbols help, you need to realize that
+      predicate symbols are used in two different ways with two different
+      goals.
+
+        a. Allow simplification of predicates which have been combined
+           during predicate hoisting.
+
+        b. Allow recognition of identical predicates which can't disambiguate
+           alternatives with common lookahead.
+
+      First we will discuss goal (a).  Consider the following rule:
+
+            rule0: rule1
+                 | ID
+                 | ...
+                 ;
+
+            rule1: rule2
+                 | rule3
+                 ;
+
+            rule2: <<isX(LATEXT(1))>>? ID ;
+            rule3: <<!isX(LATEXT(1)>>? ID ;
+
+      When the predicates in rule2 and rule3 are combined by hoisting
+      to create a prediction expression for rule1 the result is:
+
+            if ( LA(1)==ID
+                && ( isX(LATEXT(1) || !isX(LATEXT(1) ) ) { rule1(); ...
+
+      This is inefficient, but more importantly, can lead to false
+      assumptions that the predicate expression distinguishes the rule1
+      alternative with some other alternative with lookahead ID.  In
+      MR11 one can write:
+
+            #pred IsX     <<isX(LATEXT(1))>>?
+
+            ...
+
+            rule2: <<IsX>>? ID  ;
+            rule3: <<!IsX>>? ID ;
+
+      During hoisting MR11 recognizes this as a special case and
+      eliminates the predicates.  The result is a prediction
+      expression like the following:
+
+            if ( LA(1)==ID ) { rule1(); ...
+
+      Please note that the following cases which appear to be equivalent
+      *cannot* be simplified by MR11 during hoisting because the hoisting
+      logic only checks for a "!" in the predicate action, not in the
+      predicate expression for a predicate symbol.
+
+        *Not* equivalent and is not simplified during hoisting:
+
+            #pred IsX      <<isX(LATEXT(1))>>?
+            #pred NotX     <<!isX(LATEXT(1))>>?
+            ...
+            rule2: <<IsX>>? ID  ;
+            rule3: <<NotX>>? ID ;
+
+        *Not* equivalent and is not simplified during hoisting:
+
+            #pred IsX      <<isX(LATEXT(1))>>?
+            #pred NotX     !IsX
+            ...
+            rule2: <<IsX>>? ID  ;
+            rule3: <<NotX>>? ID ;
+
+      Now we will discuss goal (b).
+
+      When antlr discovers that there is a lookahead ambiguity between
+      two alternatives it attempts to resolve the ambiguity by searching
+      for predicates in both alternatives.  In the past any predicate
+      would do, even if the same one appeared in both alternatives:
+
+            rule: <<p(LATEXT(1))>>? X
+                | <<p(LATEXT(1))>>? X
+                ;
+
+      The #pred statement is a start towards solving this problem.
+      During ambiguity resolution (*not* predicate hoisting) the
+      predicates for the two alternatives are expanded and compared.
+      Consider the following example:
+
+            #pred Upper     <<isUpper(LATEXT(1))>>?
+            #pred Lower     <<isLower(LATEXT(1))>>?
+            #pred Alpha     <<isAlpha(LATEXT(1))>>?  Upper || Lower
+
+            rule0: rule1
+                 | <<Alpha>>? ID
+                 ;
+
+            rule1:
+                 | rule2
+                 | rule3
+                 ...
+                 ;
+
+            rule2: <<Upper>>? ID;
+            rule3: <<Lower>>? ID;
+
+      The definition of #pred Alpha expresses:
+
+            a. to test the predicate use the C code "isAlpha(LATEXT(1))"
+
+            b. to analyze the predicate use the information that
+               Alpha is equivalent to the union of Upper and Lower,
+
+      During ambiguity resolution the definition of Alpha is expanded
+      into "Upper || Lower" and compared with the predicate in the other
+      alternative, which is also "Upper || Lower".  Because they are
+      identical MR11 will report a problem.
+
+    -------------------------------------------------------------------------
+      t10.g, line 5: warning: the predicates used to disambiguate rule rule0
+             (file t10.g alt 1 line 5 and alt 2 line 6)
+             are identical when compared without context and may have no
+             resolving power for some lookahead sequences.
+    -------------------------------------------------------------------------
+
+      If you use the "-info p" option the output file will contain:
+
+    +----------------------------------------------------------------------+
+    |#if 0                                                                 |
+    |                                                                      |
+    |The following predicates are identical when compared without          |
+    |  lookahead context information.  For some ambiguous lookahead        |
+    |  sequences they may not have any power to resolve the ambiguity.     |
+    |                                                                      |
+    |Choice 1: rule0/1  alt 1  line 5  file t10.g                          |
+    |                                                                      |
+    |  The original predicate for choice 1 with available context          |
+    |    information:                                                      |
+    |                                                                      |
+    |    OR expr                                                           |
+    |                                                                      |
+    |      pred  <<  Upper>>?                                              |
+    |                        depth=k=1  rule rule2  line 14  t10.g         |
+    |        set context:                                                  |
+    |           ID                                                         |
+    |                                                                      |
+    |      pred  <<  Lower>>?                                              |
+    |                        depth=k=1  rule rule3  line 15  t10.g         |
+    |        set context:                                                  |
+    |           ID                                                         |
+    |                                                                      |
+    |  The predicate for choice 1 after expansion (but without context     |
+    |    information):                                                     |
+    |                                                                      |
+    |    OR expr                                                           |
+    |                                                                      |
+    |      pred  <<  isUpper(LATEXT(1))>>?                                 |
+    |                        depth=k=1  rule   line 1  t10.g               |
+    |                                                                      |
+    |      pred  <<  isLower(LATEXT(1))>>?                                 |
+    |                        depth=k=1  rule   line 2  t10.g               |
+    |                                                                      |
+    |                                                                      |
+    |Choice 2: rule0/2  alt 2  line 6  file t10.g                          |
+    |                                                                      |
+    |  The original predicate for choice 2 with available context          |
+    |    information:                                                      |
+    |                                                                      |
+    |  pred  <<  Alpha>>?                                                  |
+    |                    depth=k=1  rule rule0  line 6  t10.g              |
+    |    set context:                                                      |
+    |       ID                                                             |
+    |                                                                      |
+    |  The predicate for choice 2 after expansion (but without context     |
+    |    information):                                                     |
+    |                                                                      |
+    |  OR expr                                                             |
+    |                                                                      |
+    |    pred  <<  isUpper(LATEXT(1))>>?                                   |
+    |                      depth=k=1  rule   line 1  t10.g                 |
+    |                                                                      |
+    |    pred  <<  isLower(LATEXT(1))>>?                                   |
+    |                      depth=k=1  rule   line 2  t10.g                 |
+    |                                                                      |
+    |                                                                      |
+    |#endif                                                                |
+    +----------------------------------------------------------------------+
+
+      The comparison of the predicates for the two alternatives takes
+      place without context information, which means that in some cases
+      the predicates will be considered identical even though they operate
+      on disjoint lookahead sets.  Consider:
+
+            #pred Alpha
+
+            rule1: <<Alpha>>? ID
+                 | <<Alpha>>? Label
+                 ;
+
+      Because the comparison of predicates takes place without context
+      these will be considered identical.  The reason for comparing
+      without context is that otherwise it would be necessary to re-evaluate
+      the entire predicate expression for each possible lookahead sequence.
+      This would require more code to be written and more CPU time during
+      grammar analysis, and it is not yet clear whether anyone will even make
+      use of the new #pred facility.
+
+      A temporary workaround might be to use different #pred statements
+      for predicates you know have different context.  This would avoid
+      extraneous warnings.
+
+      The above example might be termed a "false positive".  Comparison
+      without context will also lead to "false negatives".  Consider the
+      following example:
+
+            #pred Alpha
+            #pred Beta
+
+            rule1: <<Alpha>>? A
+                 | rule2
+                 ;
+
+            rule2: <<Alpha>>? A
+                 | <<Beta>>?  B
+                 ;
+
+      The predicate used for alt 2 of rule1 is (Alpha || Beta).  This
+      appears to be different than the predicate Alpha used for alt1.
+      However, the context of Beta is B.  Thus when the lookahead is A
+      Beta will have no resolving power and Alpha will be used for both
+      alternatives.  Using the same predicate for both alternatives isn't
+      very helpful, but this will not be detected with 1.33MR11.
+
+      To properly handle this the predicate expression would have to be
+      evaluated for each distinct lookahead context.
+
+      To determine whether two predicate expressions are identical is
+      difficult.  The routine may fail to identify identical predicates.
+
+      The #pred feature also compares predicates to see if a choice between
+      alternatives which is resolved by a predicate which makes the second
+      choice unreachable.  Consider the following example:
+
+            #pred A         <<A(LATEXT(1)>>?
+            #pred B         <<B(LATEXT(1)>>?
+            #pred A_or_B    A || B
+
+            r   : s
+                | t
+                ;
+            s   : <<A_or_B>>? ID
+                ;
+            t   : <<A>>? ID
+                ;
+
+        ----------------------------------------------------------------------------
+        t11.g, line 5: warning: the predicate used to disambiguate the
+               first choice of  rule r
+             (file t11.g alt 1 line 5 and alt 2 line 6)
+             appears to "cover" the second predicate when compared without context.
+             The second predicate may have no resolving power for some lookahead
+               sequences.
+        ----------------------------------------------------------------------------
+
+#132. (Changed in 1.33MR11) Recognition of identical predicates in alts
+
+      Prior to 1.33MR11, there would be no ambiguity warning when the
+      very same predicate was used to disambiguate both alternatives:
+
+        test: ref B
+            | ref C
+            ;
+
+        ref : <<pred(LATEXT(1)>>? A
+
+      In 1.33MR11 this will cause the warning:
+
+        warning: the predicates used to disambiguate rule test
+            (file v98.g alt 1 line 1 and alt 2 line 2)
+             are identical and have no resolving power
+
+        -----------------  Note  -----------------
+
+          This is different than the following case
+
+                test: <<pred(LATEXT(1))>>? A B
+                    | <<pred(LATEXT(1)>>?  A C
+                    ;
+
+          In this case there are two distinct predicates
+          which have exactly the same text.  In the first
+          example there are two references to the same
+          predicate.  The problem represented by this
+          grammar will be addressed later.
+
+
+#127. (Changed in 1.33MR11)
+
+                    Count Syntax Errors     Count DLG Errors
+                    -------------------     ----------------
+
+       C++ mode     ANTLRParser::           DLGLexerBase::
+                      syntaxErrCount          lexErrCount
+       C mode       zzSyntaxErrCount        zzLexErrCount
+
+       The C mode variables are global and initialized to 0.
+       They are *not* reset to 0 automatically when antlr is
+       restarted.
+
+       The C++ mode variables are public.  They are initialized
+       to 0 by the constructors.  They are *not* reset to 0 by the
+       ANTLRParser::init() method.
+
+       Suggested by Reinier van den Born (reinier@vnet.ibm.com).
+
+#126. (Changed in 1.33MR11) Addition of #first <<...>>
+
+       The #first <<...>> inserts the specified text in the output
+       files before any other #include statements required by pccts.
+       The only things before the #first text are comments and
+       a #define ANTLR_VERSION.
+
+       Requested by  and Esa Pulkkinen (esap@cs.tut.fi) and Alexin
+       Zoltan (alexin@inf.u-szeged.hu).
+
+#124. A Note on the New "&&" Style Guarded Predicates
+
+        I've been asked several times, "What is the difference between
+        the old "=>" style guard predicates and the new style "&&" guard
+        predicates, and how do you choose one over the other" ?
+
+        The main difference is that the "=>" does not apply the
+        predicate if the context guard doesn't match, whereas
+        the && form always does.  What is the significance ?
+
+        If you have a predicate which is not on the "leading edge"
+        it is cannot be hoisted.  Suppose you need a predicate that
+        looks at LA(2).  You must introduce it manually.  The
+        classic example is:
+
+            castExpr :
+                     LP typeName RP
+                     | ....
+                     ;
+
+            typeName : <<isTypeName(LATEXT(1))>>?  ID
+                     | STRUCT ID
+                     ;
+
+        The problem  is that isTypeName() isn't on the leading edge
+        of typeName, so it won't be hoisted into castExpr to help
+        make a decision on which production to choose.
+
+        The *first* attempt to fix it is this:
+
+            castExpr :
+                     <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+        Unfortunately, this won't work because it ignores
+        the problem of STRUCT.  The solution is to apply
+        isTypeName() in castExpr if LA(2) is an ID and
+        don't apply it when LA(2) is STRUCT:
+
+            castExpr :
+                     (LP ID)? => <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+        In conclusion, the "=>" style guarded predicate is
+        useful when:
+
+            a. the tokens required for the predicate
+               are not on the leading edge
+            b. there are alternatives in the expression
+               selected by the predicate for which the
+               predicate is inappropriate
+
+        If (b) were false, then one could use a simple
+        predicate (assuming "-prc on"):
+
+            castExpr :
+                     <<isTypeName(LATEXT(2))>>?
+                                        LP typeName RP
+                     | ....
+                     ;
+
+            typeName : <<isTypeName(LATEXT(1))>>?  ID
+                     ;
+
+        So, when do you use the "&&" style guarded predicate ?
+
+        The new-style "&&" predicate should always be used with
+        predicate context.  The context guard is in ADDITION to
+        the automatically computed context.  Thus it useful for
+        predicates which depend on the token type for reasons
+        other than context.
+
+        The following example is contributed by Reinier van den Born
+        (reinier@vnet.ibm.com).
+
+ +-------------------------------------------------------------------------+
+ | This grammar has two ways to call functions:                            |
+ |                                                                         |
+ |  - a "standard" call syntax with parens and comma separated args        |
+ |  - a shell command like syntax (no parens and spacing separated args)   |
+ |                                                                         |
+ | The former also allows a variable to hold the name of the function,     |
+ | the latter can also be used to call external commands.                  |
+ |                                                                         |
+ | The grammar (simplified) looks like this:                               |
+ |                                                                         |
+ |   fun_call   :     ID "(" { expr ("," expr)* } ")"                      |
+ |                                  /* ID is function name */              |
+ |              | "@" ID "(" { expr ("," expr)* } ")"                      |
+ |                                  /* ID is var containing fun name */    |
+ |              ;                                                          |
+ |                                                                         |
+ |   command    : ID expr*          /* ID is function name */              |
+ |              | path expr*        /* path is external command name */    |
+ |              ;                                                          |
+ |                                                                         |
+ |   path       : ID                /* left out slashes and such */        |
+ |              | "@" ID            /* ID is environment var */            |
+ |              ;                                                          |
+ |                                                                         |
+ |   expr       : ....                                                     |
+ |              | "(" expr ")";                                            |
+ |                                                                         |
+ |   call       : fun_call                                                 |
+ |              | command                                                  |
+ |              ;                                                          |
+ |                                                                         |
+ | Obviously the call is wildly ambiguous. This is more or less how this   |
+ | is to be resolved:                                                      |
+ |                                                                         |
+ |    A call begins with an ID or an @ followed by an ID.                  |
+ |                                                                         |
+ |    If it is an ID and if it is an ext. command name  -> command         |
+ |                       if followed by a paren         -> fun_call        |
+ |                       otherwise                      -> command         |
+ |                                                                         |
+ |    If it is an @  and if the ID is a var name        -> fun_call        |
+ |                       otherwise                      -> command         |
+ |                                                                         |
+ | One can implement these rules quite neatly using && predicates:         |
+ |                                                                         |
+ |   call       : ("@" ID)? && <<isVarName(LT(2))>>? fun_call              |
+ |              | (ID)?     && <<isExtCmdName>>?     command               |
+ |              | (ID "(")?                          fun_call              |
+ |              |                                    command               |
+ |              ;                                                          |
+ |                                                                         |
+ | This can be done better, so it is not an ideal example, but it          |
+ | conveys the principle.                                                  |
+ +-------------------------------------------------------------------------+
+
+#122. (Changed in 1.33MR11)  Member functions to reset DLG in C++ mode
+
+         void DLGFileReset(FILE *f) { input = f; found_eof = 0; }
+         void DLGStringReset(DLGChar *s) { input = s; p = &input[0]; }
+
+        Supplied by R.A. Nelson (cowboy@VNET.IBM.COM)
+
+#119. (Changed in 1.33MR11) Ambiguity aid for grammars
+
+      The user can ask for additional information on ambiguities reported
+      by antlr to stdout.  At the moment, only one ambiguity report can
+      be created in an antlr run.
+
+      This feature is enabled using the "-aa" (Ambiguity Aid)  option.
+
+      The following options control the reporting of ambiguities:
+
+          -aa ruleName       Selects reporting by name of rule
+          -aa lineNumber     Selects reporting by line number
+                               (file name not compared)
+
+          -aam               Selects "multiple" reporting for a token
+                             in the intersection set of the
+                             alternatives.
+
+                             For instance, the token ID may appear dozens
+                             of times in various paths as the program
+                             explores the rules which are reachable from
+                             the point of an ambiguity. With option -aam
+                             every possible path the search program
+                             encounters is reported.
+
+                             Without -aam only the first encounter is
+                             reported.  This may result in incomplete
+                             information, but the information may be
+                             sufficient and much shorter.
+
+          -aad depth         Selects the depth of the search.
+                             The default value is 1.
+
+                             The number of paths to be searched, and the
+                             size of the report can grow geometrically
+                             with the -ck value if a full search for all
+                             contributions to the source of the ambiguity
+                             is explored.
+
+                             The depth represents the number of tokens
+                             in the lookahead set which are matched against
+                             the set of ambiguous tokens.  A depth of 1
+                             means that the search stops when a lookahead
+                             sequence of just one token is matched.
+
+                             A k=1 ck=6 grammar might generate 5,000 items
+                             in a report if a full depth 6 search is made
+                             with the Ambiguity Aid.  The source of the
+                             problem may be in the first token and obscured
+                             by the volume of data - I hesitate to call
+                             it information.
+
+                             When the user selects a depth > 1, the search
+                             is first performed at depth=1 for both
+                             alternatives, then depth=2 for both alternatives,
+                             etc.
+
+      Sample output for rule grammar in antlr.g itself:
+
+  +---------------------------------------------------------------------+
+  | Ambiguity Aid                                                       |
+  |                                                                     |
+  |   Choice 1: grammar/70                 line 632  file a.g           |
+  |   Choice 2: grammar/82                 line 644  file a.g           |
+  |                                                                     |
+  |   Intersection of lookahead[1] sets:                                |
+  |                                                                     |
+  |      "\}"             "class"          "#errclass"      "#tokclass" |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:1  ("#errclass")                        |
+  |  1 in (...)* block                grammar/70       line 632   a.g   |
+  |  2 to error                       grammar/73       line 635   a.g   |
+  |  3 error                          error/1          line 894   a.g   |
+  |  4 #token "#errclass"             error/2          line 895   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:2  ("#tokclass")                        |
+  |  2 to tclass                      grammar/74       line 636   a.g   |
+  |  3 tclass                         tclass/1         line 937   a.g   |
+  |  4 #token "#tokclass"             tclass/2         line 938   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:3  ("class")                            |
+  |  2 to class_def                   grammar/75       line 637   a.g   |
+  |  3 class_def                      class_def/1      line 669   a.g   |
+  |  4 #token "class"                 class_def/3      line 671   a.g   |
+  |                                                                     |
+  |    Choice:1  Depth:1  Group:4  ("\}")                               |
+  |  2 #token "\}"                    grammar/76       line 638   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:5  ("#errclass")                        |
+  |  1 in (...)* block                grammar/83       line 645   a.g   |
+  |  2 to error                       grammar/93       line 655   a.g   |
+  |  3 error                          error/1          line 894   a.g   |
+  |  4 #token "#errclass"             error/2          line 895   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:6  ("#tokclass")                        |
+  |  2 to tclass                      grammar/94       line 656   a.g   |
+  |  3 tclass                         tclass/1         line 937   a.g   |
+  |  4 #token "#tokclass"             tclass/2         line 938   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:7  ("class")                            |
+  |  2 to class_def                   grammar/95       line 657   a.g   |
+  |  3 class_def                      class_def/1      line 669   a.g   |
+  |  4 #token "class"                 class_def/3      line 671   a.g   |
+  |                                                                     |
+  |    Choice:2  Depth:1  Group:8  ("\}")                               |
+  |  2 #token "\}"                    grammar/96       line 658   a.g   |
+  +---------------------------------------------------------------------+
+
+      For a linear lookahead set ambiguity (where k=1 or for k>1 but
+      when all lookahead sets [i] with i<k all have degree one) the
+      reports appear in the following order:
+
+        for (depth=1 ; depth <= "-aad depth" ; depth++) {
+          for (alternative=1; alternative <=2 ; alternative++) {
+            while (matches-are-found) {
+              group++;
+              print-report
+            };
+          };
+       };
+
+      For reporting a k-tuple ambiguity, the reports appear in the
+      following order:
+
+        for (depth=1 ; depth <= "-aad depth" ; depth++) {
+          while (matches-are-found) {
+            for (alternative=1; alternative <=2 ; alternative++) {
+              group++;
+              print-report
+            };
+          };
+       };
+
+      This is because matches are generated in different ways for
+      linear lookahead and k-tuples.
+
+#117. (Changed in 1.33MR10) new EXPERIMENTAL predicate hoisting code
+
+      The hoisting of predicates into rules to create prediction
+      expressions is a problem in antlr.  Consider the following
+      example (k=1 with -prc on):
+
+        start   : (a)* "@" ;
+        a       : b | c ;
+        b       : <<isUpper(LATEXT(1))>>? A ;
+        c       : A ;
+
+      Prior to 1.33MR10 the code generated for "start" would resemble:
+
+        while {
+            if (LA(1)==A &&
+                    (!LA(1)==A || isUpper())) {
+              a();
+            }
+        };
+
+      This code is wrong because it makes rule "c" unreachable from
+      "start".  The essence of the problem is that antlr fails to
+      recognize that there can be a valid alternative within "a" even
+      when the predicate <<isUpper(LATEXT(1))>>? is false.
+
+      In 1.33MR10 with -mrhoist the hoisting of the predicate into
+      "start" is suppressed because it recognizes that "c" can
+      cover all the cases where the predicate is false:
+
+        while {
+            if (LA(1)==A) {
+              a();
+            }
+        };
+
+      With the antlr "-info p" switch the user will receive information
+      about the predicate suppression in the generated file:
+
+      --------------------------------------------------------------
+        #if 0
+
+        Hoisting of predicate suppressed by alternative without predicate.
+        The alt without the predicate includes all cases where
+            the predicate is false.
+
+           WITH predicate: line 7  v1.g
+           WITHOUT predicate: line 7  v1.g
+
+        The context set for the predicate:
+
+             A
+
+        The lookahead set for the alt WITHOUT the semantic predicate:
+
+             A
+
+        The predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 9  v1.g
+            set context:
+               A
+            tree context: null
+
+        Chain of referenced rules:
+
+            #0  in rule start (line 5 v1.g) to rule a
+            #1  in rule a (line 7 v1.g)
+
+        #endif
+      --------------------------------------------------------------
+
+      A predicate can be suppressed by a combination of alternatives
+      which, taken together, cover a predicate:
+
+        start   : (a)* "@" ;
+
+        a       : b | ca | cb | cc ;
+
+        b       : <<isUpper(LATEXT(1))>>? ( A | B | C ) ;
+
+        ca      : A ;
+        cb      : B ;
+        cc      : C ;
+
+      Consider a more complex example in which "c" covers only part of
+      a predicate:
+
+        start   : (a)* "@" ;
+
+        a       : b
+                | c
+                ;
+
+        b       : <<isUpper(LATEXT(1))>>?
+                    ( A
+                    | X
+                    );
+
+        c       : A
+                ;
+
+      Prior to 1.33MR10 the code generated for "start" would resemble:
+
+        while {
+            if ( (LA(1)==A || LA(1)==X) &&
+                    (! (LA(1)==A || LA(1)==X) || isUpper()) {
+              a();
+            }
+        };
+
+      With 1.33MR10 and -mrhoist the predicate context is restricted to
+      the non-covered lookahead.  The code resembles:
+
+        while {
+            if ( (LA(1)==A || LA(1)==X) &&
+                  (! (LA(1)==X) || isUpper()) {
+              a();
+            }
+        };
+
+      With the antlr "-info p" switch the user will receive information
+      about the predicate restriction in the generated file:
+
+      --------------------------------------------------------------
+        #if 0
+
+        Restricting the context of a predicate because of overlap
+          in the lookahead set between the alternative with the
+          semantic predicate and one without
+        Without this restriction the alternative without the predicate
+          could not be reached when input matched the context of the
+          predicate and the predicate was false.
+
+           WITH predicate: line 11  v4.g
+           WITHOUT predicate: line 12  v4.g
+
+        The original context set for the predicate:
+
+             A                X
+
+        The lookahead set for the alt WITHOUT the semantic predicate:
+
+             A
+
+        The intersection of the two sets
+
+             A
+
+        The original predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 15  v4.g
+            set context:
+               A                X
+            tree context: null
+
+        The new (modified) form of the predicate:
+
+          pred <<  isUpper(LATEXT(1))>>?
+                          depth=k=1  rule b  line 15  v4.g
+            set context:
+               X
+            tree context: null
+
+        #endif
+      --------------------------------------------------------------
+
+      The bad news about -mrhoist:
+
+        (a) -mrhoist does not analyze predicates with lookahead
+            depth > 1.
+
+        (b) -mrhoist does not look past a guarded predicate to
+            find context which might cover other predicates.
+
+      For these cases you might want to use syntactic predicates.
+      When a semantic predicate fails during guess mode the guess
+      fails and the next alternative is tried.
+
+      Limitation (a) is illustrated by the following example:
+
+        start    : (stmt)* EOF ;
+
+        stmt     : cast
+                 | expr
+                 ;
+        cast     : <<isTypename(LATEXT(2))>>? LP ID RP ;
+
+        expr     : LP ID RP ;
+
+      This is not much different from the first example, except that
+      it requires two tokens of lookahead context to determine what
+      to do.  This predicate is NOT suppressed because the current version
+      is unable to handle predicates with depth > 1.
+
+      A predicate can be combined with other predicates during hoisting.
+      In those cases the depth=1 predicates are still handled.  Thus,
+      in the following example the isUpper() predicate will be suppressed
+      by line #4 when hoisted from "bizarre" into "start", but will still
+      be present in "bizarre" in order to predict "stmt".
+
+        start    : (bizarre)* EOF ;     // #1
+                                        // #2
+        bizarre  : stmt                 // #3
+                 | A                    // #4
+                 ;
+
+        stmt     : cast
+                 | expr
+                 ;
+
+        cast     : <<isTypename(LATEXT(2))>>? LP ID RP ;
+
+        expr     : LP ID RP ;
+                 | <<isUpper(LATEXT(1))>>? A
+
+      Limitation (b) is illustrated by the following example of a
+      context guarded predicate:
+
+        rule : (A)? <<p>>?          // #1
+                     (A             // #2
+                     |B             // #3
+                     )              // #4
+             | <<q>> B              // #5
+             ;
+
+      Recall that this means that when the lookahead is NOT A then
+      the predicate "p" is ignored and it attempts to match "A|B".
+      Ideally, the "B" at line #3 should suppress predicate "q".
+      However, the current version does not attempt to look past
+      the guard predicate to find context which might suppress other
+      predicates.
+
+      In some cases -mrhoist will lead to the reporting of ambiguities
+      which were not visible before:
+
+        start   : (a)* "@";
+        a       : bc | d;
+        bc      : b  | c ;
+
+        b       : <<isUpper(LATEXT(1))>>? A;
+        c       : A ;
+
+        d       : A ;
+
+      In this case there is a true ambiguity in "a" between "bc" and "d"
+      which can both match "A".  Without -mrhoist the predicate in "b"
+      is hoisted into "a" and there is no ambiguity reported.  However,
+      with -mrhoist, the predicate in "b" is suppressed by "c" (as it
+      should be) making the ambiguity in "a" apparent.
+
+      The motivations for these changes were hoisting problems reported
+      by Reinier van den Born (reinier@vnet.ibm.com) and several others.
+
+#113. (Changed in 1.33MR10) new context guarded pred: (g)? && <<p>>? expr
+
+      The existing context guarded predicate:
+
+            rule : (guard)? => <<p>>? expr
+                 | next_alternative
+                 ;
+
+      generates code which resembles:
+
+            if (lookahead(expr) && (!guard || pred)) {
+              expr()
+            } else ....
+
+      This is not suitable for some applications because it allows
+      expr() to be invoked when the predicate is false.  This is
+      intentional because it is meant to mimic automatically computed
+      predicate context.
+
+      The new context guarded predicate uses the guard information
+      differently because it has a different goal.  Consider:
+
+            rule : (guard)? && <<p>>? expr
+                 | next_alternative
+                 ;
+
+      The new style of context guarded predicate is equivalent to:
+
+            rule : <<guard==true && pred>>? expr
+                 | next_alternative
+                 ;
+
+      It generates code which resembles:
+
+            if (lookahead(expr) && guard && pred) {
+                expr();
+            } else ...
+
+      Both forms of guarded predicates severely restrict the form of
+      the context guard: it can contain no rule references, no
+      (...)*, no (...)+, and no {...}.  It may contain token and
+      token class references, and alternation ("|").
+
+      Addition for 1.33MR11: in the token expression all tokens must
+      be at the same height of the token tree:
+
+            (A ( B | C))? && ...            is ok (all height 2)
+            (A ( B |  ))? && ...            is not ok (some 1, some 2)
+            (A B C D | E F G H)? && ...     is ok (all height 4)
+            (A B C D | E )? && ...          is not ok (some 4, some 1)
+
+      This restriction is required in order to properly compute the lookahead
+      set for expressions like:
+
+            rule1 : (A B C)? && <<pred>>? rule2 ;
+            rule2 : (A|X) (B|Y) (C|Z);
+
+      This addition was suggested by Rienier van den Born (reinier@vnet.ibm.com)
+
+#109. (Changed in 1.33MR10) improved trace information
+
+      The quality of the trace information provided by the "-gd"
+      switch has been improved significantly.  Here is an example
+      of the output from a test program.  It shows the rule name,
+      the first token of lookahead, the call depth, and the guess
+      status:
+
+        exit rule gusxx {"?"} depth 2
+        enter rule gusxx {"?"} depth 2
+        enter rule gus1 {"o"} depth 3 guessing
+        guess done - returning to rule gus1 {"o"} at depth 3
+                    (guess mode continues - an enclosing guess is still active)
+        guess done - returning to rule gus1 {"Z"} at depth 3
+                    (guess mode continues - an enclosing guess is still active)
+        exit rule gus1 {"Z"} depth 3 guessing
+        guess done - returning to rule gusxx {"o"} at depth 2 (guess mode ends)
+        enter rule gus1 {"o"} depth 3
+        guess done - returning to rule gus1 {"o"} at depth 3 (guess mode ends)
+        guess done - returning to rule gus1 {"Z"} at depth 3 (guess mode ends)
+        exit rule gus1 {"Z"} depth 3
+        line 1: syntax error at "Z" missing SC
+            ...
+
+      Rule trace reporting is controlled by the value of the integer
+      [zz]traceOptionValue:  when it is positive tracing is enabled,
+      otherwise it is disabled.  Tracing during guess mode is controlled
+      by the value of the integer [zz]traceGuessOptionValue.  When
+      it is positive AND [zz]traceOptionValue is positive rule trace
+      is reported in guess mode.
+
+      The values of [zz]traceOptionValue and [zz]traceGuessOptionValue
+      can be adjusted by subroutine calls listed below.
+
+      Depending on the presence or absence of the antlr -gd switch
+      the variable [zz]traceOptionValueDefault is set to 0 or 1.  When
+      the parser is initialized or [zz]traceReset() is called the
+      value of [zz]traceOptionValueDefault is copied to [zz]traceOptionValue.
+      The value of [zz]traceGuessOptionValue is always initialzed to 1,
+      but, as noted earlier, nothing will be reported unless
+      [zz]traceOptionValue is also positive.
+
+      When the parser state is saved/restored the value of the trace
+      variables are also saved/restored.  If a restore causes a change in
+      reporting behavior from on to off or vice versa this will be reported.
+
+      When the -gd option is selected, the macro "#define zzTRACE_RULES"
+      is added to appropriate output files.
+
+        C++ mode
+        --------
+        int     traceOption(int delta)
+        int     traceGuessOption(int delta)
+        void    traceReset()
+        int     traceOptionValueDefault
+
+        C mode
+        --------
+        int     zzTraceOption(int delta)
+        int     zzTraceGuessOption(int delta)
+        void    zzTraceReset()
+        int     zzTraceOptionValueDefault
+
+      The argument "delta" is added to the traceOptionValue.  To
+      turn on trace when inside a particular rule one:
+
+        rule : <<traceOption(+1);>>
+               (
+                rest-of-rule
+               )
+               <<traceOption(-1);>>
+       ;  /* fail clause */ <<traceOption(-1);>>
+
+      One can use the same idea to turn *off* tracing within a
+      rule by using a delta of (-1).
+
+      An improvement in the rule trace was suggested by Sramji
+      Ramanathan (ps@kumaran.com).
+
+#108. A Note on Deallocation of Variables Allocated in Guess Mode
+
+                            NOTE
+        ------------------------------------------------------
+        This mechanism only works for heap allocated variables
+        ------------------------------------------------------
+
+      The rewrite of the trace provides the machinery necessary
+      to properly free variables or undo actions following a
+      failed guess.
+
+      The macro zzUSER_GUESS_HOOK(guessSeq,zzrv) is expanded
+      as part of the zzGUESS macro.  When a guess is opened
+      the value of zzrv is 0.  When a longjmp() is executed to
+      undo the guess, the value of zzrv will be 1.
+
+      The macro zzUSER_GUESS_DONE_HOOK(guessSeq) is expanded
+      as part of the zzGUESS_DONE macro.  This is executed
+      whether the guess succeeds or fails as part of closing
+      the guess.
+
+      The guessSeq is a sequence number which is assigned to each
+      guess and is incremented by 1 for each guess which becomes
+      active.  It is needed by the user to associate the start of
+      a guess with the failure and/or completion (closing) of a
+      guess.
+
+      Guesses are nested.  They must be closed in the reverse
+      of the order that they are opened.
+
+      In order to free memory used by a variable during a guess
+      a user must write a routine which can be called to
+      register the variable along with the current guess sequence
+      number provided by the zzUSER_GUESS_HOOK macro. If the guess
+      fails, all variables tagged with the corresponding guess
+      sequence number should be released.  This is ugly, but
+      it would require a major rewrite of antlr 1.33 to use
+      some mechanism other than setjmp()/longjmp().
+
+      The order of calls for a *successful* guess would be:
+
+        zzUSER_GUESS_HOOK(guessSeq,0);
+        zzUSER_GUESS_DONE_HOOK(guessSeq);
+
+      The order of calls for a *failed* guess would be:
+
+        zzUSER_GUESS_HOOK(guessSeq,0);
+        zzUSER_GUESS_HOOK(guessSeq,1);
+        zzUSER_GUESS_DONE_HOOK(guessSeq);
+
+      The default definitions of these macros are empty strings.
+
+      Here is an example in C++ mode.  The zzUSER_GUESS_HOOK and
+      zzUSER_GUESS_DONE_HOOK macros and myGuessHook() routine
+      can be used without change in both C and C++ versions.
+
+      ----------------------------------------------------------------------
+        <<
+
+        #include "AToken.h"
+
+        typedef ANTLRCommonToken ANTLRToken;
+
+        #include "DLGLexer.h"
+
+        int main() {
+
+          {
+            DLGFileInput     in(stdin);
+            DLGLexer         lexer(&in,2000);
+            ANTLRTokenBuffer pipe(&lexer,1);
+            ANTLRCommonToken aToken;
+            P                parser(&pipe);
+
+            lexer.setToken(&aToken);
+            parser.init();
+            parser.start();
+          };
+
+          fclose(stdin);
+          fclose(stdout);
+          return 0;
+        }
+
+        >>
+
+        <<
+        char *s=NULL;
+
+        #undef zzUSER_GUESS_HOOK
+        #define zzUSER_GUESS_HOOK(guessSeq,zzrv) myGuessHook(guessSeq,zzrv);
+        #undef zzUSER_GUESS_DONE_HOOK
+        #define zzUSER_GUESS_DONE_HOOK(guessSeq)   myGuessHook(guessSeq,2);
+
+        void myGuessHook(int guessSeq,int zzrv) {
+          if (zzrv == 0) {
+            fprintf(stderr,"User hook: starting guess #%d\n",guessSeq);
+          } else if (zzrv == 1) {
+            free (s);
+            s=NULL;
+            fprintf(stderr,"User hook: failed guess #%d\n",guessSeq);
+          } else if (zzrv == 2) {
+            free (s);
+            s=NULL;
+            fprintf(stderr,"User hook: ending guess #%d\n",guessSeq);
+          };
+        }
+
+        >>
+
+        #token A    "a"
+        #token      "[\t \ \n]"     <<skip();>>
+
+        class P {
+
+        start : (top)+
+              ;
+
+        top   : (which) ?   <<fprintf(stderr,"%s is a which\n",s); free(s); s=NULL; >>
+              | other       <<fprintf(stderr,"%s is an other\n",s); free(s); s=NULL; >>
+              ; <<if (s != NULL) free(s); s=NULL; >>
+
+        which : which2
+              ;
+
+        which2 : which3
+              ;
+        which3
+              : (label)?         <<fprintf(stderr,"%s is a label\n",s);>>
+              | (global)?        <<fprintf(stderr,"%s is a global\n",s);>>
+              | (exclamation)?   <<fprintf(stderr,"%s is an exclamation\n",s);>>
+              ;
+
+        label :       <<s=strdup(LT(1)->getText());>> A ":" ;
+
+        global :      <<s=strdup(LT(1)->getText());>> A "::" ;
+
+        exclamation : <<s=strdup(LT(1)->getText());>> A "!" ;
+
+        other :       <<s=strdup(LT(1)->getText());>> "other" ;
+
+        }
+      ----------------------------------------------------------------------
+
+      This is a silly example, but illustrates the idea.  For the input
+      "a ::" with tracing enabled the output begins:
+
+      ----------------------------------------------------------------------
+        enter rule "start" depth 1
+        enter rule "top" depth 2
+        User hook: starting guess #1
+        enter rule "which" depth 3 guessing
+        enter rule "which2" depth 4 guessing
+        enter rule "which3" depth 5 guessing
+        User hook: starting guess #2
+        enter rule "label" depth 6 guessing
+        guess failed
+        User hook: failed guess #2
+        guess done - returning to rule "which3" at depth 5 (guess mode continues
+                                                 - an enclosing guess is still active)
+        User hook: ending guess #2
+        User hook: starting guess #3
+        enter rule "global" depth 6 guessing
+        exit rule "global" depth 6 guessing
+        guess done - returning to rule "which3" at depth 5 (guess mode continues
+                                                 - an enclosing guess is still active)
+        User hook: ending guess #3
+        enter rule "global" depth 6 guessing
+        exit rule "global" depth 6 guessing
+        exit rule "which3" depth 5 guessing
+        exit rule "which2" depth 4 guessing
+        exit rule "which" depth 3 guessing
+        guess done - returning to rule "top" at depth 2 (guess mode ends)
+        User hook: ending guess #1
+        enter rule "which" depth 3
+        .....
+      ----------------------------------------------------------------------
+
+      Remember:
+
+        (a) Only init-actions are executed during guess mode.
+        (b) A rule can be invoked multiple times during guess mode.
+        (c) If the guess succeeds the rule will be called once more
+              without guess mode so that normal actions will be executed.
+            This means that the init-action might need to distinguish
+              between guess mode and non-guess mode using the variable
+              [zz]guessing.
+
+#101. (Changed in 1.33MR10) antlr -info command line switch
+
+        -info
+
+            p   - extra predicate information in generated file
+
+            t   - information about tnode use:
+                    at the end of each rule in generated file
+                    summary on stderr at end of program
+
+            m   - monitor progress
+                    prints name of each rule as it is started
+                    flushes output at start of each rule
+
+            f   - first/follow set information to stdout
+
+            0   - no operation (added in 1.33MR11)
+
+      The options may be combined and may appear in any order.
+      For example:
+
+        antlr -info ptm -CC -gt -mrhoist on mygrammar.g
+
+#100a. (Changed in 1.33MR10) Predicate tree simplification
+
+      When the same predicates can be referenced in more than one
+      alternative of a block large predicate trees can be formed.
+
+      The difference that these optimizations make is so dramatic
+      that I have decided to use it even when -mrhoist is not selected.
+
+      Consider the following grammar:
+
+        start : ( all )* ;
+
+        all   : a
+              | d
+              | e
+              | f
+              ;
+
+        a     : c A B
+              | c A C
+              ;
+
+        c     : <<AAA(LATEXT(2))>>?
+              ;
+
+        d     : <<BBB(LATEXT(2))>>? B C
+              ;
+
+        e     : <<CCC(LATEXT(2))>>? B C
+              ;
+
+        f     : e X Y
+              ;
+
+      In rule "a" there is a reference to rule "c" in both alternatives.
+      The length of the predicate AAA is k=2 and it can be followed in
+      alternative 1 only by (A B) while in alternative 2 it can be
+      followed only by (A C).  Thus they do not have identical context.
+
+      In rule "all" the alternatives which refer to rules "e" and "f" allow
+      elimination of the duplicate reference to predicate CCC.
+
+      The table below summarized the kind of simplification performed by
+      1.33MR10.  In the table, X and Y stand for single predicates
+      (not trees).
+
+        (OR X (OR Y (OR Z)))  => (OR X Y Z)
+        (AND X (AND Y (AND Z)))  => (AND X Y Z)
+
+        (OR X  (... (OR  X Y) ... ))     => (OR X (... Y ... ))
+        (AND X (... (AND X Y) ... ))     => (AND X (... Y ... ))
+        (OR X  (... (AND X Y) ... ))     => (OR X (...  ... ))
+        (AND X (... (OR  X Y) ... ))     => (AND X (...  ... ))
+
+        (AND X)               => X
+        (OR X)                => X
+
+      In a test with a complex grammar for a real application, a predicate
+      tree with six OR nodes and 12 leaves was reduced to "(OR X Y Z)".
+
+      In 1.33MR10 there is a greater effort to release memory used
+      by predicates once they are no longer in use.
+
+#100b. (Changed in 1.33MR10) Suppression of extra predicate tests
+
+      The following optimizations require that -mrhoist be selected.
+
+      It is relatively easy to optimize the code generated for predicate
+      gates when they are of the form:
+
+            (AND X Y Z ...)
+        or  (OR  X Y Z ...)
+
+      where X, Y, Z, and "..." represent individual predicates (leaves) not
+      predicate trees.
+
+      If the predicate is an AND the contexts of the X, Y, Z, etc. are
+      ANDed together to create a single Tree context for the group and
+      context tests for the individual predicates are suppressed:
+
+            --------------------------------------------------
+            Note: This was incorrect.  The contexts should be
+            ORed together.  This has been fixed.  A more 
+            complete description is available in item #152.
+            ---------------------------------------------------
+
+      Optimization 1:  (AND X Y Z ...)
+
+        Suppose the context for Xtest is LA(1)==LP and the context for
+        Ytest is LA(1)==LP && LA(2)==ID.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    !(LA(1)==LP && LA(1)==LP && LA(2)==ID) ||
+                        ( (! LA(1)==LP || Xtest) &&
+                          (! (LA(1)==LP || LA(2)==ID) || Xtest)
+                        )) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==LP && LA(2)==ID) || (Xtest && Ytest) {...
+
+      Optimization 2: (OR X Y Z ...) with identical contexts
+
+        Suppose the context for Xtest is LA(1)==ID and for Ytest
+        the context is also LA(1)==ID.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==ID || LA(1)==ID) ||
+                        (LA(1)==ID && Xtest) ||
+                        (LA(1)==ID && Ytest) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    (! LA(1)==ID) || (Xtest || Ytest) {...
+
+      Optimization 3: (OR X Y Z ...) with distinct contexts
+
+        Suppose the context for Xtest is LA(1)==ID and for Ytest
+        the context is LA(1)==LP.
+
+            Without the optimization the code would resemble:
+
+                if (lookaheadContext &&
+                    ! (LA(1)==ID || LA(1)==LP) ||
+                        (LA(1)==ID && Xtest) ||
+                        (LA(1)==LP && Ytest) {...
+
+            With the -mrhoist optimization the code would resemble:
+
+                if (lookaheadContext &&
+                        (zzpf=0,
+                            (LA(1)==ID && (zzpf=1) && Xtest) ||
+                            (LA(1)==LP && (zzpf=1) && Ytest) ||
+                            !zzpf) {
+
+            These may appear to be of similar complexity at first,
+            but the non-optimized version contains two tests of each
+            context while the optimized version contains only one
+            such test, as well as eliminating some of the inverted
+            logic (" !(...) || ").
+
+      Optimization 4: Computation of predicate gate trees
+
+        When generating code for the gates of predicate expressions
+        antlr 1.33 vanilla uses a recursive procedure to generate
+        "&&" and "||" expressions for testing the lookahead. As each
+        layer of the predicate tree is exposed a new set of "&&" and
+        "||" expressions on the lookahead are generated.  In many
+        cases the lookahead being tested has already been tested.
+
+        With -mrhoist a lookahead tree is computed for the entire
+        lookahead expression.  This means that predicates with identical
+        context or context which is a subset of another predicate's
+        context disappear.
+
+        This is especially important for predicates formed by rules
+        like the following:
+
+            uppperCaseVowel : <<isUpperCase(LATEXT(1))>>?  vowel;
+            vowel:          : <<isVowel(LATEXT(1))>>? LETTERS;
+
+        These predicates are combined using AND since both must be
+        satisfied for rule upperCaseVowel.  They have identical
+        context which makes this optimization very effective.
+
+      The affect of Items #100a and #100b together can be dramatic.  In
+      a very large (but real world) grammar one particular predicate
+      expression was reduced from an (unreadable) 50 predicate leaves,
+      195 LA(1) terms, and 5500 characters to an (easily comprehensible)
+      3 predicate leaves (all different) and a *single* LA(1) term.
+
+#98.  (Changed in 1.33MR10) Option "-info p"
+
+      When the user selects option "-info p" the program will generate
+      detailed information about predicates.  If the user selects
+      "-mrhoist on" additional detail will be provided explaining
+      the promotion and suppression of predicates.  The output is part
+      of the generated file and sandwiched between #if 0/#endif statements.
+
+      Consider the following k=1 grammar:
+
+        start : ( all ) * ;
+
+        all   : ( a
+                | b
+                )
+                ;
+
+        a     : c B
+              ;
+
+        c     : <<LATEXT(1)>>?
+              | B
+              ;
+
+        b     : <<LATEXT(1)>>? X
+              ;
+
+      Below is an excerpt of the output for rule "start" for the three
+      predicate options (off, on, and maintenance release style hoisting).
+
+      For those who do not wish to use the "-mrhoist on" option for code
+      generation the option can be used in a "diagnostic" mode to provide
+      valuable information:
+
+            a. where one should insert null actions to inhibit hoisting
+            b. a chain of rule references which shows where predicates are
+               being hoisted
+
+      ======================================================================
+      Example of "-info p" with "-mrhoist on"
+      ======================================================================
+        #if 0
+
+        Hoisting of predicate suppressed by alternative without predicate.
+        The alt without the predicate includes all cases where the
+           predicate is false.
+
+           WITH predicate: line 11  v36.g
+           WITHOUT predicate: line 12  v36.g
+
+        The context set for the predicate:
+
+             B
+
+        The lookahead set for alt WITHOUT the semantic predicate:
+
+             B
+
+        The predicate:
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+               B
+            tree context: null
+
+        Chain of referenced rules:
+
+            #0  in rule start (line 1 v36.g) to rule all
+            #1  in rule all (line 3 v36.g) to rule a
+            #2  in rule a (line 8 v36.g) to rule c
+            #3  in rule c (line 11 v36.g)
+
+        #endif
+        &&
+        #if 0
+
+        pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+          set context:
+             X
+          tree context: null
+
+        #endif
+      ======================================================================
+      Example of "-info p"  with the default -prc setting ( "-prc off")
+      ======================================================================
+        #if 0
+
+        OR
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+              nil
+            tree context: null
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+            set context:
+              nil
+            tree context: null
+
+        #endif
+      ======================================================================
+      Example of "-info p" with "-prc on" and "-mrhoist off"
+      ======================================================================
+        #if 0
+
+        OR
+          pred <<  LATEXT(1)>>?  depth=k=1  rule c  line 11  v36.g
+
+            set context:
+               B
+            tree context: null
+
+          pred <<  LATEXT(1)>>?  depth=k=1  rule b  line 15  v36.g
+
+            set context:
+               X
+            tree context: null
+
+        #endif
+      ======================================================================
+
+#60.  (Changed in 1.33MR7) Major changes to exception handling
+
+        There were significant problems in the handling of exceptions
+        in 1.33 vanilla.  The general problem is that it can only
+        process one level of exception handler.  For example, a named
+        exception handler, an exception handler for an alternative, or
+        an exception for a subrule  always went to the rule's exception
+        handler if there was no "catch" which matched the exception.
+
+        In 1.33MR7 the exception handlers properly "nest".  If an
+        exception handler does not have a matching "catch" then the
+        nextmost outer exception handler is checked for an appropriate
+        "catch" clause, and so on until an exception handler with an
+        appropriate "catch" is found.
+
+        There are still undesirable features in the way exception
+        handlers are implemented, but I do not have time to fix them
+        at the moment:
+
+            The exception handlers for alternatives are outside the
+            block containing the alternative.  This makes it impossible
+            to access variables declared in a block or to resume the
+            parse by "falling through".  The parse can still be easily
+            resumed in other ways, but not in the most natural fashion.
+
+            This results in an inconsistentcy between named exception
+            handlers and exception handlers for alternatives.  When
+            an exception handler for an alternative "falls through"
+            it goes to the nextmost outer handler - not the "normal
+            action".
+
+        A major difference between 1.33MR7 and 1.33 vanilla is
+        the default action after an exception is caught:
+
+            1.33 Vanilla
+            ------------
+            In 1.33 vanilla the signal value is set to zero ("NoSignal")
+            and the code drops through to the code following the exception.
+            For named exception handlers this is the "normal action".
+            For alternative exception handlers this is the rule's handler.
+
+            1.33MR7
+            -------
+            In 1.33MR7 the signal value is NOT automatically set to zero.
+
+            There are two cases:
+
+                For named exception handlers: if the signal value has been
+                set to zero the code drops through to the "normal action".
+
+                For all other cases the code branches to the nextmost outer
+                exception handler until it reaches the handler for the rule.
+
+        The following macros have been defined for convenience:
+
+            C/C++ Mode Name
+            --------------------
+            (zz)suppressSignal
+                  set signal & return signal arg to 0 ("NoSignal")
+            (zz)setSignal(intValue)
+                  set signal & return signal arg to some value
+            (zz)exportSignal
+                  copy the signal value to the return signal arg
+
+        I'm not sure why PCCTS make a distinction between the local
+        signal value and the return signal argument, but I'm loathe
+        to change the code. The burden of copying the local signal
+        value to the return signal argument can be given to the
+        default signal handler, I suppose.
+
+#53.  (Explanation for 1.33MR6) What happens after an exception is caught ?
+
+        The Book is silent about what happens after an exception
+        is caught.
+
+        The following code fragment prints "Error Action" followed
+        by "Normal Action".
+
+        test : Word ex:Number <<printf("Normal Action\n");>>
+                exception[ex]
+                   catch NoViableAlt:
+                        <<printf("Error Action\n");>>
+        ;
+
+        The reason for "Normal Action" is that the normal flow of the
+        program after a user-written exception handler is to "drop through".
+        In the case of an exception handler for a rule this results in
+        the exection of a "return" statement.  In the case of an
+        exception handler attached to an alternative, rule, or token
+        this is the code that would have executed had there been no
+        exception.
+
+        The user can achieve the desired result by using a "return"
+        statement.
+
+        test : Word ex:Number <<printf("Normal Action\n");>>
+                exception[ex]
+                   catch NoViableAlt:
+                        <<printf("Error Action\n"); return;>>
+        ;
+
+        The most powerful mechanism for recovery from parse errors
+        in pccts is syntactic predicates because they provide
+        backtracking.  Exceptions allow "return", "break",
+        "consumeUntil(...)", "goto _handler", "goto _fail", and
+        changing the _signal value.
+
+#41.  (Added in 1.33MR6) antlr -stdout
+
+        Using "antlr -stdout ..." forces the text that would
+        normally go to the grammar.c or grammar.cpp file to
+        stdout.
+
+#40.  (Added in 1.33MR6) antlr -tab to change tab stops
+
+        Using "antlr -tab number ..." changes the tab stops
+        for the grammar.c or grammar.cpp file.  The number
+        must be between 0 and 8.  Using 0 gives tab characters,
+        values between 1 and 8 give the appropriate number of
+        space characters.
+
+#34.  (Added to 1.33MR1) Add public DLGLexerBase::set_line(int newValue)
+
+        Previously there was no public function for changing the line
+        number maintained by the lexer.
+
+#28.   (Added to 1.33MR1) More control over DLG header
+
+        Version 1.33MR1 adds the following directives to PCCTS
+        for C++ mode:
+
+          #lexprefix  <<source code>>
+
+                Adds source code to the DLGLexer.h file
+                after the #include "DLexerBase.h" but
+                before the start of the class definition.
+
+          #lexmember  <<source code>>
+
+                Adds source code to the DLGLexer.h file
+                as part of the DLGLexer class body.  It
+                appears immediately after the start of
+                the class and a "public: statement.
+
diff --git a/Tools/Source/TianoTools/Pccts/KNOWN_PROBLEMS.txt b/Tools/Source/TianoTools/Pccts/KNOWN_PROBLEMS.txt
new file mode 100644
index 0000000000..5a9b22e1bd
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/KNOWN_PROBLEMS.txt
@@ -0,0 +1,241 @@
+
+    =======================================================
+    Known Problems In PCCTS - Last revised 14 November 1998
+    =======================================================
+
+#17. The dlg fix for handling characters up to 255 is incorrect.
+
+    See item #207.
+
+    Reported by Frank Hartmann.
+        
+#16. A note about "&&" predicates (Mike Dimmick)
+
+    Mike Dimmick has pointed out a potential pitfall in the use of the
+    "&&" style predicate.  Consider:
+    
+         r0: (g)? => <<P>>?  r1
+             | ...
+             ;
+         r1: A | B;
+         
+    If the context guard g is not a subset of the lookahead context for r1
+    (in other words g is neither A nor B) then the code may execute r1 
+    even when the lookahead context is not satisfied.  This is an error
+    by the person coding the grammer, and the error should be reported to
+    the user, but it isn't. expect.  Some examples I've run seem to
+    indicate that such an error actually results in the rule becoming
+    unreachable.
+    
+    When g is properly coded the code is correct, the problem is when g
+    is not properly coded.
+    
+    A second problem reported by Mike Dimmick is that the test for a
+    failed validation predicate is equivalent to a test on the predicate
+    along.  In other words, if the "&&" has not been hoisted then it may
+    falsely report a validation error.
+
+#15. (Changed in MR23) Warning for LT(i), LATEXT(i) in token match actions
+
+    An bug (or at least an oddity) is that a reference to LT(1), LA(1),
+    or LATEXT(1) in an action which immediately follows a token match
+    in a rule refers to the token matched, not the token which is in
+    the lookahead buffer.  Consider:
+
+        r : abc <<action alpha>> D <<action beta>> E;
+
+    In this case LT(1) in action alpha will refer to the next token in
+    the lookahead buffer ("D"), but LT(1) in action beta will refer to
+    the token matched by D - the preceding token.
+
+    A warning has been added which warns users about this when an action
+    following a token match contains a reference to LT(1), LA(1), or LATEXT(1).
+
+    This behavior should be changed, but it appears in too many programs
+    now.  Another problem, perhaps more significant, is that the obvious
+    fix (moving the consume() call to before the action) could change the 
+    order in which input is requested and output appears in existing programs.
+
+    This problem was reported, along with a fix by Benjamin Mandel
+    (beny@sd.co.il).  However, I felt that changing the behavior was too
+    dangerous for existing code.
+
+#14. Parsing bug in dlg
+
+    THM: I have been unable to reproduce this problem.
+
+    Reported by Rick Howard Mijenix Corporation (rickh@mijenix.com).
+
+    The regular expression parser (in rexpr.c) fails while
+    trying to parse the following regular expression:
+
+            {[a-zA-Z]:}(\\\\[a-zA-Z0-9]*)+
+
+    See my comment in the following excerpt from rexpr.c:
+
+    /*
+     * <regExpr>        ::= <andExpr> ( '|' {<andExpr>} )*
+     *
+     * Return -1 if syntax error
+     * Return  0 if none found
+     * Return  1 if a regExrp was found
+     */
+	static
+	regExpr(g)
+	GraphPtr g;
+	{
+	    Graph g1, g2;
+	
+	    if ( andExpr(&g1) == -1 )
+	    {
+	        return -1;
+	    }
+	
+	    while ( token == '|' )
+	    {
+	        int a;
+	        next();
+	        a = andExpr(&g2);
+	        if ( a == -1 ) return -1;   /* syntax error below */
+	        else if ( !a ) return 1;    /* empty alternative */
+	        g1 = BuildNFA_AorB(g1, g2);
+	    }
+	
+	    if ( token!='\0' ) return -1;
+	*****
+	***** It appears to fail here becuause token is 125 - the closing '}'
+	***** If I change it to:
+	*****    if ( token!='\0' && token!='}' && token!= ')' ) return -1;
+	*****
+	***** It succeeds, but I'm not sure this is the corrrect approach.
+	*****
+	    *g = g1;
+	    return 1;
+	}
+
+#13. dlg reports an invalid range for: [\0x00-\0xff]
+
+    Diagnosed by Piotr Eljasiak (eljasiak@no-spam.zt.gdansk.tpsa.pl):
+
+    Fixed in MR16.
+
+#12. Strings containing comment actions
+
+     Sequences that looked like C style comments appearing in string
+     literals are improperly parsed by antlr/dlg.
+
+        << fprintf(out," /* obsolete */ ");
+
+     For this case use:
+
+        << fprintf(out," \/\* obsolete \*\/ ");
+
+     Reported by K.J. Cummings (cummings@peritus.com).
+
+#11. User hook for deallocation of variables on guess fail
+
+     The mechanism outlined in Item #108 works only for
+     heap allocated variables.
+
+#10. Label re-initialization in ( X {y:Y} )*
+
+     If a label assignment is optional and appears in a
+     (...)* or (...)+ block it will not be reset to NULL
+     when it is skipped by a subsequent iteration.
+
+     Consider the example:
+
+            ( X { y:Y })* Z
+
+     with input:
+
+            X Y X Z
+
+     The first time through the block Y will be matched and
+     y will be set to point to the token.  On the second
+     iteration of the (...)* block there is no match for Y.
+     But y will not be reset to NULL, as the user might
+     expect, it will contain a reference to the Y that was
+     matched in the first iteration.
+
+     The work-around is to manually reset y:
+
+            ( X << y = NULL; >> { y:Y } )* Z
+
+        or
+
+            ( X ( y:Y | << y = NULL; >> /* epsilon */ ) )* Z
+
+     Reported by Jeff Vincent (JVincent@novell.com).
+
+#9. PCCTAST.h PCCTSAST::setType() is a noop
+
+#8. #tokdefs with ~Token and .
+
+    THM: I have been unable to reproduce this problem.
+
+    When antlr uses #tokdefs to define tokens the fields of
+    #errclass and #tokclass do not get properly defined.
+    When it subsequently attempts to take the complement of
+    the set of tokens (using ~Token or .) it can refer to
+    tokens which don't have names, generating a fatal error.
+
+#7. DLG crashes on some invalid inputs
+
+    THM:  In MR20 have fixed the most common cases.
+
+    The following token defintion will cause DLG to crash.
+
+        #token "()"
+
+    Reported by  Mengue Olivier (dolmen@bigfoot.com).
+
+#6. On MS systems \n\r is treated as two new lines
+
+    Fixed.
+
+#5. Token expressions in #tokclass
+
+    #errclass does not support TOK1..TOK2 or ~TOK syntax.
+    #tokclass does not support ~TOKEN syntax
+
+    A workaround for #errclass TOK1..TOK2 is to use a
+    #tokclass.
+
+    Reported by Dave Watola (dwatola@amtsun.jpl.nasa.gov)
+
+#4. A #tokdef must appear "early" in the grammar file.
+
+    The "early" section of the grammar file is the only
+    place where the following directives may appear:
+
+        #header
+        #first
+        #tokdefs
+        #parser
+
+    Any other kind of statement signifiies the end of the
+    "early" section.
+
+#3. Use of PURIFY macro for C++ mode
+
+    Item #93 of the CHANGES_FROM_1.33 describes the use of
+    the PURIFY macro to zero arguments to be passed by
+    upward inheritance.
+
+        #define PURIFY(r, s) memset((char *) &(r), '\0', (s));
+
+    This may not be the right thing to do for C++ objects that
+    have constructors.  Reported by Bonny Rais (bonny@werple.net.au).
+
+    For those cases one should #define PURIFY to be an empty macro
+    in the #header or #first actions.
+
+#2. Fixed in 1.33MR10 - See CHANGES_FROM_1.33 Item #80.
+
+#1. The quality of support for systems with 8.3 file names leaves
+    much to be desired.  Since the kit is distributed using the
+    long file names and the make file uses long file names it requires
+    some effort to generate.  This will probably not be changed due
+    to the large number of systems already written using the long
+    file names.
diff --git a/Tools/Source/TianoTools/Pccts/MPW_Read_Me b/Tools/Source/TianoTools/Pccts/MPW_Read_Me
new file mode 100644
index 0000000000..70a9d1bcad
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/MPW_Read_Me
@@ -0,0 +1,21 @@
+
+1. You can control the creator type of generated files by changing a value of
+   #if control statement.
+
+
+   pccts:h:pcctscfg.h
+
+   line 225-231
+
+	#if 0
+	#define MAC_FILE_CREATOR 'MPS '   /* MPW Text files */
+	#endif
+	#if 0
+	#define MAC_FILE_CREATOR 'KAHL'   /* THINK C/Symantec C++ Text files */
+	#endif
+	#if 0
+	#define MAC_FILE_CREATOR 'CWIE'   /* Metrowerks C/C++ Text files */
+	#endif
+
+2.  If you want to build 68K version. You must convert all source files to Macintosh
+    format before compile.
diff --git a/Tools/Source/TianoTools/Pccts/NOTES.bcc b/Tools/Source/TianoTools/Pccts/NOTES.bcc
new file mode 100644
index 0000000000..1ac05b17c5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/NOTES.bcc
@@ -0,0 +1,184 @@
+March 95
+Version 1.32 of pccts
+ 
+At the moment this file is available via anonymous FTP at
+ 
+        Node: marvin.ecn.purdue.edu
+        File: pub/pccts/1.32/NOTES.BCC
+ 
+Mail corrections or additions to David Seidel <71333.1575@compuserve.com>
+===============================================================================
+Notes on Building PCCTS 1.32 with Borland C++
+ 
+David Seidel, Innovative Data Concepts Incorporated
+CompuServe: 71333,1575
+Internet:   71333.1575@compuserve.com
+            dseidel@delphi.com
+ 
+I have gotten ANTLR and DLG to succesfully build with BCC 4.0, but have found
+from experience that ANTLR, in particular, is likely to run out of memory
+with grammars over a certain size, or with larger values for the -k and -ck
+options.  Now that BCC 4.02 and the new Borland Power Pack for DOS is now
+available, I feel that there is no excuse not to build these tools as
+32-bit executables, as they ought to be.
+ 
+For people without the Power Pack, the makefiles below should be fairly easily
+modified to build 16-bit real-mode executables, but I don't really recommend
+it.  As an alternative, you might consider the highly regarded DJGPP compiler
+(a DOS port of the Gnu GCC compiler, with a DOS extender included).  Hopefully
+some other PCCTS who has DJGPP can provode whatever advice is necessary.  The
+Watcom compiler is also an excellent possibility (albeit a commercial one),
+and I hope to make available Watcom makefiles in the near future.
+ 
+Here are the makefiles I am using.  Both makefiles use a compiler configuration
+file that contains compiler switches such as optimization settings.  I call
+this file bor32.cfg and keep a copy in both the ANTLR and DLG subdirectories.
+ 
+==== File: bor32.cfg (cut here) ===============================================
+-w-
+-RT-
+-x-
+-N-
+-k-
+-d
+-O2-e-l
+-Z
+-D__STDC__=1
+==== End of file bor32.cfg (cut here) =========================================
+ 
+==== File: antlr\bor32.mak (cut here) =========================================
+#
+#  ANTLR 1.32 Makefile for Borland C++ 4.02 with DPMI 32-bit DOS extender by
+#  David Seidel
+#  Innovative Data Concepts Incorporated
+#  71333.1575@compuserve.com (or) dseidel@delphi.com
+#
+#  Notes:   1. Compiler switches (optimization etc.) are contained in the
+#              file bor32.cfg.
+#           2. This makefile requires Borland C++ 4.02 or greater with
+#              the DOS Power Pack add-on package.
+#           3. Change the BCCDIR macro below to the topmost directory in
+#              which BCC is installed on your system.
+#
+ 
+BCCDIR   =  d:\bc4
+CC       =  bcc32
+SET      =  ..\support\set
+PCCTS_H  =  ..\h
+ANTLR    =  ..\bin\antlr
+DLG      =  ..\bin\dlg
+CFLAGS   =  -I$(BCCDIR)\include -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN \
+ +bor32.cfg
+LIBS     =  dpmi32 cw32
+OBJ_EXT  =  obj
+OBJS     =  antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj fset.obj \
+ gen.obj globals.obj hash.obj lex.obj main.obj misc.obj pred.obj dialog.obj \
+ set.obj
+ 
+.c.obj:
+      $(CC) -c $(CFLAGS) {$&.c }
+ 
+antlr.exe: $(OBJS)
+   tlink32 @&&|
+-Tpe -ax -c -s -L$(BCCDIR)\lib +
+$(BCCDIR)\lib\c0x32 $**
+$@
+ 
+$(LIBS)
+;
+|
+   copy *.exe ..\bin
+ 
+ 
+# *********** Target list of PC machines ***********
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+ 
+# leave this commented out for initial build!
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+#   $(ANTLR) antlr.g
+ 
+antlr.$(OBJ_EXT): antlr.c mode.h tokens.h
+ 
+scan.$(OBJ_EXT): scan.c mode.h tokens.h
+ 
+# leave this commented out for initial build!
+#scan.c mode.h: parser.dlg
+#   $(DLG) -C2 parser.dlg scan.c
+ 
+set.$(OBJ_EXT): $(SET)\set.c
+   $(CC) -c $(CFLAGS) $(SET)\set.c
+ 
+==== End of file antlr\bor32.mak (cut here) ===================================
+ 
+==== File: dlg\bor32.mak (cut here) ===========================================
+#
+#  DLG 1.32 Makefile for Borland C++ 4.02 with DPMI 32-bit DOS extender by
+#  David Seidel
+#  Innovative Data Concepts Incorporated
+#  71333.1575@compuserve.com (or) dseidel@delphi.com
+#
+#  Notes:   1. Compiler switches (optimization etc.) are contained in the
+#              file bor32.cfg.
+#           2. This makefile requires Borland C++ 4.02 or greater with
+#              the DOS Power Pack add-on package.
+#           3. Change the BCCDIR macro below to the topmost directory in
+#              which BCC is installed on your system.
+#
+ 
+ 
+BCCDIR   =  d:\bc4
+CC       =  bcc32
+SET      =  ..\support\set
+PCCTS_H  =  ..\h
+ANTLR    =  ..\bin\antlr
+DLG      =  ..\bin\dlg
+CFLAGS   =  -I$(BCCDIR)\include -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN \
+ +bor32.cfg
+LIBS     =  dpmi32 cw32
+OBJ_EXT  =  obj
+OBJS     =  dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
+ output.obj relabel.obj automata.obj set.obj
+ 
+.c.obj:
+      $(CC) -c $(CFLAGS) {$&.c }
+ 
+dlg.exe : $(OBJS)
+   tlink32 @&&|
+-Tpe -ax -c -s -L$(BCCDIR)\lib +
+c0x32 $**
+$@
+ 
+$(LIBS)
+;
+|
+   copy *.exe ..\bin
+ 
+dlg_p.obj:  dlg_p.c
+ 
+dlg_a.obj:  dlg_a.c
+ 
+main.obj:   main.c
+ 
+err.obj:    err.c
+ 
+support.obj:   support.c
+ 
+output.obj: output.c
+ 
+relabel.obj:   relabel.c
+ 
+automata.obj:  automata.c
+ 
+set.$(OBJ_EXT): $(SET)\set.c
+   $(CC) -c $(CFLAGS) $(SET)\set.c
+ 
+==== End of file dlg\bor32.mak (cut here) =====================================
+ 
+ 
+ 
+
+
+
diff --git a/Tools/Source/TianoTools/Pccts/NOTES.msvc b/Tools/Source/TianoTools/Pccts/NOTES.msvc
new file mode 100644
index 0000000000..86f8ed66e0
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/NOTES.msvc
@@ -0,0 +1,189 @@
+
+                        Microsoft Visual C Stuff
+
+
+[Tom Moog 2-Oct-98
+
+    Users of Microsoft Visual C++ should download a separate
+    ready-to-run zip file from my web site.  It contains 
+    binaries, static library, and a sample project.
+]
+
+[
+  Two notes added by Tom Moog 23-Sep-97.  I believe the *.dsp and
+  *.mak files that were once at the end of this file are now obsolete.
+  
+  The following MSVC .dsp and .mak files for pccts and sorcerer
+  were contributed by Stanislaw Bochnak (S.Bochnak@microtool.com.pl)
+  and Jeff Vincent (jvincent@novell.com)
+
+        PCCTS Distribution Kit
+        ----------------------
+        pccts/antlr/AntlrMSVC50.dsp
+        pccts/antlr/AntlrMSVC50.mak
+
+        pccts/dlg/DlgMSVC50.dsp
+        pccts/dlg/DlgMSVC50.mak
+
+        pccts/support/genmk/watgenmk.mak
+        pccts/support/msvc.dsp
+
+        Sorcerer Distribution Kit
+        -------------------------
+        pccts/sorcerer/SorcererMSVC50.dsp
+        pccts/sorcerer/SorcererMSVC50.mak
+
+        pccts/sorcerer/lib/msvc.dsp
+
+  I do not have an MS based computer.  If you discover problems
+  please report them so as to save trouble for others in the future.
+]
+
+[
+ Modified by Terence Parr (September 1995) to change .C to .cpp
+]
+
+[
+ This file contains notes on MSVC for Windows NT console execs by Dave
+ Seidel and an explanation of flags etc.. by John Hall; good luck,
+ Terence
+]
+
+===============================================================================
+Date: Sat, 31 Dec 1994 11:40:36 -0500 (EST)
+From: David Seidel <75342.2034@compuserve.com>
+
+I've succesfully build 1.31b3 with djgpp for DOS and MSVC 2.0 for Windows 
+NT.  The only (minor) problem I had was that GNU make (version 3.71, in the 
+djgpp port) complained about "multiple targets" in both the antlr and dlg 
+makefiles.  I got around the error by, in each makefile, commenting out the 
+$(SRC) dependency, for example:
+
+   antlr: $(OBJ) #$(SRC)
+
+I don't know why this is happenning, since you haven't changed that part of 
+the makefile at all, and I think this used to work ok...
+
+Here are the makefiles I built from within the MSVC 2.0 environment for antlr 
+and dlg and Windows NT console executables.  Please feel free to pass them 
+on.  Of course, as soon as 1.31 "goes gold", I will send you nice new 
+binaries.  I'm not going to bother to keep doing both Borland and djgpp for 
+DOS however.  Instead, I'll just keep the djgpp version up to date and also 
+provide WinNT binaries.
+
+Dave
+===============================================================================
+
+         How to port PCCTS 1.10 (and 1.32 hopefully) to Visual C++
+
+                                   By
+
+                       John Hall <jhall@ivy.wpi.edu>
+
+Here is how to compile an ANTLR grammar in Visual C++.  These steps
+describe how to have your ANTLR grammar parse the input file the user
+selects when they choose File Open in your Windows application.  (Even
+if you aren't using Visual C++, the steps should be portable enough to
+other compilers.)
+
+ * Make sure that ANTLR and DLG generate ANSI code (use the -ga
+   switch).
+
+ * Set the following compiler flags in Visual C++ (these are in the
+   Memory Model category of the compiler options in the Project
+   Options menu):
+
+   FLAG MEANING
+   ==== ==============================================================
+   /AL  Large memory model (multiple data segments; data items must be
+    smaller than 64K).
+
+   /Gtn Allocates all items whose size is greater than or equal to n
+    in a new data segment.  (I let n be 256: /Gt256.)
+
+   /Gx- All references to data items are done with far addressing in
+    case they are placed in a far segment.
+
+ * Add the following member variable to the attributes section of your
+   derived CDocument class (you will need to make sure you also
+   include stdio.h):
+
+   FILE *fp;
+
+ * Add the following method to your derived CDocument class:
+
+   BOOL CAppDoc::OnOpenDocument(const char* pszPathName)
+   {
+       // Call CDocument's OnOpenDocument to do housekeeping for us
+       // DON'T add anything to the loading section of Serialize
+       if (!CDocument::OnOpenDocument(pszPathName))
+           return FALSE;
+   
+       // Open input file
+       if ((fp = fopen(pszPathName, "r")) == NULL)
+           return FALSE;
+   
+       // Parse input file
+       ANTLR(start(), fp);
+   
+       // Close input file
+       fclose(fp);
+       return TRUE;
+   }
+
+   (Note: additional code may be necessary, depending on your parser.
+   For example, if your parser uses PCCTS's symbol table library, you
+   will need to insert calls to zzs_init and zzs_done.)
+
+ * Compile the generated C files as C++ files.  (I renamed the files
+   to have a .CPP extension to fool Visual C++ into thinking they were
+   C++ files.  One might also use the /Tp switch, but that switch
+   requires you separately include the filename.)  [I used this step
+   as an easy out for all the external linking errors I was getting
+   that I couldn't fix by declaring things extern "C".]
+
+ * Make sure the __STDC__ portion of the generated files gets
+   compiled.  (Either define __STDC__ yourself or else change all
+   occurrences of __STDC__ to __cplusplus in the generated files.  You
+   can define __STDC__ in the Preprocessor category of the compiler
+   options.)
+
+        ================================================================
+        = Note 23-Sep-97: This is probably not necessary any more.     =
+        = With 1.33MRxxx the use of __STDC__ was replaced with the     =
+        = macro __USE_PROTOS to control the compilation of prototypes. =
+        ================================================================
+                        
+That last step is important for Visual C++, but may not apply to other
+compilers.  For C++ compilers, whether __STDC__ is defined is
+implementation dependent (ARM, page 379).  Apparently, Visual C++ does
+not to define it; it also does not support "old style" C function
+definitions (which is okay, according to page 404 of the ARM).  Those
+two things together caused problems when trying to port the code.
+When it saw this:
+
+#ifdef __STDC__
+void
+globals(AST **_root)
+#else
+globals(_root)
+AST **_root;
+#endif
+
+it skipped the __STDC__ section and tried to process the "old style"
+function definition, where it choked.
+
+When you finally get your parser to compile and link without error,
+you may get General Protection Fault errors at run time.  The problem
+I had was that a NULL was passed to a variable argument function
+without an explicit cast.  The function grabbed a pointer (32-bits)
+off the stack using va_arg, but the NULL was passed silently as the
+integer 0 (16 bits), making the resulting pointer was invalid.  (This
+was in PCCTS's sample C parser.)
+
+There is one other thing I might suggest to help you avoid a run-time
+error.  Make sure you redefine the default error reporting function,
+zzsyn.  To do this, put "#define USER_ZZSYN" in your #header section
+and put your own zzsyn somewhere.  You can then pop up a MessageBox or
+print the error to some output window.
+===============================================================================
diff --git a/Tools/Source/TianoTools/Pccts/README b/Tools/Source/TianoTools/Pccts/README
new file mode 100644
index 0000000000..d089b638b4
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/README
@@ -0,0 +1,159 @@
+
+                          Parr Research Corporation
+                                    with
+                  Purdue University Electrical Engineering
+                                    and
+                       University of Minnesota, AHPCRC
+
+                                Terence Parr
+                                Russell Quong
+                                 Will Cohen
+                                 Hank Dietz
+
+
+A central place for information about PCCTS 1.33 is:
+
+        http://www.polhode.com/pccts.html
+
+The maintenance release is available from:
+
+        http://www.polhode.com/pccts133mr.zip
+
+There is a ready-to-run version for win32 for Microsoft Visual Studio
+at the same site.  It is available from:
+
+        http://www.polhode.com/win32.zip
+
+New users should visit http://www.polhode.com/pccts.html in
+order to get the following document:
+
+        "Notes For New Users of PCCTS"
+
+This is a Postscript file of about 40 pages which is extremely 
+useful for someone starting out. It is a based on 1.33mr21
+
+When you have a little more experience, be sure to review the
+following documents in the distribution kit:
+
+            CHANGES_FROM_133.txt
+            CHANGES_FROM_133_BEFORE_MR13.txt
+            KNOWN_PROBLEMS.txt
+
+-------------------------------------------------------------------------
+                      INSTALLATION (Unix)
+-------------------------------------------------------------------------
+0. Download http://www.polhode.com/pccts133mr.zip
+
+1. Unzip the distribution kit to your preferred location.  
+   If there are newline problems try using zip -a ...
+
+2. cd to the main pccts directory.
+
+3. make
+
+   This will create:
+
+        antlr
+        dlg
+        sorcerer
+        genmk
+
+4. Copy to /usr/local/bin or /usr/local/bin if you like.  If you
+   don't wish to then add pccts/bin to your path.
+
+5. To get an up-to-date list of program options execute the
+   program with no command line options.  To get up-to-date
+   documentation read CHANGES_FROM_133*.txt and KNOWN_PROBLEMS.txt
+   at:
+
+           http://www.polhode.com/pccts.html
+
+6. You need not create a library.  The makefile created by genmk
+   assumes that the files are not part of a library. 
+
+   If you wish to create a library from elements of pccts/h:
+
+   If the first letter of the filename is lowercase (uppercase) it is
+   related to the code generated using the pccts C mode (C++ mode).
+   Some of the .c and .cpp files in the h directory are not meant to
+   be placed in a library and will not compile because they are meant
+   to be #include in pccts generated files which are grammar specific.
+
+   For C++ users place the following elements in the library:
+
+        AParser.cpp
+        ASTBase.cpp
+        ATokenBuffer.cpp
+        BufFileInput.cpp (optional)
+        DLexerBase.cpp
+        PCCTSAST.cpp
+        SList.cpp
+
+-------------------------------------------------------------------------
+                    INSTALLATION (Win32)
+-------------------------------------------------------------------------
+
+I've tried to keep the win32 kit to the minimum necessary to get 
+up and running.  The complete kit contains additional information
+(some historical), source code, and DevStudio projects for 
+rebuilding pccts from the source code.
+
+The kit is now distributed with both MSVC 5 and MSVC6 style projects.
+
+0. Download http://www.polhode.com/win32.zip.
+
+   You may also wish to download:
+
+        http://www.polhode.com/CHANGES_FROM_133.txt
+        http://www.polhode.com/CHANGES_FROM_133_BEFORE_MR13.txt
+        http://www.polhode.com/KNOWN_PROBLEMS.txt
+
+1. Unzip the distribution kit to your preferred location.
+
+   This will create:
+
+         a pccts directory tree
+            pccts/bin/*.exe
+            pccts/lib/*.lib
+            pccts/h/*
+            sorcerer/lib/*
+            sorcerer/h/*
+
+         an example directory tree
+            pccts\example\calcAST\*
+            pccts\example\simple\*
+
+2. Define the environment variable PCCTS to point to the main
+   pccts directory.
+
+3. Try building the simple project: pccts\example\simple\simple50.dsw
+   or simple60.dsw.
+
+4. Try building the complex project: pccts\example\calcAST\calcAST50.dsw
+   or calcAST60.dsw.
+
+-------------------------------------------------------------------------
+                      INSTALLATION (DEC/VMS)
+-------------------------------------------------------------------------
+
+DEC/VMS support added by Pi�ronne Jean-Fran�ois (jfp@altavista.net)
+
+0. Download http://www.polhode.com/pccts133mr.zip
+
+1. Unzip the distribution kit to your preferred location.
+
+2. set default to the main pccts directory.
+
+3. @makefile.vms
+
+   This will create in directory [.bin]:
+
+        antlr.exe
+        dlg.exe
+        sorcerer.exe
+        genmk.exe
+
+5. To get an up-to-date list of program options execute the
+   program with no command line options.  To get up-to-date
+   documentation read CHANGES_FROM_133*.txt and KNOWN_PROBLEMS.txt
+   at http://www.polhode.com/pccts.html.
diff --git a/Tools/Source/TianoTools/Pccts/RIGHTS b/Tools/Source/TianoTools/Pccts/RIGHTS
new file mode 100644
index 0000000000..9db175ff40
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/RIGHTS
@@ -0,0 +1,26 @@
+
+SOFTWARE RIGHTS
+
+We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+company may do whatever they wish with source code distributed with
+PCCTS or the code generated by PCCTS, including the incorporation of
+PCCTS, or its output, into commerical software.
+
+We encourage users to develop software with PCCTS.  However, we do ask
+that credit is given to us for developing PCCTS.  By "credit", we mean
+that if you incorporate our source code into one of your programs
+(commercial product, research project, or otherwise) that you
+acknowledge this fact somewhere in the documentation, research report,
+etc...  If you like PCCTS and have developed a nice tool with the
+output, please mention that you developed it using PCCTS.  In
+addition, we ask that this header remain intact in our source code.
+As long as these guidelines are kept, we expect to continue enhancing
+this system and expect to make other tools available as they are
+completed.
+
+ANTLR 1.33
+Terence Parr
+Parr Research Corporation
+with Purdue University and AHPCRC, University of Minnesota
+1989-1995
diff --git a/Tools/Source/TianoTools/Pccts/antlr/AntlrMS.mak b/Tools/Source/TianoTools/Pccts/antlr/AntlrMS.mak
new file mode 100644
index 0000000000..7c14993ee0
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/AntlrMS.mak
@@ -0,0 +1,233 @@
+# PCCTS directory
+
+# You will need to set the LIB variable similar to this.
+# LIB="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/lib;c:/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Lib"
+
+# PCCTS_HOME=<your PCCTS_HOME>
+PCCTS_HOME=$(WORKSPACE)\Tools\Source\TianoTools\Pccts
+ANTLR_SRC=$(PCCTS_HOME)\antlr
+PCCTS_H=$(PCCTS_HOME)\h
+
+
+# Support directories
+SET=$(PCCTS_HOME)\support\set
+
+
+# Compiler stuff
+CC = cl
+CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
+        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /Zi /W3 -D__USE_PROTOS /wd4700
+
+ANTLR_OBJS = antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+            fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+            misc.obj pred.obj egman.obj mrhoist.obj fcache.obj
+
+SUPPORT_OBJS = set.obj
+
+# Dependencies
+
+$(WORKSPACE)\Tools\bin\antlr.exe: $(ANTLR_OBJS) $(SUPPORT_OBJS)
+    $(CC) $(CFLAGS) -o antlr.exe $(ANTLR_OBJS) $(SUPPORT_OBJS)
+    del *.obj
+		move antlr.exe $(WORKSPACE)\Tools\bin
+
+
+antlr.obj: $(ANTLR_SRC)\antlr.c \
+	                $(PCCTS_H)\antlr.h \
+                	$(PCCTS_H)\config.h \
+	                $(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\mode.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+					$(ANTLR_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\antlr.c
+
+scan.obj: $(ANTLR_SRC)\scan.c \
+	                $(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgauto.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\mode.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+					$(ANTLR_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\scan.c
+
+err.obj: $(ANTLR_SRC)\err.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(PCCTS_H)\err.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+					$(ANTLR_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\err.c
+
+bits.obj: $(ANTLR_SRC)\bits.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\bits.c
+
+build.obj: $(ANTLR_SRC)\build.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\build.c
+
+fset2.obj: $(ANTLR_SRC)\fset2.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\fset2.c
+
+fset.obj: $(ANTLR_SRC)\fset.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\fset.c
+
+gen.obj: $(ANTLR_SRC)\gen.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\gen.c
+
+globals.obj: $(ANTLR_SRC)\globals.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\globals.c
+
+hash.obj: $(ANTLR_SRC)\hash.c \
+					$(PCCTS_H)\config.h \
+					$(ANTLR_SRC)\hash.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\hash.c
+
+lex.obj: $(ANTLR_SRC)\lex.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\lex.c
+
+main.obj: $(ANTLR_SRC)\main.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\mode.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\stdpccts.h \
+					$(ANTLR_SRC)\syn.h \
+					$(ANTLR_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\main.c
+
+misc.obj: $(ANTLR_SRC)\misc.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\misc.c
+
+pred.obj: $(ANTLR_SRC)\pred.c \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\pred.c
+
+egman.obj: $(ANTLR_SRC)\egman.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\egman.c
+
+mrhoist.obj: $(ANTLR_SRC)\mrhoist.c \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\mrhoist.c
+
+fcache.obj: $(ANTLR_SRC)\fcache.c \
+					$(ANTLR_SRC)\generic.h \
+					$(ANTLR_SRC)\hash.h \
+					$(ANTLR_SRC)\proto.h \
+					$(ANTLR_SRC)\syn.h \
+
+    $(CC) -c $(CFLAGS) $(ANTLR_SRC)\fcache.c
+
+set.obj: $(SET)\set.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+
+    $(CC) -c $(CFLAGS) $(SET)\set.c
+
+clean:	
+    del *.obj
+
+distclean:
+    del *.obj
+    del $(WORKSPACE)\Tools\bin\antlr.exe
diff --git a/Tools/Source/TianoTools/Pccts/antlr/AntlrPPC.mak b/Tools/Source/TianoTools/Pccts/antlr/AntlrPPC.mak
new file mode 100644
index 0000000000..9ede60d64c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/AntlrPPC.mak
@@ -0,0 +1,101 @@
+#   Target:     antlrPPC
+#   Sources:    ::support:set:set.c
+#               antlr.c
+#               bits.c
+#               build.c
+#               egman.c
+#               err.c
+#               fcache.c
+#               fset2.c
+#               fset.c
+#               gen.c
+#               globals.c
+#               hash.c
+#               lex.c
+#               main.c
+#               misc.c
+#               mrhoist.c
+#               pred.c
+#               scan.c
+#   Created:    Sunday, May 17, 1998 10:24:53 PM
+#	Author:		Kenji Tanaka
+MAKEFILE     = antlrPPC.make
+�MondoBuild� = {MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
+Includes     = �
+		-i "::h:" �
+		-i "::support:set:"
+Sym�PPC      = 
+ObjDir�PPC   = :Obj:
+PPCCOptions  = {Includes} {Sym�PPC} -w off -d MPW -d __STDC__=1 -d USER_ZZSYN
+Objects�PPC  = �
+		"{ObjDir�PPC}set.c.x" �
+		"{ObjDir�PPC}antlr.c.x" �
+		"{ObjDir�PPC}bits.c.x" �
+		"{ObjDir�PPC}build.c.x" �
+		"{ObjDir�PPC}egman.c.x" �
+		"{ObjDir�PPC}err.c.x" �
+		"{ObjDir�PPC}fcache.c.x" �
+		"{ObjDir�PPC}fset2.c.x" �
+		"{ObjDir�PPC}fset.c.x" �
+		"{ObjDir�PPC}gen.c.x" �
+		"{ObjDir�PPC}globals.c.x" �
+		"{ObjDir�PPC}hash.c.x" �
+		"{ObjDir�PPC}lex.c.x" �
+		"{ObjDir�PPC}main.c.x" �
+		"{ObjDir�PPC}misc.c.x" �
+		"{ObjDir�PPC}mrhoist.c.x" �
+		"{ObjDir�PPC}pred.c.x" �
+		"{ObjDir�PPC}scan.c.x"
+antlrPPC �� {�MondoBuild�} {Objects�PPC}
+	PPCLink �
+		-o {Targ} {Sym�PPC} �
+		{Objects�PPC} �
+		-t 'MPST' �
+		-c 'MPS ' �
+		"{SharedLibraries}InterfaceLib" �
+		"{SharedLibraries}StdCLib" �
+		#"{SharedLibraries}MathLib" �
+		"{PPCLibraries}StdCRuntime.o" �
+		"{PPCLibraries}PPCCRuntime.o" �
+		"{PPCLibraries}PPCToolLibs.o"
+"{ObjDir�PPC}set.c.x" � {�MondoBuild�} "::support:set:set.c"
+	{PPCC} "::support:set:set.c" -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}antlr.c.x" � {�MondoBuild�} antlr.c
+	{PPCC} antlr.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}bits.c.x" � {�MondoBuild�} bits.c
+	{PPCC} bits.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}build.c.x" � {�MondoBuild�} build.c
+	{PPCC} build.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}egman.c.x" � {�MondoBuild�} egman.c
+	{PPCC} egman.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}err.c.x" � {�MondoBuild�} err.c
+	{PPCC} err.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}fcache.c.x" � {�MondoBuild�} fcache.c
+	{PPCC} fcache.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}fset2.c.x" � {�MondoBuild�} fset2.c
+	{PPCC} fset2.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}fset.c.x" � {�MondoBuild�} fset.c
+	{PPCC} fset.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}gen.c.x" � {�MondoBuild�} gen.c
+	{PPCC} gen.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}globals.c.x" � {�MondoBuild�} globals.c
+	{PPCC} globals.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}hash.c.x" � {�MondoBuild�} hash.c
+	{PPCC} hash.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}lex.c.x" � {�MondoBuild�} lex.c
+	{PPCC} lex.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}main.c.x" � {�MondoBuild�} main.c
+	{PPCC} main.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}misc.c.x" � {�MondoBuild�} misc.c
+	{PPCC} misc.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}mrhoist.c.x" � {�MondoBuild�} mrhoist.c
+	{PPCC} mrhoist.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}pred.c.x" � {�MondoBuild�} pred.c
+	{PPCC} pred.c -o {Targ} {PPCCOptions}
+"{ObjDir�PPC}scan.c.x" � {�MondoBuild�} scan.c
+	{PPCC} scan.c -o {Targ} {PPCCOptions}
+
+antlrPPC �� antlr.r
+	Rez antlr.r -o antlrPPC -a
+Install  � antlrPPC
+	Duplicate -y antlrPPC "{MPW}"Tools:antlr
diff --git a/Tools/Source/TianoTools/Pccts/antlr/README b/Tools/Source/TianoTools/Pccts/antlr/README
new file mode 100644
index 0000000000..d7fc95916e
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/README
@@ -0,0 +1,19 @@
+                            ANTLR 1.33
+
+This directory contains the files necessary to build ANTLR.
+
+If you do a "make scrub", ANTLR will have to run on antlr.g and DLG
+will have to run on parser.dlg.  Either
+
+(1)     ANTLR uses the previous antlr in that directory to rebuild itself
+(2)     Needs to find antlr on the search path
+
+You will find that running "antlr -gh antlr.g" will result in about
+10 ambiguity warnings.  These are normal.  Don't worry.
+
+If you do a "make clean" right after installation, ANTLR and DLG should
+not need to run; only the C files will compile.
+
+Don't forget to go into the makefile to uncomment the appropriate
+definitions for your OS/architecture/compiler or see the appropriate
+NOTES.?? file.
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.1 b/Tools/Source/TianoTools/Pccts/antlr/antlr.1
new file mode 100644
index 0000000000..acfa85b066
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/antlr.1
@@ -0,0 +1,209 @@
+.TH ANTLR 1 "September 1995" "ANTLR" "PCCTS Manual Pages"
+.SH NAME
+antlr \- ANother Tool for Language Recognition
+.SH SYNTAX
+.LP
+\fBantlr\fR [\fIoptions\fR] \fIgrammar_files\fR
+.SH DESCRIPTION
+.PP
+\fIAntlr\fP converts an extended form of context-free grammar into a
+set of C functions which directly implement an efficient form of
+deterministic recursive-descent LL(k) parser.  Context-free grammars
+may be augmented with predicates to allow semantics to influence
+parsing; this allows a form of context-sensitive parsing.  Selective
+backtracking is also available to handle non-LL(k) and even
+non-LALR(k) constructs.  \fIAntlr\fP also produces a definition of a
+lexer which can be automatically converted into C code for a DFA-based
+lexer by \fIdlg\fR.  Hence, \fIantlr\fR serves a function much like
+that of \fIyacc\fR, however, it is notably more flexible and is more
+integrated with a lexer generator (\fIantlr\fR directly generates
+\fIdlg\fR code, whereas \fIyacc\fR and \fIlex\fR are given independent
+descriptions).  Unlike \fIyacc\fR which accepts LALR(1) grammars,
+\fIantlr\fR accepts LL(k) grammars in an extended BNF notation \(em
+which eliminates the need for precedence rules.
+.PP
+Like \fIyacc\fR grammars, \fIantlr\fR grammars can use
+automatically-maintained symbol attribute values referenced as dollar
+variables.  Further, because \fIantlr\fR generates top-down parsers,
+arbitrary values may be inherited from parent rules (passed like
+function parameters).  \fIAntlr\fP also has a mechanism for creating
+and manipulating abstract-syntax-trees.
+.PP
+There are various other niceties in \fIantlr\fR, including the ability to
+spread one grammar over multiple files or even multiple grammars in a single
+file, the ability to generate a version of the grammar with actions stripped
+out (for documentation purposes), and lots more.
+.SH OPTIONS
+.IP "\fB-ck \fIn\fR"
+Use up to \fIn\fR symbols of lookahead when using compressed (linear
+approximation) lookahead.  This type of lookahead is very cheap to
+compute and is attempted before full LL(k) lookahead, which is of
+exponential complexity in the worst case.  In general, the compressed
+lookahead can be much deeper (e.g, \f(CW-ck 10\fP) than the full
+lookahead (which usually must be less than 4).
+.IP \fB-CC\fP
+Generate C++ output from both ANTLR and DLG.
+.IP \fB-cr\fP
+Generate a cross-reference for all rules.  For each rule, print a list
+of all other rules that reference it.
+.IP \fB-e1\fP
+Ambiguities/errors shown in low detail (default).
+.IP \fB-e2\fP
+Ambiguities/errors shown in more detail.
+.IP \fB-e3\fP
+Ambiguities/errors shown in excruciating detail.
+.IP "\fB-fe\fP file"
+Rename \fBerr.c\fP to file.
+.IP "\fB-fh\fP file"
+Rename \fBstdpccts.h\fP header (turns on \fB-gh\fP) to file.
+.IP "\fB-fl\fP file"
+Rename lexical output, \fBparser.dlg\fP, to file.
+.IP "\fB-fm\fP file"
+Rename file with lexical mode definitions, \fBmode.h\fP, to file.
+.IP "\fB-fr\fP file"
+Rename file which remaps globally visible symbols, \fBremap.h\fP, to file.
+.IP "\fB-ft\fP file"
+Rename \fBtokens.h\fP to file.
+.IP \fB-ga\fP
+Generate ANSI-compatible code (default case).  This has not been
+rigorously tested to be ANSI XJ11 C compliant, but it is close.  The
+normal output of \fIantlr\fP is currently compilable under both K&R,
+ANSI C, and C++\(emthis option does nothing because \fIantlr\fP
+generates a bunch of #ifdef's to do the right thing depending on the
+language.
+.IP \fB-gc\fP
+Indicates that \fIantlr\fP should generate no C code, i.e., only
+perform analysis on the grammar.
+.IP \fB-gd\fP
+C code is inserted in each of the \fIantlr\fR generated parsing functions to
+provide for user-defined handling of a detailed parse trace.  The inserted
+code consists of calls to the user-supplied macros or functions called
+\fBzzTRACEIN\fR and \fBzzTRACEOUT\fP.  The only argument is a
+\fIchar *\fR pointing to a C-style string which is the grammar rule
+recognized by the current parsing function.  If no definition is given
+for the trace functions, upon rule entry and exit, a message will be
+printed indicating that a particular rule as been entered or exited.
+.IP \fB-ge\fP
+Generate an error class for each non-terminal.
+.IP \fB-gh\fP
+Generate \fBstdpccts.h\fP for non-ANTLR-generated files to include.
+This file contains all defines needed to describe the type of parser
+generated by \fIantlr\fP (e.g. how much lookahead is used and whether
+or not trees are constructed) and contains the \fBheader\fP action
+specified by the user.
+.IP \fB-gk\fP
+Generate parsers that delay lookahead fetches until needed.  Without
+this option, \fIantlr\fP generates parsers which always have \fIk\fP
+tokens of lookahead available.
+.IP \fB-gl\fP
+Generate line info about grammar actions in C parser of the form
+\fB#\ \fIline\fP\ "\fIfile\fP"\fR which makes error messages from
+the C/C++ compiler make more sense as they will \*Qpoint\*U into the
+grammar file not the resulting C file.  Debugging is easier as well,
+because you will step through the grammar not C file.
+.IP \fB-gs\fR
+Do not generate sets for token expression lists; instead generate a
+\fB||\fP-separated sequence of \fBLA(1)==\fItoken_number\fR.  The
+default is to generate sets.
+.IP \fB-gt\fP
+Generate code for Abstract-Syntax Trees.
+.IP \fB-gx\fP
+Do not create the lexical analyzer files (dlg-related).  This option
+should be given when the user wishes to provide a customized lexical
+analyzer.  It may also be used in \fImake\fR scripts to cause only the
+parser to be rebuilt when a change not affecting the lexical structure
+is made to the input grammars.
+.IP "\fB-k \fIn\fR"
+Set k of LL(k) to \fIn\fR; i.e. set tokens of look-ahead (default==1).
+.IP "\fB-o\fP dir
+Directory where output files should go (default=".").  This is very
+nice for keeping the source directory clear of ANTLR and DLG spawn.
+.IP \fB-p\fP
+The complete grammar, collected from all input grammar files and
+stripped of all comments and embedded actions, is listed to
+\fBstdout\fP.  This is intended to aid in viewing the entire grammar
+as a whole and to eliminate the need to keep actions concisely stated
+so that the grammar is easier to read.  Hence, it is preferable to
+embed even complex actions directly in the grammar, rather than to
+call them as subroutines, since the subroutine call overhead will be
+saved.
+.IP \fB-pa\fP
+This option is the same as \fB-p\fP except that the output is
+annotated with the first sets determined from grammar analysis.
+.IP "\fB-prc on\fR
+Turn on the computation and hoisting of predicate context.
+.IP "\fB-prc off\fR
+Turn off the computation and hoisting of predicate context.  This
+option makes 1.10 behave like the 1.06 release with option \fB-pr\fR
+on.  Context computation is off by default.
+.IP "\fB-rl \fIn\fR
+Limit the maximum number of tree nodes used by grammar analysis to
+\fIn\fP.  Occasionally, \fIantlr\fP is unable to analyze a grammar
+submitted by the user.  This rare situation can only occur when the
+grammar is large and the amount of lookahead is greater than one.  A
+nonlinear analysis algorithm is used by PCCTS to handle the general
+case of LL(k) parsing.  The average complexity of analysis, however, is
+near linear due to some fancy footwork in the implementation which
+reduces the number of calls to the full LL(k) algorithm.  An error
+message will be displayed, if this limit is reached, which indicates
+the grammar construct being analyzed when \fIantlr\fP hit a
+non-linearity.  Use this option if \fIantlr\fP seems to go out to
+lunch and your disk start thrashing; try \fIn\fP=10000 to start.  Once
+the offending construct has been identified, try to remove the
+ambiguity that \fIantlr\fP was trying to overcome with large lookahead
+analysis.  The introduction of (...)? backtracking blocks eliminates
+some of these problems\ \(em \fIantlr\fP does not analyze alternatives
+that begin with (...)? (it simply backtracks, if necessary, at run
+time).
+.IP \fB-w1\fR
+Set low warning level.  Do not warn if semantic predicates and/or
+(...)? blocks are assumed to cover ambiguous alternatives.
+.IP \fB-w2\fR
+Ambiguous parsing decisions yield warnings even if semantic predicates
+or (...)? blocks are used.  Warn if predicate context computed and
+semantic predicates incompletely disambiguate alternative productions.
+.IP \fB-\fR
+Read grammar from standard input and generate \fBstdin.c\fP as the
+parser file.
+.SH "SPECIAL CONSIDERATIONS"
+.PP
+\fIAntlr\fP works...  we think.  There is no implicit guarantee of
+anything.  We reserve no \fBlegal\fP rights to the software known as
+the Purdue Compiler Construction Tool Set (PCCTS) \(em PCCTS is in the
+public domain.  An individual or company may do whatever they wish
+with source code distributed with PCCTS or the code generated by
+PCCTS, including the incorporation of PCCTS, or its output, into
+commercial software.  We encourage users to develop software with
+PCCTS.  However, we do ask that credit is given to us for developing
+PCCTS.  By "credit", we mean that if you incorporate our source code
+into one of your programs (commercial product, research project, or
+otherwise) that you acknowledge this fact somewhere in the
+documentation, research report, etc...  If you like PCCTS and have
+developed a nice tool with the output, please mention that you
+developed it using PCCTS.  As long as these guidelines are followed,
+we expect to continue enhancing this system and expect to make other
+tools available as they are completed.
+.SH FILES
+.IP *.c
+output C parser.
+.IP *.cpp
+output C++ parser when C++ mode is used.
+.IP \fBparser.dlg\fP
+output \fIdlg\fR lexical analyzer.
+.IP \fBerr.c\fP
+token string array, error sets and error support routines.  Not used in
+C++ mode.
+.IP \fBremap.h\fP
+file that redefines all globally visible parser symbols.  The use of
+the #parser directive creates this file.  Not used in
+C++ mode.
+.IP \fBstdpccts.h\fP
+list of definitions needed by C files, not generated by PCCTS, that
+reference PCCTS objects.  This is not generated by default.  Not used in
+C++ mode.
+.IP \fBtokens.h\fP
+output \fI#defines\fR for tokens used and function prototypes for
+functions generated for rules.
+.SH "SEE ALSO"
+.LP
+dlg(1), pccts(1)
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.c b/Tools/Source/TianoTools/Pccts/antlr/antlr.c
new file mode 100644
index 0000000000..8aaef794e1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/antlr.c
@@ -0,0 +1,3564 @@
+/*
+ * A n t l r  T r a n s l a t i o n  H e a d e r
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ *
+ *   ..\bin\antlr -gh antlr.g
+ *
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include "pcctscfg.h"
+#include "set.h"
+#include <ctype.h>
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#define zzcr_attr(attr,tok,t)
+#define zzSET_SIZE 20
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "mode.h"
+
+/* MR23 In order to remove calls to PURIFY use the antlr -nopurify option */
+
+#ifndef PCCTS_PURIFY
+#define PCCTS_PURIFY(r,s) memset((char *) &(r),'\0',(s));
+#endif
+
+ANTLR_INFO
+
+
+/* MR20 G. Hobbelt For Borland C++ 4.x & 5.x compiling with ALL warnings enabled */
+#if defined(__TURBOC__)
+#pragma warn -aus  /* unused assignment of 'xxx' */
+#endif
+
+
+#ifdef __USE_PROTOS
+static void chkToken(char *, char *, char *, int);
+#else
+static void chkToken();
+#endif
+
+#ifdef __USE_PROTOS
+static int isDLGmaxToken(char *Token);				     /* MR3 */
+#else
+static int isDLGmaxToken();				                             /* MR3 */
+#endif
+
+static int class_nest_level = 0;
+
+/* MR20 G. Hobbelt extern definitions moved to antlr.h */
+
+  
+
+void
+#ifdef __USE_PROTOS
+grammar(void)
+#else
+grammar()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  Graph g;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    for (;;) {
+      if ( !((setwd1[LA(1)]&0x1))) break;
+      if ( (LA(1)==94) ) {
+        zzmatch(94); zzCONSUME;
+        zzmatch(Action);
+        
+        if ( HdrAction==NULL ) {
+          HdrAction = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+          require(HdrAction!=NULL, "rule grammar: cannot allocate header action");
+          strcpy(HdrAction, LATEXT(1));
+        }
+        else warn("additional #header statement ignored");
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==95) ) {
+          zzmatch(95); zzCONSUME;
+          zzmatch(Action);
+          
+          if ( FirstAction==NULL ) {
+            FirstAction = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+            require(FirstAction!=NULL, "rule grammar: cannot allocate #first action");
+            strcpy(FirstAction, LATEXT(1));
+          } else {
+            warn("additional #first statement ignored");
+          };
+ zzCONSUME;
+
+        }
+        else {
+          if ( (LA(1)==96) ) {
+            zzmatch(96); zzCONSUME;
+            zzmatch(QuotedTerm);
+            
+            if ( GenCC ) {
+              warn("#parser meta-op incompatible with -CC; ignored");
+            }
+            else {
+              if ( strcmp(ParserName,"zzparser")==0 ) {
+                ParserName=StripQuotes(mystrdup(LATEXT(1)));
+                if ( RulePrefix[0]!='\0' )
+                {
+                  warn("#parser meta-op incompatible with '-gp prefix'; '-gp' ignored");
+                  RulePrefix[0]='\0';
+                }
+              }
+              else warn("additional #parser statement ignored");
+            }
+ zzCONSUME;
+
+          }
+          else {
+            if ( (LA(1)==97) ) {
+              zzmatch(97); zzCONSUME;
+              zzmatch(QuotedTerm);
+              {
+                char *fname;
+                zzantlr_state st; FILE *f; struct zzdlg_state dst;
+                UserTokenDefsFile = mystrdup(LATEXT(1));
+                zzsave_antlr_state(&st);
+                zzsave_dlg_state(&dst);
+                fname = mystrdup(LATEXT(1));
+                f = fopen(StripQuotes(fname), "r");
+                if ( f==NULL ) {warn(eMsg1("cannot open token defs file '%s'", fname+1));}
+                else {
+                  ANTLRm(enum_file(fname+1), f, PARSE_ENUM_FILE);
+                  UserDefdTokens = 1;
+                }
+                zzrestore_antlr_state(&st);
+                zzrestore_dlg_state(&dst);
+              }
+ zzCONSUME;
+
+            }
+            else break; /* MR6 code for exiting loop "for sure" */
+          }
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    for (;;) {
+      if ( !((setwd1[LA(1)]&0x2))) break;
+      if ( (LA(1)==Action) ) {
+        zzmatch(Action);
+        {
+          UserAction *ua = newUserAction(LATEXT(1));
+          ua->file = action_file; ua->line = action_line;
+          if ( class_nest_level>0 ) list_add(&class_before_actions, ua);
+          else list_add(&BeforeActions, ua);
+        }
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==108) ) {
+          laction();
+        }
+        else {
+          if ( (LA(1)==109) ) {
+            lmember();
+          }
+          else {
+            if ( (LA(1)==110) ) {
+              lprefix();
+            }
+            else {
+              if ( (LA(1)==116) ) {
+                aLexclass();
+              }
+              else {
+                if ( (LA(1)==120) ) {
+                  token();
+                }
+                else {
+                  if ( (LA(1)==117) ) {
+                    error();
+                  }
+                  else {
+                    if ( (LA(1)==118) ) {
+                      tclass();
+                    }
+                    else {
+                      if ( (LA(1)==111) ) {
+                        aPred();
+                      }
+                      else {
+                        if ( (LA(1)==133) ) {
+                          default_exception_handler();
+                        }
+                        else {
+                          if ( (LA(1)==99) ) {
+                            class_def();
+                          }
+                          else {
+                            if ( (LA(1)==98) ) {
+                              zzmatch(98);
+                              
+                              if ( class_nest_level==0 )
+                              warn("missing class definition for trailing '}'");
+                              class_nest_level--;
+ zzCONSUME;
+
+                            }
+                            else break; /* MR6 code for exiting loop "for sure" */
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  rule();
+  g=zzaArg(zztasp1,3); SynDiag = (Junction *) zzaArg(zztasp1,3 ).left;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    for (;;) {
+      if ( !((setwd1[LA(1)]&0x4))) break;
+      if ( (LA(1)==NonTerminal) ) {
+        rule();
+        if ( zzaArg(zztasp2,1 ).left!=NULL ) {
+          g.right = NULL;
+          
+/* MR21a */             /*  Avoid use of a malformed graph when CannotContinue */
+          /* MR21a */             /*  is already set                                     */
+          /* MR21a */
+          /* MR21a */             if (! (CannotContinue && g.left == NULL)) {
+            /* MR21a */               g = Or(g, zzaArg(zztasp2,1));
+            /* MR21a */             }
+          /* MR21a */		      }
+      }
+      else {
+        if ( (LA(1)==116) ) {
+          aLexclass();
+        }
+        else {
+          if ( (LA(1)==120) ) {
+            token();
+          }
+          else {
+            if ( (LA(1)==117) ) {
+              error();
+            }
+            else {
+              if ( (LA(1)==118) ) {
+                tclass();
+              }
+              else {
+                if ( (LA(1)==111) ) {
+                  aPred();
+                }
+                else {
+                  if ( (LA(1)==99) ) {
+                    class_def();
+                  }
+                  else {
+                    if ( (LA(1)==98) ) {
+                      zzmatch(98);
+                      
+                      if ( class_nest_level==0 )
+                      warn("missing class definition for trailing '}'");
+                      class_nest_level--;
+ zzCONSUME;
+
+                    }
+                    else break; /* MR6 code for exiting loop "for sure" */
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    for (;;) {
+      if ( !((setwd1[LA(1)]&0x8))) break;
+      if ( (LA(1)==Action) ) {
+        zzmatch(Action);
+        {
+          UserAction *ua = newUserAction(LATEXT(1));
+          ua->file = action_file; ua->line = action_line;
+          if ( class_nest_level>0 ) list_add(&class_after_actions, ua);
+          else list_add(&AfterActions, ua);
+        }
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==108) ) {
+          laction();
+        }
+        else {
+          if ( (LA(1)==109) ) {
+            lmember();
+          }
+          else {
+            if ( (LA(1)==110) ) {
+              lprefix();
+            }
+            else {
+              if ( (LA(1)==117) ) {
+                error();
+              }
+              else {
+                if ( (LA(1)==118) ) {
+                  tclass();
+                }
+                else {
+                  if ( (LA(1)==99) ) {
+                    class_def();
+                  }
+                  else {
+                    if ( (LA(1)==111) ) {
+                      aPred();
+                    }
+                    else {
+                      if ( (LA(1)==98) ) {
+                        zzmatch(98);
+                        
+                        if ( class_nest_level==0 )
+                        warn("missing class definition for trailing '}'");
+                        class_nest_level--;
+ zzCONSUME;
+
+                      }
+                      else break; /* MR6 code for exiting loop "for sure" */
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(Eof); zzCONSUME;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x10);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+class_def(void)
+#else
+class_def()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  int go=1; char name[MaxRuleName+1];
+  zzmatch(99); zzCONSUME;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==NonTerminal) ) {
+      zzmatch(NonTerminal);
+      if(go) strncpy(name,LATEXT(1),MaxRuleName);
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==TokenTerm) ) {
+        zzmatch(TokenTerm);
+        if(go) strncpy(name,LATEXT(1),MaxRuleName);
+ zzCONSUME;
+
+      }
+      else {zzFAIL(1,zzerr1,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  if ( CurrentClassName[0]!='\0' && strcmp(CurrentClassName,name)!=0
+  && GenCC ) {
+    err("only one grammar class allowed in this release");
+    go = 0;
+  }
+  else strcpy(CurrentClassName, name);
+  if ( !GenCC ) { err("class meta-op used without C++ option"); }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (setwd1[LA(1)]&0x20) ) {
+      zzsetmatch(zzerr2, zzerr3);
+      if (ClassDeclStuff == NULL) {
+        /* MR10 */                   ClassDeclStuff=(char *)calloc(MaxClassDeclStuff+1,sizeof(char));
+        /* MR10 */              };
+      /* MR10 */              strncat(ClassDeclStuff," ",MaxClassDeclStuff);
+      /* MR10 */              strncat(ClassDeclStuff,LATEXT(1),MaxClassDeclStuff);
+      /* MR22 */              do {
+        /* MR22 */                if (0 == strcmp(LATEXT(1),"public")) break;
+        /* MR22 */                if (0 == strcmp(LATEXT(1),"private")) break;
+        /* MR22 */                if (0 == strcmp(LATEXT(1),"protected")) break;
+        /* MR22 */                if (0 == strcmp(LATEXT(1),"virtual")) break;
+        /* MR22 */                if (0 == strcmp(LATEXT(1),",")) break;
+        /* MR22 */                if (0 == strcmp(LATEXT(1),":")) break;
+        /* MR22 */                if (BaseClassName != NULL) break;
+        /* MR22 */                BaseClassName=(char *)calloc(strlen(LATEXT(1))+1,sizeof(char));
+        /* MR22 */                require(BaseClassName!=NULL, "rule grammar: cannot allocate base class name");
+        /* MR22 */				  strcpy(BaseClassName,LATEXT(1));
+        /* MR22 */              } while (0);
+      /* MR10 */
+ zzCONSUME;
+
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(102);
+  
+  no_classes_found = 0;
+  if ( class_nest_level>=1 ) {warn("cannot have nested classes");}
+  else class_nest_level++;
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x40);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+rule(void)
+#else
+rule()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  
+  
+			ExceptionGroup *eg;
+  RuleEntry *q; Junction *p; Graph r; int f, l; ECnode *e;
+  set toksrefd, rulesrefd;
+  char *pdecl=NULL, *ret=NULL, *a; CurRetDef = CurParmDef = NULL;
+  CurExGroups = NULL;
+  CurElementLabels = NULL;
+  CurAstLabelsInActions = NULL; /* MR27 */
+  /* We want a new element label hash table for each rule */
+  if ( Elabel!=NULL ) killHashTable(Elabel);
+  Elabel = newHashTable();
+  attribsRefdFromAction = empty;
+  zzmatch(NonTerminal);
+  q=NULL;
+  if ( hash_get(Rname, LATEXT(1))!=NULL ) {
+    err(eMsg1("duplicate rule definition: '%s'",LATEXT(1)));
+    CannotContinue=TRUE;
+  }
+  else
+  {
+    q = (RuleEntry *)hash_add(Rname,
+    LATEXT(1),
+    (Entry *)newRuleEntry(LATEXT(1)));
+    CurRule = q->str;
+  }
+  CurRuleNode = q;
+  f = CurFile; l = zzline;
+  NumRules++;
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==103) ) {
+      zzmatch(103);
+      if ( q!=NULL ) q->noAST = TRUE;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd1[LA(1)]&0x80) ) {
+      }
+      else {zzFAIL(1,zzerr4,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    ;
+    if ( (setwd2[LA(1)]&0x1) ) {
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==104) ) {
+          zzmatch(104); zzCONSUME;
+        }
+        else {
+          if ( (LA(1)==PassAction) ) {
+          }
+          else {zzFAIL(1,zzerr5,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      zzmatch(PassAction);
+      pdecl = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(pdecl!=NULL, "rule rule: cannot allocate param decl");
+      strcpy(pdecl, LATEXT(1));
+      CurParmDef = pdecl;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd2[LA(1)]&0x2) ) {
+      }
+      else {zzFAIL(1,zzerr6,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==105) ) {
+      zzmatch(105); zzCONSUME;
+      zzmatch(PassAction);
+      ret = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(ret!=NULL, "rule rule: cannot allocate ret type");
+      strcpy(ret, LATEXT(1));
+      CurRetDef = ret;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd2[LA(1)]&0x4) ) {
+      }
+      else {zzFAIL(1,zzerr7,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==QuotedTerm) ) {
+      zzmatch(QuotedTerm);
+      if ( q!=NULL ) q->egroup=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==106) ) {
+      }
+      else {zzFAIL(1,zzerr8,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  if ( GenEClasseForRules && q!=NULL ) {
+    e = newECnode;
+    require(e!=NULL, "cannot allocate error class node");
+    if ( q->egroup == NULL ) {a = q->str; a[0] = (char)toupper(a[0]);}
+    else a = q->egroup;
+    if ( Tnum( a ) == 0 )
+    {
+      e->tok = addTname( a );
+      list_add(&eclasses, (char *)e);
+      if ( q->egroup == NULL ) a[0] = (char)tolower(a[0]);
+      /* refers to itself */
+      list_add(&(e->elist), mystrdup(q->str));
+    }
+    else {
+      warn(eMsg1("default errclass for '%s' would conflict with token/errclass/tokclass",a));
+      if ( q->egroup == NULL ) a[0] = (char)tolower(a[0]);
+      free((char *)e);
+    }
+  }
+  BlkLevel++;
+  if (BlkLevel >= MAX_BLK_LEVEL) fatal("Blocks nested too deeply");
+  /* MR23 */    CurBlockID_array[BlkLevel] = CurBlockID;
+  /* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;
+  zzmatch(106);
+  inAlt=1;
+ zzCONSUME;
+
+  block( &toksrefd, &rulesrefd );
+  r = makeBlk(zzaArg(zztasp1,7),0, NULL /* pFirstSetSymbol */ );
+  CurRuleBlk = (Junction *)r.left;
+  CurRuleBlk->blockid = CurBlockID;
+  CurRuleBlk->jtype = RuleBlk;
+  if ( q!=NULL ) CurRuleBlk->rname = q->str;
+  CurRuleBlk->file = f;
+  CurRuleBlk->line = l;
+  CurRuleBlk->pdecl = pdecl;
+  CurRuleBlk->ret = ret;
+  CurRuleBlk->lock = makelocks();
+  CurRuleBlk->pred_lock = makelocks();
+  CurRuleBlk->tokrefs = toksrefd;
+  CurRuleBlk->rulerefs = rulesrefd;
+  p = newJunction();	/* add EndRule Node */
+  ((Junction *)r.right)->p1 = (Node *)p;
+  r.right = (Node *) p;
+  p->jtype = EndRule;
+  p->lock = makelocks();
+  p->pred_lock = makelocks();
+  CurRuleBlk->end = p;
+  if ( q!=NULL ) q->rulenum = NumRules;
+  zzaArg(zztasp1,7) = r;
+  
+  /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+  /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+  --BlkLevel;
+  altFixup();leFixup();egFixup();
+  zzmatch(107);
+  inAlt=0;
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==Action) ) {
+      zzmatch(Action);
+      a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(a!=NULL, "rule rule: cannot allocate error action");
+      strcpy(a, LATEXT(1));
+      CurRuleBlk->erraction = a;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd2[LA(1)]&0x8) ) {
+      }
+      else {zzFAIL(1,zzerr9,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==133) ) {
+       eg  = exception_group();
+
+      if ( eg!=NULL ) {
+        list_add(&CurExGroups, (void *)eg);
+        if (eg->label == NULL || *eg->label=='\0' ) q->has_rule_exception = 1;
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  if ( q==NULL ) zzaArg(zztasp1,0 ).left = NULL; else zzaArg(zztasp1,0) = zzaArg(zztasp1,7);
+  CurRuleBlk->exceptions = CurExGroups;
+  CurRuleBlk->el_labels = CurElementLabels;
+  CurRuleNode->ast_labels_in_actions = CurAstLabelsInActions;
+  CurRuleNode = NULL;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x10);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+laction(void)
+#else
+laction()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *a;
+  zzmatch(108); zzCONSUME;
+  zzmatch(Action);
+  
+  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+  require(a!=NULL, "rule laction: cannot allocate action");
+  strcpy(a, LATEXT(1));
+  list_add(&LexActions, a);
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x20);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+lmember(void)
+#else
+lmember()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *a;
+  zzmatch(109); zzCONSUME;
+  zzmatch(Action);
+  
+  /* MR1 */		if (! GenCC) {
+    /* MR1 */		  err("Use #lexmember only in C++ mode (to insert code in DLG class header");
+    /* MR1 */	        } else {
+    /* MR1 */		  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+    /* MR1 */		  require(a!=NULL, "rule lmember: cannot allocate action");
+    /* MR1 */		  strcpy(a, LATEXT(1));
+    /* MR1 */		  list_add(&LexMemberActions, a);
+    /* MR1 */		};
+  /* MR1 */
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x40);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+lprefix(void)
+#else
+lprefix()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *a;
+  zzmatch(110); zzCONSUME;
+  zzmatch(Action);
+  
+  /* MR1 */		if (! GenCC) {
+    /* MR1 */		  err("Use #lexprefix only in C++ mode (to insert code in DLG class header");
+    /* MR1 */	        } else {
+    /* MR1 */		  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+    /* MR1 */		  require(a!=NULL, "rule lprefix: cannot allocate action");
+    /* MR1 */		  strcpy(a, LATEXT(1));
+    /* MR1 */		  list_add(&LexPrefixActions, a);
+    /* MR1 */		};
+  /* MR1 */
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x80);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+aPred(void)
+#else
+aPred()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  PredEntry     *predEntry=NULL;
+  char          *name=NULL;
+  Predicate     *predExpr=NULL;
+  char          *predLiteral=NULL;
+  int           save_file;
+  int           save_line;
+  int           predExprPresent=0;
+  zzmatch(111);
+  
+  MR_usingPredNames=1;      /* will need to use -mrhoist version of genPredTree */
+ zzCONSUME;
+
+  zzmatch(TokenTerm);
+  name=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+  
+  /* don't free - referenced in predicates */
+  
+            CurPredName=(char *)calloc(1,strlen(name) + 10);
+  strcat(CurPredName,"#pred ");
+  strcat(CurPredName,name);
+  
+            predEntry=(PredEntry *) hash_get(Pname,name);
+  if (predEntry != NULL) {
+  warnFL(eMsg1("#pred %s previously defined - ignored",name),
+  FileStr[action_file],action_line);
+  name=NULL;
+};
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==Pred) ) {
+      zzmatch(Pred);
+      predLiteral=mystrdup(LATEXT(1));
+      save_line=action_line;
+      save_file=action_file;
+ zzCONSUME;
+
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (setwd3[LA(1)]&0x1) ) {
+           predExpr  = predOrExpr();
+
+          predExprPresent=1;
+        }
+        else {
+          if ( (setwd3[LA(1)]&0x2) ) {
+          }
+          else {zzFAIL(1,zzerr10,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      if (predLiteral != NULL && name != NULL) {
+        
+                      /*
+        *  predExpr may be NULL due to syntax errors
+        *    or simply omitted by the user
+        */
+        
+                      predEntry=newPredEntry(name);
+        predEntry->file=save_file;
+        predEntry->line=save_line;
+        predExpr=MR_predFlatten(predExpr);
+        predEntry->predLiteral=predLiteral;
+        if (! predExprPresent || predExpr == NULL) {
+          predExpr=new_pred();
+          predExpr->expr=predLiteral;
+          predExpr->source=newActionNode();
+          predExpr->source->action=predExpr->expr;
+          predExpr->source->rname=CurPredName;
+          predExpr->source->line=action_line;
+          predExpr->source->file=action_file;
+          predExpr->source->is_predicate=1;
+          predExpr->k=predicateLookaheadDepth(predExpr->source);
+        };
+        predEntry->pred=predExpr;
+        hash_add(Pname,name,(Entry *)predEntry);
+        predExpr=NULL;
+      };
+      predicate_free(predExpr);
+    }
+    else {
+      if ( (setwd3[LA(1)]&0x4) ) {
+        save_line=zzline; save_file=CurFile;
+         predExpr  = predOrExpr();
+
+        if (predExpr != NULL && name != NULL) {
+          predEntry=newPredEntry(name);
+          predEntry->file=CurFile;
+          predEntry->line=zzline;
+          predExpr=MR_predFlatten(predExpr);
+          predEntry->pred=predExpr;
+          hash_add(Pname,name,(Entry *)predEntry);
+          predExpr=NULL;
+        };
+        predicate_free(predExpr);
+      }
+      else {zzFAIL(1,zzerr11,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==107) ) {
+      zzmatch(107); zzCONSUME;
+    }
+    else {
+      if ( (setwd3[LA(1)]&0x8) ) {
+      }
+      else {zzFAIL(1,zzerr12,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  predicate_free(predExpr);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x10);
+  }
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+predOrExpr(void)
+#else
+predOrExpr()
+#endif
+{
+  Predicate *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(Predicate *  ))
+  zzMake0;
+  {
+  Predicate     *ORnode;
+  Predicate     *predExpr;
+  Predicate     **tail=NULL;
+   predExpr  = predAndExpr();
+
+  
+  ORnode=new_pred();
+  ORnode->expr=PRED_OR_LIST;
+  if (predExpr != NULL) {
+    ORnode->down=predExpr;
+    tail=&predExpr->right;
+  };
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==112) ) {
+      zzmatch(112); zzCONSUME;
+       predExpr  = predAndExpr();
+
+      
+      if (predExpr != NULL) {
+        *tail=predExpr;
+        tail=&predExpr->right;
+      };
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  _retv=ORnode;
+  ORnode=NULL;
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  predicate_free(ORnode);  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x20);
+  return _retv;
+  }
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+predAndExpr(void)
+#else
+predAndExpr()
+#endif
+{
+  Predicate *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(Predicate *  ))
+  zzMake0;
+  {
+  Predicate     *ANDnode;
+  Predicate     *predExpr;
+  Predicate     **tail=NULL;
+   predExpr  = predPrimary();
+
+  
+  ANDnode=new_pred();
+  ANDnode->expr=PRED_AND_LIST;
+  if (predExpr != NULL) {
+    ANDnode->down=predExpr;
+    tail=&predExpr->right;
+  };
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==113) ) {
+      zzmatch(113); zzCONSUME;
+       predExpr  = predPrimary();
+
+      
+      if (predExpr != NULL) {
+        *tail=predExpr;
+        tail=&predExpr->right;
+      };
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  _retv=ANDnode;
+  ANDnode=NULL;
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  predicate_free(ANDnode);  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x40);
+  return _retv;
+  }
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+predPrimary(void)
+#else
+predPrimary()
+#endif
+{
+  Predicate *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(Predicate *  ))
+  zzMake0;
+  {
+  
+  char          *name=NULL;
+  PredEntry     *predEntry=NULL;
+  Predicate     *predExpr=NULL;
+  if ( (LA(1)==TokenTerm) ) {
+    zzmatch(TokenTerm);
+    name=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+    
+    predEntry=(PredEntry *) hash_get(Pname,name);
+    if (predEntry == NULL) {
+      warnFL(eMsg1("no previously defined #pred with name \"%s\"",name),
+      FileStr[CurFile],zzline);
+      name=NULL;
+      _retv=NULL;
+    } else {
+      predExpr=predicate_dup(predEntry->pred);
+      predExpr->predEntry=predEntry;
+      _retv=predExpr;
+    };
+  }
+  else {
+    if ( (LA(1)==114) ) {
+      zzmatch(114); zzCONSUME;
+       predExpr  = predOrExpr();
+
+      zzmatch(115);
+      
+      _retv=predExpr;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==103) ) {
+        zzmatch(103); zzCONSUME;
+         predExpr  = predPrimary();
+
+        
+        predExpr->inverted=!predExpr->inverted;
+        _retv=predExpr;
+      }
+      else {zzFAIL(1,zzerr13,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+  }
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  
+  predicate_free(predExpr);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x80);
+  return _retv;
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+aLexclass(void)
+#else
+aLexclass()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  zzmatch(116); zzCONSUME;
+  zzmatch(TokenTerm);
+  lexclass(mystrdup(LATEXT(1)));
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd4, 0x1);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+error(void)
+#else
+error()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *t=NULL; ECnode *e; int go=1; TermEntry *p;
+  zzmatch(117); zzCONSUME;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    ;
+    if ( (LA(1)==TokenTerm) ) {
+      zzmatch(TokenTerm);
+      t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==QuotedTerm) ) {
+        zzmatch(QuotedTerm);
+        t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+      }
+      else {zzFAIL(1,zzerr14,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  e = newECnode;
+  require(e!=NULL, "cannot allocate error class node");
+  e->lexclass = CurrentLexClass;
+  if ( Tnum( (t=StripQuotes(t)) ) == 0 )
+  {
+    if ( hash_get(Texpr, t) != NULL )
+    warn(eMsg1("errclass name conflicts with regular expression  '%s'",t));
+    e->tok = addTname( t );
+    set_orel(e->tok, &imag_tokens);
+    require((p=(TermEntry *)hash_get(Tname, t)) != NULL,
+    "hash table mechanism is broken");
+    p->classname = 1;	/* entry is errclass name, not token */
+    list_add(&eclasses, (char *)e);
+  }
+  else
+  {
+  warn(eMsg1("redefinition of errclass or conflict w/token or tokclass '%s'; ignored",t));
+  free( (char *)e );
+  go=0;
+}
+  zzmatch(102); zzCONSUME;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==NonTerminal) ) {
+      zzmatch(NonTerminal);
+      if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==TokenTerm) ) {
+        zzmatch(TokenTerm);
+        if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==QuotedTerm) ) {
+          zzmatch(QuotedTerm);
+          if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+        }
+        else {zzFAIL(1,zzerr15,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+      }
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  if ( go ) list_add(&(e->elist), t);
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (setwd4[LA(1)]&0x2) ) {
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==NonTerminal) ) {
+          zzmatch(NonTerminal);
+          if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+        }
+        else {
+          if ( (LA(1)==TokenTerm) ) {
+            zzmatch(TokenTerm);
+            if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+          }
+          else {
+            if ( (LA(1)==QuotedTerm) ) {
+              zzmatch(QuotedTerm);
+              if ( go ) t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+            }
+            else {zzFAIL(1,zzerr16,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      if ( go ) list_add(&(e->elist), t);
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(98); zzCONSUME;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd4, 0x4);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+tclass(void)
+#else
+tclass()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *t=NULL; TCnode *e; int go=1,tok,totok; TermEntry *p, *term, *toterm;
+  char *akaString=NULL; int save_file; int save_line;
+  char *totext=NULL;
+  zzmatch(118); zzCONSUME;
+  zzmatch(TokenTerm);
+  t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+  e = newTCnode;
+  require(e!=NULL, "cannot allocate token class node");
+  e->lexclass = CurrentLexClass;
+  if ( Tnum( t ) == 0 )
+  {
+    e->tok = addTname( t );
+    set_orel(e->tok, &imag_tokens);
+    set_orel(e->tok, &tokclasses);
+    require((p=(TermEntry *)hash_get(Tname, t)) != NULL,
+    "hash table mechanism is broken");
+    p->classname = 1;	/* entry is class name, not token */
+    p->tclass = e;		/* save ptr to this tclass def */
+    list_add(&tclasses, (char *)e);
+  }
+  else
+  {
+  warn(eMsg1("redefinition of tokclass or conflict w/token '%s'; ignored",t));
+  free( (char *)e );
+  go=0;
+}
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==114) ) {
+      zzmatch(114); zzCONSUME;
+      zzmatch(QuotedTerm);
+      akaString=mystrdup(StripQuotes(LATEXT(1)));
+      /* MR11 */                   save_file=CurFile;save_line=zzline;
+      /* MR23 */
+ zzCONSUME;
+
+      zzmatch(115); zzCONSUME;
+    }
+    else {
+      if ( (LA(1)==102) ) {
+      }
+      else {zzFAIL(1,zzerr17,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  /* MR23 */         if (p!= NULL && akaString != NULL) {
+    /* MR23 */           if (p->akaString != NULL) {
+      /* MR23 */             if (strcmp(p->akaString,akaString) != 0) {
+        /* MR23 */                warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
+        /* MR23 */                              t,p->akaString),
+        /* MR23 */			                    FileStr[save_file],save_line);
+        /* MR23 */             };
+      /* MR23 */            } else {
+      /* MR23 */              p->akaString=akaString;
+      /* MR23 */            };
+    /* MR23 */          };
+  /* MR23 */
+  zzmatch(102); zzCONSUME;
+  {
+    zzBLOCK(zztasp2);
+    int zzcnt=1;
+    zzMake0;
+    {
+    do {
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==TokenTerm) ) {
+          zzmatch(TokenTerm);
+          if ( go ) {
+            term = (TermEntry *) hash_get(Tname, LATEXT(1));
+            if ( term==NULL && UserDefdTokens ) {
+              err("implicit token definition not allowed with #tokdefs");
+              go = 0;
+            }
+            else {t=mystrdup(LATEXT(1)); tok=addTname(LATEXT(1));}
+          }
+ zzCONSUME;
+
+          {
+            zzBLOCK(zztasp4);
+            zzMake0;
+            {
+            if ( (LA(1)==119) ) {
+              zzmatch(119); zzCONSUME;
+              zzmatch(TokenTerm);
+              if ( go ) {
+                toterm = (TermEntry *) hash_get(Tname, LATEXT(1));
+                if ( toterm==NULL && UserDefdTokens ) {
+                  err("implicit token definition not allowed with #tokdefs");
+                  go = 0;
+                } else {
+                  totext=mystrdup(LATEXT(1)); totok=addTname(LATEXT(1));
+                }
+              }
+ zzCONSUME;
+
+            }
+            else {
+              if ( (setwd4[LA(1)]&0x8) ) {
+              }
+              else {zzFAIL(1,zzerr18,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp4);
+            }
+          }
+        }
+        else {
+          if ( (LA(1)==QuotedTerm) ) {
+            zzmatch(QuotedTerm);
+            if ( go ) {
+              term = (TermEntry *) hash_get(Texpr, LATEXT(1));
+              if ( term==NULL && UserDefdTokens ) {
+                err("implicit token definition not allowed with #tokdefs");
+                go = 0;
+              }
+              else {t=mystrdup(LATEXT(1)); tok=addTexpr(LATEXT(1));}
+            }
+ zzCONSUME;
+
+          }
+          else {zzFAIL(1,zzerr19,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      if ( go ) {
+        if (totext == NULL) {
+          list_add(&(e->tlist), t);
+        } else {
+          list_add(&(e->tlist),"..");
+          list_add(&(e->tlist),t);
+          list_add(&(e->tlist),totext);
+        }
+        totext=NULL;
+      }
+      zzLOOP(zztasp2);
+    } while ( (setwd4[LA(1)]&0x10) );
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(98); zzCONSUME;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd4, 0x20);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+token(void)
+#else
+token()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  char *t=NULL, *e=NULL, *a=NULL; int tnum=0;
+  char *akaString=NULL; TermEntry *te;int save_file=0,save_line=0;
+  zzmatch(120);
+  tokenActionActive=1;
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==TokenTerm) ) {
+      zzmatch(TokenTerm);
+      t=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==114) ) {
+          zzmatch(114); zzCONSUME;
+          zzmatch(QuotedTerm);
+          akaString=mystrdup(StripQuotes(LATEXT(1)));
+          /* MR11 */                   save_file=CurFile;save_line=zzline;
+          /* MR11 */
+ zzCONSUME;
+
+          zzmatch(115); zzCONSUME;
+        }
+        else {
+          if ( (setwd4[LA(1)]&0x40) ) {
+          }
+          else {zzFAIL(1,zzerr20,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==121) ) {
+          zzmatch(121); zzCONSUME;
+          zzmatch(122);
+          tnum = atoi(LATEXT(1));
+ zzCONSUME;
+
+        }
+        else {
+          if ( (setwd4[LA(1)]&0x80) ) {
+          }
+          else {zzFAIL(1,zzerr21,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+    }
+    else {
+      if ( (setwd5[LA(1)]&0x1) ) {
+      }
+      else {zzFAIL(1,zzerr22,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==QuotedTerm) ) {
+      zzmatch(QuotedTerm);
+      e=mystrdup(LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd5[LA(1)]&0x2) ) {
+      }
+      else {zzFAIL(1,zzerr23,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==Action) ) {
+      zzmatch(Action);
+      
+      a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(a!=NULL, "rule token: cannot allocate action");
+      strcpy(a, LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd5[LA(1)]&0x4) ) {
+      }
+      else {zzFAIL(1,zzerr24,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==107) ) {
+      zzmatch(107); zzCONSUME;
+    }
+    else {
+      if ( (setwd5[LA(1)]&0x8) ) {
+      }
+      else {zzFAIL(1,zzerr25,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  chkToken(t, e, a, tnum);
+  if (t != NULL) {
+    te=(TermEntry *)hash_get(Tname,t);
+    if (te != NULL && akaString != NULL) {
+      if (te->akaString != NULL) {
+        if (strcmp(te->akaString,akaString) != 0) {
+          warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
+          t,te->akaString),
+          FileStr[save_file],save_line);
+        };
+      } else {
+        te->akaString=akaString;
+      };
+    };
+  };
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd5, 0x10);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+block(set * toksrefd,set * rulesrefd)
+#else
+block(toksrefd,rulesrefd)
+ set *toksrefd;
+set *rulesrefd ;
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  
+  Graph g, b;
+  set saveblah;
+  int saveinalt = inAlt;
+  ExceptionGroup *eg;
+  * toksrefd = empty;
+  * rulesrefd = empty;
+  set_clr(AST_nodes_refd_in_actions);
+  CurBlockID++;
+  /* MR23 */      CurBlockID_array[BlkLevel] = CurBlockID;
+  CurAltNum = 1;
+  /* MR23 */      CurAltNum_array[BlkLevel] = CurAltNum;                
+  saveblah = attribsRefdFromAction;
+  attribsRefdFromAction = empty;
+  alt( toksrefd,rulesrefd );
+  b = g = zzaArg(zztasp1,1);
+  
+  if ( ((Junction *)g.left)->p1->ntype == nAction )
+  {
+    ActionNode *actionNode=(ActionNode *)
+    ( ( (Junction *)g.left) ->p1);
+    if (!actionNode->is_predicate )
+    {
+      actionNode->init_action = TRUE;
+      /* MR12c */  		if (actionNode->noHoist) {
+        /* MR12c */           errFL("<<nohoist>> appears as init-action - use <<>> <<nohoist>>",
+        /* MR12c */                       FileStr[actionNode->file],actionNode->line);
+        /* MR12c */         };
+    }
+  }
+  ((Junction *)g.left)->blockid = CurBlockID;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==133) ) {
+       eg  = exception_group();
+
+      
+      if ( eg!=NULL ) {
+        /* MR7 *****       	eg->altID = makeAltID(CurBlockID,CurAltNum);        *****/
+        /* MR7 *****		CurAltStart->exception_label = eg->altID;           *****/
+        list_add(&CurExGroups, (void *)eg);
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  CurAltNum++;
+  /* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==123) ) {
+      zzmatch(123);
+      inAlt=1;
+ zzCONSUME;
+
+      alt( toksrefd,rulesrefd );
+      g = Or(g, zzaArg(zztasp2,2));
+      
+      ((Junction *)g.left)->blockid = CurBlockID;
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        while ( (LA(1)==133) ) {
+           eg  = exception_group();
+
+          
+          if ( eg!=NULL ) {
+            /* MR7 *****       	eg->altID = makeAltID(CurBlockID,CurAltNum);        *****/
+            /* MR7 *****		CurAltStart->exception_label = eg->altID;           *****/
+            list_add(&CurExGroups, (void *)eg);
+          }
+          zzLOOP(zztasp3);
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      CurAltNum++;
+      /* MR23 */        CurAltNum_array[BlkLevel] = CurAltNum;
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzaArg(zztasp1,0) = b;
+  attribsRefdFromAction = saveblah; inAlt = saveinalt;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd5, 0x20);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+alt(set * toksrefd,set * rulesrefd)
+#else
+alt(toksrefd,rulesrefd)
+ set *toksrefd;
+set *rulesrefd ;
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  int n=0; Graph g; int e_num=0, old_not=0; Node *node; set elems, dif;
+  int first_on_line = 1, use_def_MT_handler = 0;
+  g.left=NULL; g.right=NULL;
+  
+			CurAltStart = NULL;
+  elems = empty;
+  inAlt = 1;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==88) ) {
+      zzmatch(88);
+      use_def_MT_handler = 1;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd5[LA(1)]&0x40) ) {
+      }
+      else {zzFAIL(1,zzerr26,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    ;
+    while ( (setwd5[LA(1)]&0x80) ) {
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        old_not=0;
+        if ( (LA(1)==124) ) {
+          zzmatch(124);
+          old_not=1;
+ zzCONSUME;
+
+        }
+        else {
+          if ( (setwd6[LA(1)]&0x1) ) {
+          }
+          else {zzFAIL(1,zzerr27,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+       node  = element( old_not, first_on_line, use_def_MT_handler );
+
+      if ( node!=NULL && node->ntype!=nAction ) first_on_line = 0;
+      
+      if ( zzaArg(zztasp2,2 ).left!=NULL ) {
+        g = Cat(g, zzaArg(zztasp2,2));
+        n++;
+        if ( node!=NULL ) {
+          if ( node->ntype!=nAction ) e_num++;
+          /* record record number of all rule and token refs */
+          if ( node->ntype==nToken ) {
+            TokNode *tk = (TokNode *)((Junction *)zzaArg(zztasp2,2 ).left)->p1;
+            tk->elnum = e_num;
+            set_orel(e_num, &elems);
+          }
+          else if ( node->ntype==nRuleRef ) {
+            RuleRefNode *rn = (RuleRefNode *)((Junction *)zzaArg(zztasp2,2 ).left)->p1;
+            rn->elnum = e_num;
+            set_orel(e_num,  rulesrefd);
+          }
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  if ( n == 0 ) g = emptyAlt();
+  zzaArg(zztasp1,0) = g;
+  /* We want to reduce number of LT(i) calls and the number of
+  * local attribute variables in C++ mode (for moment, later we'll
+  * do for C also).  However, if trees are being built, they
+  * require most of the attrib variables to create the tree nodes
+  * with; therefore, we gen a token ptr for each token ref in C++
+  */
+  if ( GenCC && !GenAST )
+  {
+  /* This now free's the temp set -ATG 5/6/95 */
+  set temp;
+  temp = set_and(elems, attribsRefdFromAction);
+  set_orin( toksrefd, temp);
+  set_free(temp);
+}
+else set_orin( toksrefd, elems);
+if ( GenCC ) {
+  dif = set_dif(attribsRefdFromAction, elems);
+  if ( set_deg(dif)>0 )
+  err("one or more $i in action(s) refer to non-token elements");
+  set_free(dif);
+}
+set_free(elems);
+set_free(attribsRefdFromAction);
+inAlt = 0;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd6, 0x2);
+  }
+}
+
+LabelEntry *
+#ifdef __USE_PROTOS
+element_label(void)
+#else
+element_label()
+#endif
+{
+  LabelEntry *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(LabelEntry *  ))
+  zzMake0;
+  {
+  TermEntry *t=NULL; LabelEntry *l=NULL; RuleEntry *r=NULL; char *lab;
+  zzmatch(LABEL);
+  lab = mystrdup(LATEXT(1));
+ zzCONSUME;
+
+  
+  UsedNewStyleLabel = 1;
+  if ( UsedOldStyleAttrib ) err("cannot mix with new-style labels with old-style $i");
+  t = (TermEntry *) hash_get(Tname, lab);
+  if ( t==NULL ) t = (TermEntry *) hash_get(Texpr, lab);
+  if ( t==NULL ) r = (RuleEntry *) hash_get(Rname, lab);
+  if ( t!=NULL ) {
+    err(eMsg1("label definition clashes with token/tokclass definition: '%s'", lab));
+    _retv = NULL;
+  }
+  else if ( r!=NULL ) {
+    err(eMsg1("label definition clashes with rule definition: '%s'", lab));
+    _retv = NULL;
+  }
+  else {
+    /* we don't clash with anybody else */
+    l = (LabelEntry *) hash_get(Elabel, lab);
+    if ( l==NULL ) {	/* ok to add new element label */
+    l = (LabelEntry *)hash_add(Elabel,
+    lab,
+    (Entry *)newLabelEntry(lab));
+    /* add to list of element labels for this rule */
+    list_add(&CurElementLabels, (void *)lab);
+    /* MR7 */       leAdd(l);  /* list of labels waiting for exception group definitions */
+    _retv = l;
+  }
+  else {
+  err(eMsg1("label definitions must be unique per rule: '%s'", lab));
+  _retv = NULL;
+}
+}
+  zzmatch(106); zzCONSUME;
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd6, 0x4);
+  return _retv;
+  }
+}
+
+Node *
+#ifdef __USE_PROTOS
+element(int old_not,int first_on_line,int use_def_MT_handler)
+#else
+element(old_not,first_on_line,use_def_MT_handler)
+ int old_not;
+int first_on_line;
+int use_def_MT_handler ;
+#endif
+{
+  Node *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(Node *  ))
+  zzMake0;
+  {
+  
+  Attrib blk;
+  Predicate *pred = NULL;
+  int local_use_def_MT_handler=0;
+  ActionNode *act;
+  RuleRefNode *rr;
+  set toksrefd, rulesrefd;
+  TermEntry *term;
+  TokNode *p=NULL; RuleRefNode *q; int approx=0;
+  LabelEntry *label=NULL;
+  int predMsgDone=0;
+  int semDepth=0;
+  int   ampersandStyle;
+  int   height;         /* MR11 */
+  int   equal_height;   /* MR11 */
+  
+          char* pFirstSetSymbol = NULL; /* MR21 */
+  
+		  _retv = NULL;
+  if ( (setwd6[LA(1)]&0x8) ) {
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      if ( (LA(1)==LABEL) ) {
+         label  = element_label();
+
+      }
+      else {
+        if ( (setwd6[LA(1)]&0x10) ) {
+        }
+        else {zzFAIL(1,zzerr28,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      if ( (LA(1)==TokenTerm) ) {
+        zzmatch(TokenTerm);
+        
+        term = (TermEntry *) hash_get(Tname, LATEXT(1));
+        if ( term==NULL && UserDefdTokens ) {
+          err("implicit token definition not allowed with #tokdefs");
+          zzaRet.left = zzaRet.right = NULL;
+        }
+        else {
+          zzaRet = buildToken(LATEXT(1));
+          p=((TokNode *)((Junction *)zzaRet.left)->p1);
+          term = (TermEntry *) hash_get(Tname, LATEXT(1));
+          require( term!= NULL, "hash table mechanism is broken");
+          p->tclass = term->tclass;
+          p->complement =  old_not;
+          if ( label!=NULL ) {
+            p->el_label = label->str;
+            label->elem = (Node *)p;
+          }
+        }
+ zzCONSUME;
+
+        {
+          zzBLOCK(zztasp3);
+          zzMake0;
+          {
+          if ( (LA(1)==119) ) {
+            zzmatch(119); zzCONSUME;
+            {
+              zzBLOCK(zztasp4);
+              zzMake0;
+              {
+              if ( (LA(1)==QuotedTerm) ) {
+                zzmatch(QuotedTerm);
+                if ( p!=NULL ) setUpperRange(p, LATEXT(1));
+ zzCONSUME;
+
+              }
+              else {
+                if ( (LA(1)==TokenTerm) ) {
+                  zzmatch(TokenTerm);
+                  if ( p!=NULL ) setUpperRange(p, LATEXT(1));
+ zzCONSUME;
+
+                }
+                else {zzFAIL(1,zzerr29,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+              }
+              zzEXIT(zztasp4);
+              }
+            }
+          }
+          else {
+            if ( (setwd6[LA(1)]&0x20) ) {
+            }
+            else {zzFAIL(1,zzerr30,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+          zzEXIT(zztasp3);
+          }
+        }
+        
+        if ( p!=NULL && (p->upper_range!=0 || p->tclass ||  old_not) )
+        list_add(&MetaTokenNodes, (void *)p);
+        {
+          zzBLOCK(zztasp3);
+          zzMake0;
+          {
+          if ( (LA(1)==125) ) {
+            zzmatch(125);
+            if ( p!=NULL ) p->astnode=ASTroot;
+ zzCONSUME;
+
+          }
+          else {
+            if ( (setwd6[LA(1)]&0x40) ) {
+              if ( p!=NULL ) p->astnode=ASTchild;
+            }
+            else {
+              if ( (LA(1)==103) ) {
+                zzmatch(103);
+                if ( p!=NULL ) p->astnode=ASTexclude;
+ zzCONSUME;
+
+              }
+              else {zzFAIL(1,zzerr31,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+          }
+          zzEXIT(zztasp3);
+          }
+        }
+        {
+          zzBLOCK(zztasp3);
+          zzMake0;
+          {
+          if ( (LA(1)==88) ) {
+            zzmatch(88);
+            local_use_def_MT_handler = 1;
+ zzCONSUME;
+
+          }
+          else {
+            if ( (setwd6[LA(1)]&0x80) ) {
+            }
+            else {zzFAIL(1,zzerr32,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+          zzEXIT(zztasp3);
+          }
+        }
+        
+        if ( p!=NULL &&  first_on_line ) {
+          CurAltStart = (Junction *)zzaRet.left;
+          altAdd(CurAltStart);                                 /* MR7 */
+          p->altstart = CurAltStart;
+        }
+        if ( p!=NULL )
+        p->use_def_MT_handler =  use_def_MT_handler || local_use_def_MT_handler;
+        _retv = (Node *)p;
+      }
+      else {
+        if ( (LA(1)==QuotedTerm) ) {
+          zzmatch(QuotedTerm);
+          
+          term = (TermEntry *) hash_get(Texpr, LATEXT(1));
+          if ( term==NULL && UserDefdTokens ) {
+            err("implicit token definition not allowed with #tokdefs");
+            zzaRet.left = zzaRet.right = NULL;
+          }
+          else {
+            zzaRet = buildToken(LATEXT(1)); p=((TokNode *)((Junction *)zzaRet.left)->p1);
+            p->complement =  old_not;
+            if ( label!=NULL ) {
+              p->el_label = label->str;
+              label->elem = (Node *)p;
+            }
+          }
+ zzCONSUME;
+
+          {
+            zzBLOCK(zztasp3);
+            zzMake0;
+            {
+            if ( (LA(1)==119) ) {
+              zzmatch(119); zzCONSUME;
+              {
+                zzBLOCK(zztasp4);
+                zzMake0;
+                {
+                if ( (LA(1)==QuotedTerm) ) {
+                  zzmatch(QuotedTerm);
+                  if ( p!=NULL ) setUpperRange(p, LATEXT(1));
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (LA(1)==TokenTerm) ) {
+                    zzmatch(TokenTerm);
+                    if ( p!=NULL ) setUpperRange(p, LATEXT(1));
+ zzCONSUME;
+
+                  }
+                  else {zzFAIL(1,zzerr33,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+                zzEXIT(zztasp4);
+                }
+              }
+            }
+            else {
+              if ( (setwd7[LA(1)]&0x1) ) {
+              }
+              else {zzFAIL(1,zzerr34,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp3);
+            }
+          }
+          {
+            zzBLOCK(zztasp3);
+            zzMake0;
+            {
+            if ( (LA(1)==125) ) {
+              zzmatch(125);
+              if ( p!=NULL ) p->astnode=ASTroot;
+ zzCONSUME;
+
+            }
+            else {
+              if ( (setwd7[LA(1)]&0x2) ) {
+                if ( p!=NULL ) p->astnode=ASTchild;
+              }
+              else {
+                if ( (LA(1)==103) ) {
+                  zzmatch(103);
+                  if ( p!=NULL ) p->astnode=ASTexclude;
+ zzCONSUME;
+
+                }
+                else {zzFAIL(1,zzerr35,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+              }
+            }
+            zzEXIT(zztasp3);
+            }
+          }
+          {
+            zzBLOCK(zztasp3);
+            zzMake0;
+            {
+            if ( (LA(1)==88) ) {
+              zzmatch(88);
+              local_use_def_MT_handler = 1;
+ zzCONSUME;
+
+            }
+            else {
+              if ( (setwd7[LA(1)]&0x4) ) {
+              }
+              else {zzFAIL(1,zzerr36,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp3);
+            }
+          }
+          
+          if ( p!=NULL && (p->upper_range!=0 || p->tclass ||  old_not) )
+          list_add(&MetaTokenNodes, (void *)p);
+          
+          if (  first_on_line ) {
+            CurAltStart = (Junction *)zzaRet.left;
+            altAdd(CurAltStart);                                 /* MR7 */
+            p->altstart = CurAltStart;
+          }
+          if ( p!=NULL )
+          p->use_def_MT_handler =  use_def_MT_handler || local_use_def_MT_handler;
+          _retv = (Node *)p;
+        }
+        else {
+          if ( (LA(1)==WildCard) ) {
+            if (  old_not ) warn("~ WILDCARD is an undefined operation (implies 'nothing')");
+            zzmatch(WildCard);
+            zzaRet = buildWildCard(LATEXT(1)); p=((TokNode *)((Junction *)zzaRet.left)->p1);
+ zzCONSUME;
+
+            {
+              zzBLOCK(zztasp3);
+              zzMake0;
+              {
+              if ( (LA(1)==125) ) {
+                zzmatch(125);
+                p->astnode=ASTroot;
+ zzCONSUME;
+
+              }
+              else {
+                if ( (setwd7[LA(1)]&0x8) ) {
+                  p->astnode=ASTchild;
+                }
+                else {
+                  if ( (LA(1)==103) ) {
+                    zzmatch(103);
+                    p->astnode=ASTexclude;
+ zzCONSUME;
+
+                  }
+                  else {zzFAIL(1,zzerr37,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+              }
+              zzEXIT(zztasp3);
+              }
+            }
+            list_add(&MetaTokenNodes, (void *)p);
+            
+            if (  first_on_line ) {
+              CurAltStart = (Junction *)zzaRet.left;
+              altAdd(CurAltStart);                                 /* MR7 */
+              p->altstart = CurAltStart;
+              if ( label!=NULL ) {
+                p->el_label = label->str;
+                label->elem = (Node *)p;
+              }
+            }
+            _retv = (Node *)p;
+          }
+          else {
+            if ( (LA(1)==NonTerminal) ) {
+              if (  old_not ) warn("~ NONTERMINAL is an undefined operation");
+              zzmatch(NonTerminal);
+              zzaRet = buildRuleRef(LATEXT(1));
+ zzCONSUME;
+
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                if ( (LA(1)==103) ) {
+                  zzmatch(103);
+                  q = (RuleRefNode *) ((Junction *)zzaRet.left)->p1;
+                  q->astnode=ASTexclude;
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (setwd7[LA(1)]&0x10) ) {
+                  }
+                  else {zzFAIL(1,zzerr38,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                if ( (setwd7[LA(1)]&0x20) ) {
+                  {
+                    zzBLOCK(zztasp4);
+                    zzMake0;
+                    {
+                    if ( (LA(1)==104) ) {
+                      zzmatch(104); zzCONSUME;
+                    }
+                    else {
+                      if ( (LA(1)==PassAction) ) {
+                      }
+                      else {zzFAIL(1,zzerr39,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                    }
+                    zzEXIT(zztasp4);
+                    }
+                  }
+                  zzmatch(PassAction);
+                  addParm(((Junction *)zzaRet.left)->p1, LATEXT(1));
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (setwd7[LA(1)]&0x40) ) {
+                  }
+                  else {zzFAIL(1,zzerr40,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+              rr=(RuleRefNode *) ((Junction *)zzaRet.left)->p1;
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                char *a;
+                if ( (LA(1)==105) ) {
+                  zzmatch(105); zzCONSUME;
+                  zzmatch(PassAction);
+                  
+                  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+                  require(a!=NULL, "rule element: cannot allocate assignment");
+                  strcpy(a, LATEXT(1));
+                  rr->assign = a;
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (setwd7[LA(1)]&0x80) ) {
+                  }
+                  else {zzFAIL(1,zzerr41,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+              
+              if ( label!=NULL ) {
+                rr->el_label = label->str;
+                label->elem = (Node *)rr;
+              }
+              if (  first_on_line ) {
+                CurAltStart = (Junction *)zzaRet.left;
+                altAdd(CurAltStart);                                 /* MR7 */
+                ((RuleRefNode *)((Junction *)zzaRet.left)->p1)->altstart = CurAltStart;
+              }
+              _retv = (Node *)rr;
+            }
+            else {zzFAIL(1,zzerr42,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+        }
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+  }
+  else {
+    if ( (LA(1)==Action) ) {
+      if (  old_not )	warn("~ ACTION is an undefined operation");
+      zzmatch(Action);
+      zzaArg(zztasp1,0) = buildAction(LATEXT(1),action_file,action_line, 0);
+ zzCONSUME;
+
+      if (  first_on_line ) {                                /* MR7 */
+        CurAltStart = (Junction *)zzaArg(zztasp1,0 ).left;                   /* MR7 */
+        altAdd(CurAltStart);                                 /* MR7 */
+      };
+      _retv = (Node *) ((Junction *)zzaArg(zztasp1,0 ).left)->p1;
+    }
+    else {
+      if ( (LA(1)==Pred) ) {
+        if (  old_not )	warn("~ SEMANTIC-PREDICATE is an undefined operation");
+        zzmatch(Pred);
+        zzaArg(zztasp1,0) = buildAction(LATEXT(1),action_file,action_line, 1);
+ zzCONSUME;
+
+        act = (ActionNode *) ((Junction *)zzaArg(zztasp1,0 ).left)->p1;
+        if (numericActionLabel) {             /* MR10 */
+          list_add(&NumericPredLabels,act);   /* MR10 */
+          numericActionLabel=0;               /* MR10 */
+        };                                    /* MR10 */
+        {
+          zzBLOCK(zztasp2);
+          zzMake0;
+          {
+          char *a;
+          if ( (LA(1)==PassAction) ) {
+            zzmatch(PassAction);
+            
+            a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+            require(a!=NULL, "rule element: cannot allocate predicate fail action");
+            strcpy(a, LATEXT(1));
+            act->pred_fail = a;
+ zzCONSUME;
+
+          }
+          else {
+            if ( (setwd8[LA(1)]&0x1) ) {
+            }
+            else {zzFAIL(1,zzerr43,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+          zzEXIT(zztasp2);
+          }
+        }
+        if (  first_on_line ) {                                /* MR7 */
+          CurAltStart = (Junction *)zzaArg(zztasp1,0 ).left;                   /* MR7 */
+          altAdd(CurAltStart);                                 /* MR7 */
+        };
+        _retv = (Node *)act;
+      }
+      else {
+        if ( (setwd8[LA(1)]&0x2) ) {
+          if (  old_not )	warn("~ BLOCK is an undefined operation");
+          BlkLevel++;
+          if (BlkLevel >= MAX_BLK_LEVEL) fatal("Blocks nested too deeply");
+          /* MR23 */    CurBlockID_array[BlkLevel] = CurBlockID;
+          /* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;
+          {
+            zzBLOCK(zztasp2);
+            zzMake0;
+            {
+            if ( (LA(1)==Pragma) ) {
+              zzmatch(Pragma); zzCONSUME;
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                if ( (LA(1)==126) ) {
+                  zzmatch(126);
+                  approx=LL_k;
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (LA(1)==127) ) {
+                    zzmatch(127);
+                    approx = 1;
+ zzCONSUME;
+
+                  }
+                  else {
+                    if ( (LA(1)==128) ) {
+                      zzmatch(128);
+                      approx = 2;
+ zzCONSUME;
+
+                    }
+                    else {zzFAIL(1,zzerr44,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                  }
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+            }
+            else {
+              if ( (setwd8[LA(1)]&0x4) ) {
+              }
+              else {zzFAIL(1,zzerr45,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp2);
+            }
+          }
+          {
+            zzBLOCK(zztasp2);
+            zzMake0;
+            {
+            if ( (LA(1)==FirstSetSymbol) ) {
+              zzmatch(FirstSetSymbol); zzCONSUME;
+              zzmatch(114); zzCONSUME;
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                if ( (LA(1)==NonTerminal) ) {
+                  zzmatch(NonTerminal);
+                  
+                  /* MR21 */                     pFirstSetSymbol = (char *) calloc(strlen(LATEXT(1))+1,
+                  /* MR21 */                                                    sizeof(char));
+                  /* MR21 */                          require(pFirstSetSymbol!=NULL,
+                  /* MR21 */                                  "cannot allocate first set name");
+                  /* MR21 */                          strcpy(pFirstSetSymbol, LATEXT(1));
+                  /* MR21 */
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (LA(1)==TokenTerm) ) {
+                    zzmatch(TokenTerm);
+                    
+                    /* MR21 */                      pFirstSetSymbol = (char *) calloc(strlen(LATEXT(1))+1,
+                    /* MR21 */                                                        sizeof(char));
+                    /* MR21 */                      require(pFirstSetSymbol!=NULL,
+                    /* MR21 */                              "cannot allocate first set name");
+                    /* MR21 */                      strcpy(pFirstSetSymbol, LATEXT(1));
+                    /* MR21 */
+ zzCONSUME;
+
+                  }
+                  else {zzFAIL(1,zzerr46,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+              zzmatch(115); zzCONSUME;
+            }
+            else {
+              if ( (setwd8[LA(1)]&0x8) ) {
+              }
+              else {zzFAIL(1,zzerr47,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp2);
+            }
+          }
+          {
+            zzBLOCK(zztasp2);
+            zzMake0;
+            {
+            if ( (LA(1)==114) ) {
+              zzmatch(114); zzCONSUME;
+              block( &toksrefd,&rulesrefd );
+              zzmatch(115);
+              blk = zzaRet = zzaArg(zztasp2,2);
+              /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+              /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+              --BlkLevel;
+ zzCONSUME;
+
+              {
+                zzBLOCK(zztasp3);
+                zzMake0;
+                {
+                if ( (LA(1)==129) ) {
+                  zzmatch(129);
+                  zzaRet = makeLoop(zzaRet,approx,pFirstSetSymbol);
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (LA(1)==130) ) {
+                    zzmatch(130);
+                    zzaRet = makePlus(zzaRet,approx,pFirstSetSymbol);
+ zzCONSUME;
+
+                  }
+                  else {
+                    if ( (LA(1)==131) ) {
+                      zzmatch(131); zzCONSUME;
+                      {
+                        zzBLOCK(zztasp4);
+                        zzMake0;
+                        {
+                        if ( (setwd8[LA(1)]&0x10) ) {
+                          {
+                            zzBLOCK(zztasp5);
+                            zzMake0;
+                            {
+                            if ( (LA(1)==132) ) {
+                              zzmatch(132);
+                              ampersandStyle=0;
+ zzCONSUME;
+
+                            }
+                            else {
+                              if ( (LA(1)==113) ) {
+                                zzmatch(113);
+                                ampersandStyle=1;
+ zzCONSUME;
+
+                              }
+                              else {zzFAIL(1,zzerr48,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                            }
+                            zzEXIT(zztasp5);
+                            }
+                          }
+                          zzmatch(Pred);
+                          zzaRet = buildAction(LATEXT(1),action_file,action_line,1);
+ zzCONSUME;
+
+                          act = (ActionNode *) ((Junction *)zzaRet.left)->p1;
+                          semDepth=predicateLookaheadDepth(act);
+                          if (numericActionLabel) {             /* MR10 */
+                            list_add(&NumericPredLabels,act);   /* MR10 */
+                            numericActionLabel=0;               /* MR10 */
+                          };                                    /* MR10 */
+                          {
+                            zzBLOCK(zztasp5);
+                            zzMake0;
+                            {
+                            char *a;
+                            if ( (LA(1)==PassAction) ) {
+                              zzmatch(PassAction);
+                              
+                              a = (char *)calloc(strlen(LATEXT(1))+1, sizeof(char));
+                              require(a!=NULL, "rule element: cannot allocate predicate fail action");
+                              strcpy(a, LATEXT(1));
+                              act->pred_fail = a;
+ zzCONSUME;
+
+                            }
+                            else {
+                              if ( (setwd8[LA(1)]&0x20) ) {
+                              }
+                              else {zzFAIL(1,zzerr49,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                            }
+                            zzEXIT(zztasp5);
+                            }
+                          }
+                          if ( first_on_line) {                      /* MR7 */
+                            CurAltStart=(Junction *)zzaRet.left;         /* MR7 */
+                            altAdd(CurAltStart);                     /* MR7 */
+                          };
+                          _retv = (Node *)act;
+                          
+                          pred = computePredFromContextGuard(blk,&predMsgDone);           /* MR10 */
+                          if ( pred==NULL) {                                              /* MR10 */
+                            if ( !predMsgDone) err("invalid or missing context guard");   /* MR10 */
+                            predMsgDone=1;                                                /* MR10 */
+                          } else {                                                        /* MR10 */
+                            act->guardNodes=(Junction *)blk.left;                       /* MR11 */
+                            pred->expr = act->action;
+                            pred->source = act;
+                            /* MR10 */                  pred->ampersandStyle = ampersandStyle;  /* 0 means (g)? => ... 1 means (g)? && ... */
+                            /* MR13 */                  if (pred->tcontext != NULL) {
+                              /* MR13 */                    height=MR_max_height_of_tree(pred->tcontext);
+                              /* MR13 */                    equal_height=MR_all_leaves_same_height(pred->tcontext,height);
+                              /* MR13 */                    if (! equal_height) {
+                                /* MR13 */                       errFL("in guarded predicates all tokens in the guard must be at the same height",
+                                /* MR13 */                              FileStr[act->file],act->line);
+                                /* MR13 */                    };
+                              /* MR13 */                  }
+                            /* MR10 */                  if (ampersandStyle) {
+                              /* MR10 */			  		  act->ampersandPred = pred;
+                              /* MR11 */                    if (! HoistPredicateContext) {
+                                /* MR11 */                      errFL("without \"-prc on\" (guard)? && <<pred>>? ... doesn't make sense",
+                                /* MR11 */                              FileStr[act->file],act->line);
+                                /* MR11 */                    };
+                              /* MR10 */                  } else {
+                              /* MR10 */			  		  act->guardpred = pred;
+                              /* MR10 */                  };
+                            /* MR10 */                  if (pred->k != semDepth) {
+                              /* MR10 */                     warn(eMsgd2("length of guard (%d) does not match the length of semantic predicate (%d)",
+                              /* MR10 */                                  pred->k,semDepth));
+                              /* MR10 */                  };
+                          }
+                        }
+                        else {
+                          if ( (setwd8[LA(1)]&0x40) ) {
+                            zzaRet = makeBlk(zzaRet,approx,pFirstSetSymbol);
+                            FoundGuessBlk = 1;
+                            ((Junction *) ((Junction *)zzaRet.left)->p1)->guess=1;
+                            if ( ! first_on_line ) {
+                              err("(...)? predicate must be first element of production");
+                            }
+                          }
+                          else {zzFAIL(1,zzerr50,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                        }
+                        zzEXIT(zztasp4);
+                        }
+                      }
+                    }
+                    else {
+                      if ( (setwd8[LA(1)]&0x80) ) {
+                        zzaRet = makeBlk(zzaRet,approx,pFirstSetSymbol);
+                      }
+                      else {zzFAIL(1,zzerr51,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                    }
+                  }
+                }
+                zzEXIT(zztasp3);
+                }
+              }
+              
+              if ( pred==NULL && !predMsgDone) {                                      /* MR10 */
+                ((Junction *)((Junction *)zzaRet.left)->p1)->blockid = CurBlockID;
+                ((Junction *)((Junction *)zzaRet.left)->p1)->tokrefs = toksrefd;
+                ((Junction *)((Junction *)zzaRet.left)->p1)->rulerefs = rulesrefd;
+                if (  first_on_line ) {                         /* MR7 */
+                  CurAltStart = (Junction *)((Junction *)((Junction *)zzaRet.left)->p1);  /* MR7 */
+                  altAdd(CurAltStart);                         /* MR7 */
+                };                                              /* MR7 */
+                _retv = (Node *) ((Junction *)zzaRet.left)->p1;
+              }
+            }
+            else {
+              if ( (LA(1)==102) ) {
+                zzmatch(102); zzCONSUME;
+                block( &toksrefd,&rulesrefd );
+                zzaRet = makeOpt(zzaArg(zztasp2,2),approx,pFirstSetSymbol);
+                /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+                /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+                --BlkLevel;
+                zzmatch(98);
+                
+                ((Junction *)((Junction *)zzaRet.left)->p1)->blockid = CurBlockID;
+                ((Junction *)((Junction *)zzaRet.left)->p1)->tokrefs = toksrefd;
+                ((Junction *)((Junction *)zzaRet.left)->p1)->rulerefs = rulesrefd;
+ zzCONSUME;
+
+                if (  first_on_line ) {                            /* MR7 */
+                  CurAltStart = (Junction *) ((Junction *)((Junction *)zzaRet.left)->p1);  /* MR7 */
+                  altAdd(CurAltStart);                             /* MR7 */
+                };
+                _retv = (Node *) ((Junction *)zzaRet.left)->p1;
+              }
+              else {zzFAIL(1,zzerr52,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp2);
+            }
+          }
+        }
+        else {
+          if ( (LA(1)==129) ) {
+            zzmatch(129);
+            warn("don't you want a ')' with that '*'?"); CannotContinue=TRUE;
+ zzCONSUME;
+
+          }
+          else {
+            if ( (LA(1)==130) ) {
+              zzmatch(130);
+              warn("don't you want a ')' with that '+'?"); CannotContinue=TRUE;
+ zzCONSUME;
+
+            }
+            else {
+              if ( (LA(1)==105) ) {
+                zzmatch(105);
+                warn("'>' can only appear after a nonterminal"); CannotContinue=TRUE;
+ zzCONSUME;
+
+              }
+              else {
+                if ( (LA(1)==PassAction) ) {
+                  zzmatch(PassAction);
+                  warn("[...] out of context 'rule > [...]'");
+                  CannotContinue=TRUE;
+ zzCONSUME;
+
+                }
+                else {zzFAIL(1,zzerr53,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd9, 0x1);
+  return _retv;
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+default_exception_handler(void)
+#else
+default_exception_handler()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+   DefaultExGroup  = exception_group();
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd9, 0x2);
+  }
+}
+
+ExceptionGroup *
+#ifdef __USE_PROTOS
+exception_group(void)
+#else
+exception_group()
+#endif
+{
+  ExceptionGroup *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(ExceptionGroup *  ))
+  zzMake0;
+  {
+  ExceptionHandler *h; LabelEntry *label=NULL;	  /* MR6 */
+  FoundException = 1; FoundExceptionGroup = 1;
+  zzmatch(133);
+  _retv = (ExceptionGroup *)calloc(1, sizeof(ExceptionGroup));
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    char *p;
+    if ( (LA(1)==PassAction) ) {
+      zzmatch(PassAction);
+      
+      p = LATEXT(1)+1;
+      p[strlen(p)-1] = '\0';		/* kill trailing space */
+      label = (LabelEntry *) hash_get(Elabel, LATEXT(1)+1);
+      if ( label==NULL )
+      {
+        err(eMsg1("unknown label in exception handler: '%s'", LATEXT(1)+1));
+      }
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd9[LA(1)]&0x4) ) {
+      }
+      else {zzFAIL(1,zzerr54,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==135) ) {
+       h  = exception_handler();
+
+      list_add(&(_retv->handlers), (void *)h);
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==134) ) {
+      zzmatch(134); zzCONSUME;
+      zzmatch(106); zzCONSUME;
+      zzmatch(Action);
+      {
+        ExceptionHandler *eh = (ExceptionHandler *)
+        calloc(1, sizeof(ExceptionHandler));
+        char *a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+        require(eh!=NULL, "exception: cannot allocate handler");
+        require(a!=NULL, "exception: cannot allocate action");
+        strcpy(a, LATEXT(1));
+        eh->action = a;
+        eh->signalname = (char *) calloc(strlen("default")+1, sizeof(char));
+        require(eh->signalname!=NULL, "exception: cannot allocate sig name");
+        strcpy(eh->signalname, "default");
+        list_add(&(_retv->handlers), (void *)eh);
+      }
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd9[LA(1)]&0x8) ) {
+      }
+      else {zzFAIL(1,zzerr55,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  if ( label!=NULL ) {
+    /* Record ex group in sym tab for this label */
+    if ( label->ex_group!=NULL ) {
+      err(eMsg1("duplicate exception handler for label '%s'",label->str));
+    } else {
+      label->ex_group = _retv;
+      /* Label the exception group itself */
+      _retv->label = label->str;
+      /* Make the labelled element pt to the exception also */
+      /* MR6 */	  if (label->elem == NULL) {
+        /* MR6 */	     err(eMsg1("reference in exception handler to undefined label '%s'",label->str));
+        /* MR6 */	  } else {
+        switch ( label->elem->ntype ) {
+          case nRuleRef :
+          {
+            RuleRefNode *r = (RuleRefNode *)label->elem;
+            r->ex_group = _retv;
+            break;
+          }
+          case nToken :
+          {
+            TokNode *t = (TokNode *)label->elem;
+            t->ex_group = _retv;
+            break;
+          }
+        } /* end switch */
+        /* MR6 */	  }; /* end test on label->elem */
+    } /* end test on label->ex_group */
+    
+		} /* end test on exception label */
+  
+/* MR7 */
+  /* MR7 */   if (BlkLevel == 1 && label == NULL) {
+    /* MR7 */     _retv->forRule=1;
+    /* MR7 */   } else if (label == NULL) {
+    /* MR7 */     _retv->altID = makeAltID(CurBlockID_array[BlkLevel], CurAltNum_array[BlkLevel]);
+    /* MR7 */     egAdd(_retv);
+    /* MR7 */   } else {
+    /* MR7 */     _retv->labelEntry=label;
+    /* MR7 */   };
+  /* MR7 */
+  /* MR7 */	    /* You may want to remove this exc from the rule list  */
+  /* MR7 */		/* and handle at the labeled element site.             */
+  /* MR7 */
+  /* MR7 */   if (label != NULL) {
+    /* MR7 */     _retv = NULL;
+    /* MR7 */   };
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd9, 0x10);
+  return _retv;
+  }
+}
+
+ExceptionHandler *
+#ifdef __USE_PROTOS
+exception_handler(void)
+#else
+exception_handler()
+#endif
+{
+  ExceptionHandler *   _retv;
+  zzRULE;
+  zzBLOCK(zztasp1);
+  PCCTS_PURIFY(_retv,sizeof(ExceptionHandler *  ))
+  zzMake0;
+  {
+  ;
+  zzmatch(135);
+  
+  _retv = (ExceptionHandler *)calloc(1, sizeof(ExceptionHandler));
+  require(_retv!=NULL, "exception: cannot allocate handler");
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==NonTerminal) ) {
+      zzmatch(NonTerminal);
+      
+      _retv->signalname = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(_retv->signalname!=NULL, "exception: cannot allocate sig name");
+      strcpy(_retv->signalname, LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==TokenTerm) ) {
+        zzmatch(TokenTerm);
+        
+        _retv->signalname = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+        require(_retv->signalname!=NULL, "exception: cannot allocate sig name");
+        strcpy(_retv->signalname, LATEXT(1));
+ zzCONSUME;
+
+      }
+      else {zzFAIL(1,zzerr56,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(106); zzCONSUME;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    _retv->action = NULL;
+    if ( (LA(1)==Action) ) {
+      zzmatch(Action);
+      
+      _retv->action = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+      require(_retv->action!=NULL, "exception: cannot allocate action");
+      strcpy(_retv->action, LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd9[LA(1)]&0x20) ) {
+      }
+      else {zzFAIL(1,zzerr57,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return _retv;
+fail:
+  zzEXIT(zztasp1);
+  CannotContinue=TRUE;  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd9, 0x40);
+  return _retv;
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+enum_file(char * fname)
+#else
+enum_file(fname)
+ char *fname ;
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  if ( (setwd9[LA(1)]&0x80) ) {
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      if ( (LA(1)==143) ) {
+        zzmatch(143); zzCONSUME;
+        zzmatch(ID); zzCONSUME;
+        {
+          zzBLOCK(zztasp3);
+          zzMake0;
+          {
+          if ( (LA(1)==149) ) {
+            zzmatch(149); zzCONSUME;
+            zzmatch(ID); zzCONSUME;
+          }
+          else {
+            if ( (setwd10[LA(1)]&0x1) ) {
+            }
+            else {zzFAIL(1,zzerr58,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+          zzEXIT(zztasp3);
+          }
+        }
+      }
+      else {
+        if ( (setwd10[LA(1)]&0x2) ) {
+        }
+        else {zzFAIL(1,zzerr59,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      if ( (LA(1)==151) ) {
+        {
+          zzBLOCK(zztasp3);
+          int zzcnt=1;
+          zzMake0;
+          {
+          do {
+            enum_def(  fname );
+            zzLOOP(zztasp3);
+          } while ( (LA(1)==151) );
+          zzEXIT(zztasp3);
+          }
+        }
+      }
+      else {
+        if ( (LA(1)==149) ) {
+          defines(  fname );
+        }
+        else {zzFAIL(1,zzerr60,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+  }
+  else {
+    if ( (LA(1)==Eof) ) {
+    }
+    else {zzFAIL(1,zzerr61,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd10, 0x4);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+defines(char * fname)
+#else
+defines(fname)
+ char *fname ;
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  int v; int maxt=(-1); char *t;
+  {
+    zzBLOCK(zztasp2);
+    int zzcnt=1;
+    zzMake0;
+    {
+    do {
+      zzmatch(149); zzCONSUME;
+      zzmatch(ID);
+      t = mystrdup(LATEXT(1));
+ zzCONSUME;
+
+      zzmatch(INT);
+      
+      v = atoi(LATEXT(1));
+      /*			fprintf(stderr, "#token %s=%d\n", t, v);*/
+      
+	/* MR2 Andreas Magnusson (Andreas.Magnusson@mailbox.swipnet.se) */
+      /* MR2 Fix to bug introduced by 1.33MR1 for #tokdefs            */
+      /* MR2 Don't let #tokdefs be confused by 			*/
+      /* MR2   DLGminToken and DLGmaxToken     			*/
+      
+			if ( ! isDLGmaxToken(t)) {		/* MR2 */
+      TokenNum = v;
+      if ( v>maxt ) maxt=v;
+      if ( Tnum( t ) == 0 ) {
+      addForcedTname( t, v );
+    } else {
+    warnFL(eMsg1("redefinition of token %s; ignored",t), fname,zzline);
+  };
+};
+ zzCONSUME;
+
+      zzLOOP(zztasp2);
+    } while ( (LA(1)==149) );
+    zzEXIT(zztasp2);
+    }
+  }
+  TokenNum = maxt + 1;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd10, 0x8);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+enum_def(char * fname)
+#else
+enum_def(fname)
+ char *fname ;
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  int v= 0; int maxt=(-1); char *t;
+  zzmatch(151); zzCONSUME;
+  zzmatch(ID); zzCONSUME;
+  zzmatch(152); zzCONSUME;
+  zzmatch(ID);
+  t = mystrdup(LATEXT(1));
+ zzCONSUME;
+
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==153) ) {
+      zzmatch(153); zzCONSUME;
+      zzmatch(INT);
+      v=atoi(LATEXT(1));
+ zzCONSUME;
+
+    }
+    else {
+      if ( (setwd10[LA(1)]&0x10) ) {
+        v++;
+      }
+      else {zzFAIL(1,zzerr62,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  
+  /*			fprintf(stderr, "#token %s=%d\n", t, v);*/
+  TokenNum = v;
+  if ( v>maxt ) maxt=v;				/* MR3 */
+  if ( Tnum( t ) == 0 ) addForcedTname( t, v );
+  else {
+    warnFL(eMsg1("redefinition of token %s; ignored",t), fname,zzline);
+  }
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==154) ) {
+      zzmatch(154); zzCONSUME;
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==ID)&&(isDLGmaxToken(LATEXT(1))) ) {
+          if (!(isDLGmaxToken(LATEXT(1)))            ) {zzfailed_pred("  isDLGmaxToken(LATEXT(1))",0 /* report */, { 0; /* no user action */ } );}
+          zzmatch(ID); zzCONSUME;
+          {
+            zzBLOCK(zztasp4);
+            zzMake0;
+            {
+            if ( (LA(1)==153) ) {
+              zzmatch(153); zzCONSUME;
+              zzmatch(INT); zzCONSUME;
+            }
+            else {
+              if ( (setwd10[LA(1)]&0x20) ) {
+              }
+              else {zzFAIL(1,zzerr63,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+            }
+            zzEXIT(zztasp4);
+            }
+          }
+        }
+        else {
+          if ( (LA(1)==ID) ) {
+            zzmatch(ID);
+            t = mystrdup(LATEXT(1));
+ zzCONSUME;
+
+            {
+              zzBLOCK(zztasp4);
+              zzMake0;
+              {
+              if ( (LA(1)==153) ) {
+                zzmatch(153); zzCONSUME;
+                zzmatch(INT);
+                v=atoi(LATEXT(1));
+ zzCONSUME;
+
+              }
+              else {
+                if ( (setwd10[LA(1)]&0x40) ) {
+                  v++;
+                }
+                else {zzFAIL(1,zzerr64,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+              }
+              zzEXIT(zztasp4);
+              }
+            }
+            
+            /*					fprintf(stderr, "#token %s=%d\n", t, v);*/
+            TokenNum = v;
+            if ( v>maxt ) maxt=v;				/* MR3 */
+            if ( Tnum( t ) == 0 ) addForcedTname( t, v );
+            else {
+              warnFL(eMsg1("redefinition of token %s; ignored",t), fname,zzline);
+            }
+          }
+          else {
+            if ( (setwd10[LA(1)]&0x80) ) {
+            }
+            else {zzFAIL(1,zzerr65,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+          }
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(155); zzCONSUME;
+  zzmatch(156);
+  TokenNum = maxt + 1;
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd11, 0x1);
+  }
+}
+
+
+/* MR2 Andreas Magnusson (Andreas.Magnusson@mailbox.swipnet.se) */
+/* MR2 Fix to bug introduced by 1.33MR1 for #tokdefs            */
+/* MR2 Don't let #tokdefs be confused by 			*/
+/* MR2   DLGminToken and DLGmaxToken     			*/
+
+/* semantic check on DLGminToken and DLGmaxmaxToken in #tokdefs */
+
+#ifdef __USE_PROTOS
+static int isDLGmaxToken(char *Token)
+#else
+static int isDLGmaxToken(Token)
+char *	Token;
+#endif
+{
+static char checkStr1[] = "DLGmaxToken";
+static char checkStr2[] = "DLGminToken";
+
+   if (strcmp(Token, checkStr1) == 0)
+return 1;
+else if (strcmp(Token, checkStr2) == 0)
+return 1;
+else
+return 0;
+}
+
+/* semantics of #token */
+static void
+#ifdef __USE_PROTOS
+chkToken(char *t, char *e, char *a, int tnum)
+#else
+chkToken(t,e,a,tnum)
+char *t, *e, *a;
+int tnum;
+#endif
+{
+TermEntry *p;
+
+	/* check to see that they don't try to redefine a token as a token class */
+if ( t!=NULL ) {
+p = (TermEntry *) hash_get(Tname, t);
+if ( p!=NULL && p->classname ) {
+  err(eMsg1("redefinition of #tokclass '%s' to #token not allowed; ignored",t));
+  if ( a!=NULL ) free((char *)a);
+  return;
+}
+}
+
+	if ( t==NULL && e==NULL ) {			/* none found */
+err("#token requires at least token name or rexpr");
+}
+else if ( t!=NULL && e!=NULL ) {	/* both found */
+if ( UserDefdTokens ) {			/* if #tokdefs, must not define new */
+  p = (TermEntry *) hash_get(Tname, t);
+  if ( p == NULL) {
+    err(eMsg1("new token definition '%s' not allowed - only #token with name already defined by #tokdefs file allowed",t));
+    return;
+  };
+}
+Tklink(t, e);
+if ( a!=NULL ) {
+  if ( hasAction(e) ) {
+    err(eMsg1("redefinition of action for %s; ignored",e));
+  }
+  else setHasAction(e, a);
+}
+}
+else if ( t!=NULL ) {				/* only one found */
+if ( UserDefdTokens ) {
+  p = (TermEntry *) hash_get(Tname, t);
+  if (p == NULL) {
+    err(eMsg1("new token definition '%s' not allowed - only #token with name already defined by #tokdefs file allowed",t));
+  };
+  return;
+}
+if ( Tnum( t ) == 0 ) addTname( t );
+else {
+  err(eMsg1("redefinition of token %s; ignored",t));
+}
+if ( a!=NULL ) {
+  err(eMsg1("action cannot be attached to a token name (%s); ignored",t));
+  free((char *)a);
+}
+}
+else if ( e!=NULL ) {
+if ( Tnum( e ) == 0 ) addTexpr( e );
+else {
+  if ( hasAction(e) ) {
+    err(eMsg1("redefinition of action for expr %s; ignored",e));
+  }
+  else if ( a==NULL ) {
+    err(eMsg1("redefinition of expr %s; ignored",e));
+  }
+}
+if ( a!=NULL ) setHasAction(e, a);
+}
+
+	/* if a token type number was specified, then add the token ID and 'tnum'
+* pair to the ForcedTokens list.  (only applies if an id was given)
+*/
+if ( t!=NULL && tnum>0 )
+{
+if ( set_el(tnum, reserved_positions) )
+{
+  err(eMsgd("a token has already been forced to token number %d; ignored", tnum));
+}
+else
+{
+  list_add(&ForcedTokens, newForcedToken(t,tnum));
+  set_orel(tnum, &reserved_positions);
+}
+}
+}
+
+static int
+#ifdef __USE_PROTOS
+match_token(char *s, char **nxt)
+#else
+match_token(s,nxt)
+char *s;
+char **nxt;
+#endif
+{
+  if ( !(*s>='A' && *s<='Z') ) return 0;
+  s++;
+  while ( (*s>='a' && *s<='z') ||
+  (*s>='A' && *s<='Z') ||
+  (*s>='0' && *s<='9') ||
+  *s=='_' )
+  {
+    s++;
+  }
+  if ( *s!=' ' && *s!='}' ) return 0;
+  *nxt = s;
+  return 1;
+}
+
+static int
+#ifdef __USE_PROTOS
+match_rexpr(char *s, char **nxt)
+#else
+match_rexpr(s,nxt)
+char *s;
+char **nxt;
+#endif
+{
+  if ( *s!='"' ) return 0;
+  s++;
+  while ( *s!='"' )
+  {
+    if ( *s=='\n' || *s=='\r' )                   /* MR13 */
+    warn("eoln found in regular expression");
+    if ( *s=='\\' ) s++;
+    s++;
+  }
+  *nxt = s+1;
+  return 1;
+}
+
+/*
+* Walk a string "{ A .. Z }" where A..Z is a space separated list
+* of token references (either labels or reg exprs).  Return a
+* string "inlineX_set" for some unique integer X.  Basically,
+* we pretend as if we had seen "#tokclass inlineX { A .. Z }"
+* on the input stream outside of an action.
+*/
+char *
+#ifdef __USE_PROTOS
+inline_set(char *s)
+#else
+inline_set(s)
+char *s;
+#endif
+{
+  char *nxt;
+  fprintf(stderr, "found consumeUntil( {...} )\n");
+  while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+  if ( *s!='{' )
+  {
+    err("malformed consumeUntil( {...} ); missing '{'");
+    return "bad_set";
+  }
+  s++;
+  while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+  while ( *s!='}' )
+  {
+    if ( match_token(s,&nxt) ) fprintf(stderr, "found token %s\n", s);
+    else if ( match_rexpr(s,&nxt) ) fprintf(stderr, "found rexpr %s\n", s);
+    else {
+      err("invalid element in consumeUntil( {...} )");
+      return "bad_set";
+    }
+    s = nxt;
+    while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+  }
+  return "inlineX_set";
+}
+
+/* ANTLR-specific syntax error message generator
+* (define USER_ZZSYN when compiling so don't get 2 definitions)
+*/
+void
+#ifdef __USE_PROTOS
+zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok,
+int k, char *bad_text)
+#else
+zzsyn(text, tok, egroup, eset, etok, k, bad_text)
+char *text, *egroup, *bad_text;
+int tok;
+int etok;
+int k;
+SetWordType *eset;
+#endif
+{
+fprintf(stderr, ErrHdr, FileStr[CurFile]!=NULL?FileStr[CurFile]:"stdin", zzline);
+fprintf(stderr, " syntax error at \"%s\"", (tok==zzEOF_TOKEN)?"EOF":text);
+if ( !etok && !eset ) {fprintf(stderr, "\n"); return;}
+if ( k==1 ) fprintf(stderr, " missing");
+else
+{
+fprintf(stderr, "; \"%s\" not", bad_text);
+if ( zzset_deg(eset)>1 ) fprintf(stderr, " in");
+}
+if ( zzset_deg(eset)>0 ) zzedecode(eset);
+else fprintf(stderr, " %s", zztokens[etok]);
+if ( strlen(egroup) > (size_t)0 ) fprintf(stderr, " in %s", egroup);
+fprintf(stderr, "\n");
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.g b/Tools/Source/TianoTools/Pccts/antlr/antlr.g
new file mode 100644
index 0000000000..e6eda6010c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/antlr.g
@@ -0,0 +1,2586 @@
+/*
+ * antlr.g	--	PCCTS Version 1.xx ANTLR
+ *
+ * Parse an antlr input grammar and build a syntax-diagram.
+ *
+ * Written in itself (needs at least 1.06 to work)
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-1995
+ */
+
+/* MR1									*/
+/* MR1 10-Apr-97 MR1	Replace #if logic with #include "pcctscfg.h"	*/
+/* MR1									*/
+
+#header <<
+	#include "pcctscfg.h"
+	#include "set.h"
+	#include <ctype.h>
+	#include "syn.h"
+	#include "hash.h"
+	#include "generic.h"
+	#define zzcr_attr(attr,tok,t)
+	>>
+
+<<
+
+/* MR20 G. Hobbelt For Borland C++ 4.x & 5.x compiling with ALL warnings enabled */
+#if defined(__TURBOC__)
+#pragma warn -aus  /* unused assignment of 'xxx' */
+#endif
+
+
+#ifdef __USE_PROTOS
+static void chkToken(char *, char *, char *, int);
+#else
+static void chkToken();
+#endif
+
+#ifdef __USE_PROTOS
+static int isDLGmaxToken(char *Token);				     /* MR3 */
+#else
+static int isDLGmaxToken();				                             /* MR3 */
+#endif
+
+static int class_nest_level = 0;
+
+/* MR20 G. Hobbelt extern definitions moved to antlr.h */
+
+>>
+
+#lexaction <<
+/* maintained, but not used for now */
+set AST_nodes_refd_in_actions = set_init;
+int inAlt = 0;
+set attribsRefdFromAction = set_init; /* MR20 */
+int UsedOldStyleAttrib = 0;
+int UsedNewStyleLabel = 0;
+#ifdef __USE_PROTOS
+char *inline_set(char *);
+#else
+char *inline_set();
+#endif
+
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	    */
+/* MR1					in DLG action			                    */
+
+int tokenActionActive=0;                                            /* MR1 */
+
+>>
+
+#lexclass STRINGS
+#token QuotedTerm "\""		<< zzmode(START); >>
+#token "\n|\r|\r\n"     	<<
+							zzline++;
+							warn("eoln found in string");
+							zzskip();
+							>>
+#token "\\(\n|\r|\r\n)"		<< zzline++; zzmore(); >>
+#token "\\~[]"				<< zzmore(); >>
+#token "~[\n\r\"\\]+"		<< zzmore(); >>
+
+#lexclass ACTION_STRINGS
+#token "\""					<< zzmode(ACTIONS); zzmore(); >>
+#token "\n|\r|\r\n"			<<
+							zzline++;
+							warn("eoln found in string (in user action)");
+							zzskip();
+							>>
+#token "\\(\n|\r|\r\n)"		<< zzline++; zzmore(); >>
+#token "\\~[]"				<< zzmore(); >>
+#token "~[\n\r\"\\]+"			<< zzmore(); >>
+
+#lexclass ACTION_CHARS
+#token "'"					<< zzmode(ACTIONS); zzmore(); >>
+#token "\n|\r|\r\n"			<<
+							zzline++;
+							warn("eoln found in char literal (in user action)");
+							zzskip();
+							>>
+#token "\\~[]"				<< zzmore(); >>
+#token "~[\n\r'\\]+"		<< zzmore(); >>
+
+#lexclass ACTION_COMMENTS
+#token "\*/"				<< zzmode(ACTIONS); zzmore(); >>
+#token "\*"					<< zzmore(); >>
+#token "\n|\r|\r\n"			<< zzline++; zzmore(); DAWDLE; >>
+#token "~[\n\r\*]+"			<< zzmore(); >>
+
+#lexclass TOK_DEF_COMMENTS
+#token "\*/"				<< zzmode(PARSE_ENUM_FILE);
+                              zzmore(); >>
+#token "\*"					<< zzmore(); >>
+#token "\n|\r|\r\n"			<< zzline++; zzmore(); DAWDLE; >>
+#token "~[\n\r\*]+"			<< zzmore(); >>
+
+#lexclass TOK_DEF_CPP_COMMENTS
+#token "\n|\r|\r\n"			<< zzline++; zzmode(PARSE_ENUM_FILE); zzskip(); DAWDLE; >>
+#token "~[\n\r]+"			<< zzskip(); >>
+
+#lexclass ACTION_CPP_COMMENTS
+#token "\n|\r|\r\n"			<< zzline++; zzmode(ACTIONS); zzmore(); DAWDLE; >>
+#token "~[\n\r]+"			<< zzmore(); >>
+
+#lexclass CPP_COMMENTS
+#token "\n|\r|\r\n"			<< zzline++; zzmode(START); zzskip(); DAWDLE; >>
+#token "~[\n\r]+"			<< zzskip(); >>
+
+#lexclass COMMENTS
+#token "\*/"				<< zzmode(START); zzskip(); >>
+#token "\*"					<< zzskip(); >>
+#token "\n|\r|\r\n"			<< zzline++; zzskip(); DAWDLE; >>
+#token "~[\n\r\*]+"			<< zzskip(); >>
+
+/*
+ * This lexical class accepts actions of type [..] and <<..>>
+ *
+ * It translates the following special items for C:
+ *
+ * $j		--> "zzaArg(current zztasp, j)"
+ * $i.j		--> "zzaArg(zztaspi, j)"
+ * $i.nondigit> "zzaArg(current zztasp, i).nondigit"
+ * $$		--> "zzaRet"
+ * $alnum	--> "alnum"			(used to ref parameters)
+ * $rule	--> "zzaRet"
+ * $retval	--> "_retv.retval" if > 1 return values else "_retv"
+ * $[token, text] --> "zzconstr_attr(token, text)"
+ * $[]		--> "zzempty_attr()"
+ *
+ * It translates the following special items for C++:
+ * (attributes are now stored with 'Token' and $i's are only
+ *  pointers to the Tokens.  Rules don't have attributes now.)
+ *
+ * $j		--> "_tbj" where b is the block level
+ * $i.j		--> "_tij"
+ * $j->nondigit> "_tbj->nondigit"
+ * $$		--> "$$"
+ * $alnum	--> "alnum"			(used to ref parameters)
+ * $rule	--> "$rule"
+ * $retval	--> "_retv.retval" if > 1 return values else "_retv"
+ * $[token, text] --> invalid
+ * $[]		--> invalid
+ *
+ * And, for trees:
+ *
+ * #0		-->	"(*_root)"
+ * #i		--> "zzastArg(i)"
+ * #[args]	--> "zzmk_ast(zzastnew(), args)"
+ * #[]		--> "zzastnew()"
+ * #( root, child1, ..., childn )
+ *			--> "zztmake(root, child1, ...., childn, NULL)"
+ * #()		--> "NULL"
+ *
+ * For C++, ...
+ *
+ * #0		-->	"(*_root)"
+ * #i		--> "_astbi" where b is the block level
+ * #alnum	--> "alnum_ast"	(used to ref #label)
+ * #[args]	--> "new AST(args)"
+ * #[]		--> "new AST"
+ * #( root, child1, ..., childn )
+ *			--> "AST::tmake(root, child1, ...., childn, NULL)"
+ * #()		--> "NULL"
+ *
+ * To escape,
+ *
+ * \]		--> ]
+ * \)		--> )
+ * \$		--> $
+ * \#		--> #
+ *
+ * A stack is used to nest action terminators because they can be nested
+ * like crazy:  << #[$[..],..] >>
+ */
+#lexclass ACTIONS
+#token Action "\>\>"        << /* these do not nest */
+                              zzmode(START);
+                              NLATEXT[0] = ' ';
+                              NLATEXT[1] = ' ';
+                              zzbegexpr[0] = ' ';
+                              zzbegexpr[1] = ' ';
+							  if ( zzbufovf ) {
+								err( eMsgd("action buffer overflow; size %d",ZZLEXBUFSIZE));
+							  }
+
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	*/
+/* MR1					in DLG action			*/
+/* MR1			Doesn't matter what kind of action it is - reset*/
+
+			      tokenActionActive=0;		 /* MR1 */
+                            >>
+#token Pred "\>\>?"			<< /* these do not nest */
+                              zzmode(START);
+                              NLATEXT[0] = ' ';
+                              NLATEXT[1] = ' ';
+                              zzbegexpr[0] = '\0';
+							  if ( zzbufovf ) {
+								err( eMsgd("predicate buffer overflow; size %d",ZZLEXBUFSIZE));
+							  };
+#ifdef __cplusplus__
+/* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __STDC__
+/* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __USE_PROTOS
+/* MRxx */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+/* MR10 */                    list_apply(CurActionLabels,mark_label_used_in_sem_pred);
+#endif
+#endif
+#endif
+                            >>
+#token PassAction "\]"		<< if ( topint() == ']' ) {
+								  popint();
+								  if ( istackempty() )	/* terminate action */
+								  {
+									  zzmode(START);
+									  NLATEXT[0] = ' ';
+									  zzbegexpr[0] = ' ';
+									  if ( zzbufovf ) {
+										err( eMsgd("parameter buffer overflow; size %d",ZZLEXBUFSIZE));
+									  }
+								  }
+								  else {
+									  /* terminate $[..] and #[..] */
+									  if ( GenCC ) zzreplstr("))");
+									  else zzreplstr(")");
+									  zzmore();
+								  }
+							   }
+							   else if ( topint() == '|' ) { /* end of simple [...] */
+								  popint();
+								  zzmore();
+							   }
+							   else zzmore();
+							>>
+#token "consumeUntil\( [\ \t]* \{~[\}]+\} [\ \t]* \)"
+   							<<
+   							zzmore();
+							zzreplstr(inline_set(zzbegexpr+
+									  strlen("consumeUntil(")));
+							>>
+#token "consumeUntil\( ~[\)]+ \)"
+							<< zzmore(); >>
+#token "\n|\r|\r\n"			<< zzline++; zzmore(); DAWDLE; >>
+#token "\>"					<< zzmore(); >>
+#token "$"					<< zzmore(); >>
+#token "$$"					<< if ( !GenCC ) {zzreplstr("zzaRet"); zzmore();}
+							   else err("$$ use invalid in C++ mode"); >>
+
+#token "$\[\]"				<< if ( !GenCC ) {zzreplstr("zzempty_attr"); zzmore();}
+							   else err("$[] use invalid in C++ mode"); >>
+#token "$\["				<<
+							pushint(']');
+							if ( !GenCC ) zzreplstr("zzconstr_attr(");
+							else err("$[..] use invalid in C++ mode");
+							zzmore();
+							>>
+#token "$[0-9]+"			<<{
+							static char buf[100];
+                            numericActionLabel=1;       /* MR10 */
+							if ( strlen(zzbegexpr)>(size_t)85 )
+								fatal("$i attrib ref too big");
+							set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+							if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s)",
+										BlkLevel-1,zzbegexpr+1);
+							else sprintf(buf,"_t%d%s",
+										BlkLevel-1,zzbegexpr+1);
+							zzreplstr(buf);
+							zzmore();
+							UsedOldStyleAttrib = 1;
+							if ( UsedNewStyleLabel )
+								err("cannot mix old-style $i with new-style labels");
+							}
+							>>
+#token "$[0-9]+."			<<{
+							static char buf[100];
+                            numericActionLabel=1;       /* MR10 */
+							if ( strlen(zzbegexpr)>(size_t)85 )
+								fatal("$i.field attrib ref too big");
+							zzbegexpr[strlen(zzbegexpr)-1] = ' ';
+							set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+							if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s).",
+										BlkLevel-1,zzbegexpr+1);
+							else sprintf(buf,"_t%d%s.",
+										BlkLevel-1,zzbegexpr+1);
+							zzreplstr(buf);
+							zzmore();
+							UsedOldStyleAttrib = 1;
+							if ( UsedNewStyleLabel )
+								err("cannot mix old-style $i with new-style labels");
+							}
+							>>
+#token "$[0-9]+.[0-9]+"		<<{
+							static char buf[100];
+							static char i[20], j[20];
+							char *p,*q;
+                            numericActionLabel=1;       /* MR10 */
+							if (strlen(zzbegexpr)>(size_t)85) fatal("$i.j attrib ref too big");
+							for (p=zzbegexpr+1,q= &i[0]; *p!='.'; p++) {
+								if ( q == &i[20] )
+									 fatalFL("i of $i.j attrib ref too big",
+											 FileStr[CurFile], zzline );
+								*q++ = *p;
+							}
+							*q = '\0';
+							for (p++, q= &j[0]; *p!='\0'; p++) {
+								if ( q == &j[20] )
+									fatalFL("j of $i.j attrib ref too big",
+											FileStr[CurFile], zzline );
+								*q++ = *p;
+							}
+							*q = '\0';
+							if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%s,%s)",i,j);
+							else sprintf(buf,"_t%s%s",i,j);
+							zzreplstr(buf);
+							zzmore();
+							UsedOldStyleAttrib = 1;
+							if ( UsedNewStyleLabel )
+								err("cannot mix old-style $i with new-style labels");
+							}
+							>>
+#token "$[_a-zA-Z][_a-zA-Z0-9]*"
+							<<{ static char buf[300]; LabelEntry *el;
+							zzbegexpr[0] = ' ';
+							if ( CurRule != NULL &&
+								 strcmp(CurRule, &zzbegexpr[1])==0 ) {
+								if ( !GenCC ) zzreplstr("zzaRet");
+							}
+							else if ( CurRetDef != NULL &&
+									  strmember(CurRetDef, &zzbegexpr[1])) {
+								 if ( hasMultipleOperands( CurRetDef ) ) {
+									require (strlen(zzbegexpr)<=(size_t)285,
+											 "$retval attrib ref too big");
+									sprintf(buf,"_retv.%s",&zzbegexpr[1]);
+									zzreplstr(buf);
+								}
+								else zzreplstr("_retv");
+							}
+							else if ( CurParmDef != NULL &&
+									  strmember(CurParmDef, &zzbegexpr[1])) {
+								;
+							}
+							else if ( Elabel==NULL ) {
+								{ err("$-variables in actions outside of rules are not allowed"); }
+							} else if ( (el=(LabelEntry *)hash_get(Elabel, &zzbegexpr[1]))!=NULL ) {
+/* MR10 */
+/* MR10 */                      /* element labels might exist without an elem when */
+/* MR10 */                      /*  it is a forward reference (to a rule)          */
+/* MR10 */
+/* MR10 */						if ( GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) )
+/* MR10 */							{ err(eMsg1("There are no token ptrs for rule references: '$%s'",&zzbegexpr[1])); }
+/* MR10 */
+/* MR10 */						if ( !GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) && GenAST) {
+/* MR10 */                          err("You can no longer use attributes returned by rules when also using ASTs");
+/* MR10 */                          err("   Use upward inheritance (\"rule >[Attrib a] : ... <<$a=...\>\>\")");
+/* MR10 */                      };
+/* MR10 */
+/* MR10 */                      /* keep track of <<... $label ...>> for semantic predicates in guess mode */
+/* MR10 */                      /* element labels contain pointer to the owners node                      */
+/* MR10 */
+/* MR10 */                      if (el->elem != NULL && el->elem->ntype == nToken) {
+/* MR10 */                        list_add(&CurActionLabels,el);
+/* MR10 */                      };
+							}
+							else
+								warn(eMsg1("$%s not parameter, return value, (defined) element label",&zzbegexpr[1]));
+							}
+							zzmore();
+							>>
+#token "#0"					<< zzreplstr("(*_root)"); zzmore(); chkGTFlag(); >>
+#token "#\[\]"				<< if ( GenCC ) {
+                                    if (NewAST) zzreplstr("(newAST)");
+                                        else zzreplstr("(new AST)");}
+							   else {zzreplstr("zzastnew()");} zzmore();
+							   chkGTFlag();
+							>>
+#token "#\(\)"				<< zzreplstr("NULL"); zzmore(); chkGTFlag(); >>
+#token "#[0-9]+"			<<{
+							static char buf[100];
+							if ( strlen(zzbegexpr)>(size_t)85 )
+								fatal("#i AST ref too big");
+							if ( GenCC ) sprintf(buf,"_ast%d%s",BlkLevel-1,zzbegexpr+1);
+							else sprintf(buf,"zzastArg(%s)",zzbegexpr+1);
+							zzreplstr(buf);
+							zzmore();
+							set_orel(atoi(zzbegexpr+1), &AST_nodes_refd_in_actions);
+							chkGTFlag();
+ 							}
+							>>
+
+/* MR14 Arpad Beszedes  26-May-98
+        Add support for #line directives when antlr source is pre-processed
+        #lexclass ACTIONS
+*/
+
+#token "#line[\ \t]* [0-9]+ {[\ \t]* \"~[\"]+\" ([\ \t]* [0-9]*)* } (\n|\r|\r\n)"
+        <<
+        zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+        getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+        >>
+
+#token "#line ~[\n\r]* (\n|\r|\r\n)"
+        <<
+        zzline++; zzmore();
+        >>
+
+/* MR14 end of a block to support #line in antlr source code */
+
+#token "#[_a-zA-Z][_a-zA-Z0-9]*"
+							<<
+							if ( !(strcmp(zzbegexpr, "#ifdef")==0 ||
+								 strcmp(zzbegexpr, "#if")==0 ||
+								 strcmp(zzbegexpr, "#else")==0 ||
+								 strcmp(zzbegexpr, "#endif")==0 ||
+								 strcmp(zzbegexpr, "#ifndef")==0 ||
+								 strcmp(zzbegexpr, "#define")==0 ||
+								 strcmp(zzbegexpr, "#pragma")==0 ||
+								 strcmp(zzbegexpr, "#undef")==0 ||
+								 strcmp(zzbegexpr, "#import")==0 ||
+								 strcmp(zzbegexpr, "#line")==0 ||
+								 strcmp(zzbegexpr, "#include")==0 ||
+								 strcmp(zzbegexpr, "#error")==0) )
+							{
+								static char buf[100];
+								sprintf(buf, "%s_ast", zzbegexpr+1);
+/* MR27 */						list_add(&CurAstLabelsInActions, mystrdup(zzbegexpr+1));
+								zzreplstr(buf);
+								chkGTFlag();
+							}
+							zzmore();
+							>>
+#token "#\["				<<
+							pushint(']');
+							if ( GenCC ) {
+                                if (NewAST) zzreplstr("(newAST(");
+                                    else zzreplstr("(new AST("); }
+							else zzreplstr("zzmk_ast(zzastnew(),");
+							zzmore();
+							chkGTFlag();
+							>>
+#token "#\("				<<
+							pushint('}');
+							if ( GenCC ) {
+								if (tmakeInParser) {
+									zzreplstr("tmake(");
+								}
+								else {
+									zzreplstr("ASTBase::tmake(");
+								}
+							}
+							else {
+								zzreplstr("zztmake(");
+							}
+							zzmore();
+							chkGTFlag();
+							>>
+#token "#"					<< zzmore(); >>
+#token "\)"					<<
+							if ( istackempty() )
+								zzmore();
+							else if ( topint()==')' ) {
+								popint();
+							}
+							else if ( topint()=='}' ) {
+								popint();
+								/* terminate #(..) */
+								zzreplstr(", NULL)");
+							}
+							zzmore();
+							>>
+#token "\["					<<
+							pushint('|');	/* look for '|' to terminate simple [...] */
+							zzmore();
+							>>
+#token "\("					<<
+							pushint(')');
+							zzmore();
+							>>
+
+#token "\\\]"				<< zzreplstr("]");  zzmore(); >>
+#token "\\\)"				<< zzreplstr(")");  zzmore(); >>
+
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	*/
+/* MR1					in DLG action			*/
+
+#token "\\>"	<< if (! tokenActionActive) zzreplstr(">");	 /* MR1 */
+		   zzmore();				         /* MR1 */
+		>>					         /* MR1	*/
+
+
+#token "'"					<< zzmode(ACTION_CHARS); zzmore();>>
+#token "\""					<< zzmode(ACTION_STRINGS); zzmore();>>
+#token "\\$"				<< zzreplstr("$");  zzmore(); >>
+#token "\\#"				<< zzreplstr("#");  zzmore(); >>
+#token "\\(\n|\r|\r\n)"		<< zzline++; zzmore(); >>
+#token "\\~[\]\)>$#]"		<< zzmore(); >> /* escaped char, always ignore */
+#token "/"					<< zzmore(); >>
+#token "/\*"				<< zzmode(ACTION_COMMENTS); zzmore(); >>
+#token "\*/"				<< warn("Missing /*; found dangling */ in action"); zzmore(); >>
+#token "//"					<< zzmode(ACTION_CPP_COMMENTS); zzmore(); >>
+#token "~[\n\r\)\(\\$#\>\]\[\"'/]+" << zzmore(); >>
+
+#lexclass START
+#token "[\t\ ]+"			<< zzskip(); >>				/* Ignore White */
+#token "\n|\r|\r\n"	   		<< zzline++; zzskip(); >>	/* Track Line # */
+#token "\["                 << zzmode(ACTIONS); zzmore();
+                               istackreset();
+                               pushint(']'); >>
+#token "\<\<"               << action_file=CurFile; action_line=zzline;
+                               zzmode(ACTIONS); zzmore();
+                               list_free(&CurActionLabels,0);       /* MR10 */
+                               numericActionLabel=0;                /* MR10 */
+                               istackreset();
+                               pushint('>'); >>
+#token "\""					<< zzmode(STRINGS); zzmore(); >>
+#token "/\*"				<< zzmode(COMMENTS); zzskip(); >>
+#token "\*/"				<< warn("Missing /*; found dangling */"); zzskip(); >>
+#token "//"					<< zzmode(CPP_COMMENTS); zzskip(); >>
+
+/* MR14 Arpad Beszedes  26-May-98
+        Add support for #line directives when antlr source is pre-processed
+        #lexclass START
+*/
+
+#token "#line[\ \t]* [0-9]+ {[\ \t]* \"~[\"]+\" ([\ \t]* [0-9]*)* } (\n|\r|\r\n)"
+        <<
+        zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+        getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+        >>
+
+#token "#line ~[\n\r]* (\n|\r|\r\n)"
+        <<
+        zzline++; zzmore();
+        >>
+
+/* MR14 end of a block to support #line in antlr source code */
+
+/*                                                                          */
+/*  8-Apr-97	Regularize escape sequence for ">>"                         */
+/*			appearing in string literals                                    */
+/*                                                                          */
+
+#token "\>\>"			<< warn("Missing <<; found dangling \>\>"); zzskip(); >> /* MR1 */
+#token WildCard "."
+#token "\@"			<<FoundException = 1;		/* MR6 */
+    				  FoundAtOperator = 1;>>	/* MR6 */
+#token Eof					"@"
+							<<	/* L o o k  F o r  A n o t h e r  F i l e */
+							{
+							FILE *new_input;
+							new_input = NextFile();
+							if ( new_input == NULL ) { NLA=Eof; return; }
+							fclose( input );
+							input = new_input;
+							zzrdstream( input );
+							zzskip();	/* Skip the Eof (@) char i.e continue */
+							}
+							>>
+
+#token LABEL
+
+#errclass "grammar-element" { element }
+#errclass "meta-symbol"		{ "\}" "!" ";" "\|" "\~" "^" "\)" }
+
+#token Pragma			"{\\}#pragma"			/* MR21 */
+#token FirstSetSymbol	"{\\}#FirstSetSymbol"	/* MR21 */
+/*
+ * Get a grammar -- Build a list of rules like:
+ *
+ *	o-->Rule1--o
+ *	|
+ *	o-->Rule2--o
+ *	|
+ *	...
+ *	|
+ *	o-->RuleN--o
+ */
+
+/* rule grammar */
+
+grammar :	<<Graph g;>>
+			(	"{\\}#header" Action    /* MR13 */
+				<<
+				if ( HdrAction==NULL ) {
+				HdrAction = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+				require(HdrAction!=NULL, "rule grammar: cannot allocate header action");
+				strcpy(HdrAction, LATEXT(1));
+				}
+				else warn("additional #header statement ignored");
+				>>
+            |   "{\\}#first" Action
+				<<
+    				if ( FirstAction==NULL ) {
+        				FirstAction = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+        				require(FirstAction!=NULL, "rule grammar: cannot allocate #first action");
+        				strcpy(FirstAction, LATEXT(1));
+    				} else {
+                        warn("additional #first statement ignored");
+                    };
+				>>
+
+			|	"{\\}#parser" QuotedTerm
+				<<
+				if ( GenCC ) {
+					warn("#parser meta-op incompatible with -CC; ignored");
+				}
+				else {
+					if ( strcmp(ParserName,"zzparser")==0 ) {
+						ParserName=StripQuotes(mystrdup(LATEXT(1)));
+						if ( RulePrefix[0]!='\0' )
+						{
+							warn("#parser meta-op incompatible with '-gp prefix'; '-gp' ignored");
+							RulePrefix[0]='\0';
+						}
+					}
+					else warn("additional #parser statement ignored");
+				}
+				>>
+			|	"{\\}#tokdefs" QuotedTerm
+				<<{
+				char *fname;
+				zzantlr_state st; FILE *f; struct zzdlg_state dst;
+				UserTokenDefsFile = mystrdup(LATEXT(1));
+				zzsave_antlr_state(&st);
+				zzsave_dlg_state(&dst);
+				fname = mystrdup(LATEXT(1));
+				f = fopen(StripQuotes(fname), "r");
+				if ( f==NULL ) {warn(eMsg1("cannot open token defs file '%s'", fname+1));}
+				else {
+					ANTLRm(enum_file(fname+1), f, PARSE_ENUM_FILE);
+					UserDefdTokens = 1;
+				}
+				zzrestore_antlr_state(&st);
+				zzrestore_dlg_state(&dst);
+				}>>
+			)*
+			(	Action
+				<<{
+				UserAction *ua = newUserAction(LATEXT(1));
+				ua->file = action_file; ua->line = action_line;
+				if ( class_nest_level>0 ) list_add(&class_before_actions, ua);
+				else list_add(&BeforeActions, ua);
+				}>>
+			|	laction
+			|	lmember				/* MR1 */
+			|	lprefix				/* MR1 */
+			|	aLexclass
+			|	token
+			|	error
+			|	tclass
+            |   aPred               /* MR11 */
+			|	default_exception_handler
+			|	class_def
+			|	"\}"
+				<<
+				if ( class_nest_level==0 )
+					warn("missing class definition for trailing '}'");
+				class_nest_level--;
+				>>
+			)*
+            
+			rule		<<g=$3; SynDiag = (Junction *) $3.left;>>
+			(	rule
+
+                	<<if ( $1.left!=NULL ) {
+                        g.right = NULL;
+
+/* MR21a */             /*  Avoid use of a malformed graph when CannotContinue */
+/* MR21a */             /*  is already set                                     */
+/* MR21a */
+/* MR21a */             if (! (CannotContinue && g.left == NULL)) {
+/* MR21a */               g = Or(g, $1);
+/* MR21a */             }
+/* MR21a */		      }
+                    >>
+
+			|	aLexclass
+			|	token
+			|	error
+			|	tclass
+            |   aPred               /* MR11 */
+			|	class_def
+			|	"\}"
+				<<
+				if ( class_nest_level==0 )
+					warn("missing class definition for trailing '}'");
+				class_nest_level--;
+				>>
+			)*
+			(	Action
+				<<{
+				UserAction *ua = newUserAction(LATEXT(1));
+				ua->file = action_file; ua->line = action_line;
+				if ( class_nest_level>0 ) list_add(&class_after_actions, ua);
+				else list_add(&AfterActions, ua);
+				}>>
+			|	laction
+			|	lmember				/* MR1 */
+			|	lprefix				/* MR1 */
+			|	error
+			|	tclass
+			|	class_def
+            |   aPred               /* MR11 */
+			|	"\}"
+				<<
+				if ( class_nest_level==0 )
+					warn("missing class definition for trailing '}'");
+				class_nest_level--;
+				>>
+			)*
+			Eof
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule class_def */
+
+class_def
+	:	<<int go=1; char name[MaxRuleName+1];>>
+		"class"
+		(	NonTerminal		<<if(go) strncpy(name,LATEXT(1),MaxRuleName);>>
+		|	TokenTerm		<<if(go) strncpy(name,LATEXT(1),MaxRuleName);>>
+		)
+		<<
+		if ( CurrentClassName[0]!='\0' && strcmp(CurrentClassName,name)!=0
+			 && GenCC ) {
+			err("only one grammar class allowed in this release");
+			go = 0;
+		}
+		else strcpy(CurrentClassName, name);
+		>>
+		<<if ( !GenCC ) { err("class meta-op used without C++ option"); }>>
+
+/* MR10 */  (~ "\{"
+/* MR10 */            <<if (ClassDeclStuff == NULL) {
+/* MR10 */                   ClassDeclStuff=(char *)calloc(MaxClassDeclStuff+1,sizeof(char));
+/* MR10 */              };
+/* MR10 */              strncat(ClassDeclStuff," ",MaxClassDeclStuff);
+/* MR10 */              strncat(ClassDeclStuff,LATEXT(1),MaxClassDeclStuff);
+/* MR22 */              do {
+/* MR22 */                if (0 == strcmp(LATEXT(1),"public")) break;
+/* MR22 */                if (0 == strcmp(LATEXT(1),"private")) break;
+/* MR22 */                if (0 == strcmp(LATEXT(1),"protected")) break;
+/* MR22 */                if (0 == strcmp(LATEXT(1),"virtual")) break;
+/* MR22 */                if (0 == strcmp(LATEXT(1),",")) break;
+/* MR22 */                if (0 == strcmp(LATEXT(1),":")) break;
+/* MR22 */                if (BaseClassName != NULL) break;
+/* MR22 */                BaseClassName=(char *)calloc(strlen(LATEXT(1))+1,sizeof(char));
+/* MR22 */                require(BaseClassName!=NULL, "rule grammar: cannot allocate base class name");
+/* MR22 */				  strcpy(BaseClassName,LATEXT(1));
+/* MR22 */              } while (0);
+/* MR10 */            >>
+/* MR10 */  )*
+
+		"\{"
+		<<
+		no_classes_found = 0;
+		if ( class_nest_level>=1 ) {warn("cannot have nested classes");}
+		else class_nest_level++;
+		>>
+	;
+	<<CannotContinue=TRUE;>>
+
+/*
+ * Build -o-->o-R-o-->o-	where -o-R-o- is the block from rule 'block'.
+ * Construct the RuleBlk front and EndRule node on the end of the
+ * block.  This is used to add FOLLOW pointers to the rule end.  Add the
+ * new rule name to the Rname hash table and sets its rulenum.
+ * Store the parameter definitions if any are found.
+ *
+ * Note that locks are required on the RuleBlk and EndRule nodes to thwart
+ * infinite recursion.
+ *
+ * Return the left graph pointer == NULL to indicate error/dupl rule def.
+ */
+
+/* rule rule */
+
+rule	:	<<
+
+			ExceptionGroup *eg;
+			RuleEntry *q; Junction *p; Graph r; int f, l; ECnode *e;
+			set toksrefd, rulesrefd;
+			char *pdecl=NULL, *ret=NULL, *a; CurRetDef = CurParmDef = NULL;
+			CurExGroups = NULL;
+			CurElementLabels = NULL;
+			CurAstLabelsInActions = NULL; /* MR27 */
+			/* We want a new element label hash table for each rule */
+			if ( Elabel!=NULL ) killHashTable(Elabel);
+			Elabel = newHashTable();
+			attribsRefdFromAction = empty;
+			>>
+			NonTerminal
+			<<q=NULL;
+			  if ( hash_get(Rname, LATEXT(1))!=NULL ) {
+				  err(eMsg1("duplicate rule definition: '%s'",LATEXT(1)));
+				  CannotContinue=TRUE;
+			  }
+			  else
+			  {
+			  	  q = (RuleEntry *)hash_add(Rname,
+											LATEXT(1),
+											(Entry *)newRuleEntry(LATEXT(1)));
+			      CurRule = q->str;
+			  }
+			  CurRuleNode = q;
+			  f = CurFile; l = zzline;
+			  NumRules++;
+			>>
+			{	"!"  <<if ( q!=NULL ) q->noAST = TRUE;>> }
+			{	<<;>>
+				{"\<"}
+				PassAction
+				<<	pdecl = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+					require(pdecl!=NULL, "rule rule: cannot allocate param decl");
+					strcpy(pdecl, LATEXT(1));
+					CurParmDef = pdecl;
+				>>
+			}
+			{	"\>"
+				PassAction
+				<<	ret = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+				    require(ret!=NULL, "rule rule: cannot allocate ret type");
+					strcpy(ret, LATEXT(1));
+ 					CurRetDef = ret;
+				>>
+			}
+			{ QuotedTerm <<if ( q!=NULL ) q->egroup=mystrdup(LATEXT(1));>> }
+			<<
+			if ( GenEClasseForRules && q!=NULL ) {
+				e = newECnode;
+				require(e!=NULL, "cannot allocate error class node");
+				if ( q->egroup == NULL ) {a = q->str; a[0] = (char)toupper(a[0]);}
+				else a = q->egroup;
+				if ( Tnum( a ) == 0 )
+				{
+					e->tok = addTname( a );
+					list_add(&eclasses, (char *)e);
+					if ( q->egroup == NULL ) a[0] = (char)tolower(a[0]);
+					/* refers to itself */
+					list_add(&(e->elist), mystrdup(q->str));
+				}
+				else {
+					warn(eMsg1("default errclass for '%s' would conflict with token/errclass/tokclass",a));
+					if ( q->egroup == NULL ) a[0] = (char)tolower(a[0]);
+					free((char *)e);
+				}
+			}
+			>>
+			<<BlkLevel++;
+              if (BlkLevel >= MAX_BLK_LEVEL) fatal("Blocks nested too deeply");
+/* MR23 */    CurBlockID_array[BlkLevel] = CurBlockID;
+/* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;                
+            >>
+
+			":" <<inAlt=1;>>
+			block[&toksrefd, &rulesrefd]
+			<<r = makeBlk($7,0, NULL /* pFirstSetSymbol */ );
+			  CurRuleBlk = (Junction *)r.left;
+			  CurRuleBlk->blockid = CurBlockID;
+			  CurRuleBlk->jtype = RuleBlk;
+			  if ( q!=NULL ) CurRuleBlk->rname = q->str;
+			  CurRuleBlk->file = f;
+			  CurRuleBlk->line = l;
+			  CurRuleBlk->pdecl = pdecl;
+			  CurRuleBlk->ret = ret;
+			  CurRuleBlk->lock = makelocks();
+			  CurRuleBlk->pred_lock = makelocks();
+			  CurRuleBlk->tokrefs = toksrefd;
+			  CurRuleBlk->rulerefs = rulesrefd;
+			  p = newJunction();	/* add EndRule Node */
+			  ((Junction *)r.right)->p1 = (Node *)p;
+			  r.right = (Node *) p;
+			  p->jtype = EndRule;
+			  p->lock = makelocks();
+			  p->pred_lock = makelocks();
+			  CurRuleBlk->end = p;
+			  if ( q!=NULL ) q->rulenum = NumRules;
+			  $7 = r;
+			>>
+			<<
+                /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+                /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+                --BlkLevel;
+            >>
+            <<altFixup();leFixup();egFixup();>>                      /* MR7 */
+			";" <<inAlt=0;>>
+			{	Action
+				<<	a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+					require(a!=NULL, "rule rule: cannot allocate error action");
+					strcpy(a, LATEXT(1));
+					CurRuleBlk->erraction = a;
+				>>
+			}
+			(	exception_group > [eg]
+				<<if ( eg!=NULL ) {
+					list_add(&CurExGroups, (void *)eg);
+					if (eg->label == NULL || *eg->label=='\0' ) q->has_rule_exception = 1;
+			    }
+				>>
+			)*
+			<<if ( q==NULL ) $0.left = NULL; else $0 = $7;>>
+			<<CurRuleBlk->exceptions = CurExGroups;>>
+			<<CurRuleBlk->el_labels = CurElementLabels;>>
+			<<CurRuleNode->ast_labels_in_actions = CurAstLabelsInActions;>> /* MR27 */
+			<<CurRuleNode = NULL;>> /* MR27 Moved */
+		;
+		<<CannotContinue=TRUE;>>
+
+/*
+ * pragma	:	"{\\}#pragma" "dup\-labeled\-tokens"
+ *			<<Pragma_DupLabeledTokens=1;>>
+ *		;
+ */
+
+/* rule laction */
+
+laction	:	<<char *a;>>
+
+			"{\\}#lexaction"
+			Action
+			<<
+			a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+			require(a!=NULL, "rule laction: cannot allocate action");
+			strcpy(a, LATEXT(1));
+			list_add(&LexActions, a);
+			>>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* MR1									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+/* MR1			  via #lexmember <<....>> & #lexprefix <<...>>      */
+/* MR1									    */
+
+/* rule lmember */
+
+lmember:	<<char *a;>>					     /* MR1 */
+
+/* MR1 */		"{\\}#lexmember"
+/* MR1 */		Action
+/* MR1 */		<<
+/* MR1 */		if (! GenCC) {
+/* MR1 */		  err("Use #lexmember only in C++ mode (to insert code in DLG class header");
+/* MR1 */	        } else {
+/* MR1 */		  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+/* MR1 */		  require(a!=NULL, "rule lmember: cannot allocate action");
+/* MR1 */		  strcpy(a, LATEXT(1));
+/* MR1 */		  list_add(&LexMemberActions, a);
+/* MR1 */		};
+/* MR1 */		>>
+/* MR1 */	;
+/* MR1 */	<<CannotContinue=TRUE;>>
+
+/* rule lprefix */
+
+lprefix:	<<char *a;>>					     /* MR1 */
+
+/* MR1 */		"{\\}#lexprefix"
+/* MR1 */		Action
+/* MR1 */		<<
+/* MR1 */		if (! GenCC) {
+/* MR1 */		  err("Use #lexprefix only in C++ mode (to insert code in DLG class header");
+/* MR1 */	        } else {
+/* MR1 */		  a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+/* MR1 */		  require(a!=NULL, "rule lprefix: cannot allocate action");
+/* MR1 */		  strcpy(a, LATEXT(1));
+/* MR1 */		  list_add(&LexPrefixActions, a);
+/* MR1 */		};
+/* MR1 */		>>
+/* MR1 */	;
+/* MR1 */	<<CannotContinue=TRUE;>>
+
+/*
+ * #pred upper        <<isupper()>>?            predicate literal
+ * #pred lower        <<islower()>>?            predicate literal
+ * #pred up_or_low    upper || lower            predicate expression
+ *                                                concealed interdependence
+ * #pred up_or_low_2  <<isletter()>>?  A || B   predicate literal equals predicate expr
+ *                                                analyze using lower||upper
+ *                                                generate using isLetter()
+ */
+
+/* rule aPref */
+
+aPred:  <<PredEntry     *predEntry=NULL;
+          char          *name=NULL;
+          Predicate     *predExpr=NULL;
+          char          *predLiteral=NULL;
+          int           save_file;
+          int           save_line;
+          int           predExprPresent=0;
+        >>
+
+        "{\\}#pred"
+
+        <<
+          MR_usingPredNames=1;      /* will need to use -mrhoist version of genPredTree */
+        >>
+
+                                    /* used to allow NonTerminal but it caused problems
+                                       when a rule name immediately followed a #pred statement */
+
+        TokenTerm     <<name=mystrdup(LATEXT(1));>>
+
+          <<
+            /* don't free - referenced in predicates */
+
+            CurPredName=(char *)calloc(1,strlen(name) + 10);
+            strcat(CurPredName,"#pred ");
+            strcat(CurPredName,name);
+
+            predEntry=(PredEntry *) hash_get(Pname,name);
+            if (predEntry != NULL) {
+              warnFL(eMsg1("#pred %s previously defined - ignored",name),
+                                              FileStr[action_file],action_line);
+              name=NULL;
+            };
+          >>
+
+        (
+
+            Pred    <<predLiteral=mystrdup(LATEXT(1));
+                      save_line=action_line;
+                      save_file=action_file;
+                    >>
+
+              {
+                    predOrExpr>[predExpr]   <<predExprPresent=1;>>
+              }
+
+              <<if (predLiteral != NULL && name != NULL) {
+
+                      /*
+                       *  predExpr may be NULL due to syntax errors
+                       *    or simply omitted by the user
+                      */
+
+                      predEntry=newPredEntry(name);
+                      predEntry->file=save_file;
+                      predEntry->line=save_line;
+                      predExpr=MR_predFlatten(predExpr);
+                      predEntry->predLiteral=predLiteral;
+                      if (! predExprPresent || predExpr == NULL) {
+                        predExpr=new_pred();
+                        predExpr->expr=predLiteral;
+                        predExpr->source=newActionNode();
+                        predExpr->source->action=predExpr->expr;
+                        predExpr->source->rname=CurPredName;
+                        predExpr->source->line=action_line;
+                        predExpr->source->file=action_file;
+                        predExpr->source->is_predicate=1;
+                        predExpr->k=predicateLookaheadDepth(predExpr->source);
+                      };
+                      predEntry->pred=predExpr;
+                      hash_add(Pname,name,(Entry *)predEntry);
+                      predExpr=NULL;
+                };
+                predicate_free(predExpr);
+              >>
+
+            |
+               <<save_line=zzline; save_file=CurFile;>>
+
+                predOrExpr>[predExpr]
+
+              <<if (predExpr != NULL && name != NULL) {
+                  predEntry=newPredEntry(name);
+                  predEntry->file=CurFile;
+                  predEntry->line=zzline;
+                  predExpr=MR_predFlatten(predExpr);
+                  predEntry->pred=predExpr;
+                  hash_add(Pname,name,(Entry *)predEntry);
+                  predExpr=NULL;
+                };
+                predicate_free(predExpr);
+              >>
+        )
+        {";"}
+;
+
+/* fail */
+
+<<predicate_free(predExpr);
+>>
+
+/* rule predOrExpr */
+
+predOrExpr>[Predicate *result] :
+            <<Predicate     *ORnode;
+              Predicate     *predExpr;
+              Predicate     **tail=NULL;
+            >>
+        predAndExpr>[predExpr]
+            <<
+                ORnode=new_pred();
+                ORnode->expr=PRED_OR_LIST;
+                if (predExpr != NULL) {
+                    ORnode->down=predExpr;
+                    tail=&predExpr->right;
+                };
+            >>
+        ( "\|\|"  predAndExpr>[predExpr]
+            <<
+                if (predExpr != NULL) {
+                    *tail=predExpr;
+                    tail=&predExpr->right;
+                };
+            >>
+        )*
+        <<
+            $result=ORnode;
+            ORnode=NULL;
+        >>
+;
+
+/* fail */
+
+<<predicate_free(ORnode);>>
+
+/* rule predAndExpr */
+
+predAndExpr>[Predicate *result] :
+            <<Predicate     *ANDnode;
+              Predicate     *predExpr;
+              Predicate     **tail=NULL;
+            >>
+        predPrimary>[predExpr]
+            <<
+                ANDnode=new_pred();
+                ANDnode->expr=PRED_AND_LIST;
+                if (predExpr != NULL) {
+                    ANDnode->down=predExpr;
+                    tail=&predExpr->right;
+                };
+            >>
+        ( "&&"  predPrimary>[predExpr]
+            <<
+                if (predExpr != NULL) {
+                    *tail=predExpr;
+                    tail=&predExpr->right;
+                };
+            >>
+        )*
+        <<
+            $result=ANDnode;
+            ANDnode=NULL;
+        >>
+;
+
+/* fail */
+
+<<predicate_free(ANDnode);>>
+
+
+/* rule predPrimary */
+
+predPrimary>[Predicate *result] :
+            <<
+              char          *name=NULL;
+              PredEntry     *predEntry=NULL;
+              Predicate     *predExpr=NULL;
+            >>
+
+        TokenTerm            <<name=mystrdup(LATEXT(1));>>
+
+            <<
+                predEntry=(PredEntry *) hash_get(Pname,name);
+                if (predEntry == NULL) {
+                  warnFL(eMsg1("no previously defined #pred with name \"%s\"",name),
+                        FileStr[CurFile],zzline);
+                  name=NULL;
+                  $result=NULL;
+                } else {
+                  predExpr=predicate_dup(predEntry->pred);
+                  predExpr->predEntry=predEntry;
+                  $result=predExpr;
+                };
+            >>
+
+        | "\(" predOrExpr>[predExpr] "\)"
+            <<
+                $result=predExpr;
+            >>
+
+        | "!" predPrimary>[predExpr]
+            <<
+                predExpr->inverted=!predExpr->inverted;
+                $result=predExpr;
+            >>
+;
+
+/* fail */  <<
+              predicate_free(predExpr);
+            >>
+
+/* rule aLexclass */
+
+aLexclass:	"{\\}#lexclass" TokenTerm <<lexclass(mystrdup(LATEXT(1)));>>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule error */
+
+error	:	<<char *t=NULL; ECnode *e; int go=1; TermEntry *p;>>
+			"{\\}#errclass"
+			(<<;>>	TokenTerm  <<t=mystrdup(LATEXT(1));>>
+			|		QuotedTerm <<t=mystrdup(LATEXT(1));>>
+			)
+			<<e = newECnode;
+			  require(e!=NULL, "cannot allocate error class node");
+			  e->lexclass = CurrentLexClass;
+			  if ( Tnum( (t=StripQuotes(t)) ) == 0 )
+			  {
+				if ( hash_get(Texpr, t) != NULL )
+					warn(eMsg1("errclass name conflicts with regular expression  '%s'",t));
+			  	e->tok = addTname( t );
+				set_orel(e->tok, &imag_tokens);
+				require((p=(TermEntry *)hash_get(Tname, t)) != NULL,
+						"hash table mechanism is broken");
+				p->classname = 1;	/* entry is errclass name, not token */
+				list_add(&eclasses, (char *)e);
+			  }
+			  else
+			  {
+			  	warn(eMsg1("redefinition of errclass or conflict w/token or tokclass '%s'; ignored",t));
+				free( (char *)e );
+				go=0;
+			  }
+			>>
+			"\{"
+				( NonTerminal <<if ( go ) t=mystrdup(LATEXT(1));>>
+				| TokenTerm <<if ( go ) t=mystrdup(LATEXT(1));>>
+				| QuotedTerm <<if ( go ) t=mystrdup(LATEXT(1));>>
+				)
+				<<if ( go ) list_add(&(e->elist), t);>>
+				(
+					( NonTerminal <<if ( go ) t=mystrdup(LATEXT(1));>>
+					| TokenTerm <<if ( go ) t=mystrdup(LATEXT(1));>>
+					| QuotedTerm <<if ( go ) t=mystrdup(LATEXT(1));>>
+					)
+					<<if ( go ) list_add(&(e->elist), t);>>
+				)*
+			"\}"
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule tclass */
+
+tclass	:	<<char *t=NULL; TCnode *e; int go=1,tok,totok; TermEntry *p, *term, *toterm;>>
+            <<char *akaString=NULL; int save_file; int save_line;>>
+            <<char *totext=NULL; >>
+			"{\\}#tokclass" TokenTerm <<t=mystrdup(LATEXT(1));>>
+			<<e = newTCnode;
+			  require(e!=NULL, "cannot allocate token class node");
+			  e->lexclass = CurrentLexClass;
+			  if ( Tnum( t ) == 0 )
+			  {
+			  	e->tok = addTname( t );
+				set_orel(e->tok, &imag_tokens);
+				set_orel(e->tok, &tokclasses);
+				require((p=(TermEntry *)hash_get(Tname, t)) != NULL,
+						"hash table mechanism is broken");
+				p->classname = 1;	/* entry is class name, not token */
+				p->tclass = e;		/* save ptr to this tclass def */
+				list_add(&tclasses, (char *)e);
+			  }
+			  else
+			  {
+			  	warn(eMsg1("redefinition of tokclass or conflict w/token '%s'; ignored",t));
+				free( (char *)e );
+				go=0;
+			  }
+			>>
+/* MR23 */      {
+/* MR23 */          "\("
+/* MR23 */          QuotedTerm
+/* MR23 */                 <<akaString=mystrdup(StripQuotes(LATEXT(1)));
+/* MR11 */                   save_file=CurFile;save_line=zzline;
+/* MR23 */                 >>
+/* MR23 */          "\)"
+/* MR23 */      }
+/* MR23 */
+/* MR23 */
+/* MR23 */		<<
+/* MR23 */         if (p!= NULL && akaString != NULL) {
+/* MR23 */           if (p->akaString != NULL) {
+/* MR23 */             if (strcmp(p->akaString,akaString) != 0) {
+/* MR23 */                warnFL(eMsg2("this #tokclass statment conflicts with a previous #tokclass %s(\"%s\") statement",
+/* MR23 */                              t,p->akaString),
+/* MR23 */			                    FileStr[save_file],save_line);
+/* MR23 */             };
+/* MR23 */            } else {
+/* MR23 */              p->akaString=akaString;
+/* MR23 */            };
+/* MR23 */          };
+/* MR23 */		>>
+
+			"\{"
+				(
+    				( TokenTerm
+    				  <<if ( go ) {
+    					term = (TermEntry *) hash_get(Tname, LATEXT(1));
+    					if ( term==NULL && UserDefdTokens ) {
+    						err("implicit token definition not allowed with #tokdefs");
+    						go = 0;
+    					}
+    					else {t=mystrdup(LATEXT(1)); tok=addTname(LATEXT(1));}
+    					}>>
+
+                        {
+                            ".."
+                            TokenTerm
+
+            				  <<if ( go ) {
+                					toterm = (TermEntry *) hash_get(Tname, LATEXT(1));
+                					if ( toterm==NULL && UserDefdTokens ) {
+                						err("implicit token definition not allowed with #tokdefs");
+                						go = 0;
+                					} else {
+                                        totext=mystrdup(LATEXT(1)); totok=addTname(LATEXT(1));
+                                    }
+            				    }
+                              >>
+                        }
+
+    				| QuotedTerm
+    				  <<if ( go ) {
+    					term = (TermEntry *) hash_get(Texpr, LATEXT(1));
+    					if ( term==NULL && UserDefdTokens ) {
+    						err("implicit token definition not allowed with #tokdefs");
+    						go = 0;
+        					}
+    					else {t=mystrdup(LATEXT(1)); tok=addTexpr(LATEXT(1));}
+    					}>>
+    				)
+    				<<if ( go ) {
+                        if (totext == NULL) {
+                            list_add(&(e->tlist), t);
+                        } else {
+                            list_add(&(e->tlist),"..");
+                            list_add(&(e->tlist),t);
+                            list_add(&(e->tlist),totext);
+                        }
+                        totext=NULL;
+                      }
+                    >>
+				)+  // MR15 Manfred Kogler - forbid empty #tokclass sets (was "+")
+			"\}"
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule token */
+
+token	:	<<char *t=NULL, *e=NULL, *a=NULL; int tnum=0;>>
+            <<char *akaString=NULL; TermEntry *te;int save_file=0,save_line=0;>>           /* MR11 */
+			"{\\}#token"
+
+/* MR1 10-Apr-97 MR1 Allow shift right operator in DLG actions		   */
+/* MR1			Danger when parser feedback to lexer		           */
+/* MR1	                                                               */
+
+			<<tokenActionActive=1;>>		                    /* MR1 */
+			{	TokenTerm  <<t=mystrdup(LATEXT(1));>>
+
+/* MR11 */      {
+/* MR11 */          "\("
+/* MR11 */          QuotedTerm
+/* MR11 */                 <<akaString=mystrdup(StripQuotes(LATEXT(1)));
+/* MR11 */                   save_file=CurFile;save_line=zzline;
+/* MR11 */                 >>
+/* MR11 */          "\)"
+/* MR11 */      }
+
+				{	"=" "[0-9]+"		/* define the token type number */
+					<<tnum = atoi(LATEXT(1));>>
+				}
+			}
+			{ QuotedTerm <<e=mystrdup(LATEXT(1));>> }
+			{	Action
+				<<
+					a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+					require(a!=NULL, "rule token: cannot allocate action");
+					strcpy(a, LATEXT(1));
+				>>
+			}
+
+            { ";" }     /* MR11 */
+
+			<<chkToken(t, e, a, tnum);>>
+
+            <<if (t != NULL) {
+                te=(TermEntry *)hash_get(Tname,t);
+                if (te != NULL && akaString != NULL) {
+                  if (te->akaString != NULL) {
+                    if (strcmp(te->akaString,akaString) != 0) {
+                      warnFL(eMsg2("this #token statment conflicts with a previous #token %s(\"%s\") statement",
+                                    t,te->akaString),
+                        FileStr[save_file],save_line);
+                    };
+                  } else {
+                    te->akaString=akaString;
+                  };
+                };
+              };
+            >>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule block */
+
+block[set *toksrefd, set *rulesrefd]
+		:	<<
+    			Graph g, b;
+    			set saveblah;
+    			int saveinalt = inAlt;
+    			ExceptionGroup *eg;
+    			*$toksrefd = empty;
+    			*$rulesrefd = empty;
+    			set_clr(AST_nodes_refd_in_actions);
+    			CurBlockID++;
+/* MR23 */      CurBlockID_array[BlkLevel] = CurBlockID;
+    			CurAltNum = 1;
+/* MR23 */      CurAltNum_array[BlkLevel] = CurAltNum;                
+    			saveblah = attribsRefdFromAction;
+    			attribsRefdFromAction = empty;
+			>>
+
+			alt[toksrefd,rulesrefd]		<<b = g = $1;>>
+
+			<<
+			if ( ((Junction *)g.left)->p1->ntype == nAction )
+			{
+                ActionNode *actionNode=(ActionNode *)
+                                         ( ( (Junction *)g.left) ->p1);
+				if (!actionNode->is_predicate )
+				{
+					actionNode->init_action = TRUE;
+/* MR12c */  		if (actionNode->noHoist) {
+/* MR12c */           errFL("<<nohoist>> appears as init-action - use <<>> <<nohoist>>",
+/* MR12c */                       FileStr[actionNode->file],actionNode->line);
+/* MR12c */         };
+				}
+			}
+			((Junction *)g.left)->blockid = CurBlockID;
+			>>
+
+			(	exception_group > [eg]
+				<<
+				if ( eg!=NULL ) {
+/* MR7 *****       	eg->altID = makeAltID(CurBlockID,CurAltNum);        *****/
+/* MR7 *****		CurAltStart->exception_label = eg->altID;           *****/
+					list_add(&CurExGroups, (void *)eg);
+				}
+				>>
+			)*
+			<<CurAltNum++;
+/* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;
+            >>
+
+			(	"\|" <<inAlt=1;>>
+				alt[toksrefd,rulesrefd]		<<g = Or(g, $2);>>
+				<<
+				((Junction *)g.left)->blockid = CurBlockID;
+				>>
+
+				(	exception_group > [eg]
+					<<
+					if ( eg!=NULL ) {
+/* MR7 *****       	eg->altID = makeAltID(CurBlockID,CurAltNum);        *****/
+/* MR7 *****		CurAltStart->exception_label = eg->altID;           *****/
+						list_add(&CurExGroups, (void *)eg);
+					}
+					>>
+				)*
+
+				<<CurAltNum++;
+/* MR23 */        CurAltNum_array[BlkLevel] = CurAltNum;                
+                >>
+
+			)*
+			<<$0 = b;>>
+			<<attribsRefdFromAction = saveblah; inAlt = saveinalt;>>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule alt */
+
+alt[set *toksrefd, set *rulesrefd]
+		:	<<int n=0; Graph g; int e_num=0, old_not=0; Node *node; set elems, dif;
+			int first_on_line = 1, use_def_MT_handler = 0;
+			g.left=NULL; g.right=NULL;
+
+			CurAltStart = NULL;
+			elems = empty;
+			inAlt = 1;
+			>>
+			{	"\@"	/* handle MismatchedToken signals with default handler */
+				<<use_def_MT_handler = 1;>>
+			}
+
+			(	<<;>>       /* MR9 Removed unreferenced variable "tok" */
+				{ <<old_not=0;>> "\~" <<old_not=1;>> }
+				element[old_not, first_on_line, use_def_MT_handler] > [node]
+				<<if ( node!=NULL && node->ntype!=nAction ) first_on_line = 0;>>
+				<<
+				if ( $2.left!=NULL ) {
+					g = Cat(g, $2);
+					n++;
+					if ( node!=NULL ) {
+						if ( node->ntype!=nAction ) e_num++;
+						/* record record number of all rule and token refs */
+						if ( node->ntype==nToken ) {
+							TokNode *tk = (TokNode *)((Junction *)$2.left)->p1;
+							tk->elnum = e_num;
+							set_orel(e_num, &elems);
+						}
+						else if ( node->ntype==nRuleRef ) {
+							RuleRefNode *rn = (RuleRefNode *)((Junction *)$2.left)->p1;
+							rn->elnum = e_num;
+							set_orel(e_num, $rulesrefd);
+						}
+					}
+				}
+				>>
+			)*
+			<<if ( n == 0 ) g = emptyAlt();
+			  $0 = g;
+			  /* We want to reduce number of LT(i) calls and the number of
+			   * local attribute variables in C++ mode (for moment, later we'll
+			   * do for C also).  However, if trees are being built, they
+			   * require most of the attrib variables to create the tree nodes
+			   * with; therefore, we gen a token ptr for each token ref in C++
+			   */
+			  if ( GenCC && !GenAST )
+			  {
+				  /* This now free's the temp set -ATG 5/6/95 */
+				  set temp;
+				  temp = set_and(elems, attribsRefdFromAction);
+				  set_orin($toksrefd, temp);
+				  set_free(temp);
+			  }
+			  else set_orin($toksrefd, elems);
+			  if ( GenCC ) {
+				dif = set_dif(attribsRefdFromAction, elems);
+			  	if ( set_deg(dif)>0 )
+					err("one or more $i in action(s) refer to non-token elements");
+				set_free(dif);
+			  }
+			  set_free(elems);
+			  set_free(attribsRefdFromAction);
+			  inAlt = 0;
+   			>>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule element_label */
+
+element_label > [LabelEntry *label]
+	:	<<TermEntry *t=NULL; LabelEntry *l=NULL; RuleEntry *r=NULL; char *lab;>>
+		LABEL	<<lab = mystrdup(LATEXT(1));>>
+		<<
+		UsedNewStyleLabel = 1;
+		if ( UsedOldStyleAttrib ) err("cannot mix with new-style labels with old-style $i");
+		t = (TermEntry *) hash_get(Tname, lab);
+		if ( t==NULL ) t = (TermEntry *) hash_get(Texpr, lab);
+		if ( t==NULL ) r = (RuleEntry *) hash_get(Rname, lab);
+		if ( t!=NULL ) {
+			err(eMsg1("label definition clashes with token/tokclass definition: '%s'", lab));
+			$label = NULL;
+		}
+		else if ( r!=NULL ) {
+			err(eMsg1("label definition clashes with rule definition: '%s'", lab));
+			$label = NULL;
+		}
+		else {
+			/* we don't clash with anybody else */
+			l = (LabelEntry *) hash_get(Elabel, lab);
+ 			if ( l==NULL ) {	/* ok to add new element label */
+				l = (LabelEntry *)hash_add(Elabel,
+										   lab,
+										   (Entry *)newLabelEntry(lab));
+				/* add to list of element labels for this rule */
+				list_add(&CurElementLabels, (void *)lab);
+/* MR7 */       leAdd(l);  /* list of labels waiting for exception group definitions */
+				$label = l;
+			}
+			else {
+				err(eMsg1("label definitions must be unique per rule: '%s'", lab));
+				$label = NULL;
+			}
+		}
+		>>
+		":"
+	;
+
+/* rule element */
+
+element[int old_not, int first_on_line, int use_def_MT_handler] > [Node *node]
+		: <<
+		  Attrib blk;
+		  Predicate *pred = NULL;
+		  int local_use_def_MT_handler=0;
+		  ActionNode *act;
+		  RuleRefNode *rr;
+		  set toksrefd, rulesrefd;
+		  TermEntry *term;
+		  TokNode *p=NULL; RuleRefNode *q; int approx=0;
+		  LabelEntry *label=NULL;
+          int predMsgDone=0;
+          int semDepth=0;
+          int   ampersandStyle;
+          int   height;         /* MR11 */
+          int   equal_height;   /* MR11 */
+
+          char* pFirstSetSymbol = NULL; /* MR21 */
+
+		  $node = NULL;
+		  >>
+		  {element_label>[label]}
+		  ( TokenTerm
+			<<
+			term = (TermEntry *) hash_get(Tname, LATEXT(1));
+			if ( term==NULL && UserDefdTokens ) {
+				err("implicit token definition not allowed with #tokdefs");
+				$$.left = $$.right = NULL;
+			}
+			else {
+				$$ = buildToken(LATEXT(1));
+				p=((TokNode *)((Junction *)$$.left)->p1);
+				term = (TermEntry *) hash_get(Tname, LATEXT(1));
+				require( term!= NULL, "hash table mechanism is broken");
+				p->tclass = term->tclass;
+				p->complement = $old_not;
+				if ( label!=NULL ) {
+					p->el_label = label->str;
+					label->elem = (Node *)p;
+				}
+			}
+			>>
+			{	".."
+				(	QuotedTerm
+					<<if ( p!=NULL ) setUpperRange(p, LATEXT(1));>>
+				|	TokenTerm
+					<<if ( p!=NULL ) setUpperRange(p, LATEXT(1));>>
+				)
+			}
+			<<
+			if ( p!=NULL && (p->upper_range!=0 || p->tclass || $old_not) )
+				list_add(&MetaTokenNodes, (void *)p);
+			>>
+			(	"^"	<<if ( p!=NULL ) p->astnode=ASTroot;>>
+			|		<<if ( p!=NULL ) p->astnode=ASTchild;>>
+			|	"!" <<if ( p!=NULL ) p->astnode=ASTexclude;>>
+			)
+			{ "\@" <<local_use_def_MT_handler = 1;>> }
+			<<
+			if ( p!=NULL && $first_on_line ) {
+				CurAltStart = (Junction *)$$.left;
+                altAdd(CurAltStart);                                 /* MR7 */
+				p->altstart = CurAltStart;
+			}
+   			if ( p!=NULL )
+				p->use_def_MT_handler = $use_def_MT_handler || local_use_def_MT_handler;
+			$node = (Node *)p;
+			>>
+		  | QuotedTerm
+			<<
+			term = (TermEntry *) hash_get(Texpr, LATEXT(1));
+			if ( term==NULL && UserDefdTokens ) {
+				err("implicit token definition not allowed with #tokdefs");
+				$$.left = $$.right = NULL;
+			}
+			else {
+				$$ = buildToken(LATEXT(1)); p=((TokNode *)((Junction *)$$.left)->p1);
+				p->complement = $old_not;
+				if ( label!=NULL ) {
+					p->el_label = label->str;
+	   				label->elem = (Node *)p;
+				}
+			}
+			>>
+			{	".."
+				(	QuotedTerm
+					<<if ( p!=NULL ) setUpperRange(p, LATEXT(1));>>
+				|	TokenTerm
+					<<if ( p!=NULL ) setUpperRange(p, LATEXT(1));>>
+				)
+			}
+			(	"^"	<<if ( p!=NULL ) p->astnode=ASTroot;>>
+			|		<<if ( p!=NULL ) p->astnode=ASTchild;>>
+			|	"!" <<if ( p!=NULL ) p->astnode=ASTexclude;>>
+			)
+			{ "\@" <<local_use_def_MT_handler = 1;>> }
+			<<
+			if ( p!=NULL && (p->upper_range!=0 || p->tclass || $old_not) )
+				list_add(&MetaTokenNodes, (void *)p);
+			>>
+			<<
+			if ( $first_on_line ) {
+				CurAltStart = (Junction *)$$.left;
+                altAdd(CurAltStart);                                 /* MR7 */
+				p->altstart = CurAltStart;
+			}
+   			if ( p!=NULL )
+				p->use_def_MT_handler = $use_def_MT_handler || local_use_def_MT_handler;
+			$node = (Node *)p;
+			>>
+
+		  | <<if ( $old_not ) warn("~ WILDCARD is an undefined operation (implies 'nothing')");>>
+			"."
+			<<$$ = buildWildCard(LATEXT(1)); p=((TokNode *)((Junction *)$$.left)->p1);>>
+			(	"^"	<<p->astnode=ASTroot;>>
+			|		<<p->astnode=ASTchild;>>
+			|	"!" <<p->astnode=ASTexclude;>>
+			)
+			<<list_add(&MetaTokenNodes, (void *)p);>>
+			<<
+			if ( $first_on_line ) {
+				CurAltStart = (Junction *)$$.left;
+                altAdd(CurAltStart);                                 /* MR7 */
+				p->altstart = CurAltStart;
+				if ( label!=NULL ) {
+					p->el_label = label->str;
+					label->elem = (Node *)p;
+				}
+			}
+			$node = (Node *)p;
+			>>
+
+		  | <<if ( $old_not ) warn("~ NONTERMINAL is an undefined operation");>>
+			NonTerminal
+			<<$$ = buildRuleRef(LATEXT(1));>>
+			{ "!" <<q = (RuleRefNode *) ((Junction *)$$.left)->p1;
+					q->astnode=ASTexclude;>>
+			}
+			{	{"\<"}
+				PassAction <<addParm(((Junction *)$$.left)->p1, LATEXT(1));>>
+			}
+			<<rr=(RuleRefNode *) ((Junction *)$$.left)->p1;>>
+			{	<<char *a;>>
+				"\>"
+				PassAction
+				<<
+					a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+					require(a!=NULL, "rule element: cannot allocate assignment");
+					strcpy(a, LATEXT(1));
+					rr->assign = a;
+				>>
+			}
+			<<
+			if ( label!=NULL ) {
+				rr->el_label = label->str;
+				label->elem = (Node *)rr;
+			}
+			if ( $first_on_line ) {
+				CurAltStart = (Junction *)$$.left;
+                altAdd(CurAltStart);                                 /* MR7 */
+				((RuleRefNode *)((Junction *)$$.left)->p1)->altstart = CurAltStart;
+			}
+			$node = (Node *)rr;
+			>>
+		  )
+
+		|	<<if ( $old_not )	warn("~ ACTION is an undefined operation");>>
+			Action <<$0 = buildAction(LATEXT(1),action_file,action_line, 0);>>
+			<<if ( $first_on_line ) {                                /* MR7 */
+                CurAltStart = (Junction *)$0.left;                   /* MR7 */
+                altAdd(CurAltStart);                                 /* MR7 */
+              };>>                                                   /* MR7 */
+			<<$node = (Node *) ((Junction *)$0.left)->p1;>>
+
+		|	<<if ( $old_not )	warn("~ SEMANTIC-PREDICATE is an undefined operation");>>
+			Pred   <<$0 = buildAction(LATEXT(1),action_file,action_line, 1);>>
+			<<act = (ActionNode *) ((Junction *)$0.left)->p1;>>
+            <<if (numericActionLabel) {             /* MR10 */
+                list_add(&NumericPredLabels,act);   /* MR10 */
+                numericActionLabel=0;               /* MR10 */
+              };                                    /* MR10 */
+            >>
+			{	<<char *a;>>
+				PassAction
+				<<
+				a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+				require(a!=NULL, "rule element: cannot allocate predicate fail action");
+				strcpy(a, LATEXT(1));
+				act->pred_fail = a;
+				>>
+			}
+			<<if ( $first_on_line ) {                                /* MR7 */
+                CurAltStart = (Junction *)$0.left;                   /* MR7 */
+                altAdd(CurAltStart);                                 /* MR7 */
+              };>>                                                   /* MR7 */
+			<<$node = (Node *)act;>>
+
+		|	<<if ( $old_not )	warn("~ BLOCK is an undefined operation");>>
+			<<BlkLevel++;
+              if (BlkLevel >= MAX_BLK_LEVEL) fatal("Blocks nested too deeply");
+/* MR23 */    CurBlockID_array[BlkLevel] = CurBlockID;
+/* MR23 */    CurAltNum_array[BlkLevel] = CurAltNum;                
+            >>
+			{	Pragma
+				(	"approx" <<approx=LL_k;>>
+				|	"LL\(1\)"  <<approx = 1;>>  /* MR20 */
+				|	"LL\(2\)"  <<approx = 2;>>  /* MR20 */
+                )
+            }
+
+/* MR21 */  {  FirstSetSymbol
+/* MR21 */     "\("
+/* MR21 */    		(	NonTerminal
+/* MR21 */                <<
+/* MR21 */                     pFirstSetSymbol = (char *) calloc(strlen(LATEXT(1))+1,
+/* MR21 */                                                    sizeof(char));
+/* MR21 */                          require(pFirstSetSymbol!=NULL,
+/* MR21 */                                  "cannot allocate first set name");
+/* MR21 */                          strcpy(pFirstSetSymbol, LATEXT(1));
+/* MR21 */                      >>
+/* MR21 */          |    TokenTerm
+/* MR21 */                  <<
+/* MR21 */                      pFirstSetSymbol = (char *) calloc(strlen(LATEXT(1))+1,
+/* MR21 */                                                        sizeof(char));
+/* MR21 */                      require(pFirstSetSymbol!=NULL,
+/* MR21 */                              "cannot allocate first set name");
+/* MR21 */                      strcpy(pFirstSetSymbol, LATEXT(1));
+/* MR21 */                  >>
+/* MR21 */          )
+/* MR21 */      "\)"
+/* MR21 */  }
+
+            (
+
+        	"\(" block[&toksrefd,&rulesrefd] "\)"
+				<<blk = $$ = $2;
+                        /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+                        /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+                  --BlkLevel;
+            >>
+
+				(	"\*"		<<$$ = makeLoop($$,approx,pFirstSetSymbol);>>
+				|	"\+"		<<$$ = makePlus($$,approx,pFirstSetSymbol);>>
+				|	"?"
+					(	
+                        ( "=>" <<ampersandStyle=0;>>
+                        | "&&" <<ampersandStyle=1;>>  /* MR10 (g)? && <<p>>? */
+                        )
+                        Pred	/* generalized predicate */
+						/* first make into a predicate */
+					    <<$$ = buildAction(LATEXT(1),action_file,action_line,1);>>
+					    <<act = (ActionNode *) ((Junction *)$$.left)->p1;>>
+                        <<semDepth=predicateLookaheadDepth(act);>>  /* MR10 */
+                        <<if (numericActionLabel) {             /* MR10 */
+                            list_add(&NumericPredLabels,act);   /* MR10 */
+                            numericActionLabel=0;               /* MR10 */
+                          };                                    /* MR10 */
+                        >>
+						{	<<char *a;>>
+							PassAction
+							<<
+							a = (char *)calloc(strlen(LATEXT(1))+1, sizeof(char));
+							require(a!=NULL, "rule element: cannot allocate predicate fail action");
+							strcpy(a, LATEXT(1));
+							act->pred_fail = a;
+							>>
+						}
+						<<if ($first_on_line) {                      /* MR7 */
+                            CurAltStart=(Junction *)$$.left;         /* MR7 */
+                            altAdd(CurAltStart);                     /* MR7 */
+                          };>>
+						<<$node = (Node *)act;>>
+
+						/* for now, just snag context */
+						<<
+						pred = computePredFromContextGuard(blk,&predMsgDone);           /* MR10 */
+						if ( pred==NULL) {                                              /* MR10 */
+                          if ( !predMsgDone) err("invalid or missing context guard");   /* MR10 */
+                          predMsgDone=1;                                                /* MR10 */
+						} else {                                                        /* MR10 */
+                            act->guardNodes=(Junction *)blk.left;                       /* MR11 */
+							pred->expr = act->action;
+							pred->source = act;
+/* MR10 */                  pred->ampersandStyle = ampersandStyle;  /* 0 means (g)? => ... 1 means (g)? && ... */
+/* MR13 */                  if (pred->tcontext != NULL) {
+/* MR13 */                    height=MR_max_height_of_tree(pred->tcontext);
+/* MR13 */                    equal_height=MR_all_leaves_same_height(pred->tcontext,height);
+/* MR13 */                    if (! equal_height) {
+/* MR13 */                       errFL("in guarded predicates all tokens in the guard must be at the same height",
+/* MR13 */                              FileStr[act->file],act->line);
+/* MR13 */                    };
+/* MR13 */                  }
+/* MR10 */                  if (ampersandStyle) {
+/* MR10 */			  		  act->ampersandPred = pred;
+/* MR11 */                    if (! HoistPredicateContext) {
+/* MR11 */                      errFL("without \"-prc on\" (guard)? && <<pred>>? ... doesn't make sense",
+/* MR11 */                              FileStr[act->file],act->line);
+/* MR11 */                    };
+/* MR10 */                  } else {
+/* MR10 */			  		  act->guardpred = pred;
+/* MR10 */                  };
+/* MR10 */                  if (pred->k != semDepth) {
+/* MR10 */                     warn(eMsgd2("length of guard (%d) does not match the length of semantic predicate (%d)",
+/* MR10 */                                  pred->k,semDepth));
+/* MR10 */                  };
+						}
+						>>
+					|	<<$$ = makeBlk($$,approx,pFirstSetSymbol);
+						  FoundGuessBlk = 1;
+						  ((Junction *) ((Junction *)$$.left)->p1)->guess=1;
+						  if ( !$first_on_line ) {
+							err("(...)? predicate must be first element of production");
+						  }
+						>>
+					)
+				|	<<$$ = makeBlk($$,approx,pFirstSetSymbol);>>
+				)
+				<<
+				if ( pred==NULL && !predMsgDone) {                                      /* MR10 */
+					((Junction *)((Junction *)$$.left)->p1)->blockid = CurBlockID;
+					((Junction *)((Junction *)$$.left)->p1)->tokrefs = toksrefd;
+					((Junction *)((Junction *)$$.left)->p1)->rulerefs = rulesrefd;
+					if ( $first_on_line ) {                         /* MR7 */
+					   CurAltStart = (Junction *)((Junction *)((Junction *)$$.left)->p1);  /* MR7 */
+                       altAdd(CurAltStart);                         /* MR7 */
+                    };                                              /* MR7 */
+					$node = (Node *) ((Junction *)$$.left)->p1;
+				}
+				>>
+
+			|	"\{"	block[&toksrefd,&rulesrefd]
+						<<$$ = makeOpt($2,approx,pFirstSetSymbol);
+                                /* MR23 */      CurBlockID_array[BlkLevel] = (-1);
+                                /* MR23 */      CurAltNum_array[BlkLevel] = (-1);                
+                                --BlkLevel;
+                        >>
+				"\}"
+				<<
+				((Junction *)((Junction *)$$.left)->p1)->blockid = CurBlockID;
+				((Junction *)((Junction *)$$.left)->p1)->tokrefs = toksrefd;
+				((Junction *)((Junction *)$$.left)->p1)->rulerefs = rulesrefd;
+				>>
+				<<if ( $first_on_line ) {                            /* MR7 */
+					CurAltStart = (Junction *) ((Junction *)((Junction *)$$.left)->p1);  /* MR7 */
+                    altAdd(CurAltStart);                             /* MR7 */
+                  };
+				>>
+				<<$node = (Node *) ((Junction *)$$.left)->p1;>>
+
+			)
+
+/* Error catching alternatives */
+		|	"\*"	<<warn("don't you want a ')' with that '*'?"); CannotContinue=TRUE;>>
+		|	"\+"	<<warn("don't you want a ')' with that '+'?"); CannotContinue=TRUE;>>
+		|	"\>"	<<warn("'>' can only appear after a nonterminal"); CannotContinue=TRUE;>>
+		|	PassAction <<warn("[...] out of context 'rule > [...]'");
+						 CannotContinue=TRUE;>>
+		;
+		<<CannotContinue=TRUE;>>
+
+/* rule default_exception_handler */
+
+default_exception_handler
+	:	exception_group > [DefaultExGroup]
+	;
+
+/* rule exception_group */
+
+exception_group > [ExceptionGroup *eg]
+	:	<<ExceptionHandler *h; LabelEntry *label=NULL;	  /* MR6 */
+		  FoundException = 1; FoundExceptionGroup = 1;>>  /* MR6 */
+
+		"exception"	 <<$eg = (ExceptionGroup *)calloc(1, sizeof(ExceptionGroup));>>
+		{	<<char *p;>>
+			PassAction		/* did they attach a label? */
+			<<
+			p = LATEXT(1)+1;
+			p[strlen(p)-1] = '\0';		/* kill trailing space */
+			label = (LabelEntry *) hash_get(Elabel, LATEXT(1)+1);
+			if ( label==NULL )
+			{
+				err(eMsg1("unknown label in exception handler: '%s'", LATEXT(1)+1));
+			}
+			>>
+		}
+		(	exception_handler > [h]
+			<<list_add(&($eg->handlers), (void *)h);>>
+		)*
+		{	"default" ":" Action
+			<<{
+			ExceptionHandler *eh = (ExceptionHandler *)
+				calloc(1, sizeof(ExceptionHandler));
+			char *a = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+			require(eh!=NULL, "exception: cannot allocate handler");
+			require(a!=NULL, "exception: cannot allocate action");
+			strcpy(a, LATEXT(1));
+			eh->action = a;
+			eh->signalname = (char *) calloc(strlen("default")+1, sizeof(char));
+			require(eh->signalname!=NULL, "exception: cannot allocate sig name");
+			strcpy(eh->signalname, "default");
+			list_add(&($eg->handlers), (void *)eh);
+			}>>
+		}
+
+		<<
+		if ( label!=NULL ) {
+            	/* Record ex group in sym tab for this label */
+		   if ( label->ex_group!=NULL ) {
+		      err(eMsg1("duplicate exception handler for label '%s'",label->str));
+		   } else {
+			  label->ex_group = $eg;
+				/* Label the exception group itself */
+			  $eg->label = label->str;
+				/* Make the labelled element pt to the exception also */
+/* MR6 */	  if (label->elem == NULL) {
+/* MR6 */	     err(eMsg1("reference in exception handler to undefined label '%s'",label->str));
+/* MR6 */	  } else {
+			   	 switch ( label->elem->ntype ) {
+				    case nRuleRef :
+                        {
+    					    RuleRefNode *r = (RuleRefNode *)label->elem;
+    					    r->ex_group = $eg;
+    				    	break;
+                        }
+     	            case nToken :
+				        {
+					        TokNode *t = (TokNode *)label->elem;
+					        t->ex_group = $eg;
+					        break;
+				        }
+				 } /* end switch */
+/* MR6 */	  }; /* end test on label->elem */
+		    } /* end test on label->ex_group */
+
+		} /* end test on exception label */
+
+/* MR7 */
+/* MR7 */   if (BlkLevel == 1 && label == NULL) {
+/* MR7 */     $eg->forRule=1;
+/* MR7 */   } else if (label == NULL) {
+/* MR7 */     $eg->altID = makeAltID(CurBlockID_array[BlkLevel], CurAltNum_array[BlkLevel]);
+/* MR7 */     egAdd($eg);
+/* MR7 */   } else {
+/* MR7 */     $eg->labelEntry=label;
+/* MR7 */   };
+/* MR7 */
+/* MR7 */	    /* You may want to remove this exc from the rule list  */
+/* MR7 */		/* and handle at the labeled element site.             */
+/* MR7 */
+/* MR7 */   if (label != NULL) {
+/* MR7 */     $eg = NULL;
+/* MR7 */   };
+
+		>>
+	;
+	<<CannotContinue=TRUE;>>
+
+/* rule exception_handler */
+
+exception_handler > [ExceptionHandler *eh]
+	:	<<;>>                               /* MR9 Removed unreferenced variable "a" */
+		"catch"
+		<<
+		$eh = (ExceptionHandler *)calloc(1, sizeof(ExceptionHandler));
+		require($eh!=NULL, "exception: cannot allocate handler");
+		>>
+		(	NonTerminal
+			<<
+			$eh->signalname = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+			require($eh->signalname!=NULL, "exception: cannot allocate sig name");
+			strcpy($eh->signalname, LATEXT(1));
+			>>
+		|	TokenTerm
+			<<
+			$eh->signalname = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+			require($eh->signalname!=NULL, "exception: cannot allocate sig name");
+			strcpy($eh->signalname, LATEXT(1));
+			>>
+		)
+		":"
+		{	<<$eh->action = NULL;>>
+			Action
+			<<
+			$eh->action = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+			require($eh->action!=NULL, "exception: cannot allocate action");
+			strcpy($eh->action, LATEXT(1));
+			>>
+		}
+	;
+	<<CannotContinue=TRUE;>>
+
+#token NonTerminal		"[a-z] [A-Za-z0-9_]*"
+							<<
+							while ( zzchar==' ' || zzchar=='\t' ) {
+								zzadvance();
+							}
+							if ( zzchar == ':' && inAlt ) NLA = LABEL;
+							>>
+#token TokenTerm		"[A-Z] [A-Za-z0-9_]*"
+							<<
+							while ( zzchar==' ' || zzchar=='\t' ) {
+								zzadvance();
+							}
+							if ( zzchar == ':' && inAlt ) NLA = LABEL;
+							>>
+#token "{\\}#[A-Za-z0-9_]*"	<<warn(eMsg1("unknown meta-op: %s",LATEXT(1))); zzskip(); >>
+
+#lexclass PARSE_ENUM_FILE
+
+#token "[\t\ ]+"			<< zzskip(); >>				/* Ignore White */
+#token "\n|\r|\r\n"			<< zzline++; zzskip(); >>	/* Track Line # */
+#token "//"					<< zzmode(TOK_DEF_CPP_COMMENTS); zzmore(); >>
+#token "/\*"				<< zzmode(TOK_DEF_COMMENTS); zzskip(); >>
+#token "#ifdef"				<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "#if"				<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "#ifndef"			<< ; >>
+#token "#else"				<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "#endif"				<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "#undef"				<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "#import"			<< zzmode(TOK_DEF_CPP_COMMENTS); zzskip(); >>
+#token "@"					<< ; >>
+
+/* rule enum_file */
+
+enum_file[char *fname]
+	:	{	"#ifndef" ID
+			{	"#define" ID /* ignore if it smells like a gate */
+				/* First #define after the first #ifndef (if any) is ignored */
+			}
+		}
+		(	( enum_def[$fname] )+
+		|	defines[$fname]
+		)
+	|
+	;
+
+/* rule defines */
+
+defines[char *fname]
+	:	<<int v; int maxt=(-1); char *t;>>		/* MR3 */
+		(
+			"#define" ID
+			<<t = mystrdup(LATEXT(1));>>
+			INT
+			<<
+			v = atoi(LATEXT(1));
+/*			fprintf(stderr, "#token %s=%d\n", t, v);*/
+
+	/* MR2 Andreas Magnusson (Andreas.Magnusson@mailbox.swipnet.se) */
+	/* MR2 Fix to bug introduced by 1.33MR1 for #tokdefs            */
+	/* MR2 Don't let #tokdefs be confused by 			*/
+	/* MR2   DLGminToken and DLGmaxToken     			*/
+
+			if ( ! isDLGmaxToken(t)) {		/* MR2 */
+			  TokenNum = v;
+			  if ( v>maxt ) maxt=v;
+			  if ( Tnum( t ) == 0 ) {
+			    addForcedTname( t, v );
+			  } else {
+			    warnFL(eMsg1("redefinition of token %s; ignored",t),$fname,zzline);
+			  };
+	                };
+			>>
+		)+
+		<<TokenNum = maxt + 1;>>
+	;
+
+/* rule enum_def */
+
+enum_def[char *fname]
+	:	<<int v= 0; int maxt=(-1); char *t;>>			/* MR3 */
+		"enum" ID
+		"\{"
+			ID
+			<<t = mystrdup(LATEXT(1));>>
+			(	"=" INT	<<v=atoi(LATEXT(1));>>
+			|			<<v++;>>
+			)
+			<<
+/*			fprintf(stderr, "#token %s=%d\n", t, v);*/
+			TokenNum = v;
+			if ( v>maxt ) maxt=v;				/* MR3 */
+			if ( Tnum( t ) == 0 ) addForcedTname( t, v );
+			else {
+				warnFL(eMsg1("redefinition of token %s; ignored",t),$fname,zzline);
+			}
+			>>
+			(	","
+
+				/* MR2 Andreas Magnusson (Andreas.Magnusson@mailbox.swipnet.se) */
+				/* MR2 Fix to bug introduced by 1.33MR1 for #tokdefs            */
+				/* MR2 Don't let #tokdefs be confused by 			*/
+				/* MR2   DLGminToken and DLGmaxToken     			*/
+
+				{
+				  <<isDLGmaxToken(LATEXT(1))>>? ID { "=" INT }		/* MR2 */
+				| ID					                /* MR2 */
+					<<t = mystrdup(LATEXT(1));>>
+					(	"=" INT	<<v=atoi(LATEXT(1));>>
+					|			<<v++;>>
+					)
+					<<
+/*					fprintf(stderr, "#token %s=%d\n", t, v);*/
+					TokenNum = v;
+					if ( v>maxt ) maxt=v;				/* MR3 */
+					if ( Tnum( t ) == 0 ) addForcedTname( t, v );
+					else {
+						warnFL(eMsg1("redefinition of token %s; ignored",t),$fname,zzline);
+					}
+					>>
+				}
+			)*
+		"\}"
+		";"
+		<<TokenNum = maxt + 1;>>					/* MR3 */
+	;
+
+#token INT	"[0-9]+"
+#token ID	"[a-zA-Z_][_a-zA-Z0-9]*"
+
+#lexclass START
+
+/* MR14 Arpad Beszedes  26-May-98
+        Add support for #line directives when antlr source is pre-processed
+*/
+
+#lexaction
+<<
+
+static char *
+#ifdef __USE_PROTOS
+getFileNameFromTheLineInfo(char *toStr, char *fromStr)
+#else
+getFileNameFromTheLineInfo(toStr, fromStr)
+char *toStr, *fromStr;
+#endif
+{
+  int i, j, k;
+
+  if (!fromStr || !toStr) return toStr;
+
+  /* find the first " */
+
+  for (i=0;
+        (i<MaxFileName) &&
+        (fromStr[i] != '\n') &&
+        (fromStr[i] != '\r') &&
+        (fromStr[i] != '\"');
+      i++) /* nothing */ ;
+
+  if ( (i == MaxFileName) ||
+       (fromStr[i] == '\n') ||
+       (fromStr[i] == '\r') ) {
+    return toStr;
+  }
+
+  /* find the second " */
+
+  for (j=i+1;
+        (j<MaxFileName) &&
+        (fromStr[j] != '\n') &&
+        (fromStr[j] != '\r') &&
+        (fromStr[j] != '\"');
+       j++) /* nothing */ ;
+
+  if ((j == MaxFileName) ||
+      (fromStr[j] == '\n') ||
+      (fromStr[j] == '\r') ) {
+    return toStr;
+  }
+
+  /* go back until the last / or \ */
+
+  for (k=j-1;
+        (fromStr[k] != '\"') &&
+        (fromStr[k] != '/') &&
+        (fromStr[k] != '\\');
+       k--) /* nothing */ ;
+
+  /* copy the string after " / or \ into toStr */
+
+  for (i=k+1; fromStr[i] != '\"'; i++) {
+    toStr[i-k-1] = fromStr[i];
+  }
+
+  toStr[i-k-1] = '\0';
+
+  return toStr;
+}
+
+/* MR14 end of a block to support #line in antlr source code */
+
+>>
+
+<<
+
+/* MR2 Andreas Magnusson (Andreas.Magnusson@mailbox.swipnet.se) */
+/* MR2 Fix to bug introduced by 1.33MR1 for #tokdefs            */
+/* MR2 Don't let #tokdefs be confused by 			*/
+/* MR2   DLGminToken and DLGmaxToken     			*/
+
+/* semantic check on DLGminToken and DLGmaxmaxToken in #tokdefs */
+
+#ifdef __USE_PROTOS
+static int isDLGmaxToken(char *Token)
+#else
+static int isDLGmaxToken(Token)
+  char *	Token;
+#endif
+{
+   static char checkStr1[] = "DLGmaxToken";
+   static char checkStr2[] = "DLGminToken";
+
+   if (strcmp(Token, checkStr1) == 0)
+      return 1;
+   else if (strcmp(Token, checkStr2) == 0)
+      return 1;
+   else
+      return 0;
+}
+
+/* semantics of #token */
+static void
+#ifdef __USE_PROTOS
+chkToken(char *t, char *e, char *a, int tnum)
+#else
+chkToken(t,e,a,tnum)
+char *t, *e, *a;
+int tnum;
+#endif
+{
+	TermEntry *p;
+
+	/* check to see that they don't try to redefine a token as a token class */
+	if ( t!=NULL ) {
+		p = (TermEntry *) hash_get(Tname, t);
+		if ( p!=NULL && p->classname ) {
+			err(eMsg1("redefinition of #tokclass '%s' to #token not allowed; ignored",t));
+			if ( a!=NULL ) free((char *)a);
+			return;
+		}
+	}
+
+	if ( t==NULL && e==NULL ) {			/* none found */
+		err("#token requires at least token name or rexpr");
+	}
+	else if ( t!=NULL && e!=NULL ) {	/* both found */
+		if ( UserDefdTokens ) {			/* if #tokdefs, must not define new */
+			p = (TermEntry *) hash_get(Tname, t);
+			if ( p == NULL) {
+err(eMsg1("new token definition '%s' not allowed - only #token with name already defined by #tokdefs file allowed",t));
+	    		return;
+            };
+		}
+		Tklink(t, e);
+		if ( a!=NULL ) {
+			if ( hasAction(e) ) {
+				err(eMsg1("redefinition of action for %s; ignored",e));
+			}
+			else setHasAction(e, a);
+		}
+	}
+	else if ( t!=NULL ) {				/* only one found */
+		if ( UserDefdTokens ) {
+			p = (TermEntry *) hash_get(Tname, t);
+            if (p == NULL) {
+err(eMsg1("new token definition '%s' not allowed - only #token with name already defined by #tokdefs file allowed",t));
+            };
+   		    return;
+		}
+		if ( Tnum( t ) == 0 ) addTname( t );
+		else {
+			err(eMsg1("redefinition of token %s; ignored",t));
+		}
+		if ( a!=NULL ) {
+			err(eMsg1("action cannot be attached to a token name (%s); ignored",t));
+			free((char *)a);
+		}
+	}
+	else if ( e!=NULL ) {
+		if ( Tnum( e ) == 0 ) addTexpr( e );
+		else {
+			if ( hasAction(e) ) {
+				err(eMsg1("redefinition of action for expr %s; ignored",e));
+			}
+			else if ( a==NULL ) {
+				err(eMsg1("redefinition of expr %s; ignored",e));
+			}
+		}
+		if ( a!=NULL ) setHasAction(e, a);
+	}
+
+	/* if a token type number was specified, then add the token ID and 'tnum'
+	 * pair to the ForcedTokens list.  (only applies if an id was given)
+	 */
+	if ( t!=NULL && tnum>0 )
+	{
+		if ( set_el(tnum, reserved_positions) )
+		{
+			err(eMsgd("a token has already been forced to token number %d; ignored", tnum));
+		}
+		else
+		{
+			list_add(&ForcedTokens, newForcedToken(t,tnum));
+			set_orel(tnum, &reserved_positions);
+		}
+	}
+}
+>>
+
+<<
+static int
+#ifdef __USE_PROTOS
+match_token(char *s, char **nxt)
+#else
+match_token(s,nxt)
+char *s;
+char **nxt;
+#endif
+{
+    if ( !(*s>='A' && *s<='Z') ) return 0;
+	s++;
+    while ( (*s>='a' && *s<='z') ||
+		    (*s>='A' && *s<='Z') ||
+		    (*s>='0' && *s<='9') ||
+		    *s=='_' )
+    {
+	   s++;
+	}
+	if ( *s!=' ' && *s!='}' ) return 0;
+	*nxt = s;
+	return 1;
+}
+
+static int
+#ifdef __USE_PROTOS
+match_rexpr(char *s, char **nxt)
+#else
+match_rexpr(s,nxt)
+char *s;
+char **nxt;
+#endif
+{
+    if ( *s!='"' ) return 0;
+	s++;
+    while ( *s!='"' )
+    {
+	   if ( *s=='\n' || *s=='\r' )                   /* MR13 */
+		  warn("eoln found in regular expression");
+	   if ( *s=='\\' ) s++;
+	   s++;
+	}
+	*nxt = s+1;
+	return 1;
+}
+
+/*
+ * Walk a string "{ A .. Z }" where A..Z is a space separated list
+ * of token references (either labels or reg exprs).  Return a
+ * string "inlineX_set" for some unique integer X.  Basically,
+ * we pretend as if we had seen "#tokclass inlineX { A .. Z }"
+ * on the input stream outside of an action.
+ */
+char *
+#ifdef __USE_PROTOS
+inline_set(char *s)
+#else
+inline_set(s)
+char *s;
+#endif
+{
+	char *nxt;
+    fprintf(stderr, "found consumeUntil( {...} )\n");
+	while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+	if ( *s!='{' )
+	{
+	   err("malformed consumeUntil( {...} ); missing '{'");
+	   return "bad_set";
+	}
+	s++;
+	while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+	while ( *s!='}' )
+	{
+	    if ( match_token(s,&nxt) ) fprintf(stderr, "found token %s\n", s);
+		else if ( match_rexpr(s,&nxt) ) fprintf(stderr, "found rexpr %s\n", s);
+		else {
+		    err("invalid element in consumeUntil( {...} )");
+			return "bad_set";
+		}
+		s = nxt;
+		while ( *s==' ' || *s=='\t' || *s=='\n' || *s=='\r' ) {s++;}
+	}
+	return "inlineX_set";
+}
+>>
+
+<<
+/* ANTLR-specific syntax error message generator
+ * (define USER_ZZSYN when compiling so don't get 2 definitions)
+ */
+void
+#ifdef __USE_PROTOS
+zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok,
+int k, char *bad_text)
+#else
+zzsyn(text, tok, egroup, eset, etok, k, bad_text)
+char *text, *egroup, *bad_text;
+int tok;
+int etok;
+int k;
+SetWordType *eset;
+#endif
+{
+	fprintf(stderr, ErrHdr, FileStr[CurFile]!=NULL?FileStr[CurFile]:"stdin", zzline);
+	fprintf(stderr, " syntax error at \"%s\"", (tok==zzEOF_TOKEN)?"EOF":text);
+	if ( !etok && !eset ) {fprintf(stderr, "\n"); return;}
+	if ( k==1 ) fprintf(stderr, " missing");
+	else
+	{
+		fprintf(stderr, "; \"%s\" not", bad_text);
+		if ( zzset_deg(eset)>1 ) fprintf(stderr, " in");
+	}
+	if ( zzset_deg(eset)>0 ) zzedecode(eset);
+	else fprintf(stderr, " %s", zztokens[etok]);
+	if ( strlen(egroup) > (size_t)0 ) fprintf(stderr, " in %s", egroup);
+	fprintf(stderr, "\n");
+}
+>>
+
+#lexaction <<
+#ifdef __USE_PROTOS
+void mark_label_used_in_sem_pred(LabelEntry *le)              /* MR10 */
+#else
+void mark_label_used_in_sem_pred(le)                          /* MR10 */
+  LabelEntry    *le;
+#endif
+{
+  TokNode   *tn;
+  require (le->elem->ntype == nToken,"mark_label_used... ntype != nToken");
+  tn=(TokNode *)le->elem;
+  require (tn->label != 0,"mark_label_used... TokNode has no label");
+  tn->label_used_in_semantic_pred=1;
+}
+>>
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr.r b/Tools/Source/TianoTools/Pccts/antlr/antlr.r
new file mode 100644
index 0000000000..e3de38759f
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/antlr.r
@@ -0,0 +1,787 @@
+/*
+	File:		antlrMPW.r
+	Target:		antlr 133MR
+	Created:    Monday, June 15, 1998 4:41:11 AM
+	Author:		Kenji Tanaka (kentar@osa.att.ne.jp)
+*/
+
+#include "cmdo.r"
+
+resource 'cmdo' (128, "Antlr") {
+	{	/* array dialogs: 5 elements */
+		/* [1] */
+		295,
+		"ANTLR -- Purdue Compiler Construction To"
+		"ol Set (PCCTS) LL(k) parser generator.",
+		{	/* array itemArray: 12 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{18, 23, 33, 223},
+				"Read grammar from stdin",
+				"-",
+				"Read grammar from stdin."
+			},
+			/* [2] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{38, 23, 53, 310},
+				"Send grammar.c/grammar.cpp to stdout",
+				"-stdout",
+				"Send grammar.c/grammar.cpp to stdout."
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			MultiFiles {
+				"Grammar File(s)�",
+				"Choose the grammar specification files y"
+				"ou wish to have ANTLR process.",
+				{79, 22, 98, 152},
+				"Grammar specification:",
+				"",
+				MultiInputFiles {
+					{	/* array MultiTypesArray: 1 elements */
+						/* [1] */
+						text
+					},
+					".g",
+					"Files ending in .g",
+					"All text files"
+				}
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			Files {
+				DirOnly,
+				OptionalFile {
+					{58, 168, 74, 298},
+					{79, 169, 98, 299},
+					"Output Directory",
+					":",
+					"-o",
+					"",
+					"Choose the directory where ANTLR will pu"
+					"t its output.",
+					dim,
+					"Output Directory�",
+					"",
+					""
+				},
+				NoMore {
+
+				}
+			},
+			/* [5] */
+			NotDependent {
+
+			},
+			Redirection {
+				StandardOutput,
+				{126, 27}
+			},
+			/* [6] */
+			NotDependent {
+
+			},
+			Redirection {
+				DiagnosticOutput,
+				{126, 178}
+			},
+			/* [7] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{117, 20, 167, 300},
+				"Redirection"
+			},
+			/* [8] */
+			NotDependent {
+
+			},
+			NestedDialog {
+				5,
+				{20, 324, 40, 460},
+				"Parse Options�",
+				"Parse control options may be set with th"
+				"is button."
+			},
+			/* [9] */
+			NotDependent {
+
+			},
+			NestedDialog {
+				2,
+				{50, 324, 70, 460},
+				"Generate Options�",
+				"Various command line options may be set "
+				"with this button."
+			},
+			/* [10] */
+			NotDependent {
+
+			},
+			NestedDialog {
+				3,
+				{78, 324, 98, 460},
+				"More Options�",
+				"Antlr has ALOT of options. There are eve"
+				"n more to be found with this button."
+			},
+			/* [11] */
+			NotDependent {
+
+			},
+			NestedDialog {
+				4,
+				{106, 324, 126, 460},
+				"Rename Options�",
+				"Options for renaming output files may be"
+				" set with this button."
+			},
+			/* [12] */
+			NotDependent {
+
+			},
+			VersionDialog {
+				VersionString {
+					"1.33MR"
+				},
+				"PCCTS was written by Terence Parr, Russe"
+				"ll Quong, Will Cohen, and Hank Dietz: 19"
+				"89-1998. MPW port by Scott Haney.",
+				noDialog
+			}
+		},
+		/* [2] */
+		295,
+		"Use this dialog to specify command line "
+		"Generate Options.",
+		{	/* array itemArray: 15 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{18, 25, 33, 225},
+				"Generate C++ code",
+				"-CC",
+				"Generate C++ output from both ANTLR and "
+				"DLG."
+			},
+			/* [2] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{38, 25, 53, 225},
+				"Generate ASTs",
+				"-gt",
+				"Generate code for Abstract-Syntax-Trees "
+				"(ASTs)."
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{58, 25, 73, 225},
+				"Generate line info",
+				"-gl",
+				"If this option is checked, ANTLR will ge"
+				"nerate line info about grammaractions, t"
+				"hereby making debugging easier since com"
+				"pile errors will point to the grammar fi"
+				"le."
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{78, 25, 93, 225},
+				"Generate error classes",
+				"-ge",
+				"If this option is checked, ANTLR will ge"
+				"nerate an error class foreach non-termin"
+				"al."
+			},
+			/* [5] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{98, 25, 113, 225},
+				"Don't generate Code",
+				"-gc",
+				"If this option is checked, ANTLR will ge"
+				"nerate no code, i.e. it will only perfor"
+				"m analysis on the grammar."
+			},
+			/* [6] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{118, 25, 133, 225},
+				"Delay lookahead fetches",
+				"-gk",
+				"If this option is checked, ANTLR will ge"
+				"nerate a parser that delays lookahead fe"
+				"tches until needed."
+			},
+			/* [7] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{138, 25, 153, 225},
+				"Use newAST(...)",
+				"-newAST",
+				"In C++ mode use \"newAST(...)\" rather tha"
+				"n \"new AST(...)\""
+			},
+			/* [8] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{18, 235, 33, 435},
+				"Support parse traces",
+				"-gd",
+				"If this option is checked, ANTLR inserts"
+				" code in each parsing function to provid"
+				"e for user-defined handling of a detaile"
+				"d parse trace. The code consists of call"
+				"s to zzTRACEIN and zzTRACEOUT."
+			},
+			/* [9] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{38, 235, 53, 435},
+				"Generate cross-references",
+				"-cr",
+				"If this option is checked, ANTLR will ge"
+				"nerate a cross reference for all rules. "
+				"For each rule it will print a list of al"
+				"l other rules that refrence it."
+			},
+			/* [10] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{58, 235, 73, 435},
+				"Don't create Lexer files",
+				"-gx",
+				"If this option is checked, ANTLR will no"
+				"t generate DLG-related output files. Thi"
+				"s option should be used if one wants a c"
+				"ustom lexical analyzer or if one has mad"
+				"e changes to the grammar not affecting t"
+				"he lexical structure."
+			},
+			/* [11] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{78, 235, 93, 460},
+				"Don't generate token expr sets",
+				"-gs",
+				"If this option is checked, ANTLR will no"
+				"t generate sets for token expression set"
+				"s; instead, it will generate a || separa"
+				"ted sequence of LA(1)==token #. "
+			},
+			/* [12] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{98, 235, 113, 460},
+				"Generate ANSI-compatible",
+				"-ga",
+				"Generate ANSI-compatible code (default=F"
+				"ALSE)"
+			},
+			/* [13] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{118, 235, 133, 460},
+				"Don't generate tokens.h",
+				"-gxt",
+				"Do not generate tokens.h (default=FALSE)"
+			},
+			/* [13] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{138, 235, 153, 460},
+				"Provide \"(alpha)? beta\" info",
+				"-alpha",
+				"Provide additional information for \"(alpha)? beta\" error messages"
+			},
+			/* [14] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Tabs(1 to 8):",
+				{162, 23, 177, 117},
+				{163, 125, 179, 196},
+				"",
+				keepCase,
+				"-tab",
+				"Width of tabs (1 to 8) for grammar.c/gra"
+				"mmar.cpp files."
+			},
+			/* [15] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Function Prefix:",
+				{161, 236, 177, 342},
+				{162, 345, 177, 454},
+				"",
+				keepCase,
+				"-gp",
+				"Prefix all generated rule functions with"
+				" a string."
+			}
+		},
+		/* [3] */
+		295,
+		"Use this dialog to specify still more co"
+		"mmand line options.",
+		{	/* array itemArray: 12 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			RadioButtons {
+				{	/* array radioArray: 3 elements */
+					/* [1] */
+					{38, 25, 53, 85}, "None", "", Set, "When this option is selected, ANTLR will"
+					" not print the grammar to stdout.",
+					/* [2] */
+					{38, 100, 53, 160}, "Yes", "-p", NotSet, "When this option is selected, ANTLR will"
+					" print the grammar, stripped of all acti"
+					"ons and comments, to stdout.",
+					/* [3] */
+					{38, 175, 53, 235}, "More", "-pa", NotSet, "When this option is selected, ANTLR will"
+					" print the grammar, stripped of all acti"
+					"ons and comments, to stdout. It will als"
+					"o annotate the output with the first set"
+					"s determined from grammar analysis."
+				}
+			},
+			/* [2] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{28, 15, 60, 250},
+				"Grammar Printing"
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			RadioButtons {
+				{	/* array radioArray: 3 elements */
+					/* [1] */
+					{88, 25, 103, 85}, "Low", "", Set, "When this option is selected, ANTLR will"
+					" show ambiguities/errors in low detail.",
+					/* [2] */
+					{88, 100, 103, 160}, "Medium", "-e2", NotSet, "When this option is selected, ANTLR will"
+					" show ambiguities/errors in more detail.",
+					/* [3] */
+					{88, 175, 103, 235}, "High", "-e3", NotSet, "When this option is selected, ANTLR will"
+					" show ambiguities/errors in excruciating"
+					" detail."
+				}
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{78, 15, 110, 250},
+				"Error reporting"
+			},
+			/* [5] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{130, 22, 145, 222},
+				"More warnings",
+				"-w2",
+				"If this option is checked, ANTLR will wa"
+				"rn if semantic predicates and/or (�)? bl"
+				"ocks are assumed to cover ambiguous alte"
+				"rnatives."
+			},
+			/* [6] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Report when tnode usage exceeds:",
+				{162, 23, 180, 253},
+				{162, 255, 178, 326},
+				"",
+				keepCase,
+				"-treport",
+				"Report when tnode usage exceeds value du"
+				"ring ambiguity resolution."
+			},
+			/* [7] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{40, 292, 55, 431},
+				"Predicate",
+				"-info p",
+				"With the antlr \"-info p\" switch the user"
+				" will receive information about the pred"
+				"icate suppression in the generated file."
+			},
+			/* [8] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{60, 292, 75, 430},
+				"Tree Nodes",
+				"-info t",
+				"Using \"-info t\" gives information about "
+				"the total number of tnodes created and t"
+				"he peak number of tnodes."
+			},
+			/* [9] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{80, 292, 95, 425},
+				"First/follow",
+				"-info f",
+				"first/follow set information."
+			},
+			/* [10] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{100, 292, 115, 425},
+				"Monitor progress",
+				"-info m",
+				"prints name of each rule as it is starte"
+				"d and flushes output at start of each rule."
+			},
+			/* [11] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{120, 292, 135, 416},
+				"Orphan rules",
+				"-info o",
+				"If there is more than one rule which is "
+				"not referenced by any other rule then al"
+				"l such rules are listed."
+			},
+			/* [12] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{28, 279, 147, 451},
+				"Extra info"
+			}
+		},
+		/* [4] */
+		295,
+		"Use this dialog to specify command line "
+		"options relating to renaming output file"
+		"s.",
+		{	/* array itemArray: 7 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Errors file name:",
+				{35, 25, 50, 205},
+				{35, 205, 51, 300},
+				"err.c",
+				keepCase,
+				"-fe",
+				"This entry specifies the name ANTLR uses"
+				" for the errors file."
+			},
+			/* [2] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Lexical output name:",
+				{60, 25, 75, 205},
+				{60, 205, 76, 300},
+				"parser.dlg",
+				keepCase,
+				"-fl",
+				"This entry specifies the name ANTLR uses"
+				" for the lexical output file."
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Lexical modes name:",
+				{85, 25, 100, 205},
+				{85, 205, 101, 300},
+				"mode.h",
+				keepCase,
+				"-fm",
+				"This entry specifies the name ANTLR uses"
+				" for the lexical mode definitions file."
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Remap file name:",
+				{110, 25, 125, 205},
+				{110, 205, 126, 300},
+				"remap.h",
+				keepCase,
+				"-fr",
+				"This entry specifies the name ANTLR uses"
+				" for the file that remaps globally visib"
+				"le symbols."
+			},
+			/* [5] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Tokens file name:",
+				{135, 25, 150, 205},
+				{135, 205, 151, 300},
+				"tokens.h",
+				keepCase,
+				"-ft",
+				"This entry specifies the name ANTLR uses"
+				" for the tokens file."
+			},
+			/* [6] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{160, 25, 175, 175},
+				"Create std header",
+				"-gh",
+				"If this option is checked, ANTLR will cr"
+				"eate a standard header file named, by de"
+				"fault 'stdpccts.h'. This name can be alt"
+				"ered using the entry right next door."
+			},
+			/* [7] */
+			Or {
+				{	/* array OrArray: 1 elements */
+					/* [1] */
+					6
+				}
+			},
+			RegularEntry {
+				"Std header file name:",
+				{160, 175, 175, 355},
+				{160, 355, 176, 450},
+				"stdpccts.h",
+				keepCase,
+				"-fh",
+				"This entry specifies the name ANTLR uses"
+				" for the standard header file."
+			}
+		},
+		/* [5] */
+		295,
+		"Use this dialog to specify parse options"
+		".",
+		{	/* array itemArray: 9 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Lookahead:",
+				{23, 27, 38, 152},
+				{46, 29, 62, 154},
+				"1",
+				keepCase,
+				"-k",
+				"This entry specifies the number of token"
+				"s of lookahead."
+			},
+			/* [2] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Compr lookahead:",
+				{22, 167, 37, 292},
+				{46, 172, 62, 297},
+				"",
+				keepCase,
+				"-ck",
+				"This entry specifies the number of token"
+				"s of lookahead when using compressed (li"
+				"near approximation) lookahead. In genera"
+				"l, the compressed lookahead is much deep"
+				"er than the full lookahead."
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Max tree nodes:",
+				{22, 312, 37, 437},
+				{46, 315, 62, 445},
+				"",
+				keepCase,
+				"-rl",
+				"This entry specifies the maximum number "
+				"of tokens of tree nodes used by the gram"
+				"mar analysis."
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{76, 25, 91, 350},
+				"Maintenance Release style hoisting",
+				"-mrhoist",
+				"Turn on/off k=1 Maintenance Release styl"
+				"e hoisting."
+			},
+			/* [5] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{96, 25, 111, 431},
+				"EXPERIMENTAL Maintenance Release style h"
+				"oisting",
+				"-mrhoistk",
+				"Turn on/off k>1 EXPERIMENTAL Maintenance"
+				" Release style hoisting."
+			},
+			/* [6] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{116, 25, 131, 363},
+				"Compute context for hoisted predicates",
+				"-prc on",
+				"Turn on/off computation of context for h"
+				"oisted predicates."
+			},
+			/* [7] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Ambiguity aid:",
+				{140, 27, 155, 125},
+				{141, 135, 155, 209},
+				"",
+				keepCase,
+				"-aa",
+				"Ambiguity aid for a rule (rule name or l"
+				"ine number)."
+			},
+			/* [8] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Limits exp growth:",
+				{140, 236, 155, 361},
+				{139, 372, 155, 452},
+				"",
+				keepCase,
+				"-aad",
+				"Limits exp growth of -aa listing - defau"
+				"lt=1 (max=ck value)."
+			},
+			/* [9] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{164, 26, 179, 366},
+				"Lookahead token may appear multiple time"
+				"s",
+				"-aam",
+				"Lookahead token may appear multiple time"
+				"s in -aa listing."
+			}
+		}
+	}
+};
+
diff --git a/Tools/Source/TianoTools/Pccts/antlr/antlr1.txt b/Tools/Source/TianoTools/Pccts/antlr/antlr1.txt
new file mode 100644
index 0000000000..4a7d22e7f2
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/antlr1.txt
@@ -0,0 +1,264 @@
+
+
+
+ANTLR(1)               PCCTS Manual Pages                ANTLR(1)
+
+
+
+NAME
+     antlr - ANother Tool for Language Recognition
+
+SYNTAX
+     antlr [_o_p_t_i_o_n_s] _g_r_a_m_m_a_r__f_i_l_e_s
+
+DESCRIPTION
+     _A_n_t_l_r converts an extended form of context-free grammar into
+     a set of C functions which directly implement an efficient
+     form of deterministic recursive-descent LL(k) parser.
+     Context-free grammars may be augmented with predicates to
+     allow semantics to influence parsing; this allows a form of
+     context-sensitive parsing.  Selective backtracking is also
+     available to handle non-LL(k) and even non-LALR(k) con-
+     structs.  _A_n_t_l_r also produces a definition of a lexer which
+     can be automatically converted into C code for a DFA-based
+     lexer by _d_l_g.  Hence, _a_n_t_l_r serves a function much like that
+     of _y_a_c_c, however, it is notably more flexible and is more
+     integrated with a lexer generator (_a_n_t_l_r directly generates
+     _d_l_g code, whereas _y_a_c_c and _l_e_x are given independent
+     descriptions).  Unlike _y_a_c_c which accepts LALR(1) grammars,
+     _a_n_t_l_r accepts LL(k) grammars in an extended BNF notation -
+     which eliminates the need for precedence rules.
+
+     Like _y_a_c_c grammars, _a_n_t_l_r grammars can use automatically-
+     maintained symbol attribute values referenced as dollar
+     variables.  Further, because _a_n_t_l_r generates top-down
+     parsers, arbitrary values may be inherited from parent rules
+     (passed like function parameters).  _A_n_t_l_r also has a mechan-
+     ism for creating and manipulating abstract-syntax-trees.
+
+     There are various other niceties in _a_n_t_l_r, including the
+     ability to spread one grammar over multiple files or even
+     multiple grammars in a single file, the ability to generate
+     a version of the grammar with actions stripped out (for
+     documentation purposes), and lots more.
+
+OPTIONS
+     -ck _n
+          Use up to _n symbols of lookahead when using compressed
+          (linear approximation) lookahead.  This type of looka-
+          head is very cheap to compute and is attempted before
+          full LL(k) lookahead, which is of exponential complex-
+          ity in the worst case.  In general, the compressed loo-
+          kahead can be much deeper (e.g, -ck 10) _t_h_a_n _t_h_e _f_u_l_l
+          _l_o_o_k_a_h_e_a_d (_w_h_i_c_h _u_s_u_a_l_l_y _m_u_s_t _b_e _l_e_s_s _t_h_a_n _4).
+
+     -CC  Generate C++ output from both ANTLR and DLG.
+
+     -cr  Generate a cross-reference for all rules.  For each
+          rule, print a list of all other rules that reference
+          it.
+
+     -e1  Ambiguities/errors shown in low detail (default).
+
+     -e2  Ambiguities/errors shown in more detail.
+
+     -e3  Ambiguities/errors shown in excruciating detail.
+
+     -fe file
+          Rename err.c to file.
+
+     -fh file
+          Rename stdpccts.h header (turns on -gh) to file.
+
+     -fl file
+          Rename lexical output, parser.dlg, to file.
+
+     -fm file
+          Rename file with lexical mode definitions, mode.h, to
+          file.
+
+     -fr file
+          Rename file which remaps globally visible symbols,
+          remap.h, to file.
+
+     -ft file
+          Rename tokens.h to file.
+
+     -ga  Generate ANSI-compatible code (default case).  This has
+          not been rigorously tested to be ANSI XJ11 C compliant,
+          but it is close.  The normal output of _a_n_t_l_r is
+          currently compilable under both K&R, ANSI C, and C++-
+          this option does nothing because _a_n_t_l_r generates a
+          bunch of #ifdef's to do the right thing depending on
+          the language.
+
+     -gc  Indicates that _a_n_t_l_r should generate no C code, i.e.,
+          only perform analysis on the grammar.
+
+     -gd  C code is inserted in each of the _a_n_t_l_r generated pars-
+          ing functions to provide for user-defined handling of a
+          detailed parse trace.  The inserted code consists of
+          calls to the user-supplied macros or functions called
+          zzTRACEIN and zzTRACEOUT.  The only argument is a _c_h_a_r
+          * pointing to a C-style string which is the grammar
+          rule recognized by the current parsing function.  If no
+          definition is given for the trace functions, upon rule
+          entry and exit, a message will be printed indicating
+          that a particular rule as been entered or exited.
+
+     -ge  Generate an error class for each non-terminal.
+
+     -gh  Generate stdpccts.h for non-ANTLR-generated files to
+          include.  This file contains all defines needed to
+          describe the type of parser generated by _a_n_t_l_r (e.g.
+          how much lookahead is used and whether or not trees are
+          constructed) and contains the header action specified
+          by the user.
+
+     -gk  Generate parsers that delay lookahead fetches until
+          needed.  Without this option, _a_n_t_l_r generates parsers
+          which always have _k tokens of lookahead available.
+
+     -gl  Generate line info about grammar actions in C parser of
+          the form # _l_i_n_e "_f_i_l_e" which makes error messages from
+          the C/C++ compiler make more sense as they will point
+          into the grammar file not the resulting C file.
+          Debugging is easier as well, because you will step
+          through the grammar not C file.
+
+     -gs  Do not generate sets for token expression lists;
+          instead generate a ||-separated sequence of
+          LA(1)==_t_o_k_e_n__n_u_m_b_e_r.  The default is to generate sets.
+
+     -gt  Generate code for Abstract-Syntax Trees.
+
+     -gx  Do not create the lexical analyzer files (dlg-related).
+          This option should be given when the user wishes to
+          provide a customized lexical analyzer.  It may also be
+          used in _m_a_k_e scripts to cause only the parser to be
+          rebuilt when a change not affecting the lexical struc-
+          ture is made to the input grammars.
+
+     -k _n Set k of LL(k) to _n; i.e. set tokens of look-ahead
+          (default==1).
+
+     -o dir
+          Directory where output files should go (default=".").
+          This is very nice for keeping the source directory
+          clear of ANTLR and DLG spawn.
+
+     -p   The complete grammar, collected from all input grammar
+          files and stripped of all comments and embedded
+          actions, is listed to stdout.  This is intended to aid
+          in viewing the entire grammar as a whole and to elim-
+          inate the need to keep actions concisely stated so that
+          the grammar is easier to read.  Hence, it is preferable
+          to embed even complex actions directly in the grammar,
+          rather than to call them as subroutines, since the sub-
+          routine call overhead will be saved.
+
+     -pa  This option is the same as -p except that the output is
+          annotated with the first sets determined from grammar
+          analysis.
+
+     -prc on
+          Turn on the computation and hoisting of predicate con-
+          text.
+
+     -prc off
+          Turn off the computation and hoisting of predicate con-
+          text.  This option makes 1.10 behave like the 1.06
+          release with option -pr on.  Context computation is off
+          by default.
+
+     -rl _n
+          Limit the maximum number of tree nodes used by grammar
+          analysis to _n.  Occasionally, _a_n_t_l_r is unable to
+          analyze a grammar submitted by the user.  This rare
+          situation can only occur when the grammar is large and
+          the amount of lookahead is greater than one.  A non-
+          linear analysis algorithm is used by PCCTS to handle
+          the general case of LL(k) parsing.  The average com-
+          plexity of analysis, however, is near linear due to
+          some fancy footwork in the implementation which reduces
+          the number of calls to the full LL(k) algorithm.  An
+          error message will be displayed, if this limit is
+          reached, which indicates the grammar construct being
+          analyzed when _a_n_t_l_r hit a non-linearity.  Use this
+          option if _a_n_t_l_r seems to go out to lunch and your disk
+          start thrashing; try _n=10000 to start.  Once the
+          offending construct has been identified, try to remove
+          the ambiguity that _a_n_t_l_r was trying to overcome with
+          large lookahead analysis.  The introduction of (...)?
+          backtracking blocks eliminates some of these problems -
+          _a_n_t_l_r does not analyze alternatives that begin with
+          (...)? (it simply backtracks, if necessary, at run
+          time).
+
+     -w1  Set low warning level.  Do not warn if semantic
+          predicates and/or (...)? blocks are assumed to cover
+          ambiguous alternatives.
+
+     -w2  Ambiguous parsing decisions yield warnings even if
+          semantic predicates or (...)? blocks are used.  Warn if
+          predicate context computed and semantic predicates
+          incompletely disambiguate alternative productions.
+
+     -    Read grammar from standard input and generate stdin.c
+          as the parser file.
+
+SPECIAL CONSIDERATIONS
+     _A_n_t_l_r works...  we think.  There is no implicit guarantee of
+     anything.  We reserve no legal rights to the software known
+     as the Purdue Compiler Construction Tool Set (PCCTS) - PCCTS
+     is in the public domain.  An individual or company may do
+     whatever they wish with source code distributed with PCCTS
+     or the code generated by PCCTS, including the incorporation
+     of PCCTS, or its output, into commercial software.  We
+     encourage users to develop software with PCCTS.  However, we
+     do ask that credit is given to us for developing PCCTS.  By
+     "credit", we mean that if you incorporate our source code
+     into one of your programs (commercial product, research pro-
+     ject, or otherwise) that you acknowledge this fact somewhere
+     in the documentation, research report, etc...  If you like
+     PCCTS and have developed a nice tool with the output, please
+     mention that you developed it using PCCTS.  As long as these
+     guidelines are followed, we expect to continue enhancing
+     this system and expect to make other tools available as they
+     are completed.
+
+FILES
+     *.c  output C parser.
+
+     *.cpp
+          output C++ parser when C++ mode is used.
+
+     parser.dlg
+          output _d_l_g lexical analyzer.
+
+     err.c
+          token string array, error sets and error support rou-
+          tines.  Not used in C++ mode.
+
+     remap.h
+          file that redefines all globally visible parser sym-
+          bols.  The use of the #parser directive creates this
+          file.  Not used in C++ mode.
+
+     stdpccts.h
+          list of definitions needed by C files, not generated by
+          PCCTS, that reference PCCTS objects.  This is not gen-
+          erated by default.  Not used in C++ mode.
+
+     tokens.h
+          output #_d_e_f_i_n_e_s for tokens used and function prototypes
+          for functions generated for rules.
+
+
+SEE ALSO
+     dlg(1), pccts(1)
+
+
+
+
+
diff --git a/Tools/Source/TianoTools/Pccts/antlr/bits.c b/Tools/Source/TianoTools/Pccts/antlr/bits.c
new file mode 100644
index 0000000000..ddd9bd6053
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/bits.c
@@ -0,0 +1,1025 @@
+/* bits.c -- manage creation and output of bit sets used by the parser.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <assert.h>
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+
+/* char is only thing that is pretty much always known == 8 bits
+ * This allows output of antlr (set stuff, anyway) to be androgynous (portable)
+ */
+typedef unsigned char SetWordType;
+#define BitsPerByte		8
+#define BitsPerWord		BitsPerByte*sizeof(SetWordType)
+
+static SetWordType *setwd = NULL;
+int setnum = -1;
+int wordnum = 0;
+
+int esetnum = 0;
+
+/* Used to convert native wordsize, which ANTLR uses (via set.c) to manipulate sets,
+   to bytes that are most portable size-wise.
+   */
+void
+#ifdef __USE_PROTOS
+DumpIntAsChars( FILE *f, char *format, unsigned wd )
+#else
+DumpIntAsChars( f, format, wd )
+FILE *f;
+char *format;
+unsigned wd;
+#endif
+{
+	int i;
+	/* uses max of 32 bit unsigned integer for the moment */
+	static unsigned long byte_mask[sizeof(unsigned long)] =
+				{ 0xFF, 0xFF00UL, 0xFF0000UL, 0xFF000000UL };  /* MR20 G. Hobbelt */
+/*				  0xFF00000000, 0xFF0000000000, 0xFF000000000000, 0xFF00000000000000 };*/
+
+	/* for each byte in the word */
+	assert(sizeof(unsigned) <= 4); /* M20 G. Hobbelt Sanity check */
+	for (i=0; i<sizeof(unsigned); i++)
+	{
+		/* mask out the ith byte and shift down to the first 8 bits */
+		fprintf(f, format, (wd&byte_mask[i])>>(i*BitsPerByte));
+		if ( i<sizeof(unsigned)-1) fprintf(f, ",");
+	}
+}
+
+/* Create a new setwd (ignoring [Ep] token on end) */
+void
+#ifdef __USE_PROTOS
+NewSetWd( void )
+#else
+NewSetWd( )
+#endif
+{
+	SetWordType *p;
+
+	if ( setwd == NULL )
+	{
+		setwd = (SetWordType *) calloc(TokenNum, sizeof(SetWordType));
+		require(setwd!=NULL, "NewSetWd: cannot alloc set wd\n");
+	}
+	for (p = setwd; p<&(setwd[TokenNum]); p++)  {*p=0;}
+	wordnum++;
+}
+
+void
+#ifdef __USE_PROTOS
+DumpSetWd( void )
+#else
+DumpSetWd( )
+#endif
+{
+	if ( GenCC ) DumpSetWdForCC();
+	else DumpSetWdForC();
+}
+
+/* Dump the current setwd to ErrFile. 0..MaxTokenVal */
+void
+#ifdef __USE_PROTOS
+DumpSetWdForC( void )
+#else
+DumpSetWdForC( )
+#endif
+{
+	int i,c=1;
+
+	if ( setwd==NULL ) return;
+	fprintf(DefFile, "extern SetWordType setwd%d[];\n", wordnum);
+	fprintf(ErrFile,
+			"SetWordType setwd%d[%d] = {", wordnum, TokenNum-1);
+	for (i=0; i<TokenNum-1; i++)
+	{
+		DAWDLE;
+		if ( i!=0 ) fprintf(ErrFile, ",");
+		if ( c == 8 ) {fprintf(ErrFile, "\n\t"); c=1;} else c++;
+		fprintf(ErrFile, "0x%x", setwd[i]);
+	}
+	fprintf(ErrFile, "};\n");
+}
+
+/* Dump the current setwd to Parser.C file. 0..MaxTokenVal;
+ * Only used if -CC on.
+ */
+void
+#ifdef __USE_PROTOS
+DumpSetWdForCC( void )
+#else
+DumpSetWdForCC( )
+#endif
+{
+	int i,c=1;
+
+	if ( setwd==NULL ) return;
+	fprintf(Parser_h, "\tstatic SetWordType setwd%d[%d];\n", wordnum, TokenNum-1);
+	fprintf(Parser_c,
+			"SetWordType %s::setwd%d[%d] = {", CurrentClassName, wordnum,
+			TokenNum-1);
+	for (i=0; i<TokenNum-1; i++)
+	{
+		DAWDLE;
+		if ( i!=0 ) fprintf(Parser_c, ",");
+		if ( c == 8 ) {fprintf(Parser_c, "\n\t"); c=1;} else c++;
+		fprintf(Parser_c, "0x%x", setwd[i]);
+	}
+	fprintf(Parser_c, "};\n");
+}
+
+/* Make a new set.  Dump old setwd and create new setwd if current setwd is full */
+void
+#ifdef __USE_PROTOS
+NewSet( void )
+#else
+NewSet( )
+#endif
+{
+	setnum++;
+	if ( setnum==BitsPerWord )		/* is current setwd full? */
+	{
+		DumpSetWd(); NewSetWd(); setnum = 0;
+	}
+}
+
+/* s is a set of tokens.  Turn on bit at each token position in set 'setnum' */
+void
+#ifdef __USE_PROTOS
+FillSet( set s )
+#else
+FillSet( s )
+set s;
+#endif
+{
+	SetWordType mask=(((unsigned)1)<<setnum);
+	unsigned int e;
+
+	while ( !set_nil(s) )
+	{
+		e = set_int(s);
+		set_rm(e, s);
+		setwd[e] |= mask;
+	}
+}
+
+					/* E r r o r  C l a s s  S t u f f */
+
+/* compute the FIRST of a rule for the error class stuff */
+static set
+#ifdef __USE_PROTOS
+Efirst( char *rule, ECnode *eclass )
+#else
+Efirst( rule, eclass )
+char *rule;
+ECnode *eclass;
+#endif
+{
+	set rk, a;
+	Junction *r;
+	RuleEntry *q = (RuleEntry *) hash_get(Rname, rule);
+
+	if ( q == NULL )
+	{
+		warnNoFL(eMsg2("undefined rule '%s' referenced in errclass '%s'; ignored",
+						rule, TokenString(eclass->tok)));
+		return empty;
+	}
+	r = RulePtr[q->rulenum];
+	r->end->halt = TRUE;		/* don't let reach fall off end of rule here */
+	rk = empty;
+	REACH(r, 1, &rk, a);
+	r->end->halt = FALSE;
+	return a;
+}
+
+/*
+ * scan the list of tokens/eclasses/nonterminals filling the new eclass
+ * with the set described by the list.  Note that an eclass can be
+ * quoted to allow spaces etc... However, an eclass must not conflict
+ * with a reg expr found elsewhere.  The reg expr will be taken over
+ * the eclass name.
+ */
+static void
+#ifdef __USE_PROTOS
+doEclass( char *eclass )
+#else
+doEclass( eclass )
+char *eclass;
+#endif
+{
+	TermEntry *q;
+	ECnode *p;
+	TCnode *tcnode;
+	ListNode *e;
+	unsigned int t;
+	unsigned deg=0;
+	set a;
+	require(eclass!=NULL, "doEclass: NULL eset");
+	
+	p = (ECnode *) eclass;
+	lexmode(p->lexclass);	/* switch to lexclass where errclass is defined */
+	p->eset = empty;
+	for (e = (p->elist)->next; e!=NULL; e=e->next)
+	{
+		q = NULL;								/* MR23 */
+
+		if ( islower( *((char *)e->elem) ) )	/* is it a rule ref? (alias FIRST request) */
+		{
+			a = Efirst((char *)e->elem, p);
+			set_orin(&p->eset, a);
+			deg += set_deg(a);
+			set_free( a );
+			continue;
+		}
+		else if ( *((char *)e->elem)=='"' )
+		{
+			t = 0;
+			q = (TermEntry *) hash_get(Texpr, (char *) e->elem);
+			if ( q == NULL )
+			{
+				/* if quoted and not an expr look for eclass name */
+				q = (TermEntry *) hash_get(Tname, *((char **)&(e->elem))=StripQuotes((char *)e->elem));
+				if ( q != NULL ) t = q->token;
+			}
+			else t = q->token;
+		}
+		else	/* labelled token/eclass/tokclass */
+		{
+			q = (TermEntry *) hash_get(Tname, (char *)e->elem);
+			if ( q != NULL )
+			{
+				if ( strcmp((char *)e->elem, TokenString(p->tok))==0 )
+				{
+					warnNoFL(eMsg1("self-referential error class '%s'; ignored",
+								   (char *)e->elem));
+					continue;
+				}
+				else
+					t = q->token;
+			}
+			else t=0;
+		}
+		if ( t!=0 )
+		{
+			if (isTermEntryTokClass(q))  {			/* MR23 */
+			    tcnode = q->tclass;					/* MR23 */
+				set_orin(&p->eset, tcnode->tset);	/* MR23 */
+				deg = set_deg(p->eset);				/* MR23 */
+			}										/* MR23 */
+			else {
+				set_orel(t, &p->eset);
+				deg++;
+			}
+		}
+		else warnNoFL(eMsg2("undefined token '%s' referenced in errclass '%s'; ignored",
+							(char *)e->elem, TokenString(p->tok)));
+	}
+	p->setdeg = deg;
+}
+
+void
+#ifdef __USE_PROTOS
+ComputeErrorSets( void )
+#else
+ComputeErrorSets( )
+#endif
+{
+#ifdef __cplusplus
+    list_apply(eclasses, (void (*)(void *)) doEclass);
+#else
+#ifdef __USE_PROTOS
+    list_apply(eclasses, (void (*)(void *)) doEclass);
+#else
+    list_apply(eclasses, doEclass);
+#endif
+#endif
+}
+
+void
+#ifdef __USE_PROTOS
+ComputeTokSets( void )
+#else
+ComputeTokSets( )
+#endif
+{
+	ListNode *t, *e = NULL, *e1, *e2;
+	int something_changed;
+    int i;
+	TCnode *p;
+	TermEntry *q, *q1, *q2;
+
+	if ( tclasses == NULL ) return;
+
+	/* turn lists of token/tokclass references into sets */
+	for (t = tclasses->next; t!=NULL; t=t->next)
+	{
+		p = (TCnode *) t->elem;
+
+		/* if wild card, then won't have entries in tclass, assume all_tokens */
+		if ( p->tok == WildCardToken )
+		{
+			p->tset = set_dup(all_tokens);
+			continue;
+		}
+
+		lexmode(p->lexclass);	/* switch to lexclass where tokclass is defined */
+		p->tset = empty;
+
+		/* instantiate all tokens/token_classes into the tset */
+		for (e = (p->tlist)->next; e!=NULL; e=e->next)
+		{
+			char *tokstr;
+			tokstr = (char *)e->elem;
+			if ( *tokstr == '"' ) {
+                q = (TermEntry *) hash_get(Texpr, tokstr);
+    			require(q!=NULL, "ComputeTokSets: no token def");
+    			set_orel(q->token, &p->tset);
+			} else if (tokstr[0] == '.') {
+                e1=e->next;
+                e2=e1->next;
+                e=e2;
+                q1= (TermEntry *) hash_get(Tname, (char *)e1->elem);
+    			require(q1!=NULL, "ComputeTokSets: no token def");
+                q2= (TermEntry *) hash_get(Tname, (char *)e2->elem);
+    			require(q2!=NULL, "ComputeTokSets: no token def");
+
+                if (set_el(q1->token,imag_tokens)) {
+errNoFL(eMsg2("can't define #tokclass %s using #tokclass or #errclass %s",
+                        TokenString(p->tok),(char *)e1->elem) );
+                }
+                if (set_el(q2->token,imag_tokens)) {
+errNoFL(eMsg2("can't define #tokclass %s using #tokclass or #errclass %s",
+                        TokenString(p->tok),(char *)e2->elem) );
+                }
+                if (q1->token > q2->token) {
+errNoFL(eMsg3("for #tokclass %s %s..%s - first token number > second token number",
+                        TokenString(p->tok),(char *)e1->elem,(char *)e2->elem) );
+                  for (i=q2->token; i<=q1->token; i++) { set_orel(i, &p->tset); }
+                } else {
+                  for (i=q1->token; i<=q2->token; i++) { set_orel(i, &p->tset); }
+                }
+            } else {
+                q = (TermEntry *) hash_get(Tname, tokstr);
+    			require(q!=NULL, "ComputeTokSets: no token def");
+    			set_orel(q->token, &p->tset);
+            }
+		}
+	}
+
+	/* Go thru list of tokclasses again looking for tokclasses in sets */
+again:
+	something_changed = 0;
+	for (t = tclasses->next; t!=NULL; t=t->next)
+	{
+		set tcl;
+		p = (TCnode *) t->elem;
+		tcl = set_and(p->tset, tokclasses);
+		if ( !set_nil(tcl) )
+		{
+			int tk;
+			/* replace refs to tokclasses with the associated set of tokens */
+			something_changed = 1;
+			while ( !set_nil(tcl) )
+			{
+				tk = set_int(tcl);		/* grab one of the tok class refs */
+				set_rm(tk, tcl);
+				if ( p->tok != tk )		/* tokclass ref to yourself? */
+				{
+					q = (TermEntry *) hash_get(Tname, TokenString(tk));
+					require(q!=NULL, "#tokclass not in hash table");
+					set_orin(&p->tset, q->tclass->tset);
+				}
+				set_rm(tk, p->tset);	/* remove ref that we replaced */
+			}
+		}
+		set_free(tcl);
+	}
+	if ( something_changed ) goto again;
+}
+
+void
+#ifdef __USE_PROTOS
+DumpRemainingTokSets(void)
+#else
+DumpRemainingTokSets()
+#endif
+{
+	TCnode *p;
+	ListNode *t;
+
+	/* Go thru tclasses (for the last time) and dump the sets not dumped
+	 * during code gen; yes, this is a bogus way to do this, but ComputeTokSets()
+	 * can't dump the defs as the error file and tok file has not been created
+	 * yet etc...
+	 */
+	if ( tclasses==NULL ) return;
+	for (t = tclasses->next; t!=NULL; t=t->next)
+	{
+		unsigned e;
+		p = (TCnode *) t->elem;
+		if ( p->dumped ) continue;
+		e = DefErrSet(&(p->tset), 0, TokenString(p->tok));
+		p->dumped = 1;
+		p->setnum = e;
+	}
+}
+
+
+/* replace a subset of an error set with an error class name if a subset is found
+ * repeat process until no replacements made
+ */
+void
+#ifdef __USE_PROTOS
+SubstErrorClass( set *f )
+#else
+SubstErrorClass( f )
+set *f;
+#endif
+{
+	int max, done = 0;
+	ListNode *p;
+	ECnode *ec, *maxclass = NULL;
+	set a;
+	require(f!=NULL, "SubstErrorClass: NULL eset");
+
+	if ( eclasses == NULL ) return;
+	while ( !done )
+	{
+		max = 0;
+		maxclass = NULL;
+		for (p=eclasses->next; p!=NULL; p=p->next)	/* chk all error classes */
+		{
+			ec = (ECnode *) p->elem;
+			if ( ec->setdeg > max )
+			{
+				if ( set_sub(ec->eset, *f) || set_equ(ec->eset, *f) )
+					{maxclass = ec; max=ec->setdeg;}
+			}
+		}
+		if ( maxclass != NULL )	/* if subset found, replace with token */
+		{
+			a = set_dif(*f, maxclass->eset);
+			set_orel((unsigned)maxclass->tok, &a);
+			set_free(*f);
+			*f = a;
+		}
+		else done = 1;
+	}
+}
+
+int
+#ifdef __USE_PROTOS
+DefErrSet1(int nilOK, set *f, int subst, char *name )
+#else
+DefErrSet1(nilOK, f, subst, name )
+int nilOK;
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+#endif
+{
+	if ( GenCC ) return DefErrSetForCC1(nilOK, f, subst, name, "_set");
+	else return DefErrSetForC1(nilOK, f, subst, name, "_set");
+}
+
+int
+#ifdef __USE_PROTOS
+DefErrSet( set *f, int subst, char *name )
+#else
+DefErrSet( f, subst, name )
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+#endif
+{
+    return DefErrSet1(0,f,subst,name);
+}
+
+int
+#ifdef __USE_PROTOS
+DefErrSetWithSuffix(int nilOK, set *f, int subst, char *name, const char* suffix)
+#else
+DefErrSetWithSuffix(nilOK, f, subst, name, suffix )
+int nilOK;
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+char *suffix;
+#endif
+{
+	if ( GenCC ) return DefErrSetForCC1(nilOK, f, subst, name, suffix );
+	else return DefErrSetForC1(nilOK, f, subst, name, suffix);
+}
+
+/* Define a new error set.  WARNING...set-implementation dependent.
+ */
+int
+#ifdef __USE_PROTOS
+DefErrSetForC1(int nilOK, set *f, int subst, char * name, const char * suffix)
+#else
+DefErrSetForC1(nilOK, f, subst, name, suffix)
+int nilOK;          /* MR13 */
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+const char *suffix;
+#endif
+{
+	unsigned *p, *endp;
+	int e=1;
+
+    if (!nilOK)	require(!set_nil(*f), "DefErrSetForC1: nil set to dump?");
+
+	if ( subst ) SubstErrorClass(f);
+	p = f->setword;
+	endp = &(f->setword[f->n]);
+	esetnum++;
+	if ( name!=NULL )
+		fprintf(DefFile, "extern SetWordType %s%s[];\n", name, suffix);
+	else
+		fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
+	if ( name!=NULL ) {
+		fprintf(ErrFile, "SetWordType %s%s[%d] = {",
+				name,
+                suffix,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+	}
+	else {
+		fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
+				esetnum,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+	}
+	while ( p < endp )
+	{
+		if ( e > 1 ) fprintf(ErrFile, ", ");
+		DumpIntAsChars(ErrFile, "0x%x", *p++);
+		if ( e == 3 )
+		{
+			DAWDLE;
+			if ( p < endp ) fprintf(ErrFile, ",");
+			fprintf(ErrFile, "\n\t");
+			e=1;
+		}
+		else e++;
+	}
+	fprintf(ErrFile, "};\n");
+
+	return esetnum;
+}
+
+int
+#ifdef __USE_PROTOS
+DefErrSetForC( set *f, int subst, char *name )
+#else
+DefErrSetForC( f, subst, name )
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+#endif
+{
+  return DefErrSetForC1(0,f,subst,name, "_set");
+}
+
+/* Define a new error set.  WARNING...set-implementation dependent;
+ * Only used when -CC on.
+ */
+
+int
+#ifdef __USE_PROTOS
+DefErrSetForCC1(int nilOK, set *f, int subst, char *name, const char *suffix )
+#else
+DefErrSetForCC1(nilOK, f, subst, name, suffix )
+int nilOK;          /* MR13 */
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+const char *suffix;
+#endif
+{
+	unsigned *p, *endp;
+	int e=1;
+
+    if (!nilOK)	require(!set_nil(*f), "DefErrSetForCC1: nil set to dump?");
+
+	if ( subst ) SubstErrorClass(f);
+	p = f->setword;
+	endp = &(f->setword[f->n]);
+	esetnum++;
+
+	if ( name!=NULL ) {
+		fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+		fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
+				CurrentClassName,
+				name,
+				suffix,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+	}
+	else {
+		fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
+				CurrentClassName,
+				esetnum,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+		fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
+				NumWords(TokenNum-1)*sizeof(unsigned));
+	}
+
+	while ( p < endp )
+	{
+		if ( e > 1 ) fprintf(Parser_c, ", ");
+		DumpIntAsChars(Parser_c, "0x%x", *p++);
+		if ( e == 3 )
+		{
+			if ( p < endp ) fprintf(Parser_c, ",");
+			fprintf(Parser_c, "\n\t");
+			e=1;
+		}
+		else e++;
+	}
+	fprintf(Parser_c, "};\n");
+
+	return esetnum;
+}
+
+int
+#ifdef __USE_PROTOS
+DefErrSetForCC( set *f, int subst, char *name )
+#else
+DefErrSetForCC( f, subst, name )
+set *f;
+int subst;			/* should be substitute error classes? */
+char *name;
+#endif
+{
+  return DefErrSetForCC1(0,f,subst,name, "_set");
+}
+
+void
+#ifdef __USE_PROTOS
+GenParser_c_Hdr(void)
+#else
+GenParser_c_Hdr()
+#endif
+{
+	int i,j;
+    TermEntry   *te;
+    char * hasAkaName = NULL;									/* MR23 */
+
+	hasAkaName = (char *) malloc(TokenNum+1);					/* MR23 */
+	require(hasAkaName!=NULL, "Cannot alloc hasAkaName\n");		/* MR23 */
+	for (i = 0; i < TokenNum; i++) hasAkaName[i]='0';			/* MR23 */
+	hasAkaName[TokenNum] = 0;                                   /* MR23 */
+
+	fprintf(Parser_c, "/*\n");
+	fprintf(Parser_c, " * %s: P a r s e r  S u p p o r t\n", CurrentClassName);
+	fprintf(Parser_c, " *\n");
+	fprintf(Parser_c, " * Generated from:");
+	for (i=0; i<NumFiles; i++) fprintf(Parser_c, " %s", FileStr[i]);
+	fprintf(Parser_c, "\n");
+	fprintf(Parser_c, " *\n");
+	fprintf(Parser_c, " * Terence Parr, Russell Quong, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(Parser_c, " * Parr Research Corporation\n");
+	fprintf(Parser_c, " * with Purdue University Electrical Engineering\n");
+	fprintf(Parser_c, " * with AHPCRC, University of Minnesota\n");
+	fprintf(Parser_c, " * ANTLR Version %s\n", Version);
+	fprintf(Parser_c, " */\n\n");
+	
+  if ( FirstAction != NULL ) dumpAction(FirstAction,Parser_c, 0, -1, 0, 1);    /* MR11 MR15b */
+
+	fprintf(Parser_c, "#define ANTLR_VERSION	%s\n", VersionDef);
+
+	fprintf(Parser_c, "#include \"pcctscfg.h\"\n");
+	fprintf(Parser_c, "#include \"pccts_stdio.h\"\n");
+	fprintf(Parser_c, "#define ANTLR_SUPPORT_CODE\n");
+	if ( UserTokenDefsFile != NULL )
+	   fprintf(Parser_c, "#include %s\n", UserTokenDefsFile);
+	else
+	   fprintf(Parser_c, "#include \"%s\"\n", DefFileName);
+
+	fprintf(Parser_c, "#include \"%s.h\"\n\n", CurrentClassName);
+
+	fprintf(Parser_c, "const ANTLRChar *%s::tokenName(int tok) ",   /* MR1 */
+					CurrentClassName);                  	        /* MR1 */
+	fprintf(Parser_c, "  { return _token_tbl[tok]; }\n");	        /* MR1 */ /* MR10 */
+	/* Dump a Parser::tokens for each automaton */
+	fprintf(Parser_c, "\nconst ANTLRChar *%s::_token_tbl[]={\n",
+                                                 CurrentClassName); /* MR20 */
+	fprintf(Parser_c, "\t/* 00 */\t\"Invalid\"");
+
+	for (i=1; i<TokenNum-1; i++)
+	{
+		DAWDLE;
+		if ( i == EpToken ) continue;
+		/* remapped to invalid token? */
+		if ( TokenInd!=NULL && TokenInd[i]>=LastTokenCounted )
+		{
+			fprintf(Parser_c, ",\n\t/* %02d */\t\"invalid\"", i);
+			continue;
+		}
+		if ( TokenString(i) != NULL ) {
+           te=(TermEntry *) hash_get(Tname,TokenString(i));                     /* MR11 */
+            if (te == NULL || te->akaString == NULL) {                          /* MR11 */
+  	   	      fprintf(Parser_c, ",\n\t/* %02d */\t\"%s\"", i, TokenString(i));
+            } else {
+			  hasAkaName[i] = '1';											    /* MR23 */
+  	   	      fprintf(Parser_c, ",\n\t/* %02d */\t\"%s\"", i, te->akaString);   /* MR11 */
+            }
+        }
+		else
+		{
+			/* look in all lexclasses for the reg expr */
+			for (j=0; j<NumLexClasses; j++)
+			{
+				lexmode(j);
+				if ( ExprString(i) != NULL )
+				{
+					fprintf(Parser_c, ",\n\t/* %02d */\t", i);
+					dumpExpr(Parser_c, ExprString(i));
+					break;
+				}
+			}
+			if ( j>=NumLexClasses )
+			{
+				if ( UserDefdTokens )
+				{
+					fprintf(Parser_c, ",\n\t/* %02d */\t\"\"", i);
+				}
+				else
+					fatal_internal(eMsgd("No label or expr for token %d",i));
+			}
+		}
+	}
+	fprintf(Parser_c, "\n};\n");
+
+	/* Build constructors */
+	fprintf(Parser_c, "\n%s::", CurrentClassName);
+	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
+						CurrentClassName,
+						(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
+						OutputLL_k,
+						FoundGuessBlk,
+						DemandLookahead,
+						NumWords(TokenNum-1)*sizeof(unsigned));
+	fprintf(Parser_c, "{\n");
+	fprintf(Parser_c, "\ttoken_tbl = _token_tbl;\n");
+    if (TraceGen) {
+      fprintf(Parser_c, "\ttraceOptionValueDefault=1;\t\t// MR10 turn trace ON\n");
+    } else {
+      fprintf(Parser_c, "\ttraceOptionValueDefault=0;\t\t// MR10 turn trace OFF\n");
+    };
+	fprintf(Parser_c, "}\n\n");
+	free ( (void *) hasAkaName);
+}
+
+void
+#ifdef __USE_PROTOS
+GenParser_h_Hdr(void)
+#else
+GenParser_h_Hdr()
+#endif
+{
+	int i;
+
+	fprintf(Parser_h, "/*\n");
+	fprintf(Parser_h, " * %s: P a r s e r  H e a d e r \n", CurrentClassName);
+	fprintf(Parser_h, " *\n");
+	fprintf(Parser_h, " * Generated from:");
+	for (i=0; i<NumFiles; i++) fprintf(Parser_h, " %s", FileStr[i]);
+	fprintf(Parser_h, "\n");
+	fprintf(Parser_h, " *\n");
+	fprintf(Parser_h, " * Terence Parr, Russell Quong, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(Parser_h, " * Parr Research Corporation\n");
+	fprintf(Parser_h, " * with Purdue University Electrical Engineering\n");
+	fprintf(Parser_h, " * with AHPCRC, University of Minnesota\n");
+	fprintf(Parser_h, " * ANTLR Version %s\n", Version);
+	fprintf(Parser_h, " */\n\n");
+
+  if ( FirstAction != NULL ) dumpAction( FirstAction, Parser_h, 0, -1, 0, 1);         /* MR11 MR15b */
+
+	fprintf(Parser_h, "#ifndef %s_h\n", CurrentClassName);
+	fprintf(Parser_h, "#define %s_h\n\n", CurrentClassName);
+
+    fprintf(Parser_h, "#ifndef ANTLR_VERSION\n");
+    fprintf(Parser_h, "#define ANTLR_VERSION %s\n",VersionDef);
+    fprintf(Parser_h, "#endif\n\n");
+
+	if ( GenAST ) fprintf(Parser_h, "class ASTBase;\n");
+    if (TraceGen) {
+      fprintf(Parser_h,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+      fprintf(Parser_h,"#define zzTRACE_RULES\n");  /* MR20 */
+      fprintf(Parser_h,"#endif\n");                 /* MR22 */
+    };
+	fprintf(Parser_h, "#include \"%s\"\n\n", APARSER_H);
+
+	if ( HdrAction != NULL ) dumpAction( HdrAction, Parser_h, 0, -1, 0, 1);
+	
+/* MR10 */    if (ClassDeclStuff == NULL) {
+/* MR10 */  	fprintf(Parser_h, "class %s : public ANTLRParser {\n", CurrentClassName);
+/* MR10 */    } else {
+/* MR10 */      fprintf(Parser_h, "class %s %s {\n",CurrentClassName,ClassDeclStuff);
+/* MR10 */    };
+
+	fprintf(Parser_h, "public:\n");					          /* MR1 */
+	fprintf(Parser_h, "\tstatic  const ANTLRChar *tokenName(int tk);\n");/* MR1 */
+    fprintf(Parser_h, "\tenum { SET_SIZE = %i };\n",TokenNum-1);         /* MR21 */
+	fprintf(Parser_h, "protected:\n");
+	fprintf(Parser_h, "\tstatic const ANTLRChar *_token_tbl[];\n");     /* MR20 */
+	fprintf(Parser_h, "private:\n");
+}
+
+/* Currently, this is only used in !GenCC mode */
+void
+#ifdef __USE_PROTOS
+GenErrHdr( void )
+#else
+GenErrHdr( )
+#endif
+{
+	int i, j;
+    TermEntry   *te;
+
+	fprintf(ErrFile, "/*\n");
+	fprintf(ErrFile, " * A n t l r  S e t s / E r r o r  F i l e  H e a d e r\n");
+	fprintf(ErrFile, " *\n");
+	fprintf(ErrFile, " * Generated from:");
+	for (i=0; i<NumFiles; i++) fprintf(ErrFile, " %s", FileStr[i]);
+	fprintf(ErrFile, "\n");
+	fprintf(ErrFile, " *\n");
+	fprintf(ErrFile, " * Terence Parr, Russell Quong, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(ErrFile, " * Parr Research Corporation\n");
+	fprintf(ErrFile, " * with Purdue University Electrical Engineering\n");
+	fprintf(ErrFile, " * With AHPCRC, University of Minnesota\n");
+	fprintf(ErrFile, " * ANTLR Version %s\n", Version);
+	fprintf(ErrFile, " */\n\n");
+
+  if ( FirstAction != NULL ) dumpAction( FirstAction, ErrFile, 0, -1, 0, 1);         /* MR11 MR15b */
+	
+  fprintf(ErrFile, "#define ANTLR_VERSION	%s\n", VersionDef);
+
+  fprintf(ErrFile, "#include \"pcctscfg.h\"\n");
+	fprintf(ErrFile, "#include \"pccts_stdio.h\"\n");
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		fprintf(ErrFile, "#define %s %s\n", DefaultParserName, ParserName);
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		fprintf(ErrFile, "#include \"%s\"\n", RemapFileName);
+	if ( HdrAction != NULL ) dumpAction( HdrAction, ErrFile, 0, -1, 0, 1 );
+	if ( FoundGuessBlk )
+	{
+		fprintf(ErrFile, "#define ZZCAN_GUESS\n");
+		fprintf(ErrFile, "#include \"pccts_setjmp.h\"\n");
+	}
+    if (TraceGen) {
+      fprintf(ErrFile,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+      fprintf(ErrFile,"#define zzTRACE_RULES\n");  /* MR20 */
+      fprintf(ErrFile,"#endif\n");                 /* MR22 */
+    };
+
+	if ( OutputLL_k > 1 ) fprintf(ErrFile, "#define LL_K %d\n", OutputLL_k);
+#ifdef DUM
+	if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
+#endif
+	fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+	if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
+	fprintf(ErrFile, "#include \"antlr.h\"\n");
+	if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
+			
+    if ( UserDefdTokens ) fprintf(ErrFile, "#include %s\n", UserTokenDefsFile);
+	/* still need this one as it has the func prototypes */
+	fprintf(ErrFile, "#include \"%s\"\n", DefFileName);
+	fprintf(ErrFile, "#include \"dlgdef.h\"\n");
+	fprintf(ErrFile, "#include \"err.h\"\n\n");
+
+	/* Dump a zztokens for each automaton */
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+	{
+		fprintf(ErrFile, "ANTLRChar *%s_zztokens[%d]={\n", ParserName, TokenNum-1);
+	}
+	else
+	{
+		fprintf(ErrFile, "ANTLRChar *zztokens[%d]={\n", TokenNum-1);
+	}
+	fprintf(ErrFile, "\t/* 00 */\t\"Invalid\"");
+	for (i=1; i<TokenNum-1; i++)
+	{
+		DAWDLE;
+		if ( i == EpToken ) continue;
+		/* remapped to invalid token? */
+		if ( TokenInd!=NULL && TokenInd[i]>=LastTokenCounted )
+		{
+			fprintf(ErrFile, ",\n\t/* %02d */\t\"invalid\"", i);
+			continue;
+		}
+		if ( TokenString(i) != NULL ) {
+            te=(TermEntry *) hash_get(Tname,TokenString(i));                     /* MR11 */
+            if (te == NULL || te->akaString == NULL) {                          /* MR11 */
+  			  fprintf(ErrFile, ",\n\t/* %02d */\t\"%s\"", i, TokenString(i));
+            } else {
+  			  fprintf(ErrFile, ",\n\t/* %02d */\t\"%s\"", i, te->akaString);    /* MR11 */
+            }
+        }
+		else
+		{
+			/* look in all lexclasses for the reg expr */
+			for (j=0; j<NumLexClasses; j++)
+			{
+				lexmode(j);
+				if ( ExprString(i) != NULL )
+				{
+					fprintf(ErrFile, ",\n\t/* %02d */\t", i);
+					dumpExpr(ErrFile, ExprString(i));
+					break;
+				}
+			}
+			if ( j>=NumLexClasses )
+			{
+				if ( UserDefdTokens )
+				{
+					fprintf(ErrFile, ",\n\t/* %02d */\t\"\"", i);
+				}
+				else
+					fatal_internal(eMsgd("No label or expr for token %d",i));
+			}
+		}
+	}
+	fprintf(ErrFile, "\n};\n");
+}
+
+void
+#ifdef __USE_PROTOS
+dumpExpr( FILE *f, char *e )
+#else
+dumpExpr( f, e )
+FILE *f;
+char *e;
+#endif
+{
+	while ( *e!='\0' )
+	{
+		if ( *e=='\\' && *(e+1)=='\\' )
+			{putc('\\', f); putc('\\', f); e+=2;}
+		else if ( *e=='\\' && *(e+1)=='"' )
+			{putc('\\', f); putc('"', f); e+=2;}
+		else if ( *e=='\\' ) {putc('\\', f); putc('\\', f); e++;}
+		else {putc(*e, f); e++;}
+	}
+}
+
+int
+#ifdef __USE_PROTOS
+isTermEntryTokClass(TermEntry *te)
+#else
+isTermEntryTokClass(te)
+TermEntry *te;
+#endif
+{
+	ListNode *t;
+	TCnode *p;
+	TermEntry *q;
+	char *tokstr;
+
+	if (tclasses == NULL) return 0;
+
+	for (t = tclasses->next; t!=NULL; t=t->next)
+	{
+		p = (TCnode *) t->elem;
+		tokstr = TokenString(p->tok);
+		lexmode(p->lexclass);	/* switch to lexclass where tokclass is defined */
+        q = (TermEntry *) hash_get(Tname, tokstr);
+		if (q == te) return 1;
+	}
+	return 0;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.c b/Tools/Source/TianoTools/Pccts/antlr/build.c
new file mode 100644
index 0000000000..4eb3b02af1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/build.c
@@ -0,0 +1,813 @@
+/*
+ * build.c -- functions associated with building syntax diagrams.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+
+#define SetBlk(g, t, approx, first_set_symbol) {         		        \
+			((Junction *)g.left)->jtype = t;					        \
+			((Junction *)g.left)->approx = approx;				        \
+			((Junction *)g.left)->pFirstSetSymbol = first_set_symbol;   \
+			((Junction *)g.left)->end = (Junction *) g.right;	        \
+			((Junction *)g.right)->jtype = EndBlk;}
+
+/* Add the parameter string 'parm' to the parms field of a block-type junction
+ * g.left points to the sentinel node on a block.  i.e. g.left->p1 points to
+ * the actual junction with its jtype == some block-type.
+ */
+void
+#ifdef __USE_PROTOS
+addParm( Node *p, char *parm )
+#else
+addParm( p, parm )
+Node *p;
+char *parm;
+#endif
+{
+	char *q = (char *) malloc( strlen(parm) + 1 );
+	require(p!=NULL, "addParm: NULL object\n");
+	require(q!=NULL, "addParm: unable to alloc parameter\n");
+
+	strcpy(q, parm);
+	if ( p->ntype == nRuleRef )
+	{
+		((RuleRefNode *)p)->parms = q;
+	}
+	else if ( p->ntype == nJunction )
+	{
+		((Junction *)p)->parm = q;	/* only one parameter allowed on subrules */
+	}
+	else fatal_internal("addParm: invalid node for adding parm");
+}
+
+/*
+ * Build an action node for the syntax diagram
+ *
+ * buildAction(ACTION) ::= --o-->ACTION-->o--
+ *
+ * Where o is a junction node.
+ */
+Graph
+#ifdef __USE_PROTOS
+buildAction( char *action, int file, int line, int is_predicate )
+#else
+buildAction( action, file, line, is_predicate )
+char *action;
+int file;
+int line;
+int is_predicate;
+#endif
+{
+	Junction *j1, *j2;
+	Graph g;
+	ActionNode *a;
+	require(action!=NULL, "buildAction: invalid action");
+	
+	j1 = newJunction();
+	j2 = newJunction();
+	a = newActionNode();
+	a->action = (char *) malloc( strlen(action)+1 );
+	require(a->action!=NULL, "buildAction: cannot alloc space for action\n");
+	strcpy(a->action, action);
+	j1->p1 = (Node *) a;
+	a->next = (Node *) j2;
+	a->is_predicate = is_predicate;
+
+    if (is_predicate) {
+        PredEntry   *predEntry;
+        char        *t;
+        char        *key;
+        char        *u;
+        int         inverted=0;
+
+        t=key=(char *)calloc(1,strlen(a->action)+1);
+
+        for (u=a->action; *u != '\0' ; u++) {
+          if (*u != ' ') {
+            if (t==key && *u=='!') {
+              inverted=!inverted;
+            } else {
+              *t++=*u;
+            };
+          };
+        };
+
+        *t='\0';
+
+
+        predEntry=(PredEntry *)hash_get(Pname,key);
+        a->predEntry=predEntry;
+        if (predEntry != NULL) a->inverted=inverted;
+    } else {
+/* MR12c */      char  *strStart=a->action;
+/* MR12c */      char  *strEnd;
+/* MR12c */      strEnd=strStart+strlen(strStart)-1;
+/* MR12c */      for ( ; strEnd >= strStart &&  isspace(*strEnd); strEnd--) *strEnd=0;
+/* MR12c */      while (*strStart != '\0' && isspace(*strStart)) strStart++;
+/* MR12c */      if (ci_strequ(strStart,"nohoist")) {
+/* MR12c */        a->noHoist=1;
+/* MR12c */      }
+	}
+
+	g.left = (Node *) j1; g.right = (Node *) j2;
+	a->file = file;
+	a->line = line;
+	a->rname = CurRule;     /* MR10 */
+	return g;
+}
+
+/*
+ * Build a token node for the syntax diagram
+ *
+ * buildToken(TOKEN) ::= --o-->TOKEN-->o--
+ *
+ * Where o is a junction node.
+ */
+Graph
+#ifdef __USE_PROTOS
+buildToken( char *text )
+#else
+buildToken( text )
+char *text;
+#endif
+{
+	Junction *j1, *j2;
+	Graph g;
+	TokNode *t;
+	require(text!=NULL, "buildToken: invalid token name");
+	
+	j1 = newJunction();
+	j2 = newJunction();
+	t = newTokNode();
+	t->altstart = CurAltStart;
+	if ( *text == '"' ) {t->label=FALSE; t->token = addTexpr( text );}
+	else {t->label=TRUE; t->token = addTname( text );}
+	j1->p1 = (Node *) t;
+	t->next = (Node *) j2;
+	g.left = (Node *) j1; g.right = (Node *) j2;
+	return g;
+}
+
+/*
+ * Build a wild-card node for the syntax diagram
+ *
+ * buildToken(TOKEN) ::= --o-->'.'-->o--
+ *
+ * Where o is a junction node.
+ */
+Graph
+#ifdef __USE_PROTOS
+buildWildCard( char *text )
+#else
+buildWildCard( text )
+char *text;
+#endif
+{
+	Junction *j1, *j2;
+	Graph g;
+	TokNode *t;
+	TCnode *w;
+	TermEntry *p;
+	require(text!=NULL, "buildWildCard: invalid token name");
+	
+	j1 = newJunction();
+	j2 = newJunction();
+	t = newTokNode();
+
+	/* If the ref a wild card, make a token class for it */
+	if ( Tnum(WildCardString) == 0 )
+	{
+		w = newTCnode;
+	  	w->tok = addTname( WildCardString );
+		set_orel(w->tok, &imag_tokens);
+		set_orel(w->tok, &tokclasses);
+		WildCardToken = w->tok;
+		require((p=(TermEntry *)hash_get(Tname, WildCardString)) != NULL,
+				"hash table mechanism is broken");
+		p->classname = 1;	/* entry is class name, not token */
+		p->tclass = w;		/* save ptr to this tclass def */
+		list_add(&tclasses, (char *)w);
+	}
+	else {
+		p=(TermEntry *)hash_get(Tname, WildCardString);
+		require( p!= NULL, "hash table mechanism is broken");
+		w = p->tclass;
+	}
+
+	t->token = w->tok;
+	t->wild_card = 1;
+	t->tclass = w;
+
+	t->altstart = CurAltStart;
+	j1->p1 = (Node *) t;
+	t->next = (Node *) j2;
+	g.left = (Node *) j1; g.right = (Node *) j2;
+	return g;
+}
+
+void
+#ifdef __USE_PROTOS
+setUpperRange(TokNode *t, char *text)
+#else
+setUpperRange(t, text)
+TokNode *t;
+char *text;
+#endif
+{
+	require(t!=NULL, "setUpperRange: NULL token node");
+	require(text!=NULL, "setUpperRange: NULL token string");
+
+	if ( *text == '"' ) {t->upper_range = addTexpr( text );}
+	else {t->upper_range = addTname( text );}
+}
+
+/*
+ * Build a rule reference node of the syntax diagram
+ *
+ * buildRuleRef(RULE) ::= --o-->RULE-->o--
+ *
+ * Where o is a junction node.
+ *
+ * If rule 'text' has been defined already, don't alloc new space to store string.
+ * Set r->text to point to old copy in string table.
+ */
+Graph
+#ifdef __USE_PROTOS
+buildRuleRef( char *text )
+#else
+buildRuleRef( text )
+char *text;
+#endif
+{
+	Junction *j1, *j2;
+	Graph g;
+	RuleRefNode *r;
+	RuleEntry *p;
+	require(text!=NULL, "buildRuleRef: invalid rule name");
+	
+	j1 = newJunction();
+	j2 = newJunction();
+	r = newRNode();
+	r->altstart = CurAltStart;
+	r->assign = NULL;
+	if ( (p=(RuleEntry *)hash_get(Rname, text)) != NULL ) r->text = p->str;
+	else r->text = mystrdup( text );
+	j1->p1  = (Node *) r;
+	r->next = (Node *) j2;
+	g.left = (Node *) j1; g.right = (Node *) j2;
+	return g;
+}
+
+/*
+ * Or two subgraphs into one graph via:
+ *
+ * Or(G1, G2) ::= --o-G1-o--
+ *                  |    ^
+ *					v    |
+ *                  o-G2-o
+ *
+ * Set the altnum of junction starting G2 to 1 + altnum of junction starting G1.
+ * If, however, the G1 altnum is 0, make it 1 and then
+ * make G2 altnum = G1 altnum + 1.
+ */
+Graph
+#ifdef __USE_PROTOS
+Or( Graph g1, Graph g2 )
+#else
+Or( g1, g2 )
+Graph g1;
+Graph g2;
+#endif
+{
+	Graph g;
+	require(g1.left != NULL, "Or: invalid graph");
+	require(g2.left != NULL && g2.right != NULL, "Or: invalid graph");
+
+	((Junction *)g1.left)->p2 = g2.left;
+	((Junction *)g2.right)->p1 = g1.right;
+	/* set altnums */
+	if ( ((Junction *)g1.left)->altnum == 0 ) ((Junction *)g1.left)->altnum = 1;
+	((Junction *)g2.left)->altnum = ((Junction *)g1.left)->altnum + 1;
+	g.left = g2.left;
+	g.right = g1.right;
+	return g;
+}
+
+/*
+ * Catenate two subgraphs
+ *
+ * Cat(G1, G2) ::= --o-G1-o-->o-G2-o--
+ * Cat(NULL,G2)::= --o-G2-o--
+ * Cat(G1,NULL)::= --o-G1-o--
+ */
+Graph
+#ifdef __USE_PROTOS
+Cat( Graph g1, Graph g2 )
+#else
+Cat( g1, g2 )
+Graph g1;
+Graph g2;
+#endif
+{
+	Graph g;
+	
+	if ( g1.left == NULL && g1.right == NULL ) return g2;
+	if ( g2.left == NULL && g2.right == NULL ) return g1;
+	((Junction *)g1.right)->p1 = g2.left;
+	g.left = g1.left;
+	g.right = g2.right;
+	return g;
+}
+
+/*
+ * Make a subgraph an optional block
+ *
+ * makeOpt(G) ::= --o-->o-G-o-->o--
+ *                      | 	    ^
+ *						v  	    |
+ *					    o-------o
+ *
+ * Note that this constructs {A|B|...|Z} as if (A|B|...|Z|) was found.
+ *
+ * The node on the far right is added so that every block owns its own
+ * EndBlk node.
+ */
+Graph
+#ifdef __USE_PROTOS
+makeOpt( Graph g1, int approx, char * pFirstSetSymbol )
+#else
+makeOpt( g1, approx, pFirstSetSymbol )
+Graph g1;
+int approx;
+char * pFirstSetSymbol;
+#endif
+{
+	Junction *j1,*j2,*p;
+	Graph g;
+	require(g1.left != NULL && g1.right != NULL, "makeOpt: invalid graph");
+
+	j1 = newJunction();
+	j2 = newJunction();
+	((Junction *)g1.right)->p1 = (Node *) j2;	/* add node to G at end */
+
+    /*  MR21
+     *
+     *  There is code in genBlk which recognizes the node created
+     *  by emptyAlt() as a special case and bypasses it.  We don't
+     *  want this to happen for the optBlk.
+     */
+
+	g = emptyAlt3(); /* MR21 */
+	if ( ((Junction *)g1.left)->altnum == 0 ) ((Junction *)g1.left)->altnum = 1;
+	((Junction *)g.left)->altnum = ((Junction *)g1.left)->altnum + 1;
+	for(p=(Junction *)g1.left; p->p2!=NULL; p=(Junction *)p->p2)
+		{;}										/* find last alt */
+	p->p2 = g.left;								/* add optional alternative */
+	((Junction *)g.right)->p1 = (Node *)j2;		/* opt alt points to EndBlk */
+	g1.right = (Node *)j2;
+	SetBlk(g1, aOptBlk, approx, pFirstSetSymbol);
+	j1->p1 = g1.left;							/* add generic node in front */
+	g.left = (Node *) j1;
+	g.right = g1.right;
+	return g;
+}
+
+/*
+ * Make a graph into subblock
+ *
+ * makeBlk(G) ::= --o-->o-G-o-->o--
+ *
+ * The node on the far right is added so that every block owns its own
+ * EndBlk node.
+ */
+Graph
+#ifdef __USE_PROTOS
+makeBlk( Graph g1, int approx, char * pFirstSetSymbol )
+#else
+makeBlk( g1, approx, pFirstSetSymbol )
+Graph g1;
+int approx;
+char * pFirstSetSymbol;
+#endif
+{
+	Junction *j,*j2;
+	Graph g;
+	require(g1.left != NULL && g1.right != NULL, "makeBlk: invalid graph");
+
+	j = newJunction();
+	j2 = newJunction();
+	((Junction *)g1.right)->p1 = (Node *) j2;	/* add node to G at end */
+	g1.right = (Node *)j2;
+	SetBlk(g1, aSubBlk, approx, pFirstSetSymbol);
+	j->p1 = g1.left;							/* add node in front */
+	g.left = (Node *) j;
+	g.right = g1.right;
+
+	return g;
+}
+
+/*
+ * Make a subgraph into a loop (closure) block -- (...)*
+ *
+ * makeLoop(G) ::=       |---|
+ *					     v   |
+ *			   --o-->o-->o-G-o-->o--
+ *                   |           ^
+ *                   v           |
+ *					 o-----------o
+ *
+ * After making loop, always place generic node out front.  It becomes
+ * the start of enclosing block.  The aLoopBlk is the target of the loop.
+ *
+ * Loop blks have TWO EndBlk nodes--the far right and the node that loops back
+ * to the aLoopBlk node.  Node with which we can branch past loop == aLoopBegin and
+ * one which is loop target == aLoopBlk.
+ * The branch-past (initial) aLoopBegin node has end
+ * pointing to the last EndBlk node.  The loop-target node has end==NULL.
+ *
+ * Loop blocks have a set of locks (from 1..CLL_k) on the aLoopBlk node.
+ */
+Graph
+#ifdef __USE_PROTOS
+makeLoop( Graph g1, int approx, char * pFirstSetSymbol )
+#else
+makeLoop( g1, approx, pFirstSetSymbol)
+Graph g1;
+int approx;
+char * pFirstSetSymbol;
+#endif
+{
+	Junction *back, *front, *begin;
+	Graph g;
+	require(g1.left != NULL && g1.right != NULL, "makeLoop: invalid graph");
+
+	back = newJunction();
+	front = newJunction();
+	begin = newJunction();
+	g = emptyAlt3();
+	((Junction *)g1.right)->p2 = g1.left;		/* add loop branch to G */
+	((Junction *)g1.right)->p1 = (Node *) back;	/* add node to G at end */
+	((Junction *)g1.right)->jtype = EndBlk;		/* mark 1st EndBlk node */
+	((Junction *)g1.left)->jtype = aLoopBlk;	/* mark 2nd aLoopBlk node */
+	((Junction *)g1.left)->end = (Junction *) g1.right;
+	((Junction *)g1.left)->lock = makelocks();
+	((Junction *)g1.left)->pred_lock = makelocks();
+	g1.right = (Node *) back;
+	begin->p1 = (Node *) g1.left;
+	g1.left = (Node *) begin;
+	begin->p2 = (Node *) g.left;				/* make bypass arc */
+	((Junction *)g.right)->p1 = (Node *) back;
+	SetBlk(g1, aLoopBegin, approx, pFirstSetSymbol);
+	front->p1 = g1.left;						/* add node to front */
+	g1.left = (Node *) front;
+
+	return g1;
+}
+
+/*
+ * Make a subgraph into a plus block -- (...)+ -- 1 or more times
+ *
+ * makePlus(G) ::=	 |---|
+ *					 v   |
+ *			   --o-->o-G-o-->o--
+ *
+ * After making loop, always place generic node out front.  It becomes
+ * the start of enclosing block.  The aPlusBlk is the target of the loop.
+ *
+ * Plus blks have TWO EndBlk nodes--the far right and the node that loops back
+ * to the aPlusBlk node.
+ *
+ * Plus blocks have a set of locks (from 1..CLL_k) on the aPlusBlk node.
+ */
+Graph
+#ifdef __USE_PROTOS
+makePlus( Graph g1, int approx, char * pFirstSetSymbol)
+#else
+makePlus( g1, approx, pFirstSetSymbol)
+Graph g1;
+int approx;
+char * pFirstSetSymbol;
+#endif
+{
+	int has_empty_alt_already = 0;
+	Graph g;
+	Junction *j2, *j3, *first_alt;
+	Junction *last_alt=NULL, *p;
+	require(g1.left != NULL && g1.right != NULL, "makePlus: invalid graph");
+
+	first_alt = (Junction *)g1.left;
+	j2 = newJunction();
+	j3 = newJunction();
+	if ( ((Junction *)g1.left)->altnum == 0 ) ((Junction *)g1.left)->altnum = 1;
+	((Junction *)g1.right)->p2 = g1.left;		/* add loop branch to G */
+	((Junction *)g1.right)->p1 = (Node *) j2;	/* add node to G at end */
+	((Junction *)g1.right)->jtype = EndBlk;		/* mark 1st EndBlk node */
+	g1.right = (Node *) j2;
+	SetBlk(g1, aPlusBlk, approx, pFirstSetSymbol);
+	((Junction *)g1.left)->lock = makelocks();
+	((Junction *)g1.left)->pred_lock = makelocks();
+	j3->p1 = g1.left;							/* add node to front */
+	g1.left = (Node *) j3;
+
+	/* add an optional branch which is the "exit" branch of loop */
+	/* FIRST, check to ensure that there does not already exist
+	 * an optional path.
+	 */
+	/* find last alt */
+	for(p=first_alt; p!=NULL; p=(Junction *)p->p2)
+	{
+		if ( p->p1->ntype == nJunction &&
+			 p->p1!=NULL &&
+			 ((Junction *)p->p1)->jtype==Generic &&
+			 ((Junction *)p->p1)->p1!=NULL &&
+			 ((Junction *)((Junction *)p->p1)->p1)->jtype==EndBlk )
+		{
+			has_empty_alt_already = 1;
+		}
+		last_alt = p;
+	}
+	if ( !has_empty_alt_already )
+	{
+		require(last_alt!=NULL, "last_alt==NULL; bad (..)+");
+		g = emptyAlt();
+		last_alt->p2 = g.left;
+		((Junction *)g.right)->p1 = (Node *) j2;
+
+		/* make sure lookahead computation ignores this alt for
+		* FIRST("(..)+"); but it's still used for computing the FIRST
+		* of each alternative.
+		*/
+		((Junction *)g.left)->ignore = 1;
+	}
+
+	return g1;
+}
+
+/*
+ * Return an optional path:  --o-->o--
+ */
+
+Graph
+#ifdef __USE_PROTOS
+emptyAlt( void )
+#else
+emptyAlt( )
+#endif
+{
+	Junction *j1, *j2;
+	Graph g;
+
+	j1 = newJunction();
+	j2 = newJunction();
+	j1->p1 = (Node *) j2;
+	g.left = (Node *) j1;
+	g.right = (Node *) j2;
+	
+	return g;
+}
+
+/*  MR21
+ *
+ *  There is code in genBlk which recognizes the node created
+ *  by emptyAlt() as a special case and bypasses it.  We don't
+ *  want this to happen for the optBlk.
+ */
+
+Graph
+#ifdef __USE_PROTOS
+emptyAlt3( void )
+#else
+emptyAlt3( )
+#endif
+{
+	Junction *j1, *j2, *j3;
+	Graph g;
+
+	j1 = newJunction();
+	j2 = newJunction();
+    j3 = newJunction();
+	j1->p1 = (Node *) j2;
+	j2->p1 = (Node *) j3;
+	g.left = (Node *) j1;
+	g.right = (Node *) j3;
+	
+	return g;
+}
+
+/* N o d e  A l l o c a t i o n */
+
+TokNode *
+#ifdef __USE_PROTOS
+newTokNode( void )
+#else
+newTokNode( )
+#endif
+{
+	static TokNode *FreeList = NULL;
+	TokNode *p, *newblk;
+
+	if ( FreeList == NULL )
+	{
+		newblk = (TokNode *)calloc(TokenBlockAllocSize, sizeof(TokNode));
+		if ( newblk == NULL )
+			fatal_internal(eMsg1("out of memory while building rule '%s'",CurRule));
+		for (p=newblk; p<&(newblk[TokenBlockAllocSize]); p++)
+		{
+			p->next = (Node *)FreeList;	/* add all new token nodes to FreeList */
+			FreeList = p;
+		}
+	}
+	p = FreeList;
+	FreeList = (TokNode *)FreeList->next;/* remove a TokNode node */
+	p->next = NULL;						/* NULL the ptr we used */
+    memset( (char *) p, 0, sizeof(TokNode));        /* MR10 */
+	p->ntype = nToken;
+	p->rname = CurRule;
+	p->file = CurFile;
+	p->line = zzline;
+	p->altstart = NULL;
+
+	return p;
+}
+
+RuleRefNode *
+#ifdef __USE_PROTOS
+newRNode( void )
+#else
+newRNode( )
+#endif
+{
+	static RuleRefNode *FreeList = NULL;
+	RuleRefNode *p, *newblk;
+
+	if ( FreeList == NULL )
+	{
+		newblk = (RuleRefNode *)calloc(RRefBlockAllocSize, sizeof(RuleRefNode));
+		if ( newblk == NULL )
+			fatal_internal(eMsg1("out of memory while building rule '%s'",CurRule));
+		for (p=newblk; p<&(newblk[RRefBlockAllocSize]); p++)
+		{
+			p->next = (Node *)FreeList;	/* add all new rref nodes to FreeList */
+			FreeList = p;
+		}
+	}
+	p = FreeList;
+	FreeList = (RuleRefNode *)FreeList->next;/* remove a Junction node */
+	p->next = NULL;						/* NULL the ptr we used */
+    memset( (char *) p, 0, sizeof(RuleRefNode));        /* MR10 */
+	p->ntype = nRuleRef;
+	p->rname = CurRule;
+	p->file = CurFile;
+	p->line = zzline;
+	p->astnode = ASTinclude;
+	p->altstart = NULL;
+	
+	return p;
+}
+
+static int junctionSeqNumber=0;         /* MR10 */
+
+Junction *
+#ifdef __USE_PROTOS
+newJunction( void )
+#else
+newJunction( )
+#endif
+{
+	static Junction *FreeList = NULL;
+	Junction *p, *newblk;
+
+	if ( FreeList == NULL )
+	{
+		newblk = (Junction *)calloc(JunctionBlockAllocSize, sizeof(Junction));
+		if ( newblk == NULL )
+			fatal_internal(eMsg1("out of memory while building rule '%s'",CurRule));
+		for (p=newblk; p<&(newblk[JunctionBlockAllocSize]); p++)
+		{
+			p->p1 = (Node *)FreeList;	/* add all new Junction nodes to FreeList */
+			FreeList = p;
+		}
+	}
+	p = FreeList;
+	FreeList = (Junction *)FreeList->p1;/* remove a Junction node */
+	p->p1 = NULL;						/* NULL the ptr we used */
+    memset( (char *) p, 0, sizeof(Junction));       /* MR10 */
+	p->ntype = nJunction;
+	p->visited = 0;
+	p->jtype = Generic;
+	p->rname = CurRule;
+	p->file = CurFile;
+	p->line = zzline;
+	p->exception_label = NULL;
+	p->fset = (set *) calloc(CLL_k+1, sizeof(set));
+	require(p->fset!=NULL, "cannot allocate fset in newJunction");
+    p->seq=++junctionSeqNumber;     /* MR10 */
+
+	return p;
+}
+
+ActionNode *
+#ifdef __USE_PROTOS
+newActionNode( void )
+#else
+newActionNode( )
+#endif
+{
+	static ActionNode *FreeList = NULL;
+	ActionNode *p, *newblk;
+
+	if ( FreeList == NULL )
+	{
+		newblk = (ActionNode *)calloc(ActionBlockAllocSize, sizeof(ActionNode));
+		if ( newblk == NULL )
+			fatal_internal(eMsg1("out of memory while building rule '%s'",CurRule));
+		for (p=newblk; p<&(newblk[ActionBlockAllocSize]); p++)
+		{
+			p->next = (Node *)FreeList;	/* add all new Action nodes to FreeList */
+			FreeList = p;
+		}
+	}
+	p = FreeList;
+	FreeList = (ActionNode *)FreeList->next;/* remove an Action node */
+    memset( (char *) p, 0, sizeof(ActionNode));     /* MR10 */
+	p->ntype = nAction;
+	p->next = NULL;						/* NULL the ptr we used */
+	p->done = 0;
+	p->pred_fail = NULL;
+	p->guardpred = NULL;
+    p->ampersandPred = NULL;
+	return p;
+}
+
+/*
+ * allocate the array of locks (1..CLL_k) used to inhibit infinite recursion.
+ * Infinite recursion can occur in (..)* blocks, FIRST calcs and FOLLOW calcs.
+ * Therefore, we need locks on aLoopBlk, RuleBlk, EndRule nodes.
+ *
+ * if ( lock[k]==TRUE ) then we have been here before looking for k tokens
+ * of lookahead.
+ */
+char *
+#ifdef __USE_PROTOS
+makelocks( void )
+#else
+makelocks( )
+#endif
+{
+	char *p = (char *) calloc(CLL_k+1, sizeof(char));
+	require(p!=NULL, "cannot allocate lock array");
+	
+	return p;
+}
+
+#if 0
+** #ifdef __USE_PROTOS
+** void my_memset(char *p,char value,int count)
+** #else
+** void my_memset(p,value,count)
+**   char      *p;
+**   char      value;
+**   int       count;
+** #endif
+** {
+**    int      i;
+**
+**    for (i=0; i<count; i++) {
+**     p[i]=value;
+**   };
+** }
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.xml b/Tools/Source/TianoTools/Pccts/antlr/build.xml
new file mode 100644
index 0000000000..9d8bd7c485
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/build.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK antlr Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="antlr"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+		<condition property="CheckDepends">
+		  <uptodate targetfile="${WORKSPACE}/Tools/bin/antlr.exe">
+			  <srcfiles dir="." includes="*.c *.h *.g"/>
+			</uptodate>
+		</condition>
+		<if>
+		  <equals arg1="${CheckDepends}" arg2="true"/>
+			<then>
+				<echo message="Executable, antlr.exe, is up to date."/>
+			</then>
+		</if>
+  </target>
+
+  <target name="GenTool" depends="init" unless="CheckDepends">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f AntlrMS.mak"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+	</target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f AntlrMS.mak clean"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile clean"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f AntlrMS.mak distclean"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile distclean"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/Pccts/antlr/dumpcycles.c b/Tools/Source/TianoTools/Pccts/antlr/dumpcycles.c
new file mode 100644
index 0000000000..8156159f71
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/dumpcycles.c
@@ -0,0 +1,67 @@
+#include <stdio.h>
+#include <ctype.h>
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+
+void 
+#ifdef __USE_PROTOS
+dumpcycles(void)
+#else
+dumpcycles()
+#endif
+{
+  Cycle         *c;
+  CacheEntry    *f;
+  ListNode      *p;
+  int           i=0;
+  int           k;
+  int           degree;
+
+  for (k=1; k <= CLL_k; k++) {
+    if (Cycles[k] == NULL) continue;
+
+    for (p = Cycles[k]->next; p!=NULL; p=p->next) {
+  	  c = (Cycle *) p->elem;
+      degree=set_deg(c->cyclicDep);
+	  fprintf(stderr,"Cycle %d: (degree %d) %s -->\n", i++, degree, RulePtr[c->croot]->rname);
+      fprintf(stderr,"    *self*\n");
+      MR_dumpRuleSet(c->cyclicDep);
+      fprintf(stderr,"\n");
+	  f = (CacheEntry *)
+			hash_get(Fcache,Fkey(RulePtr[c->croot]->rname,'o',k));
+      if (f == NULL) {
+        fprintf(stderr,"    *** FOLLOW(%s) must be in cache but isn't ***\n",
+                                         RulePtr[c->croot]->rname);
+      };
+    };
+  };
+}
+
+void 
+#ifdef __USE_PROTOS
+dumpfostack(int k) 
+#else
+dumpfostack(k) 
+int k;
+#endif
+{
+  int   i=0;
+  int   *pi;
+
+  fprintf(stderr,"\n");
+  if (FoStack[k] == NULL) {
+    fprintf(stderr,"FoStack[%d] is null\n",k);
+  };
+  if (FoTOS[k] == NULL) {
+    fprintf(stderr,"FoTOS[%d] is null\n",k);
+  }
+  if (FoTOS[k] != NULL && FoStack[k] != NULL) {
+    for (pi=FoStack[k]; pi <= FoTOS[k]; pi++) {
+      i++;
+      fprintf(stderr,"#%d  rule %d  %s\n",i,*pi,RulePtr[*pi]->rname);
+    }
+  }
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/dumpnode.c b/Tools/Source/TianoTools/Pccts/antlr/dumpnode.c
new file mode 100644
index 0000000000..2a34c6fcd5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/dumpnode.c
@@ -0,0 +1,423 @@
+#include <stdio.h>
+#include <ctype.h>
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+
+#ifdef __USE_PROTOS
+void dumpset1(set s)
+#else
+void dumpset1(s)
+  set   s;
+#endif
+{
+  if (set_nil(s)) {
+    fprintf(stderr,"{}");
+  } else {
+    s_fprT(stderr,s);
+  };
+}
+
+#ifdef __USE_PROTOS
+void dumpset(set s)
+#else
+void dumpset(s)
+  set   s;
+#endif
+{
+  dumpset1(s);
+  fprintf(stderr,"\n");
+}
+
+#ifdef __USE_PROTOS
+int isEndRule(Node * p)
+#else
+int isEndRule(p)
+  Node *    p;
+#endif
+{
+  int       result=0;
+  if ( p->ntype == nJunction &&
+       ( (Junction *) p)->jtype == EndRule) {
+    result=1;
+  };
+  return result;
+}
+
+#ifdef __USE_PROTOS
+void dumppred1(int depth,Predicate *p)
+#else
+void dumppred1(depth,p)
+  int           depth;
+  Predicate     *p;
+#endif
+{
+  int       i;
+  int       k;
+
+  for (i=0; i<depth ; i++) {
+    fprintf(stderr,"  ");
+  };
+  if (p->expr == PRED_AND_LIST ||
+      p->expr == PRED_OR_LIST) {
+    fprintf(stderr," %s", (p->expr == NULL ? "null expr" : p->expr));
+    if (p->inverted) fprintf(stderr," predicate inverted !");
+    if (p->redundant) {
+      fprintf(stderr," Redundant!");
+    };
+    if (p->isConst) fprintf(stderr," const %d !",p->constValue);
+    fprintf(stderr,"\n");
+  } else {
+    fprintf(stderr,"predicate k=%d",p->k);
+    k=set_int(p->completionSet);
+    if (k >= 0) {
+      fprintf(stderr," Incomplete Set=%d !",k);
+    };
+    k=set_int(p->completionTree);
+    if (k >= 0) {
+      fprintf(stderr," Incomplete Tree=%d !",k);
+    };
+    if (p->redundant) {
+      fprintf(stderr," Redundant!");
+    };
+    fprintf(stderr," \"%s\" (%x)", (p->expr == NULL ? "null expr" : p->expr) ,p);
+    if (p->source != NULL) {
+       fprintf(stderr,"line %d",p->source->line);
+    };
+    if (p->inverted) fprintf(stderr," predicate inverted !");
+    fprintf(stderr,"\n");
+    for (i=0; i<depth ; i++) {
+      fprintf(stderr,"  ");
+    };
+    fprintf(stderr,"scontext: ");
+    dumpset(p->scontext[1]);
+    for (i=0; i<depth ; i++) {
+      fprintf(stderr,"  ");
+    };
+    fprintf(stderr,"tcontext: ");
+    preorder(p->tcontext);
+    fprintf(stderr,"\n");
+  };
+  fprintf(stderr,"\n");
+  if (p->down != NULL) {
+    dumppred1(depth+1,p->down);
+  };
+  if (p->right != NULL) {
+    dumppred1(depth,p->right);
+  };
+}
+
+#ifdef __USE_PROTOS
+void dumppred(Predicate *p)
+#else
+void dumppred(p)
+  Predicate     *p;
+#endif
+{
+  fprintf(stderr,"---------------------------------\n");
+  dumppred1(0,p);
+  fprintf(stderr,"\n");
+}
+
+#ifdef __USE_PROTOS
+void dumppredtree(Predicate *p)
+#else
+void dumppredtree(p)
+  Predicate     *p;
+#endif
+{
+  fprintf(stderr,"predicate k=%d \"%s\" line %d\n",p->k,p->expr,p->source->line);
+  dumpset(p->scontext[1]);
+}
+
+#ifdef __USE_PROTOS
+void dumppredexpr(Predicate *p)
+#else
+void dumppredexpr(p)
+  Predicate     *p;
+#endif
+{
+  fprintf(stderr,"    pred expr \"%s\"\n",p->expr);
+}
+
+#ifdef __USE_PROTOS
+void dt(Tree *t)
+#else
+void dt(t)
+  Tree  *t;
+#endif
+{
+  MR_dumpTreeF(stderr,0,t,5);
+}
+
+#ifdef __USE_PROTOS
+void d(Node * p)
+#else
+void d(p)
+  Node *    p;
+#endif
+{
+
+  Junction      *j;
+  RuleRefNode   *r;
+  TokNode       *t;
+  ActionNode    *a;
+
+  if (p==NULL) {
+    fprintf(stderr,"dumpNode: Node is NULL");
+    return;
+  };
+
+  switch (p->ntype) {
+    case nJunction :
+      j = (Junction *) p;
+      fprintf(stderr, "Junction (#%d in rule %s line %d) ",j->seq,j->rname,j->line);
+      if (j->guess) fprintf(stderr,"guess block ");
+      switch (j->jtype ) {
+        case aSubBlk :
+          fprintf(stderr,"aSubBlk");
+          break;
+        case aOptBlk :
+          fprintf(stderr,"aOptBlk");
+          break;
+        case aLoopBegin :
+          fprintf(stderr,"aLoopBeginBlk");
+          break;
+        case aLoopBlk :
+          fprintf(stderr,"aLoopBlk");
+          break;
+        case aPlusBlk :
+          fprintf(stderr,"aPlusBlk");
+          break;
+        case EndBlk :
+          fprintf(stderr,"EndBlk");
+          break;
+        case RuleBlk :
+          fprintf(stderr,"RuleBlk");
+          break;
+        case Generic :
+          fprintf(stderr,"Generic");
+          break;
+        case EndRule :
+          fprintf(stderr,"EndRule");
+          break;
+      };
+      if (j->halt) fprintf(stderr,"  halt!");
+      if (j->p1) fprintf(stderr," p1 valid");
+      if (j->p2) {
+        if (j->p2->ntype == nJunction) {
+           fprintf(stderr," (p2=#%d)",( (Junction *) j->p2)->seq);
+        } else {
+           fprintf(stderr," (p2 valid)");
+        };
+      };
+	  if (j->ignore) fprintf(stderr, " ignore/plus-block-bypass");
+      if (j->fset != NULL && set_deg(*j->fset) != 0) {
+         fprintf(stderr,"\nfset:\n");
+         dumpset(*j->fset);
+      };
+      if (j->ftree != NULL) {
+         fprintf(stderr,"\nftree:\n");
+         preorder(j->ftree);
+      };
+      fprintf(stderr,"\n");
+      break;
+    case nRuleRef :
+       r = (RuleRefNode *) p;
+       fprintf(stderr, "RuleRefNode (in rule %s line %d) to rule %s\n", r->rname,r->line,r->text);
+       break;
+    case nToken :
+       t = (TokNode *) p;
+       fprintf(stderr, "TokNode (in rule %s line %d) token %s\n",t->rname,t->line,TerminalString(t->token));
+       break;
+    case nAction :
+       a =(ActionNode *) p;
+       if (a->is_predicate) {
+         fprintf(stderr, "Predicate (in rule %s line %d) %s",a->rname,a->line,a->action);
+         if (a->inverted) fprintf(stderr," action inverted !");
+         if (a->guardpred != NULL) {
+           fprintf(stderr," guarded");
+           dumppredexpr(a->guardpred);
+           if (a->ampersandPred) {
+             fprintf(stderr," \"&&\" style");
+           } else {
+             fprintf(stderr," \"=>\" style");
+           };
+         };
+         if (a->predEntry != NULL) fprintf(stderr," predEntry \"%s\" ",a->predEntry->str);
+         fprintf(stderr,"\n");
+       } else if (a->init_action) {
+         fprintf(stderr, "Init-Action (in rule %s line %d) %s\n",a->rname,a->line,a->action);
+       } else {
+         fprintf(stderr, "Action (in rule %s line %d) %s\n",a->rname,a->line,a->action);
+       };
+       break;
+   };
+}
+
+#ifdef __USE_PROTOS
+Node * dp1(Node * p)
+#else
+Node * dp1(p)
+  Node *    p;
+#endif
+{
+  Node  *result=NULL;
+
+  if (p->ntype == nJunction) {
+    result=( (Junction *) p )->p1;
+    d(result);
+  } else {
+    fprintf(stderr,"dp1: Not a Junction node");
+  };
+  return result;
+}
+
+#ifdef __USE_PROTOS
+Node * dp2(Node * p)
+#else
+Node * dp2(p)
+  Node *    p;
+#endif
+{
+  Node  *result=NULL;
+
+  if (p->ntype == nJunction) {
+    result=( (Junction *) p )->p2;
+    d(result);
+  } else {
+    fprintf(stderr,"dp2: Not a Junction node");
+  };
+  return result;
+}
+
+#ifdef __USE_PROTOS
+Node * dn(Node * p)
+#else
+Node * dn(p)
+  Node *    p;
+#endif
+
+{
+  Node  *result=NULL;
+
+  if (p->ntype == nRuleRef) {
+    result=( (RuleRefNode *)p )->next;
+  } else if (p->ntype == nAction) {
+    result=( (ActionNode *)p )->next;
+  } else if (p->ntype == nToken) {
+    result=( (TokNode *)p )->next;
+  } else {
+    fprintf(stderr,"No next field: Neither a RuleRefNode, ActionNode, nor TokNode");
+  };
+  if (result != NULL) d(result);
+  return result;
+}
+
+#ifdef __USE_PROTOS
+void df(Node * p)
+#else
+void df(p)
+  Node *    p;
+#endif
+{
+  int       count=0;
+  Node      *next;
+
+  fprintf(stderr,"\n#%d ",++count);
+  d(p);
+
+  for (next=p; next != NULL && !isEndRule(next) ; ) {
+    fprintf(stderr,"#%d ",++count);
+    if (next->ntype == nJunction) {
+      next=dp1(next);
+    } else {
+      next=dn(next);
+    };
+  };
+}
+
+#ifdef __USE_PROTOS
+Node * dfn(Node * p,int target)
+#else
+Node * dfn(p,target)
+  Node *    p;
+  int       target;
+#endif
+{
+  Node      *result=NULL;
+  int       count=0;
+  Node      *next;
+
+  fprintf(stderr,"#%d ",++count);
+  d(p);
+
+  for (next=p; next != NULL && !isEndRule(next) ; ) {
+    fprintf(stderr,"#%d ",++count);
+    if (next->ntype == nJunction) {
+      next=dp1(next);
+    } else {
+      next=dn(next);
+    };
+    if (count == target) {
+      result=next;
+      break;
+    };
+  };
+  return result;
+}
+
+
+static int findnodeMatch;
+
+#ifdef __USE_PROTOS
+Junction *findnode1(Node *n)
+#else
+Junction *findnode1(n)
+  Node  *n;
+#endif
+{
+   Node         *next;
+   Junction     *j;
+   Junction     *match;
+
+   if (n == NULL) return NULL;
+   if (n->ntype == nJunction) {
+     j=(Junction *) n;
+     if (j->seq == findnodeMatch) return j;
+     if (j->jtype == EndRule) return NULL;
+     if (j->jtype != RuleBlk && j->jtype != EndBlk) {
+       if (j->p2 != NULL && !j->ignore) {
+          match=findnode1(j->p2);
+          if (match != NULL) return match;
+       };
+     };
+   };
+   next=MR_advance(n);
+   return findnode1(next);
+}
+
+#ifdef __USE_PROTOS
+Junction *findnode(int match)
+#else
+Junction *findnode(match)
+  int   match;
+#endif
+{
+  Junction  *j;
+  Junction  *result=NULL;
+
+  findnodeMatch=match;
+
+  for (j=SynDiag; j != NULL; j=(Junction *)j->p2) {
+    require (j->ntype == nJunction && j->jtype == RuleBlk,"Not a rule block");
+    result=findnode1( (Node *) j);
+    if (result != NULL) break;
+  };
+  if (result != NULL) {
+    d( (Node *) result);
+  };
+  return result;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/egman.c b/Tools/Source/TianoTools/Pccts/antlr/egman.c
new file mode 100644
index 0000000000..c8a633fc06
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/egman.c
@@ -0,0 +1,328 @@
+/*
+ * egman.c
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33MR10
+ * 2001
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "proto.h"
+
+static ExceptionGroup **egArray=NULL;   /* ExceptionGroup by BlkLevel */
+static LabelEntry     **leArray=NULL;   /* LabelEntry by BlkLevel     */
+static Junction       **altArray=NULL;  /* start of alternates        */
+static int              arraySize=0;
+static int              highWater=0;
+static ExceptionGroup *lastEG=NULL;     /* used in altFixup()         */
+static int             lastBlkLevel=0;  /* used in altFixup()         */
+
+#ifdef __USE_PROTOS
+static void arrayCheck(void);
+#else
+static void arrayCheck();
+#endif
+
+/* Called to add an exception group for an alternative EG */
+
+#ifdef __USE_PROTOS
+void egAdd(ExceptionGroup * eg)
+#else
+void egAdd(eg)
+ExceptionGroup *eg;
+#endif
+{
+  int               i;
+
+  ExceptionGroup    *nextEG;
+  ExceptionGroup    *innerEG;
+
+  LabelEntry        *nextLE;
+  LabelEntry        *innerLE;
+
+  Junction          *nextAlt;
+  Junction          *innerAlt;
+
+  lastEG=eg;
+  lastBlkLevel=BlkLevel;
+
+  arrayCheck();
+  eg->pendingLink=egArray[BlkLevel];
+  egArray[BlkLevel]=eg;
+
+  /* EG for alternates already have their altID filled in      */
+
+  for (i=BlkLevel+1; i<=highWater ; i++) {
+    for (innerEG=egArray[i]; innerEG != NULL ; innerEG=nextEG) {
+      nextEG=innerEG->pendingLink;
+      innerEG->pendingLink=NULL;
+      innerEG->outerEG=eg;
+    };
+    egArray[i]=NULL;
+  };
+
+  /*
+   *  for patching up the LabelEntry you might use an EG for the
+   *  current alternative - unlike patching up an alternative EG
+   *    i.e. start the loop at BlkLevel rather than (BlkLevel+1)
+   *  fill it in only if the EG and the LE are for the very
+   *    same alternative if they're at the same BlkLevel
+   *  it's easier to leave the LE on this list (filled in) rather than
+   *    trying to selectively remove it.  It will eventually be
+   *    removed anyway when the BlkLevel gets small enough.
+   */
+
+  for (i=BlkLevel; i<=highWater ; i++) {
+    for (innerLE=leArray[i]; innerLE != NULL ; innerLE=nextLE) {
+      nextLE=innerLE->pendingLink;
+      if (BlkLevel != i ||
+        innerLE->curAltNum == CurAltNum_array[BlkLevel]) {
+        if (innerLE->outerEG == NULL) {
+          innerLE->outerEG=eg;
+        };
+      };
+    };
+    if (BlkLevel != i) leArray[i]=NULL;
+  };
+
+/*
+ * For the start of alternatives it is necessary to make a
+ * distinction between the exception group for the current
+ * alternative and the "fallback" EG for the block which
+ * contains the alternative
+ *
+ * The fallback outerEG is used to handle the case where
+ * no alternative of a block matches.  In that case the
+ * signal is "NoViableAlt" (or "NoSemViableAlt" and the
+ * generator needs the EG of the block CONTAINING the
+ * current one.
+ *
+ *      rule: ( ( ( a
+ *                | b
+ *                )
+ *              | c
+ *              )
+ *            | d
+ *            );
+ */
+
+  for (i=BlkLevel; i <= highWater ; i++) {
+    for (innerAlt=altArray[i]; innerAlt != NULL ; innerAlt=nextAlt) {
+      nextAlt=innerAlt->pendingLink;
+
+      /*  first fill in the EG for the current alternative         */
+      /*  but leave it on the list in order to get the fallback EG */
+      /*  if the EG is at the same LEVEL as the alternative then   */
+      /*    fill it in only if in the very same alternative        */
+      /*                                                           */
+      /*        rule: ( a                                          */
+      /*              | b                                          */
+      /*              | c  exception ...                           */
+      /*              )                                            */
+      /*                                                           */
+      /*  if the EG is outside the alternative (e.g. BlkLevel < i) */
+      /*    then it doesn't matter about the alternative           */
+      /*                                                           */
+      /*        rule: ( a                                          */
+      /*              | b                                          */
+      /*              | c                                          */
+      /*              )   exception ...                            */
+      /*                                                           */
+
+#if 0
+      printf("BlkLevel=%d i=%d altnum=%d CurAltNum=%d altID=%s\n",
+        BlkLevel,i,innerAlt->curAltNum,CurAltNum_array[BlkLevel],eg->altID);
+#endif
+      if (BlkLevel != i ||
+          innerAlt->curAltNum == CurAltNum_array[BlkLevel]) {
+        if (innerAlt->exception_label == NULL) {
+          innerAlt->exception_label=eg->altID;
+        };
+      };
+
+      /*  ocurs at a later pass then for the exception_label       */
+      /*  if an outerEG has been found then fill in the outer EG   */
+      /*  remove if from the list when the BlkLevel gets smaller   */
+
+      if (BlkLevel != i) {
+        if (innerAlt->outerEG == NULL) {
+          innerAlt->outerEG=eg;
+        };
+      };
+    };
+    if (BlkLevel != i) altArray[i]=NULL;
+  };
+}
+
+#ifdef __USE_PROTOS
+void leAdd(LabelEntry * le)
+#else
+void leAdd(le)
+LabelEntry *le;
+#endif
+
+{
+  arrayCheck();
+  le->pendingLink=leArray[BlkLevel];
+  le->curAltNum=CurAltNum_array[BlkLevel];
+  leArray[BlkLevel]=le;
+}
+
+#ifdef __USE_PROTOS
+void altAdd(Junction *alt)
+#else
+void altAdd(alt)
+Junction *alt;
+#endif
+
+{
+  arrayCheck();
+#if 0
+  printf("BlkLevel=%d CurAltNum=%d\n",
+            BlkLevel,CurAltNum_array[BlkLevel]);
+#endif
+  alt->curAltNum=CurAltNum_array[BlkLevel];
+  alt->pendingLink=altArray[BlkLevel];
+  altArray[BlkLevel]=alt;
+}
+
+static void 
+#ifdef __USE_PROTOS
+arrayCheck(void)
+#else
+arrayCheck()
+#endif
+{
+  ExceptionGroup    **egArrayNew;
+  LabelEntry        **leArrayNew;
+  Junction          **altArrayNew;
+  int               arraySizeNew;
+  int               i;
+
+  if (BlkLevel > highWater) highWater=BlkLevel;
+
+  if (BlkLevel >= arraySize) {
+    arraySizeNew=BlkLevel+5;	/* MR20 */
+    egArrayNew=(ExceptionGroup **)
+        calloc(arraySizeNew,sizeof(ExceptionGroup *));
+    leArrayNew=(LabelEntry **)
+        calloc(arraySizeNew,sizeof(LabelEntry *));
+    altArrayNew=(Junction **)
+        calloc(arraySizeNew,sizeof(Junction *));
+    for (i=0; i<arraySize ; i++) {
+      egArrayNew[i]=egArray[i];
+      leArrayNew[i]=leArray[i];
+      altArrayNew[i]=altArray[i];
+    };
+    arraySize=arraySizeNew;
+    if (egArray != NULL) free( (char *) egArray);
+    if (leArray != NULL) free( (char *) leArray);
+    if (altArray != NULL) free( (char *) altArray);
+    egArray=egArrayNew;
+    leArray=leArrayNew;
+    altArray=altArrayNew;
+  };
+}
+
+/* always call leFixup() BEFORE egFixup() */
+
+void 
+#ifdef __USE_PROTOS
+egFixup(void) 
+#else
+egFixup()
+#endif
+{
+  int               i;
+  ExceptionGroup    *nextEG;
+  ExceptionGroup    *innerEG;
+
+  for (i=1; i<=highWater ; i++) {
+    for (innerEG=egArray[i]; innerEG != NULL ; innerEG=nextEG) {
+      nextEG=innerEG->pendingLink;
+      innerEG->pendingLink=NULL;
+    };
+    egArray[i]=NULL;
+  };
+  lastEG=NULL;
+  lastBlkLevel=0;
+}
+
+/* always call leFixup() BEFORE egFixup() */
+
+#ifdef __USE_PROTOS
+void leFixup(void) 
+#else
+void leFixup() 
+#endif
+{
+
+  int               i;
+  LabelEntry        *nextLE;
+  LabelEntry        *innerLE;
+
+  for (i=BlkLevel; i<=highWater ; i++) {
+    for (innerLE=leArray[i]; innerLE != NULL ; innerLE=nextLE) {
+      nextLE=innerLE->pendingLink;
+      innerLE->pendingLink=NULL;
+    };
+    leArray[i]=NULL;
+  };
+}
+
+/* always call altFixup() BEFORE egFixup() */
+
+#ifdef __USE_PROTOS
+void altFixup(void)
+#else
+void altFixup() 
+#endif
+{
+
+  int               i;
+  Junction          *nextAlt;
+  Junction          *innerAlt;
+
+  for (i=BlkLevel; i<=highWater ; i++) {
+    for (innerAlt=altArray[i]; innerAlt != NULL ; innerAlt=nextAlt) {
+
+      /*  if an outerEG has been found then fill in the outer EG   */
+
+      if (lastBlkLevel <= i) {
+        if (innerAlt->outerEG == NULL) {
+          innerAlt->outerEG=lastEG;
+        };
+      };
+      nextAlt=innerAlt->pendingLink;
+      innerAlt->pendingLink=NULL;
+    };
+    altArray[i]=NULL;
+  };
+}
+
diff --git a/Tools/Source/TianoTools/Pccts/antlr/err.c b/Tools/Source/TianoTools/Pccts/antlr/err.c
new file mode 100644
index 0000000000..ca239398cf
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/err.c
@@ -0,0 +1,538 @@
+/*
+ * A n t l r  S e t s / E r r o r  F i l e  H e a d e r
+ *
+ * Generated from: antlr.g
+ *
+ * Terence Parr, Russell Quong, Will Cohen, and Hank Dietz: 1989-2001
+ * Parr Research Corporation
+ * with Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include "pcctscfg.h"
+#include "set.h"
+#include <ctype.h>
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#define zzcr_attr(attr,tok,t)
+#define zzSET_SIZE 20
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "err.h"
+
+ANTLRChar *zztokens[157]={
+	/* 00 */	"Invalid",
+	/* 01 */	"Eof",
+	/* 02 */	"QuotedTerm",
+	/* 03 */	"\\n|\\r|\\r\\n",
+	/* 04 */	"\\(\\n|\\r|\\r\\n)",
+	/* 05 */	"\\~[]",
+	/* 06 */	"~[\\n\\r\"\\]+",
+	/* 07 */	"\"",
+	/* 08 */	"\\n|\\r|\\r\\n",
+	/* 09 */	"\\(\\n|\\r|\\r\\n)",
+	/* 10 */	"\\~[]",
+	/* 11 */	"~[\\n\\r\"\\]+",
+	/* 12 */	"'",
+	/* 13 */	"\\n|\\r|\\r\\n",
+	/* 14 */	"\\~[]",
+	/* 15 */	"~[\\n\\r'\\]+",
+	/* 16 */	"\\*/",
+	/* 17 */	"\\*",
+	/* 18 */	"\\n|\\r|\\r\\n",
+	/* 19 */	"~[\\n\\r\\*]+",
+	/* 20 */	"\\*/",
+	/* 21 */	"\\*",
+	/* 22 */	"\\n|\\r|\\r\\n",
+	/* 23 */	"~[\\n\\r\\*]+",
+	/* 24 */	"\\n|\\r|\\r\\n",
+	/* 25 */	"~[\\n\\r]+",
+	/* 26 */	"\\n|\\r|\\r\\n",
+	/* 27 */	"~[\\n\\r]+",
+	/* 28 */	"\\n|\\r|\\r\\n",
+	/* 29 */	"~[\\n\\r]+",
+	/* 30 */	"\\*/",
+	/* 31 */	"\\*",
+	/* 32 */	"\\n|\\r|\\r\\n",
+	/* 33 */	"~[\\n\\r\\*]+",
+	/* 34 */	"Action",
+	/* 35 */	"Pred",
+	/* 36 */	"PassAction",
+	/* 37 */	"consumeUntil\\( [\\ \\t]* \\{~[\\}]+\\} [\\ \\t]* \\)",
+	/* 38 */	"consumeUntil\\( ~[\\)]+ \\)",
+	/* 39 */	"\\n|\\r|\\r\\n",
+	/* 40 */	"\\>",
+	/* 41 */	"$",
+	/* 42 */	"$$",
+	/* 43 */	"$\\[\\]",
+	/* 44 */	"$\\[",
+	/* 45 */	"$[0-9]+",
+	/* 46 */	"$[0-9]+.",
+	/* 47 */	"$[0-9]+.[0-9]+",
+	/* 48 */	"$[_a-zA-Z][_a-zA-Z0-9]*",
+	/* 49 */	"#0",
+	/* 50 */	"#\\[\\]",
+	/* 51 */	"#\\(\\)",
+	/* 52 */	"#[0-9]+",
+	/* 53 */	"#line[\\ \\t]* [0-9]+ {[\\ \\t]* \"~[\"]+\" ([\\ \\t]* [0-9]*)* } (\\n|\\r|\\r\\n)",
+	/* 54 */	"#line ~[\\n\\r]* (\\n|\\r|\\r\\n)",
+	/* 55 */	"#[_a-zA-Z][_a-zA-Z0-9]*",
+	/* 56 */	"#\\[",
+	/* 57 */	"#\\(",
+	/* 58 */	"#",
+	/* 59 */	"\\)",
+	/* 60 */	"\\[",
+	/* 61 */	"\\(",
+	/* 62 */	"\\\\]",
+	/* 63 */	"\\\\)",
+	/* 64 */	"\\>",
+	/* 65 */	"'",
+	/* 66 */	"\"",
+	/* 67 */	"\\$",
+	/* 68 */	"\\#",
+	/* 69 */	"\\(\\n|\\r|\\r\\n)",
+	/* 70 */	"\\~[\\]\\)>$#]",
+	/* 71 */	"/",
+	/* 72 */	"/\\*",
+	/* 73 */	"\\*/",
+	/* 74 */	"//",
+	/* 75 */	"~[\\n\\r\\)\\(\\$#\\>\\]\\[\"'/]+",
+	/* 76 */	"[\\t\\ ]+",
+	/* 77 */	"\\n|\\r|\\r\\n",
+	/* 78 */	"\\[",
+	/* 79 */	"\\<\\<",
+	/* 80 */	"\"",
+	/* 81 */	"/\\*",
+	/* 82 */	"\\*/",
+	/* 83 */	"//",
+	/* 84 */	"#line[\\ \\t]* [0-9]+ {[\\ \\t]* \"~[\"]+\" ([\\ \\t]* [0-9]*)* } (\\n|\\r|\\r\\n)",
+	/* 85 */	"#line ~[\\n\\r]* (\\n|\\r|\\r\\n)",
+	/* 86 */	"\\>\\>",
+	/* 87 */	"WildCard",
+	/* 88 */	"\\@",
+	/* 89 */	"LABEL",
+	/* 90 */	"grammar-element",
+	/* 91 */	"meta-symbol",
+	/* 92 */	"Pragma",
+	/* 93 */	"FirstSetSymbol",
+	/* 94 */	"{\\}#header",
+	/* 95 */	"{\\}#first",
+	/* 96 */	"{\\}#parser",
+	/* 97 */	"{\\}#tokdefs",
+	/* 98 */	"\\}",
+	/* 99 */	"class",
+	/* 100 */	"NonTerminal",
+	/* 101 */	"TokenTerm",
+	/* 102 */	"\\{",
+	/* 103 */	"!",
+	/* 104 */	"\\<",
+	/* 105 */	"\\>",
+	/* 106 */	":",
+	/* 107 */	";",
+	/* 108 */	"{\\}#lexaction",
+	/* 109 */	"{\\}#lexmember",
+	/* 110 */	"{\\}#lexprefix",
+	/* 111 */	"{\\}#pred",
+	/* 112 */	"\\|\\|",
+	/* 113 */	"&&",
+	/* 114 */	"\\(",
+	/* 115 */	"\\)",
+	/* 116 */	"{\\}#lexclass",
+	/* 117 */	"{\\}#errclass",
+	/* 118 */	"{\\}#tokclass",
+	/* 119 */	"..",
+	/* 120 */	"{\\}#token",
+	/* 121 */	"=",
+	/* 122 */	"[0-9]+",
+	/* 123 */	"\\|",
+	/* 124 */	"\\~",
+	/* 125 */	"^",
+	/* 126 */	"approx",
+	/* 127 */	"LL\\(1\\)",
+	/* 128 */	"LL\\(2\\)",
+	/* 129 */	"\\*",
+	/* 130 */	"\\+",
+	/* 131 */	"?",
+	/* 132 */	"=>",
+	/* 133 */	"exception",
+	/* 134 */	"default",
+	/* 135 */	"catch",
+	/* 136 */	"{\\}#[A-Za-z0-9_]*",
+	/* 137 */	"[\\t\\ ]+",
+	/* 138 */	"\\n|\\r|\\r\\n",
+	/* 139 */	"//",
+	/* 140 */	"/\\*",
+	/* 141 */	"#ifdef",
+	/* 142 */	"#if",
+	/* 143 */	"#ifndef",
+	/* 144 */	"#else",
+	/* 145 */	"#endif",
+	/* 146 */	"#undef",
+	/* 147 */	"#import",
+	/* 148 */	"ID",
+	/* 149 */	"#define",
+	/* 150 */	"INT",
+	/* 151 */	"enum",
+	/* 152 */	"\\{",
+	/* 153 */	"=",
+	/* 154 */	",",
+	/* 155 */	"\\}",
+	/* 156 */	";"
+};
+SetWordType zzerr1[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr2[20] = {0xfc,0xff,0xff,0xff, 0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xf3,
+	0xbf,0xff,0xff,0xff, 0xff,0xff,0xff,0x1f};
+SetWordType zzerr3[20] = {0xfc,0xff,0xff,0xff, 0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xfb,
+	0x3b,0xf7,0xf7,0xc7, 0xff,0xff,0xff,0x1f};
+SetWordType zzerr4[20] = {0x4,0x0,0x0,0x0, 0x10,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x80,0x7,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType setwd1[157] = {0x0,0x50,0xa0,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x6a,0x20,0xa0,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x0,0x0,0x20,0x20,0x21,
+	0x21,0x21,0x21,0x6e,0x6e,0x64,0x20,0x0,
+	0x20,0xa0,0xa0,0xa0,0x20,0x6a,0x6a,0x6a,
+	0x6e,0x20,0x20,0x20,0x20,0x66,0x6e,0x6e,
+	0x20,0x66,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x62,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+	0x20,0x20,0x20,0x20,0x20,0x20};
+SetWordType zzerr5[20] = {0x0,0x0,0x0,0x0, 0x10,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x1,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr6[20] = {0x4,0x0,0x0,0x0, 0x10,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x7,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr7[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x6,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr8[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x4,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr9[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf0,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType setwd2[157] = {0x0,0xf8,0x6,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xf8,0x0,0x1,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xf8,0xf8,0xf8,0x0,0x0,
+	0x0,0x1,0x2,0x6,0x0,0xf8,0xf8,0xf8,
+	0xf8,0x0,0x0,0x0,0x0,0xf8,0xf8,0xf8,
+	0x0,0xf8,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0xe8,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr10[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0xbc,0xf8,0x74,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr11[20] = {0x0,0x0,0x0,0x0, 0x8,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0xa0,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr12[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr13[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0xa0,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType setwd3[157] = {0x0,0xfa,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xfa,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xfa,0xfa,0xfa,0x5,0x0,
+	0x5,0x0,0x0,0x0,0xe2,0xfa,0xfa,0xfa,
+	0xfa,0xc0,0x80,0x5,0xe0,0xfa,0xfa,0xfa,
+	0x0,0xfa,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0xfa,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr14[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x20,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr15[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr16[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr17[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x40,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr18[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x24,0x0,0x80,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr19[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x20,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr20[20] = {0x6,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x74,0x3, 0x20,0x0,0x0,0x0};
+SetWordType zzerr21[20] = {0x6,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x70,0x3, 0x20,0x0,0x0,0x0};
+SetWordType setwd4[157] = {0x0,0xe5,0xda,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xe5,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xed,0xe5,0xe7,0x1a,0x0,
+	0x0,0x0,0x0,0x0,0xc0,0xe5,0xe5,0xe5,
+	0xe5,0x0,0x0,0x0,0x0,0xe5,0xe5,0xe5,
+	0x0,0xe5,0x40,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0xe5,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr22[20] = {0x6,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x3c,0xf8,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr23[20] = {0x6,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr24[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr25[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x70,0x1, 0x20,0x0,0x0,0x0};
+SetWordType zzerr26[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x5,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType setwd5[157] = {0x0,0x1f,0xc1,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xdf,0xc0,0xc0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0xc0,0x0,0xc0,0x0,0x0,0xc0,0xc0,0x0,
+	0x0,0x0,0x0,0x7f,0x1f,0xdf,0xc0,0xc0,
+	0x0,0x0,0xc0,0x0,0x67,0x1f,0x1f,0x1f,
+	0x1f,0x0,0x0,0xc0,0x60,0x1f,0x1f,0x1f,
+	0x0,0x1f,0x0,0x0,0x40,0xc0,0x0,0x0,
+	0x0,0x0,0xc0,0xc0,0x0,0x0,0x5f,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr27[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x0,0x0,0x0,0x10, 0x0,0x0,0x0,0x0};
+SetWordType zzerr28[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x80,0x2,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr29[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x20,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr30[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xd,
+	0x0,0x0,0x80,0x0, 0x20,0x0,0x0,0x0};
+SetWordType zzerr31[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xd,
+	0x0,0x0,0x0,0x0, 0x20,0x0,0x0,0x0};
+SetWordType zzerr32[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x5,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr33[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x20,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType setwd6[157] = {0x0,0x0,0xfd,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xe1,0xe1,0xe1,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0xfd,0x60,0xe9,0x0,0x0,0xe1,0xe1,0x0,
+	0x0,0x0,0x0,0xe2,0x0,0xfd,0xfd,0xe1,
+	0x20,0x0,0xe1,0x0,0xe2,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xe1,0xe2,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0xe2,0xe0,0x20,0x0,
+	0x0,0x0,0xe1,0xe1,0x0,0x0,0xe2,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr34[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xd,
+	0x0,0x0,0x80,0x0, 0x20,0x0,0x0,0x0};
+SetWordType zzerr35[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xd,
+	0x0,0x0,0x0,0x0, 0x20,0x0,0x0,0x0};
+SetWordType zzerr36[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x5,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr37[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xc,
+	0x0,0x0,0x0,0x0, 0x20,0x0,0x0,0x0};
+SetWordType zzerr38[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x84,0x9,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr39[20] = {0x0,0x0,0x0,0x0, 0x10,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x1,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr40[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x9,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr41[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr42[20] = {0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x80,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType setwd7[157] = {0x0,0x0,0xdf,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xdf,0xdf,0xff,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0xdf,0x3,0xdf,0x0,0x0,0xdf,0xdf,0x0,
+	0x0,0x0,0x0,0xdf,0x0,0xdf,0xdf,0xdf,
+	0x1,0x30,0xdf,0x0,0xdf,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xdf,0xdf,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0xdf,0xdf,0x1,0x0,
+	0x0,0x0,0xdf,0xdf,0x0,0x0,0xdf,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr43[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr44[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xc0, 0x1,0x0,0x0,0x0};
+SetWordType zzerr45[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x30,
+	0x40,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr46[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr47[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x20,
+	0x40,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr48[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x2,0x0, 0x10,0x0,0x0,0x0};
+SetWordType zzerr49[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x8,0x8,0x18, 0x20,0x0,0x0,0x0};
+SetWordType zzerr50[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x8,0xa,0x18, 0x30,0x0,0x0,0x0};
+SetWordType zzerr51[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x4,0x8,0x8,0x18, 0x28,0x0,0x0,0x0};
+SetWordType zzerr52[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x40,0x0,0x4,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr53[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x4,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType setwd8[157] = {0x0,0x0,0xe1,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0xe1,0xe1,0xe1,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0xe1,0x0,0xe1,0x0,0x0,0xe3,0xe7,0x0,
+	0x0,0x0,0x0,0xe1,0x0,0xe1,0xe1,0xef,
+	0x0,0x0,0xe1,0x0,0xe1,0x0,0x0,0x0,
+	0x0,0x0,0x10,0xef,0xe1,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0xe1,0xe1,0x0,0x0,
+	0x0,0x0,0xe1,0xe1,0x0,0x10,0xe1,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr54[20] = {0x2,0x0,0x0,0x0, 0x14,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x78,0x9, 0xe0,0x0,0x0,0x0};
+SetWordType zzerr55[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x78,0x9, 0x60,0x0,0x0,0x0};
+SetWordType zzerr56[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x30,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr57[20] = {0x2,0x0,0x0,0x0, 0x4,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x1c,0xf8,0x78,0x9, 0xe0,0x0,0x0,0x0};
+SetWordType setwd9[157] = {0x0,0x7c,0x1,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x7f,0x1,0x1,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x1,0x0,0x1,0x0,0x0,0x1,0x1,0x0,
+	0x0,0x0,0x0,0x7f,0x7e,0x7f,0x1,0x1,
+	0x0,0x0,0x1,0x0,0x7d,0x7e,0x7e,0x7e,
+	0x7e,0x0,0x0,0x1,0x7d,0x7e,0x7e,0x7e,
+	0x0,0x7e,0x0,0x0,0x7d,0x1,0x0,0x0,
+	0x0,0x0,0x1,0x1,0x0,0x0,0x7f,0x64,
+	0x64,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x80,0x0,0x0,0x0,0x0,0x0,0x80,0x0,
+	0x80,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr58[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0xa0,0x0};
+SetWordType zzerr59[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x80,0xa0,0x0};
+SetWordType zzerr60[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0xa0,0x0};
+SetWordType zzerr61[20] = {0x2,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x80,0xa0,0x0};
+SetWordType zzerr62[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xe};
+SetWordType zzerr63[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xe};
+SetWordType zzerr64[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0xe};
+SetWordType zzerr65[20] = {0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0, 0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0, 0x0,0x0,0x10,0xc};
+SetWordType setwd10[157] = {0x0,0xc,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,
+	0x3,0x0,0x0,0xf0,0xf0,0x0};
+SetWordType setwd11[157] = {0x0,0x1,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
+	0x1,0x0,0x0,0x0,0x0,0x0};
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fcache.c b/Tools/Source/TianoTools/Pccts/antlr/fcache.c
new file mode 100644
index 0000000000..ff7dcdfdd5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/fcache.c
@@ -0,0 +1,123 @@
+/*
+ * fcache.c
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33MR10
+ *
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+
+#include "pcctscfg.h"
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+
+#ifdef __USE_PROTOS
+CacheEntry *dumpFcache1(char *prev)
+#else
+CacheEntry *dumpFcache1(prev)
+  char  *prev;
+#endif
+{
+    Entry   **table=Fcache;
+
+    int     low=0;
+    int     hi=0;
+
+    CacheEntry  *least=NULL;
+
+	Entry   **p;
+
+	for (p=table; p<&(table[HashTableSize]); p++) {
+
+		CacheEntry *q =(CacheEntry *) *p;
+		
+		if ( q != NULL && low==0 ) low = p-table;
+		while ( q != NULL ) {
+            if (strcmp(q->str,prev) > 0) {
+              if (least == NULL) {
+                least=q;
+              } else {
+                if (strcmp(q->str,least->str) < 0) {
+                  least=q;
+                };
+              };
+            };
+			q = q->next;
+		};
+
+		if ( *p != NULL ) hi = p-table;
+	}
+    return least;
+}
+
+#ifdef __USE_PROTOS
+void reportFcache(CacheEntry *q)
+#else
+void reportFcache(q)
+  CacheEntry    *q;
+#endif
+{
+    char        *qstr;
+
+    fprintf(stdout,"\nrule ");
+    for (qstr=q->str; *qstr != '*' ; qstr++) {
+      fprintf(stdout,"%c",*qstr);
+    };
+
+    qstr++;
+    if (*qstr == 'i') fprintf(stdout," First[");
+    if (*qstr == 'o') fprintf(stdout," Follow[");
+    qstr++;
+    fprintf(stdout,"%s]",qstr);
+    if (q->incomplete) fprintf(stdout," *** incomplete ***");
+    fprintf(stdout,"\n");
+    MR_dumpTokenSet(stdout,1,q->fset);
+}
+
+void 
+#ifdef __USE_PROTOS
+DumpFcache(void) 
+#else
+DumpFcache() 
+#endif
+{
+
+    char        *prev="";
+    int          n=0;
+    CacheEntry  *next;
+
+    fprintf(stdout,"\n\nDump of First/Follow Cache\n");
+
+    for(;;) {
+      next=dumpFcache1(prev);
+      if (next == NULL) break;
+      reportFcache(next);
+      ++n;
+      prev=next->str;
+    };
+    fprintf(stdout,"\nEnd dump of First/Follow Cache\n");
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fset.c b/Tools/Source/TianoTools/Pccts/antlr/fset.c
new file mode 100644
index 0000000000..e1a76ec620
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/fset.c
@@ -0,0 +1,1555 @@
+/*
+ * fset.c
+ *
+ * Compute FIRST and FOLLOW sets.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "pcctscfg.h"
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+#include "limits.h"
+
+#ifdef __USE_PROTOS
+static void ensure_predicates_cover_ambiguous_lookahead_sequences
+                                    (Junction *, Junction *, char *, Tree *);
+#else
+static void ensure_predicates_cover_ambiguous_lookahead_sequences();
+#endif
+
+/*
+ * What tokens are k tokens away from junction q?
+ *
+ * Follow both p1 and p2 paths (unless RuleBlk) to collect the tokens k away from this
+ * node.
+ * We lock the junction according to k--the lookahead.  If we have been at this
+ * junction before looking for the same, k, number of lookahead tokens, we will
+ * do it again and again...until we blow up the stack.  Locks are only used on aLoopBlk,
+ * RuleBlk, aPlusBlk and EndRule junctions to remove/detect infinite recursion from
+ * FIRST and FOLLOW calcs.
+ *
+ * If p->jtype == EndRule we are going to attempt a FOLLOW.  (FOLLOWs are really defined
+ * in terms of FIRST's, however).  To proceed with the FOLLOW, p->halt cannot be
+ * set.  p->halt is set to indicate that a reference to the current rule is in progress
+ * and the FOLLOW is not desirable.
+ *
+ * If we attempt a FOLLOW and find that there is no FOLLOW or REACHing beyond the EndRule
+ * junction yields an empty set, replace the empty set with EOF.  No FOLLOW means that
+ * only EOF can follow the current rule.  This normally occurs only on the start symbol
+ * since all other rules are referenced by another rule somewhere.
+ *
+ * Normally, both p1 and p2 are followed.  However, checking p2 on a RuleBlk node is
+ * the same as checking the next rule which is clearly incorrect.
+ *
+ * Cycles in the FOLLOW sense are possible.  e.g. Fo(c) requires Fo(b) which requires
+ * Fo(c).  Both Fo(b) and Fo(c) are defined to be Fo(b) union Fo(c).  Let's say
+ * Fo(c) is attempted first.  It finds all of the FOLLOW symbols and then attempts
+ * to do Fo(b) which finds of its FOLLOW symbols.  So, we have:
+ *
+ *                  Fo(c)
+ *                 /     \
+ *              a set    Fo(b)
+ *                      /     \
+ *                   a set    Fo(c) .....Hmmmm..... Infinite recursion!
+ *
+ * The 2nd Fo(c) is not attempted and Fo(b) is left deficient, but Fo(c) is now
+ * correctly Fo(c) union Fo(b).  We wish to pick up where we left off, so the fact
+ * that Fo(b) terminated early means that we lack Fo(c) in the Fo(b) set already
+ * laying around.  SOOOOoooo, we track FOLLOW cycles.  All FOLLOW computations are
+ * cached in a hash table.  After the sequence of FOLLOWs finish, we reconcile all
+ * cycles --> correct all Fo(rule) sets in the cache.
+ *
+ * Confused? Good! Read my MS thesis [Purdue Technical Report TR90-30].
+ * TJP 8/93 -- can now read PhD thesis from Purdue.
+ *
+ * Also, FIRST sets are cached in the hash table.  Keys are (rulename,Fi/Fo,k).
+ * Only FIRST sets, for which the FOLLOW is not included, are stored.
+ *
+ * SPECIAL CASE of (...)+ blocks:
+ * I added an optional alt so that the alts could see what
+ * was behind the (...)+ block--thus using enough lookahead
+ * to branch out rather than just enough to distinguish
+ * between alts in the (...)+.  However, when the FIRST("(...)+") is
+ * is needed, must not use this last "optional" alt.  This routine
+ * turns off this path by setting a new 'ignore' flag for
+ * the alt and then resetting it afterwards.
+ */
+
+set
+#ifdef __USE_PROTOS
+rJunc( Junction *p, int k, set *rk )
+#else
+rJunc( p, k, rk )
+Junction *p;
+int k;
+set *rk;
+#endif
+{
+	set     a, b;
+
+	require(p!=NULL,				"rJunc: NULL node");
+	require(p->ntype==nJunction,	"rJunc: not junction");
+
+#ifdef DBG_LL1
+	if ( p->jtype == RuleBlk ) fprintf(stderr, "FIRST(%s,%d) \n",((Junction *)p)->rname,k);
+	else fprintf(stderr, "rJunc: %s in rule %s\n",
+			decodeJType[p->jtype], ((Junction *)p)->rname);
+#endif
+	/* if this is one of the added optional alts for (...)+ then return */
+
+    /* no need to pop backtrace - hasn't been pushed */
+
+	if ( p->ignore ) return empty;
+
+    if (MR_MaintainBackTrace) MR_pointerStackPush(&MR_BackTraceStack,p);
+
+/* MR14 */    if (AlphaBetaTrace && p->alpha_beta_guess_end) {
+/* MR14 */         warnFL(
+/* MR14 */           "not possible to compute follow set for alpha in an \"(alpha)? beta\" block.  ",
+/* MR14 */                 FileStr[p->file],p->line);
+/* MR14 */         MR_alphaBetaTraceReport();
+/* MR14 */    };
+
+/* MR14 */    if (p->alpha_beta_guess_end) {
+/* MR14 */      if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+/* MR14 */      return empty;
+/* MR14 */    }
+
+	/* locks are valid for aLoopBlk,aPlusBlk,RuleBlk,EndRule junctions only */
+	if ( p->jtype==aLoopBlk || p->jtype==RuleBlk ||
+		 p->jtype==aPlusBlk || p->jtype==EndRule )
+	{
+		require(p->lock!=NULL, "rJunc: lock array is NULL");
+		if ( p->lock[k] )
+		{
+			if ( p->jtype == EndRule )	/* FOLLOW cycle? */
+			{
+#ifdef DBG_LL1
+				fprintf(stderr, "FOLLOW cycle to %s: panic!\n", p->rname);
+#endif
+                if (! MR_AmbSourceSearch) RegisterCycle(p->rname, k);
+			}
+            if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+			return empty;
+		}
+		if ( p->jtype == RuleBlk &&
+                 p->end->halt  &&
+                     ! MR_AmbSourceSearch)	/* check for FIRST cache */
+		{
+			CacheEntry *q = (CacheEntry *) hash_get(Fcache, Fkey(p->rname,'i',k));
+			if ( q != NULL )
+			{
+				set_orin(rk, q->rk);
+                if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+   				return set_dup( q->fset );
+			}
+		}
+		if ( p->jtype == EndRule &&
+                !p->halt &&                     /* MR11 was using cache even when halt set */
+                     ! MR_AmbSourceSearch)		/* FOLLOW set cached already? */
+		{
+			CacheEntry *q = (CacheEntry *) hash_get(Fcache, Fkey(p->rname,'o',k));
+			if ( q != NULL )
+			{
+#ifdef DBG_LL1
+				fprintf(stderr, "cache for FOLLOW(%s,%d):", p->rname,k);
+				s_fprT(stderr, q->fset);
+				if ( q->incomplete ) fprintf(stderr, " (incomplete)");
+				fprintf(stderr, "\n");
+#endif
+				if ( !q->incomplete )
+				{
+                    if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+					return set_dup( q->fset );
+				}
+			}
+		}
+		p->lock[k] = TRUE;	/* This rule is busy */
+	}
+
+	a = b = empty;
+
+	if ( p->jtype == EndRule )
+	{
+		if (p->halt )			/* don't want FOLLOW here? */ /* unless MR10 hoisting */
+		{
+ 	  	      p->lock[k] = FALSE;
+			  set_orel(k, rk);						/* indicate this k value needed */
+              if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+			  return empty;
+		}
+		if (! MR_AmbSourceSearch) FoPush(p->rname, k);		/* Attempting FOLLOW */
+		if ( p->p1 == NULL ) set_orel((TokenInd!=NULL?TokenInd[EofToken]:EofToken), &a);/* if no FOLLOW assume EOF */
+#ifdef DBG_LL1
+		fprintf(stderr, "-->FOLLOW(%s,%d)\n", p->rname,k);
+#endif
+	}
+
+	if ( p->p1 != NULL ) {
+/* MR14 */      if (p->guess) {
+/* MR14 */        if (p->guess_analysis_point == NULL) {
+/* MR14 */           Node * guess_point;
+/* MR14 */           guess_point=(Node *)analysis_point(p);
+/* MR14 */           if (guess_point == (Node *)p) {
+/* MR14 */             guess_point=p->p1;
+/* MR14 */           }
+/* MR14 */           p->guess_analysis_point=guess_point;
+/* MR14 */        }
+/* MR14 */        REACH(p->guess_analysis_point, k, rk, a);
+                } else {
+                  REACH(p->p1, k, rk, a);
+                }
+    }	
+
+	/* C a c h e  R e s u l t s */
+
+	if ( p->jtype == RuleBlk && p->end->halt && ! MR_AmbSourceSearch)		/* can save FIRST set? */
+	{
+		CacheEntry *q = newCacheEntry( Fkey(p->rname,'i',k) );
+		/*fprintf(stderr, "Caching %s FIRST %d\n", p->rname, k);*/
+		hash_add(Fcache, Fkey(p->rname,'i',k), (Entry *)q);
+		q->fset = set_dup( a );
+		q->rk = set_dup( *rk );
+	}
+
+	if ( p->jtype == EndRule &&
+            !p->halt &&                         /* MR11 was using cache even with halt set */
+                 ! MR_AmbSourceSearch)			/* just completed FOLLOW? */
+	{
+		/* Cache Follow set */
+		CacheEntry *q = (CacheEntry *) hash_get(Fcache, Fkey(p->rname,'o',k));
+		if ( q==NULL )
+		{
+			q = newCacheEntry( Fkey(p->rname,'o',k) );
+			hash_add(Fcache, Fkey(p->rname,'o',k), (Entry *)q);
+		}
+		/*fprintf(stderr, "Caching %s FOLLOW %d\n", p->rname, k);*/
+		if ( set_nil(a) && !q->incomplete )
+		{
+			/* Don't ever save a nil set as complete.
+			 * Turn it into an eof set.
+			 */
+			set_orel(EofToken, &a);
+		}
+		set_orin(&(q->fset), a);
+		FoPop( k );
+		if ( FoTOS[k] == NULL && Cycles[k] != NULL ) ResolveFoCycles(k);
+#ifdef DBG_LL1
+		fprintf(stderr, "saving FOLLOW(%s,%d):", p->rname, k);
+		s_fprT(stderr, q->fset);
+		if ( q->incomplete ) fprintf(stderr, " (incomplete)");
+		fprintf(stderr, "\n");
+#endif
+	}
+	
+    if (p->jtype != RuleBlk && p->p2 != NULL && /* MR14 */ ! p->guess) {
+       REACH(p->p2, k, rk, b);
+    }	
+
+	if ( p->jtype==aLoopBlk || p->jtype==RuleBlk ||
+		 p->jtype==aPlusBlk || p->jtype==EndRule )
+		p->lock[k] = FALSE;							/* unlock node */
+
+	set_orin(&a, b);
+	set_free(b);
+    if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+	return a;
+}
+
+set
+#ifdef __USE_PROTOS
+rRuleRef( RuleRefNode *p, int k, set *rk_out )
+#else
+rRuleRef( p, k, rk_out )
+RuleRefNode *p;
+int k;
+set *rk_out;
+#endif
+{
+	set rk;
+	Junction *r;
+	int k2;
+	set a, rk2, b;
+	int save_halt;
+	RuleEntry *q = (RuleEntry *) hash_get(Rname, p->text);
+	require(p!=NULL,			"rRuleRef: NULL node");
+	require(p->ntype==nRuleRef,	"rRuleRef: not rule ref");
+
+#ifdef DBG_LL1
+	fprintf(stderr, "rRuleRef: %s\n", p->text);
+#endif
+
+    if (MR_MaintainBackTrace) MR_pointerStackPush(&MR_BackTraceStack,p);
+
+	if ( q == NULL )
+	{
+		warnFL( eMsg1("rule %s not defined",p->text), FileStr[p->file], p->line );
+		REACH(p->next, k, rk_out, a);
+        if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+		return a;
+	}
+	rk2 = empty;
+
+/* MR9 Problems with rule references in guarded predicates */
+/* MR9    Perhaps can use hash table to find rule ?        */
+
+/* MR9 */    if (RulePtr == NULL) {
+/* MR9 */        fatalFL(eMsg2("Rule %s uses rule %s via RulePtr before it has been initialized",
+/* MR9 */                                p->rname,q->str),FileStr[p->file],p->line);
+/* MR9 */    };
+
+	r = RulePtr[q->rulenum];
+	if ( r->lock[k] )
+	{
+		errNoFL( eMsg2("infinite left-recursion to rule %s from rule %s",
+						r->rname, p->rname) );
+
+        if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+
+		return empty;
+	}
+
+	save_halt = r->end->halt;
+	r->end->halt = TRUE;		/* don't let reach fall off end of rule here */
+	rk = empty;
+	REACH(r, k, &rk, a);
+	r->end->halt = save_halt;
+	while ( !set_nil(rk) ) {
+		k2 = set_int(rk);               /* MR11 this messes up the ambiguity search routine */
+		set_rm(k2, rk);
+		REACH(p->next, k2, &rk2, b);    /* MR11 by changing the value of k                  */
+		set_orin(&a, b);
+		set_free(b);
+	}
+	set_free(rk);				/* this has no members, but free it's memory */
+	set_orin(rk_out, rk2);		/* remember what we couldn't do */
+	set_free(rk2);
+    if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+	return a;
+}
+
+/*
+ * Return FIRST sub k ( token_node )
+ *
+ * TJP 10/11/93 modified this so that token nodes that are actually
+ * ranges (T1..T2) work.
+ */
+set
+#ifdef __USE_PROTOS
+rToken( TokNode *p, int k, set *rk )
+#else
+rToken( p, k, rk )
+TokNode *p;
+int k;
+set *rk;
+#endif
+{
+	set a;
+
+	require(p!=NULL,			"rToken: NULL node");
+	require(p->ntype==nToken,	"rToken: not token node");
+
+#ifdef DBG_LL1
+	fprintf(stderr, "rToken: %s\n", (TokenString(p->token)!=NULL)?TokenString(p->token):
+									ExprString(p->token));
+#endif
+
+
+    if (MR_MaintainBackTrace) MR_pointerStackPush(&MR_BackTraceStack,p);
+
+    if (MR_AmbSourceSearch && (k-1) == 0) {
+
+      set       localConstrain;
+      set       intersection;
+
+      localConstrain=fset[maxk-k+1];
+
+      if (! set_nil(p->tset)) {
+        intersection=set_and(localConstrain,p->tset);
+        if (! set_nil(intersection)) {
+          MR_backTraceReport();
+        };
+        set_free(intersection);
+      } else {
+        if (set_el( (unsigned) p->token,localConstrain)) {
+          MR_backTraceReport();
+        }
+      };
+    };
+
+	if ( k-1 == 0 )	{
+
+        if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+
+		if ( !set_nil(p->tset) ) {
+            return set_dup(p->tset);
+        } else {
+    		return set_of(p->token);
+        };
+	}
+
+	REACH(p->next, k-1, rk, a);
+	
+    if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+
+	return a;
+}
+
+set
+#ifdef __USE_PROTOS
+rAction( ActionNode *p, int k, set *rk )
+#else
+rAction( p, k, rk )
+ActionNode *p;
+int k;
+set *rk;
+#endif
+{
+	set a;
+
+	require(p!=NULL,			"rJunc: NULL node");
+	require(p->ntype==nAction,	"rJunc: not action");
+	
+/* MR11 */    if (p->is_predicate && p->ampersandPred != NULL) {
+/* MR11 */      Predicate   *pred=p->ampersandPred;
+/* MR11 */      if (k <= pred->k) {
+/* MR11 */        REACH(p->guardNodes,k,rk,a);
+/* MR11 */        return a;
+/* MR11 */      };
+/* MR11 */    };
+
+    /* it might be a good idea when doing an MR_AmbSourceSearch
+       to *not* look behind predicates under some circumstances
+       we'll look into that later
+    */
+
+	REACH(p->next, k, rk, a);	/* ignore actions */
+	return a;
+}
+
+				/* A m b i g u i t y  R e s o l u t i o n */
+
+
+void
+#ifdef __USE_PROTOS
+dumpAmbigMsg( set *fset, FILE *f, int want_nls )
+#else
+dumpAmbigMsg( fset, f, want_nls )
+set *fset;
+FILE *f;
+int want_nls;
+#endif
+{
+	int i;
+
+    set     copy;               /* MR11 */
+
+	if ( want_nls ) fprintf(f, "\n\t");
+	else fprintf(f, " ");
+
+	for (i=1; i<=CLL_k; i++)
+	{
+        copy=set_dup(fset[i]);  /* MR11 */
+
+		if ( i>1 )
+		{
+			if ( !want_nls ) fprintf(f, ", ");
+		}
+		if ( set_deg(copy) > 3 && elevel == 1 )
+		{
+			int e,m;
+			fprintf(f, "{");
+			for (m=1; m<=3; m++)
+			{
+				e=set_int(copy);
+				fprintf(f, " %s", TerminalString(e));
+				set_rm(e, copy);
+			}
+			fprintf(f, " ... }");
+		}
+		else s_fprT(f, copy);
+		if ( want_nls ) fprintf(f, "\n\t");
+        set_free(copy);
+	}
+	fprintf(f, "\n");
+
+}
+
+static void
+#ifdef __USE_PROTOS
+verify_context(Predicate *predicate)
+#else
+verify_context(predicate)
+Predicate *predicate;
+#endif
+{
+	if ( predicate == NULL ) return;
+
+	if ( predicate->expr == PRED_OR_LIST ||
+		 predicate->expr == PRED_AND_LIST )
+	{
+		verify_context(predicate->down);
+		verify_context(predicate->right);       /* MR10 */
+		return;
+	}
+
+	if ( !predicate->source->ctxwarned && predicate->source->guardpred==NULL &&
+		 ((predicate->k > 1 &&
+		 !is_single_tuple(predicate->tcontext)) ||
+		 ( predicate->k == 1 &&
+			  set_deg(predicate->scontext[1])>1 )) )
+	{
+
+/* MR9 Suppress annoying messages caused by our own clever(?) fix */
+
+  		fprintf(stderr, ErrHdr, FileStr[predicate->source->file],
+				predicate->source->line);
+		fprintf(stderr, " warning: predicate applied for >1 lookahead %d-sequences\n", predicate->k);
+		fprintf(stderr, ErrHdr, FileStr[predicate->source->file],
+				predicate->source->line);
+		fprintf(stderr, "     predicate text: \"%s\"\n",
+                        (predicate->expr == NULL ? "(null)" : predicate->expr) );
+		fprintf(stderr, ErrHdr, FileStr[predicate->source->file],
+				predicate->source->line);
+		fprintf(stderr, "     You may only want one lookahead %d-sequence to apply\n", predicate->k);
+		fprintf(stderr, ErrHdr, FileStr[predicate->source->file],
+				predicate->source->line);
+		fprintf(stderr, "     Try using a context guard '(...)? =>'\n");
+		predicate->source->ctxwarned = 1;
+	}
+    verify_context(predicate->right);       /* MR10 */
+}
+
+/*
+ * If delta is the set of ambiguous lookahead sequences, then make sure that
+ * the predicate(s) for productions alt1,alt2 cover the sequences in delta.
+ *
+ * For example,
+ *	a : <<PRED1>>? (A B|A C)
+ *	  | b
+ *    ;
+ *	b : <<PRED2>>? A B
+ *	  | A C
+ *	  ;
+ *
+ * This should give a warning that (A C) predicts both productions and alt2
+ * does not have a predicate in the production that generates (A C).
+ *
+ * The warning detection is simple.  Let delta = LOOK(alt1) intersection LOOK(alt2).
+ * Now, if ( delta set-difference context(predicates-for-alt1) != empty then
+ * alt1 does not "cover" all ambiguous sequences.
+ *
+ * If ambig is nonempty, then ambig in LL(k) sense -> use tree info; else use fset
+ * info.  Actually, sets are used only if k=1 for this grammar.
+ */
+static void
+#ifdef __USE_PROTOS
+ensure_predicates_cover_ambiguous_lookahead_sequences
+                        ( Junction *alt1, Junction *alt2, char *sub, Tree *ambig )
+#else
+ensure_predicates_cover_ambiguous_lookahead_sequences( alt1, alt2, sub, ambig )
+Junction *alt1;
+Junction *alt2;
+char *sub;
+Tree *ambig;
+#endif
+{
+	if ( !ParseWithPredicates ) return;
+
+	if ( ambig!=NULL )
+	{
+		Tree *non_covered = NULL;
+		if ( alt1->predicate!=NULL )
+			non_covered = tdif(ambig, alt1->predicate, alt1->fset, alt2->fset);
+		if ( (non_covered!=NULL || alt1->predicate==NULL) && WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+			fprintf(stderr, " warning: alt %d %shas no predicate to resolve ambiguity",
+							alt1->altnum, sub);
+			if ( alt1->predicate!=NULL && non_covered!=NULL )
+			{
+				fprintf(stderr, " upon");
+				preorder(non_covered);
+			}
+			else if ( alt1->predicate==NULL )
+			{
+				fprintf(stderr, " upon");
+				preorder(ambig->down);
+			}
+			fprintf(stderr, "\n");
+		}
+		Tfree(non_covered);
+		non_covered = NULL;
+		if ( alt2->predicate!=NULL )
+			non_covered = tdif(ambig, alt2->predicate, alt1->fset, alt2->fset);
+		if ( (non_covered!=NULL || alt2->predicate==NULL) && WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt2->file], alt2->line);
+			fprintf(stderr, " warning: alt %d %shas no predicate to resolve ambiguity",
+							alt2->altnum, sub);
+			if ( alt2->predicate!=NULL && non_covered!=NULL )
+			{
+				fprintf(stderr, " upon");
+				preorder(non_covered);
+			}
+			else if ( alt2->predicate==NULL )
+			{
+				fprintf(stderr, " upon");
+				preorder(ambig->down);
+			}
+			fprintf(stderr, "\n");
+		}
+		Tfree(non_covered);
+	}
+	else if ( !set_nil(alt1->fset[1]) )
+	{
+		set delta, non_covered;
+		delta = set_and(alt1->fset[1], alt2->fset[1]);
+		non_covered = set_dif(delta, covered_set(alt1->predicate));
+		if ( set_deg(non_covered)>0 && WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+			fprintf(stderr, " warning: alt %d %shas no predicate to resolve ambiguity",
+							alt1->altnum, sub);
+			if ( alt1->predicate!=NULL )
+			{
+				fprintf(stderr, " upon ");
+				s_fprT(stderr, non_covered);
+			}
+			fprintf(stderr, "\n");
+		}
+		set_free( non_covered );
+		non_covered = set_dif(delta, covered_set(alt2->predicate));
+		if ( set_deg(non_covered)>0 && WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt2->file], alt2->line);
+			fprintf(stderr, " warning: alt %d %shas no predicate to resolve ambiguity",
+							alt2->altnum, sub);
+			if ( alt2->predicate!=NULL )
+			{
+				fprintf(stderr, " upon ");
+				s_fprT(stderr, non_covered);
+			}
+			fprintf(stderr, "\n");
+		}
+		set_free( non_covered );
+		set_free( delta );
+	}
+	else fatal_internal("productions have no lookahead in predicate checking routine");
+}
+
+#ifdef __USE_PROTOS
+void MR_doPredicatesHelp(int inGuessBlock,Junction *alt1,Junction *alt2,int jtype,char *sub)
+#else
+void MR_doPredicatesHelp(inGuessBlock,alt1,alt2,jtype,sub)
+  int       inGuessBlock;
+  Junction  *alt1;
+  Junction  *alt2;
+  int       jtype;
+  char      *sub;
+#endif
+{
+    Predicate   *p1;
+    Predicate   *p2;
+
+    Junction    *parentRule=MR_nameToRuleBlk(alt1->rname);
+
+    if (inGuessBlock && WarningLevel <= 1) return;
+
+    /* let antlr give the usual error message */
+
+    if (alt1->predicate == NULL && alt2->predicate == NULL) return;
+
+    if ( (jtype == RuleBlk || jtype == aSubBlk)
+             && (alt1->predicate == NULL && alt2->predicate != NULL)) {
+        fprintf(stderr, ErrHdr, FileStr[parentRule->file],parentRule->line);
+        fprintf(stderr," warning: alt %d line %d and alt %d line %d of %s\n%s%s%s",
+          alt1->altnum,
+          alt1->line,
+          alt2->altnum,
+          alt2->line,
+          sub,
+          "     These alts have ambig lookahead sequences resolved by a predicate for\n",
+          "     the second choice. The second choice may not be reachable.\n",
+          "     You may want to use a complementary predicate or rearrange the alts\n"
+        );
+        return;
+    };
+
+    /* first do the easy comparison.  then do the hard one */
+
+    if (MR_comparePredicates(alt1->predicate,alt2->predicate)) {
+
+      if (jtype == aLoopBegin || jtype == aPlusBlk ) {
+
+        /* I'm not sure this code is reachable.
+           Predicates following a (...)+ or (...)* block are probably
+             considered validation predicates and therefore not
+             participate in the predication expression
+        */
+
+      	fprintf(stderr, ErrHdr,FileStr[parentRule->file],parentRule->line);
+        fprintf(stderr," warning: %s of %s in rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s",
+          "the predicates used to disambiguate optional/exit paths of ",
+          sub,
+          CurRule,
+          FileStr[alt1->file],
+          alt1->altnum,
+          alt1->line,
+          alt2->altnum,
+          alt2->line,
+          "     are identical and have no resolving power\n");
+      } else {
+    	fprintf(stderr, ErrHdr, FileStr[parentRule->file], parentRule->line);
+        fprintf(stderr," warning: %s rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s",
+          "the predicates used to disambiguate",
+          CurRule,
+          FileStr[alt1->file],
+          alt1->altnum,
+          alt1->line,
+          alt2->altnum,
+          alt2->line,
+          "     are identical and have no resolving power\n");
+      };
+    } else {
+      p1=predicate_dup_without_context(alt1->predicate);
+      p1=MR_unfold(p1);
+      MR_clearPredEntry(p1);
+      MR_simplifyInverted(p1,0);
+      p1=MR_predSimplifyALL(p1);
+      p2=predicate_dup_without_context(alt2->predicate);
+      p2=MR_unfold(p2);
+      MR_clearPredEntry(p2);
+      MR_simplifyInverted(p2,0);
+      p2=MR_predSimplifyALL(p2);
+      if (MR_comparePredicates(p1,p2)) {
+        if (jtype == aLoopBegin || jtype == aPlusBlk ) {
+          fprintf(stderr, ErrHdr, FileStr[parentRule->file], parentRule->line);
+          fprintf(stderr," warning: %s of %s in rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s%s",
+            "the predicates used to disambiguate optional/exit paths of ",
+            sub,
+            CurRule,
+            FileStr[alt1->file],
+            alt1->altnum,
+            alt1->line,
+            alt2->altnum,
+            alt2->line,
+            "     are identical when compared without context and may have no\n",
+            "     resolving power for some lookahead sequences.\n");
+        } else {
+          fprintf(stderr, ErrHdr, FileStr[parentRule->file], parentRule->line);
+          fprintf(stderr," warning: %s rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s%s",
+            "the predicates used to disambiguate",
+            CurRule,
+            FileStr[alt1->file],
+            alt1->altnum,
+            alt1->line,
+            alt2->altnum,
+            alt2->line,
+            "     are identical when compared without context and may have no\n",
+            "     resolving power for some lookahead sequences.\n");
+        };
+        if (InfoP) {
+          fprintf(output,"\n#if 0\n\n");
+          fprintf(output,"The following predicates are identical when compared without\n");
+          fprintf(output,"  lookahead context information.  For some ambiguous lookahead\n");
+          fprintf(output,"  sequences they may not have any power to resolve the ambiguity.\n");
+          fprintf(output,"\n");
+
+          fprintf(output,"Choice 1: %s  alt %d  line %d  file %s\n\n",
+                  MR_ruleNamePlusOffset( (Node *) alt1),
+                  alt1->altnum,
+                  alt1->line,
+                  FileStr[alt1->file]);
+          fprintf(output,"  The original predicate for choice 1 with available context information:\n\n");
+          MR_dumpPred1(2,alt1->predicate,1);
+          fprintf(output,"  The predicate for choice 1 after expansion (but without context information):\n\n");
+          MR_dumpPred1(2,p1,0);
+          if (p1 == NULL) {
+            Predicate   *phelp;
+            fprintf(output,"  The predicate for choice 1 after expansion (but before simplification)\n\n");
+            phelp=predicate_dup_without_context(alt1->predicate);
+            phelp=MR_unfold(phelp);
+            MR_clearPredEntry(phelp);
+            MR_simplifyInverted(phelp,0);
+            phelp=MR_predSimplifyALLX(phelp,1);
+            MR_dumpPred1(2,phelp,0);
+            predicate_free(phelp);
+          };
+          fprintf(output,"\n");
+
+          fprintf(output,"Choice 2: %s  alt %d  line %d  file %s\n\n",
+                  MR_ruleNamePlusOffset( (Node *) alt2),
+                  alt2->altnum,
+                  alt2->line,
+                  FileStr[alt2->file]);
+          fprintf(output,"  The original predicate for choice 2 with available context information:\n\n");
+          MR_dumpPred1(1,alt2->predicate,1);
+          fprintf(output,"  The predicate for choice 2 after expansion (but without context information):\n\n");
+          MR_dumpPred1(1,p2,0);
+          if (p2 == NULL) {
+            Predicate   *phelp;
+            fprintf(output,"  The predicate for choice 2 after expansion (but before simplification)\n\n");
+            phelp=predicate_dup_without_context(alt2->predicate);
+            phelp=MR_unfold(phelp);
+            MR_clearPredEntry(phelp);
+            MR_simplifyInverted(phelp,0);
+            phelp=MR_predSimplifyALLX(phelp,1);
+            MR_dumpPred1(2,phelp,0);
+            predicate_free(phelp);
+          };
+          fprintf(output,"\n#endif\n");
+        };
+      } else if (MR_secondPredicateUnreachable(p1,p2)) {
+        if (jtype == aLoopBegin || jtype == aPlusBlk ) {
+          fprintf(stderr, ErrHdr, FileStr[parentRule->file], parentRule->line);
+          fprintf(stderr," warning: %s of %s in rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s%s",
+            "the predicate used to disambiguate the first choice of the optional/exit paths of ",
+            sub,
+            CurRule,
+            FileStr[alt1->file],
+            alt1->altnum,
+            alt1->line,
+            alt2->altnum,
+            alt2->line,
+            "     appears to \"cover\" the second predicate when compared without context.\n",
+            "     The second predicate may have no resolving power for some lookahead sequences.\n");
+        } else {
+          fprintf(stderr, ErrHdr, FileStr[parentRule->file], parentRule->line);
+          fprintf(stderr," warning: %s rule %s\n     (file %s alt %d line %d and alt %d line %d)\n%s%s",
+            "the predicate used to disambiguate the first choice of",
+            CurRule,
+            FileStr[alt1->file],
+            alt1->altnum,
+            alt1->line,
+            alt2->altnum,
+            alt2->line,
+            "     appears to \"cover\" the second predicate when compared without context.\n",
+            "     The second predicate may have no resolving power for some lookahead sequences.\n");
+        };
+        if (InfoP) {
+          fprintf(output,"\n#if 0\n\n");
+          fprintf(output,"The first predicate appears to \"cover\" the second predicate when they\n");
+          fprintf(output,"  are compared without lookahead context information.  For some ambiguous\n");
+          fprintf(output,"  lookahead sequences the second predicate may not have any power to\n");
+          fprintf(output,"  resolve the ambiguity.\n");
+          fprintf(output,"\n");
+          fprintf(output,"Choice 1: %s  alt %d  line %d  file %s\n\n",
+                  MR_ruleNamePlusOffset( (Node *) alt1),
+                  alt1->altnum,
+                  alt1->line,
+                  FileStr[alt1->file]);
+          fprintf(output,"  The original predicate for choice 1 with available context information:\n\n");
+          MR_dumpPred1(2,alt1->predicate,1);
+          fprintf(output,"  The predicate for choice 1 after expansion (but without context information):\n\n");
+          MR_dumpPred1(2,p1,0);
+          if (p1 == NULL) {
+            Predicate   *phelp;
+            fprintf(output,"  The predicate for choice 1 after expansion (but before simplification)\n\n");
+            phelp=predicate_dup_without_context(alt1->predicate);
+            phelp=MR_unfold(phelp);
+            MR_clearPredEntry(phelp);
+            MR_simplifyInverted(phelp,0);
+            phelp=MR_predSimplifyALLX(phelp,1);
+            MR_dumpPred1(2,phelp,0);
+            predicate_free(phelp);
+          };
+          fprintf(output,"\n");
+
+          fprintf(output,"Choice 2: %s  alt %d  line %d  file %s\n\n",
+                  MR_ruleNamePlusOffset( (Node *) alt2),
+                  alt2->altnum,
+                  alt2->line,
+                  FileStr[alt2->file]);
+          fprintf(output,"  The original predicate for choice 2 with available context information:\n\n");
+          MR_dumpPred1(1,alt2->predicate,1);
+          fprintf(output,"  The predicate for choice 2 after expansion (but without context information):\n\n");
+          MR_dumpPred1(1,p2,0);
+          if (p2 == NULL) {
+            Predicate   *phelp;
+            fprintf(output,"  The predicate for choice 2 after expansion (but before simplification)\n\n");
+            phelp=predicate_dup_without_context(alt2->predicate);
+            phelp=MR_unfold(phelp);
+            MR_clearPredEntry(phelp);
+            MR_simplifyInverted(phelp,0);
+            phelp=MR_predSimplifyALLX(phelp,1);
+            MR_dumpPred1(2,phelp,0);
+            predicate_free(phelp);
+          };
+          fprintf(output,"\n#endif\n");
+        };
+      };
+      predicate_free(p1);
+      predicate_free(p2);
+    };
+}
+
+static  int     totalOverflow=0;                /* MR9 */
+
+void
+#ifdef __USE_PROTOS
+HandleAmbiguity( Junction *block, Junction *alt1, Junction *alt2, int jtype )
+#else
+HandleAmbiguity( block, alt1, alt2, jtype )
+Junction *block;
+Junction *alt1;
+Junction *alt2;
+int jtype;
+#endif
+{
+	unsigned **ftbl;
+	set *fset, b;
+	int i, numAmbig,n2;
+	Tree *ambig=NULL, *t, *u;
+	char *sub = "";
+    long    n;
+    int     thisOverflow=0;             /* MR9 */
+    long    set_deg_value;              /* MR10 */
+    long    threshhold;                 /* MR10 */
+
+	require(block!=NULL, "NULL block");
+	require(block->ntype==nJunction, "invalid block");
+
+	/* These sets are used to constrain LL_k set, but are made CLL_k long anyway */
+	fset = (set *) calloc(CLL_k+1, sizeof(set));
+	require(fset!=NULL, "cannot allocate fset");
+	ftbl = (unsigned **) calloc(CLL_k+1, sizeof(unsigned *));
+	require(ftbl!=NULL, "cannot allocate ftbl");
+
+	/* create constraint table and count number of possible ambiguities (use<=LL_k) */
+	for (n=1,i=1; i<=CLL_k; i++)
+	{
+         		b = set_and(alt1->fset[i], alt2->fset[i]);
+/* MR9 */       set_deg_value = set_deg(b);
+/* MR10 */      if (n > 0) {
+/* MR10 */        threshhold = LONG_MAX / n;
+/* MR10 */        if (set_deg_value <= threshhold) {
+/* MR10 */       	n *= set_deg_value;
+/* MR10 */        } else {
+/* MR10 */          n=LONG_MAX;
+/* MR9 */           if (totalOverflow == 0) {
+#if 0
+                      /* MR10 comment this out because it just makes users worry */
+
+/* MR9 */             warnNoFL("Overflow in computing number of possible ambiguities in HandleAmbiguity\n");
+#endif
+/* MR9 */           };
+/* MR9 */           thisOverflow++;
+/* MR9 */           totalOverflow++;
+/* MR9 */         };
+/* MR10 */      } else {
+/* MR10 */        n *= set_deg_value;
+/* MR9 */       };
+		fset[i] = set_dup(b);
+		ftbl[i] = set_pdq(b);
+		set_free(b);
+	}
+
+	switch ( jtype )
+	{
+		case aSubBlk: sub = "of (..) "; break;
+		case aOptBlk: sub = "of {..} "; break;
+		case aLoopBegin: sub = "of (..)* "; break;
+		case aLoopBlk: sub = "of (..)* "; break;
+		case aPlusBlk: sub = "of (..)+ "; break;
+		case RuleBlk: sub = "of the rule itself "; break;
+		default : sub = ""; break;
+	}
+
+	/* If the block is marked as a compressed lookahead only block, then
+	 * simply return; ambiguity warning is given only at warning level 2.
+	 */
+	if ( block->approx>0 )
+	{
+		if ( ParseWithPredicates )
+		{
+            if (alt1->predicate != NULL) predicate_free(alt1->predicate);  /* MR12 */
+            if (alt2->predicate != NULL) predicate_free(alt2->predicate);  /* MR12 */
+
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+          	alt1->predicate = MR_find_predicates_and_supp((Node *)alt1->p1);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+            require (MR_predicate_context_completed(alt1->predicate),"predicate alt 1 not completed");
+            alt1->predicate=MR_predSimplifyALL(alt1->predicate);
+
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+    		alt2->predicate = MR_find_predicates_and_supp((Node *)alt2->p1);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+            require (MR_predicate_context_completed(alt2->predicate),"predicate alt 2 not completed");
+            alt2->predicate=MR_predSimplifyALL(alt2->predicate);
+
+            MR_doPredicatesHelp(0,alt1,alt2,jtype,sub);
+
+			if ( HoistPredicateContext
+                    && (alt1->predicate!=NULL||alt2->predicate!=NULL) )
+			{
+				verify_context(alt1->predicate);
+				verify_context(alt2->predicate);
+			}
+
+			if ( HoistPredicateContext
+                     && (alt1->predicate!=NULL||alt2->predicate!=NULL)
+                     && WarningLevel>1 )
+			ensure_predicates_cover_ambiguous_lookahead_sequences(alt1, alt2, sub, ambig);
+		}
+
+		if ( WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+			if ( jtype == aLoopBegin || jtype == aPlusBlk )
+				fprintf(stderr, " warning: optional/exit path and alt(s) %sambiguous upon", sub);
+			else
+				fprintf(stderr, " warning(approx): alts %d and %d %sambiguous upon",
+						alt1->altnum, alt2->altnum, sub);
+			dumpAmbigMsg(fset, stderr, 0);
+            MR_traceAmbSource(fset,alt1,alt2);
+		}
+		for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+		free((char *)fset);
+		for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+		free((char *)ftbl);
+		return;
+    }
+
+	/* if all sets have degree 1 for k<LL_k, then must be ambig upon >=1 permutation;
+	 * don't bother doing full LL(k) analysis.
+	 * (This "if" block handles the LL(1) case)
+	 */
+
+	n2 = 0;
+	for (i=1; i<LL_k; i++) n2 += set_deg(alt1->fset[i])+set_deg(alt2->fset[i]);
+
+    /* here STARTS the special case in which the lookahead sets for alt1 and alt2
+       all have degree 1 for k<LL_k (including LL_k=1)
+    */
+
+	if ( n2==2*(LL_k-1) )
+	{
+
+        /* TJP: added to fix the case where LL(1) and syntactic predicates didn't
+         * work.  It now recognizes syntactic predicates, but does not like combo:
+         * LL(1)/syn/sem predicates. (10/24/93)
+         */
+
+		if ( first_item_is_guess_block_extra((Junction *)alt1->p1)!=NULL )
+		{
+			if ( WarningLevel==1 )
+			{
+				for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+				free((char *)fset);
+				for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+				free((char *)ftbl);
+				return;
+			}
+
+			fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+			if ( jtype == aLoopBegin || jtype == aPlusBlk )
+			   fprintf(stderr, " warning: optional/exit path and alt(s) %sambiguous upon", sub);
+			else
+			   fprintf(stderr, " warning: alts %d and %d %sambiguous upon",
+					   alt1->altnum, alt2->altnum, sub);
+			dumpAmbigMsg(fset, stderr, 0);
+            MR_traceAmbSource(fset,alt1,alt2);
+		}
+
+		ambig = NULL;
+		if ( LL_k>1 ) ambig = make_tree_from_sets(alt1->fset, alt2->fset);
+		if ( ParseWithPredicates )
+		{
+           if (alt1->predicate != NULL) predicate_free(alt1->predicate);  /* MR12 */
+           if (alt2->predicate != NULL) predicate_free(alt2->predicate);  /* MR12 */
+
+           require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+           alt1->predicate = MR_find_predicates_and_supp((Node *)alt1->p1);
+           require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+           require (MR_predicate_context_completed(alt1->predicate),"predicate alt 1 not completed");
+           alt1->predicate=MR_predSimplifyALL(alt1->predicate);
+
+           require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+    	   alt2->predicate = MR_find_predicates_and_supp((Node *)alt2->p1);
+           require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+           require (MR_predicate_context_completed(alt2->predicate),"predicate alt 2 not completed");
+           alt2->predicate=MR_predSimplifyALL(alt2->predicate);
+
+           MR_doPredicatesHelp(0,alt1,alt2,jtype,sub);
+
+		   if ( HoistPredicateContext && (alt1->predicate!=NULL||alt2->predicate!=NULL) )
+		   {
+				verify_context(alt1->predicate);
+				verify_context(alt2->predicate);
+		   }
+		   if (HoistPredicateContext&&(alt1->predicate!=NULL||alt2->predicate!=NULL) && WarningLevel>1)
+			  ensure_predicates_cover_ambiguous_lookahead_sequences(alt1, alt2, sub, ambig);
+		   if ( WarningLevel == 1 &&
+			   (alt1->predicate!=NULL||alt2->predicate!=NULL))
+		   {
+			  for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+			  free((char *)fset);
+			  for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+			  free((char *)ftbl);
+			  Tfree(ambig);
+			  return;
+		   }
+		}
+/* end TJP (10/24/93) */
+
+		fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+		if ( jtype == aLoopBegin || jtype == aPlusBlk )
+			fprintf(stderr, " warning: optional/exit path and alt(s) %sambiguous upon", sub);
+		else
+		   fprintf(stderr, " warning: alts %d and %d %sambiguous upon",
+				   alt1->altnum, alt2->altnum, sub);
+		if ( elevel == 3 && LL_k>1 )
+		{
+		   preorder(ambig);
+		   fprintf(stderr, "\n");
+  	       for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+    	   free((char *)fset);
+		   for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+		   free((char *)ftbl);
+		   Tfree(ambig);
+		   return;
+        };
+
+		Tfree(ambig);
+		dumpAmbigMsg(fset, stderr, 0);
+
+        /* because this is a special case in which both alt1 and alt2 have
+           lookahead sets of degree 1 for k<LL_k (including k=1) the linear
+           lookahead style search is adequate
+        */
+
+        MR_traceAmbSource(fset,alt1,alt2);
+
+		for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+		free((char *)fset);
+		for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+		free((char *)ftbl);
+		return;
+	}
+
+    /* here ENDS the special case in which the lookahead sets for alt1 and alt2
+       all have degree 1 for k<LL_k (including LL_k=1)
+    */
+
+	/* in case tree construction runs out of memory, set info to make good err msg */
+
+	CurAmbigAlt1 = alt1->altnum;
+	CurAmbigAlt2 = alt2->altnum;
+	CurAmbigbtype = sub;
+	CurAmbigfile = alt1->file;
+	CurAmbigline = alt1->line;
+	
+	/* Don't do full LL(n) analysis if (...)? block because the block,
+	   by definition, defies LL(n) analysis.
+	   If guess (...)? block and ambiguous then don't remove anything from
+	   2nd alt to resolve ambig.
+	   Want to predict with LL sup 1 ( n ) decision not LL(n) if guess block
+	   since it is much cheaper than LL(n).  LL sup 1 ( n ) "covers" the LL(n)
+	   lookahead information.
+
+	   Note: LL(n) context cannot be computed for semantic predicates when
+	   followed by (..)?.
+
+	   If (..)? then we scream "AAAHHHH!  No LL(n) analysis will help"
+
+       Is 'ambig' always defined if we enter this if?  I hope so
+	   because the 'ensure...()' func references it. TJP Nov 1993.
+	   */
+
+	/* THM MR30:  Instead of using first_item_is_guss_block we use
+	   first_item_is_guess_block_extra which will look inside a
+	   loop block for a guess block.  In other words ( (...)? )*.
+	   It there is an ambiguity in this circumstance then we suppress
+	   the normal methods of resolving ambiguities.
+	*/
+
+	if ( first_item_is_guess_block_extra((Junction *)alt1->p1)!=NULL )
+	{
+		if ( ParseWithPredicates )
+		{
+            if (alt1->predicate != NULL) predicate_free(alt1->predicate);  /* MR12 */
+            if (alt2->predicate != NULL) predicate_free(alt2->predicate);  /* MR12 */
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+        	alt1->predicate = MR_find_predicates_and_supp((Node *)alt1->p1);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+            require (MR_predicate_context_completed(alt1->predicate),"predicate alt 1 not completed");
+            alt1->predicate=MR_predSimplifyALL(alt1->predicate);
+
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+    		alt2->predicate = MR_find_predicates_and_supp((Node *)alt2->p1);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+            require (MR_predicate_context_completed(alt2->predicate),"predicate alt 2 not completed");
+            alt2->predicate=MR_predSimplifyALL(alt2->predicate);
+
+            MR_doPredicatesHelp(1,alt1,alt2,jtype,sub);
+
+			if ( HoistPredicateContext && (alt1->predicate!=NULL||alt2->predicate!=NULL) )
+			{
+				verify_context(alt1->predicate);
+				verify_context(alt2->predicate);
+			}
+			if ( HoistPredicateContext && (alt1->predicate!=NULL||alt2->predicate!=NULL) && WarningLevel>1 )
+				ensure_predicates_cover_ambiguous_lookahead_sequences(alt1, alt2, sub, ambig);
+			if ( WarningLevel==1 &&
+				(alt1->predicate!=NULL||alt2->predicate!=NULL))
+			{
+				for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+				free((char *)fset);
+				for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+				free((char *)ftbl);
+				return;
+			}
+		}
+
+		if ( WarningLevel>1 )
+		{
+			fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+			if ( jtype == aLoopBegin || jtype == aPlusBlk )
+				fprintf(stderr, " warning: optional/exit path and alt(s) %sambiguous upon", sub);
+			else
+				fprintf(stderr, " warning: alts %d and %d %sambiguous upon",
+						alt1->altnum, alt2->altnum, sub);
+			dumpAmbigMsg(fset, stderr, 0);
+            MR_traceAmbSource(fset,alt1,alt2);
+		}
+
+		for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+		free((char *)fset);
+		for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+		free((char *)ftbl);
+		return;
+	}
+	
+	/* Not resolved with (..)? block.  Do full LL(n) analysis */
+	
+	/* ambig is the set of k-tuples truly in common between alt 1 and alt 2 */
+    /* MR11 VerifyAmbig once used fset destructively */
+
+	ambig = VerifyAmbig(alt1, alt2, ftbl, fset, &t, &u, &numAmbig);
+
+	/* are all things in intersection really ambigs? */
+
+	if (thisOverflow ||  numAmbig < n )                     /* MR9 */
+	{
+		Tree *v;
+
+		/* remove ambig permutation from 2nd alternative to resolve ambig;
+		 * We want to compute the set of artificial tuples, arising from
+		 * LL sup 1 (n) compression, that collide with real tuples from the
+		 * 2nd alternative.  This is the set of "special case" tuples that
+		 * the LL sup 1 (n) decision template maps incorrectly.
+		 */
+
+        /* when generating code in genExpr() it does
+         *
+         *      if ( genExprSets(j->fset) && !genExprTree(j->ftree)) {...
+         *
+         * Sooooo the j->ftree is the tree of alt2
+         *               after removal of conflicts, not alt1 !
+         */
+
+		if ( ambig!=NULL )
+		{
+            /* at the top of ambig is an ALT node */
+
+			for (v=ambig->down; v!=NULL; v=v->right)
+			{
+				u = trm_perm(u, v);     /* remove v FROM u */
+			}
+/*			fprintf(stderr, "after rm alt2:"); preorder(u); fprintf(stderr, "\n");*/
+		}
+		Tfree( t );
+		alt1->ftree = tappend(alt1->ftree, u);
+		alt1->ftree = tleft_factor(alt1->ftree);
+	}
+
+	if ( ambig==NULL )
+	{
+		for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+		free((char *)fset);
+		for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+		free((char *)ftbl);
+		return;
+	}
+
+	ambig = tleft_factor(ambig);
+
+/* TJP:
+ * At this point, we surely have an LL(k) ambiguity.  Check for predicates
+ */
+	if ( ParseWithPredicates )
+	{
+        if (alt1->predicate != NULL) predicate_free(alt1->predicate);  /* MR12 */
+        if (alt2->predicate != NULL) predicate_free(alt2->predicate);  /* MR12 */
+        require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+    	alt1->predicate = MR_find_predicates_and_supp((Node *)alt1->p1);
+        require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+        require (MR_predicate_context_completed(alt1->predicate),"predicate alt 1 not completed");
+        alt1->predicate=MR_predSimplifyALL(alt1->predicate);
+
+        require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+		alt2->predicate = MR_find_predicates_and_supp((Node *)alt2->p1);
+        require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+        require (MR_predicate_context_completed(alt2->predicate),"predicate alt 2 not completed");
+        alt2->predicate=MR_predSimplifyALL(alt2->predicate);
+
+        MR_doPredicatesHelp(0,alt1,alt2,jtype,sub);
+
+		if ( HoistPredicateContext && (alt1->predicate!=NULL||alt2->predicate!=NULL) )
+		{
+			verify_context(alt1->predicate);
+			verify_context(alt2->predicate);
+		}
+		if ( HoistPredicateContext && (alt1->predicate!=NULL||alt2->predicate!=NULL) && WarningLevel>1 )
+		   ensure_predicates_cover_ambiguous_lookahead_sequences(alt1, alt2, sub, ambig);
+		if ( WarningLevel==1 &&
+ 			(alt1->predicate!=NULL||alt2->predicate!=NULL))
+		{
+
+			/* We found at least one pred for at least one of the alts;
+			 * If warnings are low, just return.
+			 */
+
+			Tfree(ambig);
+            for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+    	    free((char *)fset);
+    		for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+    		free((char *)ftbl);
+			return;
+		}
+		/* else we're gonna give a warning */
+	}
+/* end TJP addition */
+
+	fprintf(stderr, ErrHdr, FileStr[alt1->file], alt1->line);
+	if ( jtype == aLoopBegin || jtype == aPlusBlk )
+		fprintf(stderr, " warning: optional/exit path and alt(s) %sambiguous upon", sub);
+	else
+		fprintf(stderr, " warning: alts %d and %d %sambiguous upon",
+					alt1->altnum, alt2->altnum, sub);
+	if ( elevel == 3 )
+	{
+		preorder(ambig->down);      /* <===== k>1 ambiguity message data */
+		fprintf(stderr, "\n");
+	} else {
+        MR_skipped_e3_report=1;
+    	dumpAmbigMsg(fset, stderr, 0);
+    };
+
+    MR_traceAmbSourceK(ambig,alt1,alt2);     /* <====== k>1 ambiguity aid */
+
+	Tfree(ambig);
+
+    for (i=1; i<=CLL_k; i++) set_free( fset[i] );
+	free((char *)fset);
+	for (i=1; i<=CLL_k; i++) free( (char *)ftbl[i] );
+	free((char *)ftbl);
+}
+
+/* Don't analyze alpha block of (alpha)?beta; if (alpha)? then analyze
+ * Return the 1st node of the beta block if present else return j.
+ */
+Junction *
+#ifdef __USE_PROTOS
+analysis_point( Junction *j )
+#else
+analysis_point( j )
+Junction *j;
+#endif
+{
+	Junction *gblock;
+
+    /* MR13b  When there was an action/predicate preceding a guess block
+              the guess block became invisible at the analysis_point.
+
+              first_item_is_guess_block accepts any kind of node,
+              despite the fact that the formal is a junction.  But
+              I don't want to have to change it all over the place
+              until I know it works.
+    */
+
+	if ( j->ntype != nJunction && j->ntype != nAction) return j;
+
+	gblock = first_item_is_guess_block((Junction *)j);
+
+	if ( gblock!=NULL )
+	{
+		Junction *past = gblock->end;
+		Junction *p;
+		require(past!=NULL, "analysis_point: no end block on (...)? block");
+
+		for (p=(Junction *)past->p1; p!=NULL; )
+		{
+			if ( p->ntype==nAction )
+			{
+				p=(Junction *)((ActionNode *)p)->next;
+				continue;
+			}
+			if ( p->ntype!=nJunction )
+			{
+                past->alpha_beta_guess_end=1;           /* MR14 */
+				return (Junction *)past->p1;
+			}
+			if ( p->jtype==EndBlk || p->jtype==EndRule )
+			{
+				return j;
+			}
+/* MR6                                									      */
+/* MR6	A guess block is of the form "(alpha)? beta" or "(alpha)?".           */
+/* MR6  When beta is omitted (second form) this means "(alpha)? alpha".       */
+/* MR6  The program does not store another copy of alpha in this case.        */
+/* MR6  During analysis when the program needs to know what follows the       */
+/* MR6    guess clause.  It calls this routine.                               */
+/* MR6                                                                        */
+/* MR6      If it is of the form "(alpha)? beta" it returns a pointer to beta.*/
+/* MR6                                                                        */
+/* MR6      If it is of the form "(alpha)?" it returns a pointer to the guess */
+/* MR6        block itself thereby reusing the junction tree.                 */
+/* MR6                                                                        */
+/* MR6  It works by searching the "next in sequence" chain (skipping actions) */
+/* MR6    searching for a RuleRef or Token node.  (Those are the only 4 kinds */
+/* MR6    of nodes: Junctions, RuleRef, Token, and Action.)                   */
+/* MR6                                                                        */
+/* MR6  This won't work for the special case "(alpha)? ()" because it has no  */
+/* MR6    rule references or token nodes.  It eventually encounters a         */
+/* MR6	  junction of type EndBlk or EndRule and says to its caller: nothing  */
+/* MR6    more here to analyze - must be of the form "(alpha)?".              */
+/* MR6                                                                        */
+/* MR6  In the case of "(alpha)? ()" it should return a pointer to "()"       */
+/* MR6                                                                        */
+/* MR6  I think.                                                              */
+/* MR6                                                                        */
+			if ( p->jtype!=Generic) {		                           /* MR6 */
+                past->alpha_beta_guess_end=1;                          /* MR14 */
+				return (Junction *)past->p1;                           /* MR6 */
+			};					                                       /* MR6 */
+   			p=(Junction *)p->p1;
+		}
+	}
+	return j;
+}
+
+set
+#ifdef __USE_PROTOS
+First( Junction *j, int k, int jtype, int *max_k )
+#else
+First( j, k, jtype, max_k )
+Junction *j;
+int k;
+int jtype;
+int *max_k;
+#endif
+{
+	Junction *alt1, *alt2;
+	set a, rk, fCurBlk;
+	int savek;
+	int p1, p2;
+
+    int     save_maintainBackTrace;
+
+	require(j->ntype==nJunction, "First: non junction passed");
+
+	/* C o m p u t e  F I R S T  s e t  w i t h  k  l o o k a h e a d */
+	fCurBlk = rk = empty;
+	for (alt1=j; alt1!=NULL; alt1 = (Junction *)alt1->p2 )
+	{
+		Junction * p = NULL;
+		Junction * p1junction = NULL;
+		p = analysis_point((Junction *)alt1->p1);
+		p1junction = (Junction *) (alt1->p1);
+#if 0
+		if (p != p1junction) {
+			fprintf(stdout,"Analysis point for #%d is #%d", p1junction->seq, p->seq); /* debug */
+		}
+#endif
+		REACH(p, k, &rk, alt1->fset[k]);
+		require(set_nil(rk), "rk != nil");
+		set_free(rk);
+		set_orin(&fCurBlk, alt1->fset[k]);
+	}
+
+	/* D e t e c t  A m b i g u i t i e s */
+	*max_k = 1;
+	for (p1=1,alt1=j; alt1!=NULL; alt1 = (Junction *)alt1->p2, p1++)
+	{
+		for (p2=1,alt2=(Junction *)alt1->p2; alt2!=NULL; alt2 = (Junction *)alt2->p2, p2++)
+		{
+			savek = k;
+			a = set_and(alt1->fset[k], alt2->fset[k]);
+			while ( !set_nil(a) )
+			{
+				/* if we have hit the max k requested, just give warning */
+				if ( j->approx==k ) {
+				}
+
+				if ( k==CLL_k )
+				{
+#ifdef NOT_USED
+***					int save_LL_k = LL_k;
+***					int save_CLL_k = CLL_k;
+***					/* Get new LL_k from interactive feature if enabled */
+***					if ( AImode )
+***						AmbiguityDialog(j, jtype, alt1, alt2, &CLL_k, &LL_k);
+#endif
+					*max_k = CLL_k;
+                    save_maintainBackTrace=MR_MaintainBackTrace;
+                    if (AlphaBetaTrace) MR_MaintainBackTrace=0;
+					HandleAmbiguity(j, alt1, alt2, jtype);
+                    MR_MaintainBackTrace=save_maintainBackTrace;
+					break;
+				}
+				else
+				{
+					Junction *p = analysis_point((Junction *)alt1->p1);
+					Junction *q = analysis_point((Junction *)alt2->p1);
+					k++;	/* attempt ambig alts again with more lookahead */
+
+					REACH(p, k, &rk, alt1->fset[k]);
+					require(set_nil(rk), "rk != nil");
+					REACH(q, k, &rk, alt2->fset[k]);
+					require(set_nil(rk), "rk != nil");
+					set_free(a);
+					a = set_and(alt1->fset[k], alt2->fset[k]);
+					if ( k > *max_k ) *max_k = k;
+				}
+			}
+			set_free(a);
+			k = savek;
+		}
+	}
+
+	return fCurBlk;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/fset2.c b/Tools/Source/TianoTools/Pccts/antlr/fset2.c
new file mode 100644
index 0000000000..7f686a53d5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/fset2.c
@@ -0,0 +1,2250 @@
+/*
+ * fset2.c
+ *
+ * Compute FIRST sets for full LL(k)
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#include <stdlib.h>
+
+#ifdef PCCTS_USE_STDARG
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+
+/* ick! globals.  Used by permute() to track which elements of a set have been used */
+
+static int *findex;
+set *fset;              /* MR11 make global */
+static unsigned **ftbl;
+static set *constrain; /* pts into fset. constrains tToken() to 'constrain' */
+int ConstrainSearch;
+int maxk;               /* set to initial k upon tree construction request */
+                        /* MR11 make global */
+static Tree *FreeList = NULL;
+
+#ifdef __USE_PROTOS
+static int tmember_of_context(Tree *, Predicate *);
+#else
+static int tmember_of_context();
+#endif
+
+#if TREE_DEBUG
+set     set_of_tnodes_in_use;
+int     stop_on_tnode_seq_number=(-1);     /* (-1) to disable */
+#endif
+
+/* Do root
+ * Then each sibling
+ */
+
+void
+#ifdef __USE_PROTOS
+preorder( Tree *tree )
+#else
+preorder( tree )
+Tree *tree;
+#endif
+{
+	if ( tree == NULL ) return;
+	if ( tree->down != NULL ) fprintf(stderr, " (");
+	if ( tree->token == ALT ) fprintf(stderr, " ALT");
+	else fprintf(stderr, " %s", TerminalString(tree->token));
+	if ( tree->token==EpToken ) fprintf(stderr, "(%d)", tree->v.rk);
+	preorder(tree->down);
+	if ( tree->down != NULL ) fprintf(stderr, " )");
+	preorder(tree->right);
+}
+
+#ifdef __USE_PROTOS
+int MR_tree_matches_constraints(int k,set * constrain,Tree *t)
+#else
+int MR_tree_matches_constraints(k,constrain,t)
+  int       k;
+  set *     constrain;
+  Tree *    t;
+#endif
+{
+  int       i;
+  Tree      *u;
+
+  if (k == 0) return 1;
+
+  /* for testing guard predicates: if the guard tree is shorter
+     than the constraint then it is a match.  The reason is that
+     a guard of (A B) should be equivalent to a guard of (A B . . .)
+     where "." matches every token.  Thus a match which runs out
+     of tree before constraint is a match.
+  */
+
+  if (t == NULL) return 1;
+  require (set_deg(constrain[0]) == 1,
+            "MR_tree_matches_constraints: set_deg != 1");
+  i=set_int(constrain[0]);
+  if (t->token != i) return 0;
+  if (k-1 == 0) return 1;
+  for (u=t->down; u != NULL; u=u->right) {
+    if (MR_tree_matches_constraints(k-1,&constrain[1],u)) {
+       return 1;
+    };
+  };
+  return 0;
+}
+
+/* check the depth of each primary sibling to see that it is exactly
+ * k deep. e.g.;
+ *
+ *	ALT
+ *   |
+ *   A ------- B
+ *   |         |
+ *   C -- D    E
+ *
+ * Remove all branches <= k deep.
+ *
+ * Added by TJP 9-23-92 to make the LL(k) constraint mechanism to work.
+ */
+
+static int pruneCount=0;
+static int prunePeak=200;
+
+Tree *
+#ifdef __USE_PROTOS
+prune( Tree *t, int k )
+#else
+prune( t, k )
+Tree *t;
+int k;
+#endif
+{
+    pruneCount++;
+    if (pruneCount > prunePeak+100) {
+      prunePeak=pruneCount;
+#if 0
+***   fprintf(stderr,"pruneCount=%d\n",pruneCount);
+/***  preorder(t);   ***/
+***   fprintf(stderr,"\n",pruneCount);
+#endif
+    };
+    if ( t == NULL ) {
+        pruneCount--;
+        return NULL;
+    };
+    if ( t->token == ALT ) fatal_internal("prune: ALT node in FIRST tree");
+    if ( t->right!=NULL ) t->right = prune(t->right, k);
+    if ( k>1 )
+	{
+		if ( t->down!=NULL ) t->down = prune(t->down, k-1);
+		if ( t->down == NULL )
+		{
+			Tree *r = t->right;
+			t->right = NULL;
+			Tfree(t);
+            pruneCount--;
+			return r;
+		}
+	}
+    pruneCount--;
+    return t;
+}
+
+/* build a tree (root child1 child2 ... NULL) */
+#ifdef PCCTS_USE_STDARG
+Tree *tmake(Tree *root, ...)
+#else
+Tree *tmake(va_alist)
+va_dcl
+#endif
+{
+	Tree *w;
+	va_list ap;
+	Tree *child, *sibling=NULL, *tail=NULL;
+#ifndef PCCTS_USE_STDARG
+	Tree *root;
+#endif
+
+#ifdef PCCTS_USE_STDARG
+	va_start(ap, root);
+#else
+	va_start(ap);
+	root = va_arg(ap, Tree *);
+#endif
+	child = va_arg(ap, Tree *);
+	while ( child != NULL )
+	{
+#ifdef DUM
+		/* added "find end of child" thing TJP March 1994 */
+		for (w=child; w->right!=NULL; w=w->right) {;} /* find end of child */
+#else
+		w = child;
+#endif
+
+		if ( sibling == NULL ) {sibling = child; tail = w;}
+		else {tail->right = child; tail = w;}
+		child = va_arg(ap, Tree *);
+	}
+
+	/* was "root->down = sibling;" */
+	if ( root==NULL ) root = sibling;
+	else root->down = sibling;
+
+	va_end(ap);
+	return root;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tnode( int tok )
+#else
+tnode( tok )
+int tok;
+#endif
+{
+	Tree *p, *newblk;
+	static int n=0;
+	
+	if ( FreeList == NULL )
+	{
+		/*fprintf(stderr, "tnode: %d more nodes\n", TreeBlockAllocSize);*/
+		if ( TreeResourceLimit > 0 )
+		{
+			if ( (n+TreeBlockAllocSize) >= TreeResourceLimit )
+			{
+				fprintf(stderr, ErrHdr, FileStr[CurAmbigfile], CurAmbigline);
+				fprintf(stderr, " hit analysis resource limit while analyzing alts %d and %d %s\n",
+								CurAmbigAlt1,
+								CurAmbigAlt2,
+								CurAmbigbtype);
+				exit(PCCTS_EXIT_FAILURE);
+			}
+		}
+		newblk = (Tree *)calloc(TreeBlockAllocSize, sizeof(Tree));
+		if ( newblk == NULL )
+		{
+			fprintf(stderr, ErrHdr, FileStr[CurAmbigfile], CurAmbigline);
+			fprintf(stderr, " out of memory while analyzing alts %d and %d %s\n",
+							CurAmbigAlt1,
+							CurAmbigAlt2,
+							CurAmbigbtype);
+			exit(PCCTS_EXIT_FAILURE);
+		}
+		n += TreeBlockAllocSize;
+		for (p=newblk; p<&(newblk[TreeBlockAllocSize]); p++)
+		{
+			p->right = FreeList;	/* add all new Tree nodes to Free List */
+			FreeList = p;
+		}
+	}
+	p = FreeList;
+	FreeList = FreeList->right;		/* remove a tree node */
+	p->right = NULL;				/* zero out ptrs */
+	p->down = NULL;
+	p->token = tok;
+
+    TnodesAllocated++;                                      /* MR10 */
+    TnodesInUse++;                                          /* MR10 */
+    if (TnodesInUse > TnodesPeak) TnodesPeak=TnodesInUse;   /* MR10 */
+
+#ifdef TREE_DEBUG
+	require(!p->in_use, "tnode: node in use!");
+	p->in_use = 1;
+    p->seq=TnodesAllocated;
+    set_orel( (unsigned) TnodesAllocated,&set_of_tnodes_in_use);
+    if (stop_on_tnode_seq_number == p->seq) {
+      fprintf(stderr,"\n*** just allocated tnode #%d ***\n",
+            stop_on_tnode_seq_number);
+    };
+#endif
+	return p;
+}
+
+static Tree *
+#ifdef __USE_PROTOS
+eofnode( int k )
+#else
+eofnode( k )
+int k;
+#endif
+{
+	Tree *t=NULL;
+	int i;
+
+	for (i=1; i<=k; i++)
+	{
+		t = tmake(tnode((TokenInd!=NULL?TokenInd[EofToken]:EofToken)), t, NULL);
+	}
+	return t;
+}
+
+
+
+void
+#ifdef __USE_PROTOS
+_Tfree( Tree *t )
+#else
+_Tfree( t )
+Tree *t;
+#endif
+{
+	if ( t!=NULL )
+	{
+#ifdef TREE_DEBUG
+        if (t->seq == stop_on_tnode_seq_number) {
+           fprintf(stderr,"\n*** just freed tnode #%d ***\n",t->seq);
+        };
+		require(t->in_use, "_Tfree: node not in use!");
+		t->in_use = 0;
+        set_rm( (unsigned) t->seq,set_of_tnodes_in_use);
+#endif
+		t->right = FreeList;
+		FreeList = t;
+        TnodesInUse--;                   /* MR10 */
+	}
+}
+
+/* tree duplicate */
+Tree *
+#ifdef __USE_PROTOS
+tdup( Tree *t )
+#else
+tdup( t )
+Tree *t;
+#endif
+{
+	Tree *u;
+	
+	if ( t == NULL ) return NULL;
+	u = tnode(t->token);
+	u->v.rk = t->v.rk;
+	u->right = tdup(t->right);
+	u->down = tdup(t->down);
+	return u;
+}
+
+/* tree duplicate (assume tree is a chain downwards) */
+Tree *
+#ifdef __USE_PROTOS
+tdup_chain( Tree *t )
+#else
+tdup_chain( t )
+Tree *t;
+#endif
+{
+	Tree *u;
+	
+	if ( t == NULL ) return NULL;
+	u = tnode(t->token);
+	u->v.rk = t->v.rk;
+	u->down = tdup(t->down);
+	return u;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tappend( Tree *t, Tree *u )
+#else
+tappend( t, u )
+Tree *t;
+Tree *u;
+#endif
+{
+	Tree *w;
+
+/*** fprintf(stderr, "tappend(");
+ *** preorder(t); fprintf(stderr, ",");
+ *** preorder(u); fprintf(stderr, " )\n");
+*/
+	if ( t == NULL ) return u;
+	if ( t->token == ALT && t->right == NULL ) return tappend(t->down, u);
+	for (w=t; w->right!=NULL; w=w->right) {;}
+	w->right = u;
+	return t;
+}
+
+/* dealloc all nodes in a tree */
+void
+#ifdef __USE_PROTOS
+Tfree( Tree *t )
+#else
+Tfree( t )
+Tree *t;
+#endif
+{
+	if ( t == NULL ) return;
+	Tfree( t->down );
+	Tfree( t->right );
+	_Tfree( t );
+}
+
+/* find all children (alts) of t that require remaining_k nodes to be LL_k
+ * tokens long.
+ *
+ * t-->o
+ *     |
+ *     a1--a2--...--an		<-- LL(1) tokens
+ *     |   |        |
+ *     b1  b2  ...  bn		<-- LL(2) tokens
+ *     |   |        |
+ *     .   .        .
+ *     .   .        .
+ *     z1  z2  ...  zn		<-- LL(LL_k) tokens
+ *
+ * We look for all [Ep] needing remaining_k nodes and replace with u.
+ * u is not destroyed or actually used by the tree (a copy is made).
+ */
+Tree *
+#ifdef __USE_PROTOS
+tlink( Tree *t, Tree *u, int remaining_k )
+#else
+tlink( t, u, remaining_k )
+Tree *t;
+Tree *u;
+int remaining_k;
+#endif
+{
+	Tree *p;
+	require(remaining_k!=0, "tlink: bad tree");
+
+	if ( t==NULL ) return NULL;
+	/*fprintf(stderr, "tlink: u is:"); preorder(u); fprintf(stderr, "\n");*/
+	if ( t->token == EpToken && t->v.rk == remaining_k )
+	{
+		require(t->down==NULL, "tlink: invalid tree");
+		if ( u == NULL ) {
+/* MR10 */  Tree  *tt=t->right;
+/* MR10 */  _Tfree(t);
+/* MR10 */  return tt;
+        };
+		p = tdup( u );
+		p->right = t->right;
+		_Tfree( t );
+		return p;
+	}
+	t->down = tlink(t->down, u, remaining_k);
+	t->right = tlink(t->right, u, remaining_k);
+	return t;
+}
+
+/* remove as many ALT nodes as possible while still maintaining semantics */
+Tree *
+#ifdef __USE_PROTOS
+tshrink( Tree *t )
+#else
+tshrink( t )
+Tree *t;
+#endif
+{
+	if ( t == NULL ) return NULL;
+	t->down = tshrink( t->down );
+	t->right = tshrink( t->right );
+	if ( t->down == NULL )
+	{
+		if ( t->token == ALT )
+		{
+			Tree *u = t->right;
+			_Tfree(t);
+			return u;			/* remove useless alts */
+		}
+		return t;
+	}
+
+	/* (? (ALT (? ...)) s) ==> (? (? ...) s) where s = sibling, ? = match any */
+	if ( t->token == ALT && t->down->right == NULL)
+	{
+		Tree *u = t->down;
+		u->right = t->right;
+		_Tfree( t );
+		return u;
+	}
+	/* (? (A (ALT t)) s) ==> (? (A t) s) where A is a token; s,t siblings */
+	if ( t->token != ALT && t->down->token == ALT && t->down->right == NULL )
+	{
+		Tree *u = t->down->down;
+		_Tfree( t->down );
+		t->down = u;
+		return t;
+	}
+	return t;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tflatten( Tree *t )
+#else
+tflatten( t )
+Tree *t;
+#endif
+{
+	if ( t == NULL ) return NULL;
+	t->down = tflatten( t->down );
+	t->right = tflatten( t->right );
+	if ( t->down == NULL ) return t;
+	
+	if ( t->token == ALT )
+	{
+		Tree *u;
+		/* find tail of children */
+		for (u=t->down; u->right!=NULL; u=u->right) {;}
+		u->right = t->right;
+		u = t->down;
+		_Tfree( t );
+		return u;
+	}
+	return t;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tJunc( Junction *p, int k, set *rk )
+#else
+tJunc( p, k, rk )
+Junction *p;
+int k;
+set *rk;
+#endif
+{
+	Tree *t=NULL, *u=NULL;
+	Junction *alt;
+	Tree *tail=NULL, *r;
+
+#ifdef DBG_TRAV
+	fprintf(stderr, "tJunc(%d): %s in rule %s\n", k,
+			decodeJType[p->jtype], ((Junction *)p)->rname);
+#endif
+
+/* MR14 */    if (AlphaBetaTrace && p->alpha_beta_guess_end) {
+/* MR14 */         warnFL(
+/* MR14 */           "not possible to compute follow set for alpha in an \"(alpha)? beta\" block.  ",
+/* MR14 */                 FileStr[p->file],p->line);
+/* MR14 */         MR_alphaBetaTraceReport();
+/* MR14 */    };
+
+/* MR14 */    if (p->alpha_beta_guess_end) {
+/* MR14 */      return NULL;
+/* MR14 */    }
+
+	if ( p->jtype==aLoopBlk || p->jtype==RuleBlk ||
+		 p->jtype==aPlusBlk || p->jtype==aSubBlk || p->jtype==aOptBlk )
+	{
+		if ( p->jtype!=aSubBlk && p->jtype!=aOptBlk ) {
+			require(p->lock!=NULL, "rJunc: lock array is NULL");
+			if ( p->lock[k] ) return NULL;
+			p->lock[k] = TRUE;
+		}
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+		TRAV(p->p1, k, rk, tail);
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+
+		if ( p->jtype==RuleBlk ) {p->lock[k] = FALSE; return tail;}
+		r = tmake(tnode(ALT), tail, NULL);
+		for (alt=(Junction *)p->p2; alt!=NULL; alt = (Junction *)alt->p2)
+		{
+			/* if this is one of the added optional alts for (...)+ then break */
+			if ( alt->ignore ) break;
+
+			if ( tail==NULL ) {TRAV(alt->p1, k, rk, tail); r->down = tail;}
+			else
+			{
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+				TRAV(alt->p1, k, rk, tail->right);
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+				if ( tail->right != NULL ) tail = tail->right;
+			}
+		}
+		if ( p->jtype!=aSubBlk && p->jtype!=aOptBlk ) p->lock[k] = FALSE;
+#ifdef DBG_TREES
+		fprintf(stderr, "blk(%s) returns:",((Junction *)p)->rname); preorder(r); fprintf(stderr, "\n");
+#endif
+		if ( r->down == NULL ) {_Tfree(r); return NULL;}
+		return r;
+	}
+
+	if ( p->jtype==EndRule )
+	{
+		if ( p->halt )						/* don't want FOLLOW here? */
+		{
+/****		if ( ContextGuardTRAV ) return NULL; ****/
+			set_orel( (unsigned) k, rk);	/* indicate this k value needed */ /* MR10 cast */
+			t = tnode(EpToken);
+			t->v.rk = k;
+			return t;
+		}
+		require(p->lock!=NULL, "rJunc: lock array is NULL");
+		if ( p->lock[k] ) return NULL;
+		/* if no FOLLOW assume k EOF's */
+		if ( p->p1 == NULL ) return eofnode(k);
+		p->lock[k] = TRUE;
+	}
+
+/* MR14 */	if (p->p1 != NULL && p->guess &&  p->guess_analysis_point == NULL) {
+/* MR14 */    Node * guess_point;
+/* MR14 */    guess_point=(Node *)analysis_point(p);
+/* MR14 */    if (guess_point == (Node *)p) {
+/* MR14 */      guess_point=p->p1;
+/* MR14 */    }
+/* MR14 */    p->guess_analysis_point=guess_point;
+/* MR14 */  }	
+
+	if ( p->p2 == NULL )
+	{
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+/* M14 */        if (p->guess_analysis_point != NULL) {
+/* M14 */ 		   TRAV(p->guess_analysis_point, k, rk,t);
+/* M14 */        } else {
+        		   TRAV(p->p1, k, rk,t);
+/* M14 */        }
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+
+		if ( p->jtype==EndRule ) p->lock[k]=FALSE;
+		return t;
+	}
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+/* M14 */        if (p->guess_analysis_point != NULL) {
+/* M14 */ 		   TRAV(p->guess_analysis_point, k, rk,t);
+/* M14 */        } else {
+        		   TRAV(p->p1, k, rk,t);
+/* M14 */        }
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (p->jtype != Generic) MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+
+	if ( p->jtype!=RuleBlk && /* MR14 */ !p->guess) TRAV(p->p2, k, rk, u);
+
+	if ( p->jtype==EndRule ) p->lock[k] = FALSE;/* unlock node */
+
+	if ( t==NULL ) return tmake(tnode(ALT), u, NULL);
+	return tmake(tnode(ALT), t, u, NULL);
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tRuleRef( RuleRefNode *p, int k, set *rk_out )
+#else
+tRuleRef( p, k, rk_out )
+RuleRefNode *p;
+int k;
+set *rk_out;
+#endif
+{
+	int k2;
+	Tree *t=NULL, *u=NULL;
+	Junction *r;
+	set rk, rk2;
+	int save_halt;
+	RuleEntry *q = (RuleEntry *) hash_get(Rname, p->text);
+	
+#ifdef DBG_TRAV
+	fprintf(stderr, "tRuleRef: %s\n", p->text);
+#endif
+	if ( q == NULL )
+	{
+		TRAV(p->next, k, rk_out, t);/* ignore undefined rules */
+		return t;
+	}
+	rk = rk2 = empty;
+    if (RulePtr == NULL) fatal("RulePtr==NULL");
+	r = RulePtr[q->rulenum];
+	if ( r->lock[k] ) return NULL;
+	save_halt = r->end->halt;
+	r->end->halt = TRUE;		/* don't let reach fall off end of rule here */
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+	TRAV(r, k, &rk, t);
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+
+	r->end->halt = save_halt;
+#ifdef DBG_TREES
+	fprintf(stderr, "after ruleref, t is:"); preorder(t); fprintf(stderr, "\n");
+#endif
+	t = tshrink( t );
+	while ( !set_nil(rk) ) {	/* any k left to do? if so, link onto tree */
+		k2 = set_int(rk);
+		set_rm(k2, rk);
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR10 */    };
+
+		TRAV(p->next, k2, &rk2, u);
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      MR_pointerStackPop(&MR_BackTraceStack);
+/* MR10 */    };
+
+		t = tlink(t, u, k2);	/* any alts missing k2 toks, add u onto end */
+        Tfree(u);               /* MR10 */
+	}
+	set_free(rk);				/* rk is empty, but free it's memory */
+	set_orin(rk_out, rk2);		/* remember what we couldn't do */
+	set_free(rk2);
+	return t;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tToken( TokNode *p, int k, set *rk )
+#else
+tToken( p, k, rk )
+TokNode *p;
+int k;
+set *rk;
+#endif
+{
+	Tree *t=NULL, *tset=NULL, *u;
+
+	if (ConstrainSearch) {
+      if (MR_AmbSourceSearch) {
+		require(constrain>=fset&&constrain<=&(fset[CLL_k]),"tToken: constrain is not a valid set");
+      } else {
+		require(constrain>=fset&&constrain<=&(fset[LL_k]),"tToken: constrain is not a valid set");
+      };
+      constrain = &fset[maxk-k+1];
+	}
+
+#ifdef DBG_TRAV
+        	fprintf(stderr, "tToken(%d): %s\n", k, TerminalString(p->token));
+        	if ( ConstrainSearch ) {
+        		fprintf(stderr, "constrain is:"); s_fprT(stderr, *constrain); fprintf(stderr, "\n");
+        	}
+#endif
+
+	/* is it a meta token (set of tokens)? */
+
+	if ( !set_nil(p->tset) )
+	{
+		unsigned e=0;
+		set a;
+		Tree *n, *tail = NULL;
+
+		if ( ConstrainSearch ) {
+          a = set_and(p->tset, *constrain);
+          if (set_nil(a)) {         /* MR10 */
+            set_free(a);            /* MR11 */
+            return NULL;            /* MR10 */
+          };                        /* MR10 */
+		} else {
+          a = set_dup(p->tset);
+        };
+
+		for (; !set_nil(a); set_rm(e, a))
+		{
+			e = set_int(a);
+			n = tnode(e);
+			if ( tset==NULL ) { tset = n; tail = n; }
+			else { tail->right = n; tail = n; }
+		}
+		set_free( a );
+	}
+	else if ( ConstrainSearch && !set_el(p->token, *constrain) )
+    {
+/*      fprintf(stderr, "ignoring token %s(%d)\n", TerminalString(p->token),
+                k);*/
+        return NULL;
+    }
+	else {
+        tset = tnode( p->token );
+    };
+
+/* MR10 */    if (MR_MaintainBackTrace) {
+/* MR10 */      if (k == 1) {
+/* MR10 */        MR_pointerStackPush(&MR_BackTraceStack,p);
+/* MR13 */        if (MR_SuppressSearch) {
+/* MR13 */          MR_suppressSearchReport();
+/* MR13 */        } else {
+/* MR10 */          MR_backTraceReport();
+/* MR13 */        };
+/* MR10 */        MR_pointerStackPop(&MR_BackTraceStack);
+/* MR11 */        Tfree(tset);
+/* MR11 */        return NULL;
+/* MR10 */      };
+/* MR10 */    };
+
+	if ( k == 1 ) return tset;
+
+    if (MR_MaintainBackTrace) {
+      MR_pointerStackPush(&MR_BackTraceStack,p);
+    };
+
+	TRAV(p->next, k-1, rk, t);
+
+    if (MR_MaintainBackTrace) {
+      Tfree(t);
+      Tfree(tset);
+      MR_pointerStackPop(&MR_BackTraceStack);
+      return NULL;
+    };
+
+	/* here, we are positive that, at least, this tree will not contribute
+	 * to the LL(2) tree since it will be too shallow, IF t==NULL.
+	 * If doing a context guard walk, then don't prune.
+	 */
+	if ( t == NULL && !ContextGuardTRAV )	/* tree will be too shallow */
+	{
+		if ( tset!=NULL ) Tfree( tset );
+		return NULL;
+	}
+#ifdef DBG_TREES
+	fprintf(stderr, "tToken(%d)->next:",k); preorder(t); fprintf(stderr, "\n");
+#endif
+
+	/* if single token root, then just make new tree and return */
+    /* MR10 - set_nil(p->tset) isn't a good test because of ConstraintSearch */
+
+	if (tset->right == NULL) return tmake(tset, t, NULL);    /* MR10 */
+
+	/* here we must make a copy of t as a child of each element of the tset;
+	 * e.g., "T1..T3 A" would yield ( nil ( T1 A ) ( T2 A ) ( T3 A ) )
+	 */
+	for (u=tset; u!=NULL; u=u->right)
+	{
+		/* make a copy of t and hook it onto bottom of u */
+		u->down = tdup(t);
+	}
+	Tfree( t );
+#ifdef DBG_TREES
+	fprintf(stderr, "range is:"); preorder(tset); fprintf(stderr, "\n");
+#endif
+	return tset;
+}
+
+Tree *
+#ifdef __USE_PROTOS
+tAction( ActionNode *p, int k, set *rk )
+#else
+tAction( p, k, rk )
+ActionNode *p;
+int k;
+set *rk;
+#endif
+{
+	Tree        *t=NULL;
+    set         *save_fset=NULL;
+    int         i;
+
+	/* fprintf(stderr, "tAction\n"); */
+
+/*  An MR_SuppressSearch is looking for things that can be
+      reached even when the predicate is false.
+
+    There are three kinds of predicates:
+        plain:              r1: <<p>>? r2
+        guarded:            r1: (A)? => <<p>>? r2
+        ampersand style:    r1: (A)? && <<p>>? r2
+
+    Of the three kinds of predicates, only a guard predicate
+      has things which are reachable even when the predicate
+      is false.  To be reachable the constraint must *not*
+      match the guard.
+
+*/
+
+    if (p->is_predicate && MR_SuppressSearch) {
+
+      Predicate     *pred=p->guardpred;
+
+      if (pred == NULL) {
+        t=NULL;
+        goto EXIT;
+      };
+      constrain = &fset[maxk-k+1];
+      if (pred->k == 1) {
+        set     dif;
+        dif=set_dif(*constrain,pred->scontext[1]);
+        if (set_nil(dif)) {
+          set_free(dif);
+          t=NULL;
+          goto EXIT;
+        };
+        set_free(dif);
+      } else {
+        if (MR_tree_matches_constraints(k,constrain,pred->tcontext)) {
+          t=NULL;
+          goto EXIT;
+        };
+      }
+    };
+
+    /* The ampersand predicate differs from the
+         other predicates because its first set
+         is a subset of the first set behind the predicate
+
+            r1: (A)? && <<p>>? r2 ;
+            r2: A | B;
+
+       In this case first[1] of r1 is A, even
+         though first[1] of r2 is {A B}.
+    */
+
+    if (p->is_predicate && p->ampersandPred != NULL) {
+
+      Predicate     *pred=p->ampersandPred;
+      Tree          *tAND;
+      Tree          *tset;
+
+      if (k <= pred->k) {
+        if (MR_MaintainBackTrace) MR_pointerStackPush(&MR_BackTraceStack,p);
+        TRAV(p->guardNodes,k,rk,t);
+        if (MR_MaintainBackTrace) MR_pointerStackPop(&MR_BackTraceStack);
+        return t;
+      } else {
+        require (k>1,"tAction for ampersandpred: k <= 1");
+        if (ConstrainSearch) {
+          if (MR_AmbSourceSearch) {
+    		require(constrain>=fset&&constrain<=&(fset[CLL_k]),
+                                "tToken: constrain is not a valid set");
+          } else {
+    		require(constrain>=fset&&constrain<=&(fset[LL_k]),
+                                "tToken: constrain is not a valid set");
+          };
+          save_fset=(set *) calloc (CLL_k+1,sizeof(set));
+          require (save_fset != NULL,"tAction save_fset alloc");
+          for (i=1; i <= CLL_k ; i++) {
+            save_fset[i]=set_dup(fset[i]);
+          };
+          if (pred->k == 1) {
+            constrain = &fset[maxk-k+1];
+            set_andin(constrain,pred->scontext[1]);
+            if (set_nil(*constrain)) {
+              t=NULL;
+              goto EXIT;
+            };
+          } else {
+            constrain = &fset[maxk-k+1];
+            if (! MR_tree_matches_constraints(pred->k,constrain,pred->tcontext)) {
+               t=NULL;
+               goto EXIT;
+            };  /* end loop on i          */
+          }; /* end loop on pred scontext/tcontext */
+        }; /* end if on k > pred->k     */
+      }; /* end if on constrain search  */
+
+      TRAV(p->next,k,rk,t);
+
+      if (t != NULL) {
+        t=tshrink(t);
+        t=tflatten(t);
+        t=tleft_factor(t);
+        if (pred->tcontext != NULL) {
+          tAND=MR_computeTreeAND(t,pred->tcontext);
+        } else {
+          tset=MR_make_tree_from_set(pred->scontext[1]);
+          tAND=MR_computeTreeAND(t,tset);
+          Tfree(tset);
+        };
+        Tfree(t);
+        t=tAND;
+      };
+      goto EXIT;
+
+    }; /* end if on ampersand predicate */
+
+    TRAV(p->next,k,rk,t);
+
+EXIT:
+    if (save_fset != NULL) {
+      for (i=1 ; i <= CLL_k ; i++) {
+        set_free(fset[i]);
+        fset[i]=save_fset[i];
+      };
+      free ( (char *) save_fset);
+    };
+	return t;
+}
+
+/* see if e exists in s as a possible input permutation (e is always a chain) */
+
+int
+#ifdef __USE_PROTOS
+tmember( Tree *e, Tree *s )
+#else
+tmember( e, s )
+Tree *e;
+Tree *s;
+#endif
+{
+	if ( e==NULL||s==NULL ) return 0;
+/** fprintf(stderr, "tmember(");
+***	preorder(e); fprintf(stderr, ",");
+***	preorder(s); fprintf(stderr, " )\n");
+*/
+	if ( s->token == ALT && s->right == NULL ) return tmember(e, s->down);
+	if ( e->token!=s->token )
+	{
+		if ( s->right==NULL ) return 0;
+		return tmember(e, s->right);
+	}
+	if ( e->down==NULL && s->down == NULL ) return 1;
+	if ( tmember(e->down, s->down) ) return 1;
+	if ( s->right==NULL ) return 0;
+	return tmember(e, s->right);
+}
+
+/* see if e exists in s as a possible input permutation (e is always a chain);
+ * Only check s to the depth of e.  In other words, 'e' can be a shorter
+ * sequence than s.
+ */
+int
+#ifdef __USE_PROTOS
+tmember_constrained( Tree *e, Tree *s)
+#else
+tmember_constrained( e, s )
+Tree *e;
+Tree *s;
+#endif
+{
+	if ( e==NULL||s==NULL ) return 0;
+/**	fprintf(stderr, "tmember_constrained(");
+***	preorder(e); fprintf(stderr, ",");
+***	preorder(s); fprintf(stderr, " )\n");
+**/
+	if ( s->token == ALT && s->right == NULL )
+		return tmember_constrained(e, s->down);
+	if ( e->token!=s->token )
+	{
+		if ( s->right==NULL ) return 0;
+		return tmember_constrained(e, s->right);
+	}
+	if ( e->down == NULL ) return 1; /* if s is matched to depth of e return */
+	if ( tmember_constrained(e->down, s->down) ) return 1;
+	if ( s->right==NULL ) return 0;
+	return tmember_constrained(e, s->right);
+}
+
+/* combine (? (A t) ... (A u) ...) into (? (A t u)) */
+Tree *
+#ifdef __USE_PROTOS
+tleft_factor( Tree *t )
+#else
+tleft_factor( t )
+Tree *t;
+#endif
+{
+	Tree *u, *v, *trail, *w;
+
+	/* left-factor what is at this level */
+	if ( t == NULL ) return NULL;
+	for (u=t; u!=NULL; u=u->right)
+	{
+		trail = u;
+		v=u->right;
+		while ( v!=NULL )
+		{
+			if ( u->token == v->token )
+			{
+				if ( u->down!=NULL )
+				{
+					for (w=u->down; w->right!=NULL; w=w->right) {;}
+					w->right = v->down;	/* link children together */
+				}
+				else u->down = v->down;
+				trail->right = v->right;		/* unlink factored node */
+				_Tfree( v );
+				v = trail->right;
+			}
+			else {trail = v; v=v->right;}
+		}
+	}
+	/* left-factor what is below */
+	for (u=t; u!=NULL; u=u->right) u->down = tleft_factor( u->down );
+	return t;
+}
+
+/* remove the permutation p from t if present */
+Tree *
+#ifdef __USE_PROTOS
+trm_perm( Tree *t, Tree *p )
+#else
+trm_perm( t, p )
+Tree *t;
+Tree *p;
+#endif
+{
+	/*
+	fprintf(stderr, "trm_perm(");
+	preorder(t); fprintf(stderr, ",");
+	preorder(p); fprintf(stderr, " )\n");
+	*/
+	if ( t == NULL || p == NULL ) return NULL;
+	if ( t->token == ALT )
+	{
+		t->down = trm_perm(t->down, p);
+		if ( t->down == NULL ) 				/* nothing left below, rm cur node */
+		{
+			Tree *u = t->right;
+			_Tfree( t );
+			return trm_perm(u, p);
+		}
+		t->right = trm_perm(t->right, p);	/* look for more instances of p */
+		return t;
+	}
+	if ( p->token != t->token )				/* not found, try a sibling */
+	{
+		t->right = trm_perm(t->right, p);
+		return t;
+	}
+	t->down = trm_perm(t->down, p->down);
+	if ( t->down == NULL ) 					/* nothing left below, rm cur node */
+	{
+		Tree *u = t->right;
+		_Tfree( t );
+		return trm_perm(u, p);
+	}
+	t->right = trm_perm(t->right, p);		/* look for more instances of p */
+	return t;
+}
+
+/* add the permutation 'perm' to the LL_k sets in 'fset' */
+void
+#ifdef __USE_PROTOS
+tcvt( set *fset, Tree *perm )
+#else
+tcvt( fset, perm )
+set *fset;
+Tree *perm;
+#endif
+{
+	if ( perm==NULL ) return;
+	set_orel(perm->token, fset);
+	tcvt(fset+1, perm->down);
+}
+
+/* for each element of ftbl[k], make it the root of a tree with permute(ftbl[k+1])
+ * as a child.
+ */
+Tree *
+#ifdef __USE_PROTOS
+permute( int k, int max_k )
+#else
+permute( k, max_k )
+int k, max_k;
+#endif
+{
+	Tree *t, *u;
+	
+	if ( k>max_k ) return NULL;
+	if ( ftbl[k][findex[k]] == nil ) return NULL;
+	t = permute(k+1, max_k);
+	if ( t==NULL&&k<max_k )		/* no permutation left below for k+1 tokens? */
+	{
+		findex[k+1] = 0;
+		(findex[k])++;			/* try next token at this k */
+		return permute(k, max_k);
+	}
+	
+	u = tmake(tnode(ftbl[k][findex[k]]), t, NULL);
+	if ( k == max_k ) (findex[k])++;
+	return u;
+}
+
+/* Compute LL(k) trees for alts alt1 and alt2 of p.
+ * function result is tree of ambiguous input permutations
+ *
+ * ALGORITHM may change to look for something other than LL_k size
+ * trees ==> maxk will have to change.
+ */
+Tree *
+#ifdef __USE_PROTOS
+VerifyAmbig( Junction *alt1, Junction *alt2, unsigned **ft, set *fs, Tree **t, Tree **u, int *numAmbig )
+#else
+VerifyAmbig( alt1, alt2, ft, fs, t, u, numAmbig )
+Junction *alt1;
+Junction *alt2;
+unsigned **ft;
+set *fs;
+Tree **t;
+Tree **u;
+int *numAmbig;
+#endif
+{
+	set rk;
+	Tree *perm, *ambig=NULL;
+	Junction *p;
+	int k;
+    int    tnodes_at_start=TnodesAllocated;
+    int    tnodes_at_end;
+    int    tnodes_used;
+    set    *save_fs;
+    int    j;
+
+    save_fs=(set *) calloc(CLL_k+1,sizeof(set));
+    require(save_fs != NULL,"save_fs calloc");
+
+    for (j=0; j <= CLL_k ; j++) save_fs[j]=set_dup(fs[j]);
+
+	maxk = LL_k;				/* NOTE: for now, we look for LL_k */
+	ftbl = ft;
+	fset = fs;
+	constrain = &(fset[1]);
+	findex = (int *) calloc(LL_k+1, sizeof(int));
+	if ( findex == NULL )
+	{
+		fprintf(stderr, ErrHdr, FileStr[CurAmbigfile], CurAmbigline);
+		fprintf(stderr, " out of memory while analyzing alts %d and %d of %s\n",
+						CurAmbigAlt1,
+						CurAmbigAlt2,
+						CurAmbigbtype);
+		exit(PCCTS_EXIT_FAILURE);
+	}
+	for (k=1; k<=LL_k; k++) findex[k] = 0;
+
+	rk = empty;
+	ConstrainSearch = 1;	/* consider only tokens in ambig sets */
+
+	p = analysis_point((Junction *)alt1->p1);
+	TRAV(p, LL_k, &rk, *t);
+	*t = tshrink( *t );
+	*t = tflatten( *t );
+	*t = tleft_factor( *t );    /* MR10 */
+	*t = prune(*t, LL_k);
+	*t = tleft_factor( *t );
+
+/***	fprintf(stderr, "after shrink&flatten&prune&left_factor:"); preorder(*t); fprintf(stderr, "\n");*/
+	if ( *t == NULL )
+	{
+/***	fprintf(stderr, "TreeIncomplete --> no LL(%d) ambiguity\n", LL_k);*/
+		Tfree( *t );	/* kill if impossible to have ambig */
+		*t = NULL;
+	}
+
+	p = analysis_point((Junction *)alt2->p1);
+
+	TRAV(p, LL_k, &rk, *u);
+	*u = tshrink( *u );
+	*u = tflatten( *u );
+	*t = tleft_factor( *t );    /* MR10 */
+	*u = prune(*u, LL_k);
+	*u = tleft_factor( *u );
+/*	fprintf(stderr, "after shrink&flatten&prune&lfactor:"); preorder(*u); fprintf(stderr, "\n");*/
+	if ( *u == NULL )
+	{
+/*		fprintf(stderr, "TreeIncomplete --> no LL(%d) ambiguity\n", LL_k);*/
+		Tfree( *u );
+		*u = NULL;
+	}
+
+	for (k=1; k<=LL_k; k++) set_clr( fs[k] );
+
+	ambig = tnode(ALT);
+	k = 0;
+	if ( *t!=NULL && *u!=NULL )
+	{
+		while ( (perm=permute(1,LL_k))!=NULL )
+		{
+/*			fprintf(stderr, "chk perm:"); preorder(perm); fprintf(stderr, "\n");*/
+			if ( tmember(perm, *t) && tmember(perm, *u) )
+			{
+/*				fprintf(stderr, "ambig upon"); preorder(perm); fprintf(stderr, "\n");*/
+
+				k++;
+				perm->right = ambig->down;
+				ambig->down = perm;
+				tcvt(&(fs[1]), perm);
+			}
+			else Tfree( perm );
+		}
+	}
+
+    for (j=0; j <= CLL_k ; j++) fs[j]=save_fs[j];
+    free( (char *) save_fs);
+
+    tnodes_at_end=TnodesAllocated;
+    tnodes_used=tnodes_at_end - tnodes_at_start;
+
+    if (TnodesReportThreshold > 0 && tnodes_used > TnodesReportThreshold) {
+      fprintf(stdout,"There were %d tuples whose ambiguity could not be resolved by full lookahead\n",k);
+      fprintf(stdout,"There were %d tnodes created to resolve ambiguity between:\n\n",tnodes_used);
+      fprintf(stdout,"  Choice 1: %s  line %d  file %s\n",
+                                 MR_ruleNamePlusOffset( (Node *) alt1),alt1->line,FileStr[alt1->file]);
+      fprintf(stdout,"  Choice 2: %s  line %d  file %s\n",
+                                 MR_ruleNamePlusOffset( (Node *) alt2),alt2->line,FileStr[alt2->file]);
+      for (j=1; j <= CLL_k ; j++) {
+        fprintf(stdout,"\n    Intersection of lookahead[%d] sets:\n",j);
+        MR_dumpTokenSet(stdout,2,fs[j]);
+      };
+      fprintf(stdout,"\n");
+    };
+
+	*numAmbig = k;
+	if ( ambig->down == NULL ) {_Tfree(ambig); ambig = NULL;}
+	free( (char *)findex );
+/*	fprintf(stderr, "final ambig:"); preorder(ambig); fprintf(stderr, "\n");*/
+	return ambig;
+}
+
+static Tree *
+#ifdef __USE_PROTOS
+bottom_of_chain( Tree *t )
+#else
+bottom_of_chain( t )
+Tree *t;
+#endif
+{
+    if ( t==NULL ) return NULL;
+    for (; t->down != NULL; t=t->down) {;}
+    return t;
+}
+
+/*
+ * Make a tree from k sets where the degree of the first k-1 sets is 1.
+ */
+Tree *
+#ifdef __USE_PROTOS
+make_tree_from_sets( set *fset1, set *fset2 )
+#else
+make_tree_from_sets( fset1, fset2 )
+set *fset1;
+set *fset2;
+#endif
+{
+	set inter;
+	int i;
+	Tree *t=NULL, *n, *u;
+	unsigned *p,*q;
+	require(LL_k>1, "make_tree_from_sets: LL_k must be > 1");
+
+	/* do the degree 1 sets first */
+	for (i=1; i<=LL_k-1; i++)
+	{
+		inter = set_and(fset1[i], fset2[i]);
+		require(set_deg(inter)==1, "invalid set to tree conversion");
+		n = tnode(set_int(inter));
+		if (t==NULL) t=n; else tmake(t, n, NULL);
+		set_free(inter);
+	}
+
+	/* now add the chain of tokens at depth k */
+	u = bottom_of_chain(t);
+	inter = set_and(fset1[LL_k], fset2[LL_k]);
+	if ( (q=p=set_pdq(inter)) == NULL ) fatal_internal("Can't alloc space for set_pdq");
+	/* first one is linked to bottom, then others are sibling linked */
+	n = tnode(*p++);
+	u->down = n;
+	u = u->down;
+	while ( *p != nil )
+	{
+		n = tnode(*p);
+		u->right = n;
+		u = u->right;
+		p++;
+	}
+	free((char *)q);
+
+	return t;
+}
+
+/* create and return the tree of lookahead k-sequences that are in t, but not
+ * in the context of predicates in predicate list p.
+ */
+Tree *
+#ifdef __USE_PROTOS
+tdif( Tree *ambig_tuples, Predicate *p, set *fset1, set *fset2 )
+#else
+tdif( ambig_tuples, p, fset1, fset2 )
+Tree *ambig_tuples;
+Predicate *p;
+set *fset1;
+set *fset2;
+#endif
+{
+	unsigned **ft;
+	Tree *dif=NULL;
+	Tree *perm;
+	set b;
+	int i,k;
+
+	if ( p == NULL ) return tdup(ambig_tuples);
+
+	ft = (unsigned **) calloc(CLL_k+1, sizeof(unsigned *));
+	require(ft!=NULL, "cannot allocate ft");
+	for (i=1; i<=CLL_k; i++)
+	{
+		b = set_and(fset1[i], fset2[i]);
+		ft[i] = set_pdq(b);
+		set_free(b);
+	}
+	findex = (int *) calloc(LL_k+1, sizeof(int));
+	if ( findex == NULL )
+	{
+		fatal_internal("out of memory in tdif while checking predicates");
+	}
+	for (k=1; k<=LL_k; k++) findex[k] = 0;
+
+#ifdef DBG_TRAV
+	fprintf(stderr, "tdif_%d[", p->k);
+	preorder(ambig_tuples);
+	fprintf(stderr, ",");
+	preorder(p->tcontext);
+	fprintf(stderr, "] =");
+#endif
+
+	ftbl = ft;
+	while ( (perm=permute(1,p->k))!=NULL )
+	{
+#ifdef DBG_TRAV
+		fprintf(stderr, "test perm:"); preorder(perm); fprintf(stderr, "\n");
+#endif
+		if ( tmember_constrained(perm, ambig_tuples) &&
+			 !tmember_of_context(perm, p) )
+		{
+#ifdef DBG_TRAV
+			fprintf(stderr, "satisfied upon"); preorder(perm); fprintf(stderr, "\n");
+#endif
+			k++;
+			if ( dif==NULL ) dif = perm;
+			else
+			{
+				perm->right = dif;
+				dif = perm;
+			}
+		}
+		else Tfree( perm );
+	}
+
+#ifdef DBG_TRAV
+	preorder(dif);
+	fprintf(stderr, "\n");
+#endif
+
+	for (i=1; i<=CLL_k; i++) free( (char *)ft[i] );
+	free((char *)ft);
+	free((char *)findex);
+
+	return dif;
+}
+
+/* is lookahead sequence t a member of any context tree for any
+ * predicate in p?
+ */
+static int
+#ifdef __USE_PROTOS
+tmember_of_context( Tree *t, Predicate *p )
+#else
+tmember_of_context( t, p )
+Tree *t;
+Predicate *p;
+#endif
+{
+	for (; p!=NULL; p=p->right)
+	{
+		if ( p->expr==PRED_AND_LIST || p->expr==PRED_OR_LIST )
+			return tmember_of_context(t, p->down);
+		if ( tmember_constrained(t, p->tcontext) ) return 1;
+		if ( tmember_of_context(t, p->down) ) return 1;
+	}
+	return 0;
+}
+
+int
+#ifdef __USE_PROTOS
+is_single_tuple( Tree *t )
+#else
+is_single_tuple( t )
+Tree *t;
+#endif
+{
+	if ( t == NULL ) return 0;
+	if ( t->right != NULL ) return 0;
+	if ( t->down == NULL ) return 1;
+	return is_single_tuple(t->down);
+}
+
+
+/* MR10 Check that a context guard contains only allowed things */
+/* MR10   (mainly token references).                            */
+
+#ifdef __USE_PROTOS
+int contextGuardOK(Node *p,int h,int *hmax)
+#else
+int contextGuardOK(p,h,hmax)
+  Node  *p;
+  int   h;
+  int   *hmax;
+#endif
+{
+    Junction     *j;
+    TokNode      *tn;
+
+    if (p == NULL) return 1;
+    if (p->ntype == nToken) {
+      h++;
+      if (h > *hmax) *hmax=h;
+      tn=(TokNode *)p;
+      if (tn->el_label != NULL) {
+        warnFL(eMsg1("a label (\"%s\") for a context guard element is meaningless",tn->el_label),
+                             FileStr[p->file],p->line);
+      };
+      return contextGuardOK( ( (TokNode *) p)->next,h,hmax);
+    } else if (p->ntype == nAction) {
+      goto Fail;
+    } else if (p->ntype == nRuleRef) {
+      goto Fail;
+    } else {
+      require (p->ntype == nJunction,"Unexpected ntype");
+      j=(Junction *) p;
+      if (j->jtype != Generic &&
+          j->jtype != aSubBlk &&        /* pretty sure this one is allowed */
+/****     j->jtype != aOptBlk && ****/  /* pretty sure this one is allowed */ /* MR11 not any more ! */
+          j->jtype != EndBlk) {
+        errFL("A context guard may not contain an option block: {...} or looping block: (...)* or (...)+",
+                  FileStr[p->file],p->line);
+        contextGuardOK(j->p1,h,hmax);
+        return 0;
+      };
+      /* do both p1 and p2 so use | rather than ||  */
+      return contextGuardOK(j->p2,h,hmax) | contextGuardOK(j->p1,h,hmax);
+    };
+Fail:
+    errFL("A context guard may contain only Token references - guard will be ignored",
+                             FileStr[p->file],p->line);
+    contextGuardOK( ( (ActionNode *) p)->next,h,hmax);
+    return 0;
+}
+
+/*
+ * Look at a (...)? generalized-predicate context-guard and compute
+ * either a lookahead set (k==1) or a lookahead tree for k>1.  The
+ * k level is determined by the guard itself rather than the LL_k
+ * variable.  For example, ( A B )? is an LL(2) guard and ( ID )?
+ * is an LL(1) guard.  For the moment, you can only have a single
+ * tuple in the guard.  Physically, the block must look like this
+ *   --o-->TOKEN-->o-->o-->TOKEN-->o-- ... -->o-->TOKEN-->o--
+ * An error is printed for any other type.
+ */
+Predicate *
+#ifdef __USE_PROTOS
+computePredFromContextGuard(Graph blk,int *msgDone)    /* MR10 */
+#else
+computePredFromContextGuard(blk,msgDone)               /* MR10 */
+  Graph     blk;
+  int       *msgDone;                                       /* MR10 */
+#endif
+{
+    Junction *junc = (Junction *)blk.left, *p;
+    Tree        *t=NULL;
+	Predicate   *pred = NULL;
+	set         scontext, rk;
+    int         ok;
+    int         hmax=0;
+
+    require(junc!=NULL && junc->ntype == nJunction, "bad context guard");
+
+/* MR10 Check for anything other than Tokens and generic junctions */
+
+    *msgDone=0;                                             /* MR10 */
+    ok=contextGuardOK( (Node *)junc,0,&hmax);               /* MR10 */
+    if (! ok) {                                             /* MR10 */
+      *msgDone=1;                                           /* MR10 */
+      return NULL;                                          /* MR10 */
+    };                                                      /* MR10 */
+    if (hmax == 0) {
+errFL("guard is 0 tokens long",FileStr[junc->file],junc->line);          /* MR11 */
+      *msgDone=1;
+      return NULL;
+    };
+    if (hmax > CLL_k) {                                     /* MR10 */
+errFL(eMsgd2("guard is %d tokens long - lookahead is limited to max(k,ck)==%d", /* MR10 */
+        hmax,CLL_k),                                        /* MR10 */
+        FileStr[junc->file],junc->line);                    /* MR10 */
+      *msgDone=1;                                           /* MR10 */
+      return NULL;                                          /* MR10 */
+    };                                                      /* MR10 */
+
+	rk = empty;
+	p = junc;
+	pred = new_pred();
+	pred->k = hmax;     /* MR10 should be CLL_k, not LLK ? */
+	if (hmax > 1 )      /* MR10 was LL_k                   */
+	{
+		ConstrainSearch = 0;
+		ContextGuardTRAV = 1;
+		TRAV(p, hmax, &rk, t);  /* MR10 was LL_k */
+		ContextGuardTRAV = 0;
+		set_free(rk);
+		t = tshrink( t );
+		t = tflatten( t );
+		t = tleft_factor( t );
+/*
+		fprintf(stderr, "ctx guard:");
+		preorder(t);
+		fprintf(stderr, "\n");
+*/
+		pred->tcontext = t;
+	}
+	else
+	{
+		REACH(p, 1, &rk, scontext);
+		require(set_nil(rk), "rk != nil");
+		set_free(rk);
+/*
+		fprintf(stderr, "LL(1) ctx guard is:");
+		s_fprT(stderr, scontext);
+		fprintf(stderr, "\n");
+*/
+		pred->scontext[1] = scontext;
+	}
+
+    list_add(&ContextGuardPredicateList,pred);     /* MR13 */
+
+	return pred;
+}
+
+/* MR13
+   When the context guard is originally computed the
+   meta-tokens are not known.
+*/
+
+#ifdef __USE_PROTOS
+void recomputeContextGuard(Predicate *pred)
+#else
+void recomputeContextGuard(pred)
+    Predicate   *pred;
+#endif
+{
+    Tree *          t=NULL;
+	set             scontext;
+    set             rk;
+    ActionNode *    actionNode;
+    Junction *      p;
+
+    actionNode=pred->source;
+    require (actionNode != NULL,"context predicate's source == NULL");
+
+    p=actionNode->guardNodes;
+    require (p != NULL,"context predicate's guardNodes == NULL");
+
+	rk = empty;
+	if (pred->k > 1 )
+	{
+		ConstrainSearch = 0;
+		ContextGuardTRAV = 1;
+		TRAV(p, pred->k, &rk, t);
+		ContextGuardTRAV = 0;
+		set_free(rk);
+		t = tshrink( t );
+		t = tflatten( t );
+		t = tleft_factor( t );
+        Tfree(pred->tcontext);
+		pred->tcontext = t;
+	}
+	else
+	{
+		REACH(p, 1, &rk, scontext);
+		require(set_nil(rk), "rk != nil");
+		set_free(rk);
+        set_free(pred->scontext[1]);
+		pred->scontext[1] = scontext;
+	}
+}
+
+/* MR11 - had enough of flags yet ? */
+
+int     MR_AmbSourceSearch=0;
+int     MR_AmbSourceSearchGroup=0;
+int     MR_AmbSourceSearchChoice=0;
+int     MR_AmbSourceSearchLimit=0;
+int     MR_matched_AmbAidRule=0;
+
+static    set         *matchSets[2]={NULL,NULL};
+static    int         *tokensInChain=NULL;
+static    Junction    *MR_AmbSourceSearchJ[2];
+
+void MR_traceAmbSourceKclient()
+{
+  int       i;
+  set       *save_fset;
+  int       save_ConstrainSearch;
+  set       incomplete;
+  Tree      *t;
+
+  if (matchSets[0] == NULL) {
+    matchSets[0]=(set *) calloc (CLL_k+1,sizeof(set));
+    require (matchSets[0] != NULL,"matchSets[0] alloc");
+    matchSets[1]=(set *) calloc (CLL_k+1,sizeof(set));
+    require (matchSets[1] != NULL,"matchSets[1] alloc");
+  };
+
+  for (i=1 ; i <= MR_AmbSourceSearchLimit ; i++) {
+    set_clr(matchSets[0][i]);
+    set_orel( (unsigned) tokensInChain[i],
+                              &matchSets[0][i]);
+    set_clr(matchSets[1][i]);
+    set_orel( (unsigned) tokensInChain[i],
+                              &matchSets[1][i]);
+  };
+
+  save_fset=fset;
+  save_ConstrainSearch=ConstrainSearch;
+
+
+
+  for (i=0 ; i < 2 ; i++) {
+
+#if 0
+**    fprintf(stdout,"  Choice:%d  Depth:%d  ",i+1,MR_AmbSourceSearchLimit);
+**    fprintf(stdout,"(");
+**    for (j=1 ; j <= MR_AmbSourceSearchLimit ; j++) {
+**      if (j != 1) fprintf(stdout," ");
+**      fprintf(stdout,"%s",TerminalString(tokensInChain[j]));
+**    };
+**    fprintf(stdout,")\n\n");
+#endif
+
+    fset=matchSets[i];
+
+    MR_AmbSourceSearch=1;
+    MR_MaintainBackTrace=1;
+    MR_AmbSourceSearchChoice=i;
+    ConstrainSearch=1;
+
+    maxk = MR_AmbSourceSearchLimit;
+
+    incomplete=empty;
+    t=NULL;
+
+    constrain = &(fset[1]);
+    MR_pointerStackReset(&MR_BackTraceStack);
+
+    TRAV(MR_AmbSourceSearchJ[i],maxk,&incomplete,t);
+
+    Tfree(t);
+
+    require (set_nil(incomplete),"MR_traceAmbSourceK TRAV incomplete");
+    require (MR_BackTraceStack.count == 0,"K: MR_BackTraceStack.count != 0");
+
+    set_free(incomplete);
+  };
+
+  ConstrainSearch=save_ConstrainSearch;
+  fset=save_fset;
+  MR_AmbSourceSearch=0;
+  MR_MaintainBackTrace=0;
+  MR_AmbSourceSearchChoice=0;
+}
+
+#ifdef __USE_PROTOS
+Tree *tTrunc(Tree *t,int depth)
+#else
+Tree *tTrunc(t,depth)
+  Tree  *t;
+#endif
+{
+    Tree    *u;
+
+    require ( ! (t == NULL && depth > 0),"tree too short");
+
+    if (depth == 0) return NULL;
+
+    if (t->token == ALT) {
+      u=tTrunc(t->down,depth);
+    } else {
+      u=tnode(t->token);
+      u->down=tTrunc(t->down,depth-1);
+    };
+    if (t->right != NULL) u->right=tTrunc(t->right,depth);
+    return u;
+}
+
+#ifdef __USE_PROTOS
+void MR_iterateOverTree(Tree *t,int chain[])
+#else
+void MR_iterateOverTree(t,chain)
+  Tree          *t;
+  int           chain[];
+#endif
+{
+  if (t == NULL) return;
+  chain[0]=t->token;
+  if (t->down != NULL) {
+    MR_iterateOverTree(t->down,&chain[1]);
+  } else {
+    MR_traceAmbSourceKclient();
+  };
+  MR_iterateOverTree(t->right,&chain[0]);
+  chain[0]=0;
+}
+
+#ifdef __USE_PROTOS
+void MR_traceAmbSourceK(Tree *t,Junction *alt1,Junction *alt2)
+#else
+void MR_traceAmbSourceK(t,alt1,alt2)
+  Tree      *t;
+  Junction  *alt1;
+  Junction  *alt2;
+#endif
+{
+    int         i;
+    int         depth;
+    int         maxDepth;
+    Tree        *truncatedTree;
+
+    if (MR_AmbAidRule == NULL) return;
+
+    if ( ! (
+            strcmp(MR_AmbAidRule,alt1->rname) == 0 ||
+            strcmp(MR_AmbAidRule,alt2->rname) == 0 ||
+            MR_AmbAidLine==alt1->line ||
+            MR_AmbAidLine==alt2->line
+           )
+       ) return;
+
+    MR_matched_AmbAidRule++;
+
+    /* there are no token sets in trees, only in TokNodes */
+
+    MR_AmbSourceSearchJ[0]=analysis_point( (Junction *) alt1->p1);
+    MR_AmbSourceSearchJ[1]=analysis_point( (Junction *) alt2->p1);
+
+    if (tokensInChain == NULL) {
+      tokensInChain=(int *) calloc (CLL_k+1,sizeof(int));
+      require (tokensInChain != NULL,"tokensInChain alloc");
+    };
+
+    MR_AmbSourceSearchGroup=0;
+
+    fprintf(stdout,"\n");
+    fprintf(stdout,"  Ambiguity Aid                 ");
+    fprintf(stdout,
+                (MR_AmbAidDepth <= LL_k ?
+                    "(-k %d  -aa %s  %s  -aad %d)\n\n" :
+                        "(-k %d  -aa %s  %s  [-k value limits -aad %d])\n\n"),
+                LL_k,
+                MR_AmbAidRule,
+                (MR_AmbAidMultiple ? "-aam" : ""),
+                MR_AmbAidDepth);
+
+    for (i=0 ; i < 2 ; i++) {
+      fprintf(stdout,"    Choice %d: %-25s  line %d  file %s\n",
+                  (i+1),
+                  MR_ruleNamePlusOffset( (Node *) MR_AmbSourceSearchJ[i]),
+                  MR_AmbSourceSearchJ[i]->line,
+                  FileStr[MR_AmbSourceSearchJ[i]->file]);
+    };
+
+    fprintf(stdout,"\n");
+
+    if (MR_AmbAidDepth < LL_k) {
+      maxDepth=MR_AmbAidDepth;
+    } else {
+      maxDepth=LL_k;
+    };
+
+    for (depth=1 ; depth <= maxDepth; depth++) {
+      MR_AmbSourceSearchLimit=depth;
+      if (depth < LL_k) {
+        truncatedTree=tTrunc(t,depth);
+        truncatedTree=tleft_factor(truncatedTree);
+        MR_iterateOverTree(truncatedTree,&tokensInChain[1]);    /* <===== */
+        Tfree(truncatedTree);
+      } else {
+        MR_iterateOverTree(t,tokensInChain);                /* <===== */
+      };
+      fflush(stdout);
+      fflush(stderr);
+    };
+
+    fprintf(stdout,"\n");
+    MR_AmbSourceSearch=0;
+    MR_MaintainBackTrace=0;
+    MR_AmbSourceSearchGroup=0;
+    MR_AmbSourceSearchChoice=0;
+    MR_AmbSourceSearchLimit=0;
+
+}
+
+
+/* this if for k=1 grammars only
+
+   this is approximate only because of the limitations of linear
+   approximation lookahead.  Don't want to do a k=3 search when
+   the user only specified a ck=3 grammar
+*/
+
+#ifdef __USE_PROTOS
+void MR_traceAmbSource(set *matchSets,Junction *alt1, Junction *alt2)
+#else
+void MR_traceAmbSource(matchSets,alt1,alt2)
+  set       *matchSets;
+  Junction  *alt1;
+  Junction  *alt2;
+#endif
+{
+    set         *save_fset;
+    Junction    *p[2];
+    int         i;
+    int         j;
+    set         *dup_matchSets;
+    set         intersection;
+    set         incomplete;
+    set         tokensUsed;
+    int         depth;
+
+    if (MR_AmbAidRule == NULL) return;
+    if ( ! (
+            strcmp(MR_AmbAidRule,alt1->rname) == 0 ||
+            strcmp(MR_AmbAidRule,alt2->rname) == 0 ||
+            MR_AmbAidLine==alt1->line ||
+            MR_AmbAidLine==alt2->line
+           )
+       ) return;
+
+    MR_matched_AmbAidRule++;
+
+    save_fset=fset;
+
+    dup_matchSets=(set *) calloc(CLL_k+1,sizeof(set));
+    require (dup_matchSets != NULL,"Can't allocate dup_matchSets");
+
+    p[0]=analysis_point( (Junction *) alt1->p1);
+    p[1]=analysis_point( (Junction *) alt2->p1);
+
+    fprintf(stdout,"\n");
+
+    fprintf(stdout,"  Ambiguity Aid                 ");
+    fprintf(stdout,
+                (MR_AmbAidDepth <= CLL_k ?
+                    "(-ck %d  -aa %s  %s  -aad %d)\n\n" :
+                        "(-ck %d  -aa %s  %s  [-ck value limits -aad %d])\n\n"),
+                CLL_k,
+                MR_AmbAidRule,
+                (MR_AmbAidMultiple ? "-aam" : ""),
+                MR_AmbAidDepth);
+
+    for (i=0 ; i < 2 ; i++) {
+      fprintf(stdout,"    Choice %d: %-25s  line %d  file %s\n",
+                            (i+1),
+                            MR_ruleNamePlusOffset( (Node *) p[i]),
+                            p[i]->line,FileStr[p[i]->file]);
+    };
+
+    for (j=1; j <= CLL_k ; j++) {
+      fprintf(stdout,"\n    Intersection of lookahead[%d] sets:\n",j);
+      intersection=set_and(alt1->fset[j],alt2->fset[j]);
+      MR_dumpTokenSet(stdout,2,intersection);
+      set_free(intersection);
+    };
+
+    fprintf(stdout,"\n");
+
+    require (1 <= MR_AmbAidDepth && MR_AmbAidDepth <= CLL_k,
+                "illegal MR_AmbAidDepth");
+
+    MR_AmbSourceSearchGroup=0;
+    for (depth=1; depth <= MR_AmbAidDepth; depth++) {
+        MR_AmbSourceSearchLimit=depth;
+        for (i=0 ; i < 2 ; i++) {
+
+/***        fprintf(stdout,"  Choice:%d  Depth:%d\n\n",i+1,depth);  ***/
+
+            for (j=0 ; j <= CLL_k ; j++) { dup_matchSets[j]=set_dup(matchSets[j]); };
+            fset=dup_matchSets;
+
+            fflush(output);
+            fflush(stdout);
+
+            MR_AmbSourceSearch=1;
+            MR_MaintainBackTrace=1;
+            MR_AmbSourceSearchChoice=i;
+
+            maxk = depth;
+            tokensUsed=empty;
+            incomplete=empty;
+
+            constrain = &(fset[1]);
+            MR_pointerStackReset(&MR_BackTraceStack);
+
+            REACH(p[i],depth,&incomplete,tokensUsed);
+
+            fflush(output);
+            fflush(stdout);
+
+            require (set_nil(incomplete),"MR_traceAmbSource REACH incomplete");
+            require (MR_BackTraceStack.count == 0,"1: MR_BackTraceStack.count != 0");
+
+            set_free(incomplete);
+            set_free(tokensUsed);
+
+            for (j=0 ; j <= CLL_k ; j++) { set_free(dup_matchSets[j]); };
+        };
+    };
+
+    fprintf(stdout,"\n");
+
+    MR_AmbSourceSearch=0;
+    MR_MaintainBackTrace=0;
+    MR_AmbSourceSearchGroup=0;
+    MR_AmbSourceSearchChoice=0;
+    MR_AmbSourceSearchLimit=0;
+
+    fset=save_fset;
+    free ( (char *) dup_matchSets);
+}
+
+static int itemCount;
+
+void MR_backTraceDumpItemReset() {
+  itemCount=0;
+}
+
+#ifdef __USE_PROTOS
+void MR_backTraceDumpItem(FILE *f,int skip,Node *n)
+#else
+void MR_backTraceDumpItem(f,skip,n)
+  FILE      *f;
+  int       skip;
+  Node      *n;
+#endif
+{
+  TokNode       *tn;
+  RuleRefNode   *rrn;
+  Junction      *j;
+  ActionNode    *a;
+
+  switch (n->ntype) {
+    case nToken:
+        itemCount++; if (skip) goto EXIT;
+        tn=(TokNode *)n;
+        if (set_nil(tn->tset)) {
+          fprintf(f,"  %2d #token %-23s",itemCount,TerminalString(tn->token));
+        } else {
+          fprintf(f,"  %2d #tokclass %-20s",itemCount,TerminalString(tn->token));
+        };
+        break;
+    case nRuleRef:
+        itemCount++; if (skip) goto EXIT;
+        rrn=(RuleRefNode *)n;
+        fprintf(f,"  %2d to %-27s",itemCount,rrn->text);
+        break;
+    case nAction:
+        a=(ActionNode *)n;
+        goto EXIT;
+    case nJunction:
+
+      j=(Junction *)n;
+
+      switch (j->jtype) {
+        case aSubBlk:
+            if (j->guess) {
+              itemCount++; if (skip) goto EXIT;
+              fprintf(f,"  %2d %-30s",itemCount,"in (...)? block at");
+              break;
+            };
+/******     fprintf(f,"  %2d %-32s",itemCount,"in (...) block at");  *******/
+/******     break;                                                          *******/
+            goto EXIT;
+        case aOptBlk:
+            itemCount++; if (skip) goto EXIT;
+            fprintf(f,"  %2d %-30s",itemCount,"in {...} block");
+            break;
+        case aLoopBlk:
+            itemCount++; if (skip) goto EXIT;
+            fprintf(f,"  %2d %-30s",itemCount,"in (...)* block");
+            break;
+        case EndBlk:
+            if (j->alpha_beta_guess_end) {
+              itemCount++; if (skip) goto EXIT;
+              fprintf(f,"  %2d %-30s",itemCount,"end (...)? block at");
+              break;
+            };
+            goto EXIT;
+/******     fprintf(f,"  %2d %-32s",itemCount,"end of a block at");     *****/
+/******     break;                                                             *****/
+        case RuleBlk:
+            itemCount++; if (skip) goto EXIT;
+            fprintf(f,"  %2d %-30s",itemCount,j->rname);
+            break;
+        case Generic:
+            goto EXIT;
+        case EndRule:
+            itemCount++; if (skip) goto EXIT;
+            fprintf (f,"  %2d end %-26s",itemCount,j->rname);
+            break;
+        case aPlusBlk:
+            itemCount++; if (skip) goto EXIT;
+            fprintf(f,"  %2d %-30s",itemCount,"in (...)+ block");
+            break;
+        case aLoopBegin:
+            goto EXIT;
+      };
+      break;
+  };
+  fprintf(f," %-23s line %-4d  %s\n",MR_ruleNamePlusOffset(n),n->line,FileStr[n->file]);
+EXIT:
+  return;
+}
+
+
+static PointerStack     previousBackTrace={0,0,NULL};
+
+#ifdef __USE_PROTOS
+void MR_backTraceReport(void)
+#else
+void MR_backTraceReport()
+#endif
+{
+  int       i;
+  int       match = 0;
+  int       limitMatch;
+
+  Node      *p;
+  TokNode   *tn;
+  set       remainder;
+  int       depth;
+
+  /* Even when doing a k=2 search this routine can get
+       called when there is only 1 token on the stack.
+     This is because something like rRuleRef can change
+       the search value of k from 2 to 1 temporarily.
+     It does this because the it wants to know the k=1
+       first set before it does a k=2 search
+  */
+
+  depth=0;
+  for (i=0; i < MR_BackTraceStack.count ; i++) {
+    p=(Node *) MR_BackTraceStack.data[i];
+    if (p->ntype == nToken) depth++;
+  };
+
+/* MR14 */  if (MR_AmbSourceSearch) {
+/* MR14 */     require (depth <= MR_AmbSourceSearchLimit,"depth > MR_AmbSourceSearchLimit");
+/* MR14 */  }
+
+  /* MR23 THM - Traceback report was being called at the wrong time for -alpha reports */
+  /*            Reported by Arpad Beszedes (beszedes@inf.u-szeged.hu)                  */
+
+  if (MR_AmbSourceSearchLimit == 0 || depth < MR_AmbSourceSearchLimit) {
+    return;
+  };
+
+  MR_backTraceDumpItemReset();
+
+  limitMatch=MR_BackTraceStack.count;
+  if (limitMatch > previousBackTrace.count) {
+    limitMatch=previousBackTrace.count;
+  };
+
+  for (match=0; match < limitMatch; match++) {
+    if (MR_BackTraceStack.data[match] !=
+        previousBackTrace.data[match]) {
+      break;
+    };
+  };
+
+  /* not sure at the moment why there would be duplicates */
+
+  if (match != MR_BackTraceStack.count) {
+
+    fprintf(stdout,"     Choice:%d  Depth:%d  Group:%d",
+        (MR_AmbSourceSearchChoice+1),
+        MR_AmbSourceSearchLimit,
+        ++MR_AmbSourceSearchGroup);
+
+    depth=0;
+    fprintf(stdout,"  (");
+    for (i=0; i < MR_BackTraceStack.count ; i++) {
+      p=(Node *) MR_BackTraceStack.data[i];
+      if (p->ntype != nToken) continue;
+      tn=(TokNode *)p;
+      if (depth != 0) fprintf(stdout," ");
+      fprintf(stdout,TerminalString(tn->token));
+      depth++;
+      if (! MR_AmbAidMultiple) {
+        if (set_nil(tn->tset)) {
+          set_rm( (unsigned) tn->token,fset[depth]);
+        } else {
+          remainder=set_dif(fset[depth],tn->tset);
+          set_free(fset[depth]);
+          fset[depth]=remainder;
+        };
+      };
+    };
+    fprintf(stdout,")\n");
+
+    for (i=0; i < MR_BackTraceStack.count ; i++) {
+      MR_backTraceDumpItem(stdout, (i<match) ,(Node *) MR_BackTraceStack.data[i]);
+    };
+    fprintf(stdout,"\n");
+    fflush(stdout);
+
+    MR_pointerStackReset(&previousBackTrace);
+
+    for (i=0; i < MR_BackTraceStack.count ; i++) {
+      MR_pointerStackPush(&previousBackTrace,MR_BackTraceStack.data[i]);
+    };
+
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_setConstrainPointer(set * newConstrainValue)
+#else
+void MR_setConstrainPointer(newConstrainValue)
+  set * newConstrainValue;
+#endif
+{
+	constrain=newConstrainValue;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/gen.c b/Tools/Source/TianoTools/Pccts/antlr/gen.c
new file mode 100644
index 0000000000..368a96b9ac
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/gen.c
@@ -0,0 +1,4797 @@
+/*
+ * gen.c
+ *
+ * Generate C code (ANSI, K&R, C++)
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+
+#define NumExprPerLine	4
+static int on1line=0;
+static set tokensRefdInBlock;
+
+					/* T r a n s l a t i o n  T a b l e s */
+
+/* C_Trans[node type] == pointer to function that knows how to translate that node. */
+#ifdef __cplusplus
+void (*C_Trans[NumNodeTypes+1])(...) = {
+	NULL,
+	NULL,					/* See next table.
+Junctions have many types */
+	(void (*)(...)) genRuleRef,
+	(void (*)(...)) genToken,
+	(void (*)(...)) genAction
+ };
+#else
+void (*C_Trans[NumNodeTypes+1])() = {
+	NULL,
+	NULL,					/* See next table.
+Junctions have many types */
+	genRuleRef,
+	genToken,
+	genAction
+ };
+#endif
+
+/* C_JTrans[Junction type] == pointer to function that knows how to translate that
+ * kind of junction node.
+ */
+#ifdef __cplusplus
+void (*C_JTrans[NumJuncTypes+1])(...) = {
+	NULL,
+	(void (*)(...)) genSubBlk,
+	(void (*)(...)) genOptBlk,
+	(void (*)(...)) genLoopBlk,
+	(void (*)(...)) genEndBlk,
+	(void (*)(...)) genRule,
+	(void (*)(...)) genJunction,
+	(void (*)(...)) genEndRule,
+	(void (*)(...)) genPlusBlk,
+	(void (*)(...)) genLoopBegin
+ };
+#else
+void (*C_JTrans[NumJuncTypes+1])() = {
+	NULL,
+	genSubBlk,
+	genOptBlk,
+	genLoopBlk,
+	genEndBlk,
+	genRule,
+	genJunction,
+	genEndRule,
+	genPlusBlk,
+	genLoopBegin
+ };
+#endif
+
+#define PastWhiteSpace(s)	while (*(s) == ' ' || *(s) == '\t') {s++;}
+
+static int tabs = 0;
+
+/* MR6	Got tired of text running off page when using standard tab stops */
+
+#define TAB { int i; 					                		\
+	      if (TabWidth==0) { 					                \
+	         for (i=0; i<tabs; i++) fputc('\t', output);		                \
+	      } else {           							\
+		 for (i=0; i<tabs*TabWidth; i++) fputc(' ',output);     	        \
+	      };	                						\
+	    }
+
+static void
+#ifdef __USE_PROTOS
+tab( void )
+#else
+tab( )
+#endif
+TAB
+
+#ifdef __USE_PROTOS
+static char *tokenFollowSet(TokNode *);
+static ActionNode *findImmedAction( Node * );
+static void dumpRetValAssign(char *, char *, RuleRefNode *);		/* MR30 */
+static void dumpAfterActions(FILE *output);
+static set ComputeErrorSet(Junction *, int, int);
+static void makeErrorClause(Junction *, set, int, int);
+static void DumpFuncHeader( Junction *, RuleEntry * );
+static int has_guess_block_as_first_item(Junction *);
+static int genExprSets(set *, int);
+static void genExprTree( Tree *t, int k );
+static void genExprTreeOriginal( Tree *t, int k );                  /* MR10 */
+static char * findOuterHandlerLabel(ExceptionGroup *eg);            /* MR7 */
+static void OutLineInfo(FILE *file,int line,char *fileName);        /* MR14 */
+#else
+static char *tokenFollowSet();
+static ActionNode *findImmedAction();
+static void dumpRetValAssign();
+static void dumpAfterActions();
+static set ComputeErrorSet();
+static void makeErrorClause();
+static void DumpFuncHeader();
+static int has_guess_block_as_first_item();
+static int genExprSets();
+static void genExprTree();
+static void genExprTreeOriginal();                                  /* MR10 */
+static char * findOuterHandlerLabel();                              /* MR7 */
+static void OutLineInfo();                                          /* MR14 */
+#endif
+
+#define gen(s)			{tab(); fprintf(output, s);}
+#define gen1(s,a)		{tab(); fprintf(output, s,a);}
+#define gen2(s,a,b)		{tab(); fprintf(output, s,a,b);}
+#define gen3(s,a,b,c)	{tab(); fprintf(output, s,a,b,c);}
+#define gen4(s,a,b,c,d)	{tab(); fprintf(output, s,a,b,c,d);}
+#define gen5(s,a,b,c,d,e)	{tab(); fprintf(output, s,a,b,c,d,e);}
+#define gen6(s,a,b,c,d,e,f)	{tab(); fprintf(output, s,a,b,c,d,e,f);}
+#define gen7(s,a,b,c,d,e,f,g)	{tab(); fprintf(output, s,a,b,c,d,e,f,g);}
+
+#define _gen(s)			{fprintf(output, s);}
+#define _gen1(s,a)		{fprintf(output, s,a);}
+#define _gen2(s,a,b)	{fprintf(output, s,a,b);}
+#define _gen3(s,a,b,c)	{fprintf(output, s,a,b,c);}
+#define _gen4(s,a,b,c,d){fprintf(output, s,a,b,c,d);}
+#define _gen5(s,a,b,c,d,e){fprintf(output, s,a,b,c,d,e);}
+#define _gen6(s,a,b,c,d,e,f){fprintf(output, s,a,b,c,d,e,f);}
+#define _gen7(s,a,b,c,d,e,f,g){fprintf(output, s,a,b,c,d,e,f,g);}
+
+
+/* MR11 a convenient place to set a break point */
+
+#ifdef __USE_PROTOS
+void MR_break(void) 
+#else
+void MR_break() 
+#endif
+{
+  return;
+}
+
+/* MR10 genTraceOut(Junction *)      */
+
+#ifdef __USE_PROTOS
+static void genTraceOut(Junction *q)
+#else
+static void genTraceOut(q)
+  Junction  *q;
+#endif
+{
+  if ( TraceGen ) {
+		if ( GenCC ) {gen1("zzTRACEOUT(\"%s\");\n", q->rname);}
+    		else gen1("zzTRACEOUT((ANTLRChar *)\"%s\");\n", q->rname);
+  }
+}
+
+static void
+#ifdef __USE_PROTOS
+warn_about_using_gk_option(void)
+#else
+warn_about_using_gk_option()
+#endif
+{
+	static int warned_already=0;
+
+	if ( !DemandLookahead || warned_already ) return;
+	warned_already = 1;
+	warnNoFL("-gk option could cause trouble for <<...>>? predicates");
+}
+
+void
+#ifdef __USE_PROTOS
+freeBlkFsets( Junction *q )
+#else
+freeBlkFsets( q )
+Junction *q;
+#endif
+{
+	int i;
+	Junction *alt;
+	require(q!=NULL, "freeBlkFsets: invalid node");
+
+	for (alt=q; alt != NULL; alt= (Junction *) alt->p2 )
+	{
+		for (i=1; i<=CLL_k; i++) set_free(alt->fset[i]);
+	}
+}
+
+/*
+ * Generate a local variable allocation for each token references
+ * in this block.
+ */
+static void
+#ifdef __USE_PROTOS
+genTokenPointers( Junction *q )
+#else
+genTokenPointers( q )
+Junction *q;
+#endif
+{
+	/* Rule refs are counted and can be referenced, but their
+	 * value is not set to anything useful ever.
+	 *
+     * The ptrs are to be named _tij where i is the current level
+	 * and j is the element number within an alternative.
+	 */
+	int first=1, t=0;
+	set a;
+	tokensRefdInBlock = q->tokrefs;
+
+	if ( set_deg(q->tokrefs) == 0 ) return;
+	a = set_dup(q->tokrefs);
+	gen("ANTLRTokenPtr ");
+	for (; !set_nil(a); set_rm(t, a))
+	{
+		t = set_int(a);
+		if ( first ) first = 0;
+		else _gen(",");
+		if ( !DontCopyTokens ) _gen2("_tv%d%d,", BlkLevel, t);
+		_gen2("_t%d%d", BlkLevel, t);
+		if ( !DontCopyTokens ) {_gen2("= &_tv%d%d", BlkLevel, t);}
+		else _gen("=NULL");
+	}
+	_gen(";\n");
+	set_free(a);
+}
+
+static int
+#ifdef __USE_PROTOS
+hasDefaultException(ExceptionGroup *eg)
+#else
+hasDefaultException(eg)
+ExceptionGroup *eg;
+#endif
+{
+    ListNode *q;
+
+    for (q = eg->handlers->next; q!=NULL; q=q->next)
+    {
+        ExceptionHandler *eh = (ExceptionHandler *)q->elem;
+        if ( strcmp("default", eh->signalname)==0 ) {
+            return 1;
+        }
+    }
+    return 0;
+}
+static void
+#ifdef __USE_PROTOS
+dumpException(ExceptionGroup *eg, int no_default_case)
+#else
+dumpException(eg, no_default_case)
+ExceptionGroup *eg;
+int no_default_case;
+#endif
+{
+    char    *outerLabel;                                             /* MR7 */
+    int     altHandler=0;                                            /* MR7 */
+    int     namedHandler=0;                                          /* MR7 */
+
+    outerLabel=findOuterHandlerLabel(eg);                            /* MR7 */
+
+    if (eg->label != NULL) {                                         /* MR7 */
+      namedHandler=1;                                                /* MR7 */
+    } else if (eg->forRule) {                                        /* MR7 */
+      /* nothing */                                                  /* MR20 */
+    } else {                                                         /* MR7 */
+      altHandler=1;                                                  /* MR7 */
+    };                                                               /* MR7 */
+
+#if 0
+**     if (! eg->used) {                                             /* MR7 */
+**     	warnFL("exception group never used",                         /* MR7 */
+**             FileStr[eg->altstart->file],eg->altstart->line);      /* MR7 */
+**     };                                                            /* MR7 */
+#endif
+
+    if (namedHandler) {                                              /* MR7 */
+	  gen1("switch ( _signal ) {  /* [%s] */\n",eg->label);          /* MR7 */
+    } else {                                                         /* MR7 */
+	  gen("switch ( _signal ) {\n");                                 /* MR7 */
+      gen("case NoSignal: break;  /* MR7 */\n");                     /* MR7 */
+    };                                                               /* MR7 */
+	{
+		ListNode *q;
+		for (q = eg->handlers->next; q!=NULL; q=q->next)
+		{
+			ExceptionHandler *eh = (ExceptionHandler *)q->elem;
+			if ( strcmp("default", eh->signalname)==0 ) {
+				gen("default :\n");
+				tabs++;
+				dumpAction(eh->action, output, tabs, -1, 1, 1);
+                gen("_signal=NoSignal;  /* MR7 */\n");                  /* MR7 */
+                gen("break;  /* MR7 */\n");                             /* MR7 */
+				tabs--;
+				gen("}\n");
+
+                /* copied from later code in dumpException */        /* MR7 */
+
+                if (namedHandler) {                                  /* MR7 */
+                  gen("if (_signal != NoSignal)");                   /* MR7 */
+                  _gen1(" goto %s_handler;  /* MR7 */\n",outerLabel);/* MR7 */
+                } else if (altHandler) {                             /* MR7 */
+                  gen1("goto %s_handler;  /* MR7 */\n",outerLabel);  /* MR7 */
+                };
+				return;
+			}
+			gen1("case %s :\n", eh->signalname);
+			tabs++;
+			if ( eh->action != NULL )
+			{
+				dumpAction(eh->action, output, tabs, -1, 1, 1);
+                gen("break;  /* MR7 */\n");                          /* MR7 */
+			}
+			tabs--;
+		}
+	}
+	if ( no_default_case ) return;
+
+	gen("default :\n");
+    tabs++;                                                         /* MR7 */
+    gen("break;  /* MR7 */\n");                                     /* MR7 */
+    tabs--;                                                         /* MR7 */
+
+	tabs++;
+/*****	gen("*_retsignal = _signal;\n"); *****/
+
+	tabs--;
+	gen("}\n");
+
+    if (namedHandler) {                                             /* MR7 */
+      gen("if (_signal != NoSignal)");                              /* MR7 */
+      _gen1(" goto %s_handler;  /* MR7 */\n",outerLabel);           /* MR7 */
+    } else if (altHandler) {                                        /* MR7 */
+      gen1("goto %s_handler;  /* MR7 */\n",outerLabel);             /* MR7 */
+    };
+
+}
+
+static void
+#ifdef __USE_PROTOS
+dumpExceptions(ListNode *list)
+#else
+dumpExceptions(list)
+ListNode *list;
+#endif
+{
+	ListNode *p;
+
+	for (p = list->next; p!=NULL; p=p->next)
+	{
+		ExceptionGroup *eg = (ExceptionGroup *) p->elem;
+		_gen2("%s%s_handler:\n",
+			  eg->label==NULL?"":eg->label,
+			  eg->altID==NULL?"":eg->altID);
+		if ( eg->altID!=NULL ) dumpException(eg, 0);
+		else {
+			/* This must be the rule exception handler */
+			dumpException(eg, 1);
+			if ( !hasDefaultException(eg) )
+            {
+                gen("default :\n");
+                tabs++;
+                gen("zzdflthandlers(_signal,_retsignal);\n");
+                tabs--;
+                gen("}\n");
+            }
+		}
+	}
+}
+
+/* For each element label that is found in a rule, generate a unique
+ * Attribute (and AST pointer if GenAST) variable.
+ */
+void
+#ifdef __USE_PROTOS
+genElementLabels(ListNode *list)
+#else
+genElementLabels(list)
+ListNode *list;
+#endif
+{
+	int first=1;
+	ListNode *p;
+
+	if ( GenCC ) {gen("ANTLRTokenPtr");}
+	else {gen("Attrib");}
+	for (p = list->next; p!=NULL; p=p->next)
+	{
+		char *ep = (char *)p->elem;
+		if ( first ) first = 0;
+		else _gen(",");
+		if ( GenCC ) {_gen1(" %s=NULL",ep);}
+		else {_gen1(" %s",ep);}
+	}
+	_gen(";\n");
+
+	if ( !GenAST ) return;
+
+	first = 1;
+	gen("AST");
+	for (p = list->next; p!=NULL; p=p->next)
+	{
+		char *ep = (char *)p->elem;
+		if ( first ) first = 0;
+		else _gen(",");
+		_gen1(" *%s_ast=NULL",ep);
+	}
+	_gen(";\n");
+}
+
+/*
+ * Generate a local variable allocation for each token or rule reference
+ * in this block.
+ */
+static void
+#ifdef __USE_PROTOS
+genASTPointers( Junction *q )
+#else
+genASTPointers( q )
+Junction *q;
+#endif
+{
+	int first=1, t;
+	set a;
+
+	a = set_or(q->tokrefs, q->rulerefs);
+	if ( set_deg(a) > 0 )
+	{
+		gen("AST ");
+		for (; !set_nil(a); set_rm(t, a))
+		{
+			t = set_int(a);
+			if ( first ) first = 0;
+			else _gen(",");
+			_gen2("*_ast%d%d=NULL", BlkLevel, t);
+		}
+		set_free(a);
+	}
+	_gen(";\n");
+}
+
+static void
+#ifdef __USE_PROTOS
+BLOCK_Head( void )
+#else
+BLOCK_Head( )
+#endif
+{
+	gen("{\n");
+	tabs++;
+	if ( !GenCC ) gen1("zzBLOCK(zztasp%d);\n", BlkLevel);
+}
+
+static void
+#ifdef __USE_PROTOS
+BLOCK_Tail( void )
+#else
+BLOCK_Tail( )
+#endif
+{
+	if ( !GenCC ) gen1("zzEXIT(zztasp%d);\n", BlkLevel);
+	if ( !GenCC ) gen("}\n");
+	tabs--;
+	gen("}\n");
+}
+
+static void
+#ifdef __USE_PROTOS
+BLOCK_Preamble( Junction *q )
+#else
+BLOCK_Preamble( q )
+Junction *q;
+#endif
+{
+	ActionNode *a;
+	Junction *begin;
+
+	BLOCK_Head();
+	if ( GenCC ) genTokenPointers(q);
+	if ( GenCC&&GenAST ) genASTPointers(q);
+	if ( q->jtype == aPlusBlk ) gen("int zzcnt=1;\n");
+	if ( q->parm != NULL && !q->predparm ) gen1("zzaPush(%s);\n", q->parm)
+	else if ( !GenCC ) gen("zzMake0;\n");
+	if ( !GenCC ) gen("{\n");
+	if ( q->jtype == aLoopBegin ) begin = (Junction *) ((Junction *)q->p1);
+	else begin = q;
+	if ( has_guess_block_as_first_item(begin) )
+	{
+		gen("zzGUESS_BLOCK\n");
+	}
+	if ( q->jtype == aLoopBegin )
+		a = findImmedAction( ((Junction *)q->p1)->p1 );	/* look at aLoopBlk */
+	else
+		a = findImmedAction( q->p1 );
+	if ( a!=NULL && !a->is_predicate) {
+/* MR21 */ if (!a->noHoist) dumpActionPlus(a, a->action, output, tabs, a->file, a->line, 1);
+		   a->done = 1;	/* remove action. We have already handled it */
+	}
+}
+
+void
+#ifdef __USE_PROTOS
+genCombinedPredTreeContextOrig( Predicate *p )
+#else
+genCombinedPredTreeContextOrig( p )
+Predicate *p;
+#endif
+{
+	static set *ctx=NULL;		/* genExprSets() is destructive, make copy*/
+	require(p!=NULL, "can't make context tree for NULL pred tree");
+
+#ifdef DBG_PRED
+	fprintf(stderr, "enter genCombinedPredTreeContextOrig(%s,0x%x) with sets:\n", p->expr, p);
+	s_fprT(stderr, p->scontext[1]);
+	fprintf(stderr, "\n");
+#endif
+	if ( p->down == NULL )
+	{
+/***	if ( p->k>1 && p->tcontext!=NULL ) ***/
+		if ( p->tcontext!=NULL )
+		{
+			_gen("(");
+			genExprTree(p->tcontext, 1);
+			_gen(")");
+		}
+/***	else if ( p->k==1 && set_deg(p->scontext[1])>0 ) ***/
+		else if ( set_deg(p->scontext[1])>0 )
+		{
+			if ( ctx==NULL ) ctx = (set *)calloc(CLL_k+1, sizeof(set));
+			require(ctx!=NULL, "ctx cannot allocate");
+			ctx[0]=empty;
+			ctx[1]=set_dup(p->scontext[1]);
+			_gen("(");
+			genExprSets(&(ctx[0]), p->k);
+			_gen(")");
+			set_free(ctx[1]);
+		}
+		else if ( p->expr==PRED_AND_LIST || p->expr==PRED_OR_LIST ) {
+			fatal_internal("pred tree is orphan OR or AND list");
+		}
+		else {
+            if (! HoistPredicateContext) {
+              _gen(" 1 /* no context: prc is off */ ");
+            } else {
+              fatal_internal("pred tree context is empty");
+            };
+		}
+		return;
+	}
+
+/* MR10 - make AND just like OR */
+
+	if ( p->expr == PRED_AND_LIST )
+	{
+        Predicate *list = p->down;
+        for (; list!=NULL; list=list->right)
+        {
+     	     genCombinedPredTreeContextOrig(list);
+       		 if ( list->right!=NULL ) _gen("|| /* MR10 was wrong */ ");
+        };
+		return;
+	}
+
+	if ( p->expr == PRED_OR_LIST )
+	{
+        Predicate *list = p->down;
+        for (; list!=NULL; list=list->right)
+        {
+           genCombinedPredTreeContextOrig(list);
+           if ( list->right!=NULL ) _gen("||");
+        };
+        return;
+     };
+
+	fatal("pred tree is really wacked");
+}
+
+/* [genCombinedPredTreeContext] */
+
+void
+#ifdef __USE_PROTOS
+genCombinedPredTreeContext( Predicate *p )
+#else
+genCombinedPredTreeContext( p )
+Predicate *p;
+#endif
+{
+  Tree  *t;
+  int   predDepth=0;
+
+  if (0 && ! MR_usingPredNames && ! MRhoisting) {
+    genCombinedPredTreeContextOrig(p);
+  } else {
+/* MR13 */    MR_pred_depth(p,&predDepth);
+/* MR13 */    if (predDepth == 1) {
+/* MR13 */
+/* MR13 */      set   scontext[2];
+/* MR13 */      scontext[0]=empty;
+/* MR13 */      scontext[1]=MR_compute_pred_set(p);
+/* MR13 */      if (set_nil(scontext[1])) {
+/* MR13 */        _gen(" 1 /* MR12 no context (-prc off) */ ");
+/* MR13 */      } else {
+/* MR13 */        _gen("(");
+/* MR13 */        genExprSets(&scontext[0], 1);
+/* MR13 */        set_free(scontext[1]);
+/* MR13 */        _gen(")");
+/* MR13 */      };
+
+    } else {
+      t=MR_compute_pred_tree_context(p);
+      if (t == NULL) {
+        _gen(" 1 /* MR12 no context (-prc off) */ ");
+      } else {
+        _gen("(");
+        genExprTree(t, 1);
+        Tfree(t);   /* MR10 */
+        _gen(")");
+      };
+    };
+  };
+}
+
+/* [genPredTreeGate] */
+
+void
+#ifdef __USE_PROTOS
+genPredTreeGate( Predicate *p, int in_and_expr )
+#else
+genPredTreeGate( p, in_and_expr )
+Predicate *p;
+int in_and_expr;
+#endif
+{
+	if ( in_and_expr )
+	{
+		_gen("!(");
+		genCombinedPredTreeContext(p);
+		_gen(")||");
+		if ( p->down!=NULL ) _gen("\n");
+	}
+	else
+	{
+		_gen("(");
+		genCombinedPredTreeContext(p);
+		_gen(")&&");
+		if ( p->down!=NULL ) _gen("\n");
+	}
+}
+
+#ifdef __USE_PROTOS
+void genPredEntry(Predicate *p,int outer)
+#else
+void genPredEntry(p,outer)
+  Predicate     *p;
+  int           outer;
+#endif
+{
+    int         inverted=0;
+    Predicate   *q;
+    int         localOuter=outer;
+    int         needRP=0;
+
+    if (p == NULL) return;
+
+    if (p->predEntry != NULL && p->predEntry->predLiteral != NULL) {
+      if (p->inverted != p->predEntry->pred->inverted) {
+        _gen("! /* inverted pred */ (");
+        needRP=1;
+      } else {
+        if (!localOuter) _gen("(");
+        needRP=1;
+      };
+      dumpAction(p->predEntry->predLiteral,output,0,p->source->file,p->source->line,0);
+      if (needRP) _gen(")");
+      return;
+    };
+
+    inverted=p->inverted;
+
+    if (inverted) {
+      _gen(" ! /* inverted pred */ (");
+      localOuter=1;
+    };
+
+    if (p->expr == PRED_OR_LIST) {
+      if (!localOuter) _gen("(");
+      for (q=p->down; q != NULL ; q=q->right) {
+        genPredEntry(q,0);
+        if (q->right != NULL) _gen(" || ");
+      };
+      if (!localOuter) _gen(")");
+    } else if (p->expr == PRED_AND_LIST) {
+      if (!localOuter) _gen("(");
+      for (q=p->down; q != NULL ; q=q->right) {
+        genPredEntry(q,0);
+        if (q->right != NULL) _gen(" && ");
+      };
+      if (!localOuter) _gen(")");
+    } else {
+      if (!localOuter) _gen("(");
+      require (p->source != NULL,"predEntry->source == NULL");
+      require (p->source->inverted == 0,"dumpPredEntry p->source->inverted != 0");
+      dumpAction(p->source->action,output,0,p->source->file,p->source->line,0);
+      if (!localOuter) _gen(")");
+    };
+
+    if (inverted) {
+        _gen(")");
+    }
+}
+
+void
+#ifdef __USE_PROTOS
+dumpPredAction(ActionNode *anode,
+                    char *s,FILE *output,int tabs,int file,int line,int final_newline)
+#else
+dumpPredAction(anode,
+                    s,output,tabs,file,line,final_newline)
+
+    ActionNode  *anode;
+    char        *s;
+    FILE        *output;
+    int         tabs;
+    int         file;
+    int         line;
+    int         final_newline;
+#endif
+{
+    PredEntry   *predEntry=anode->predEntry;
+    int         inverted=anode->inverted;
+    Predicate   *workPred;
+
+    if (predEntry == NULL) {
+
+      /* inline predicate literal */
+
+      require(inverted == 0,"dumpPredAction action->inverted");
+  	  dumpAction(s,output,tabs,file,line,final_newline);
+
+    } else {
+
+      /* a reference to a predicate - possibly with an inverted source */
+
+      if (predEntry->predLiteral != NULL) {
+        if (inverted) _gen("! /* inverted pred */ (");
+        dumpAction(predEntry->predLiteral,output,0,anode->file,anode->line,0);
+        if (inverted) _gen(")");
+      } else {
+        workPred=predicate_dup(predEntry->pred);
+        if (inverted) workPred->inverted=!workPred->inverted;
+        genPredEntry(workPred,1);
+        predicate_free(workPred);
+      };
+    };
+}
+
+/* [genPred] */
+
+void
+#ifdef __USE_PROTOS
+genPred(Predicate *p, Node *j,int suppress_sva)
+#else
+genPred(p,j,suppress_sva)
+    Predicate   *p;
+    Node        *j;
+    int         suppress_sva;
+#endif
+{
+	if ( FoundException && !suppress_sva) {_gen("(_sva=(");}    /* MR11 suppress_sva */
+	else {_gen("(");}
+	if ( GenLineInfo && j->file != -1 ) _gen("\n");
+    if (p->source != NULL && p->source->ampersandPred != NULL) {
+      if (p->source->ampersandPred->k == 1) {
+
+            set     ctx[2];
+
+			ctx[0]=empty;
+			ctx[1]=set_dup(p->source->ampersandPred->scontext[1]);
+
+			_gen("(");
+			genExprSets(&(ctx[0]), p->k);
+			_gen(") && ");
+			set_free(ctx[1]);
+      } else {
+        _gen("( ");
+        genExprTree(p->source->ampersandPred->tcontext,1);
+		_gen(" ) && ");
+      };
+    };
+
+    dumpPredAction((ActionNode *)p->source,
+                p->expr, output, 0, -1 /*indicates no line info*/, j->line, 0);
+
+	if ( FoundException && !suppress_sva)   /* MR11 suppress_sva */
+         {_gen("),_sva)");}    /* MR10 - get red of "meant ==" messages */
+	else {_gen(")");}
+}
+
+void
+#ifdef __USE_PROTOS
+MR_distinctORcontextOpt(Predicate *p,Node *j,int in_and_expr)
+#else
+MR_distinctORcontextOpt(p,j,in_and_expr)
+    Predicate   *p;
+    Node        *j;
+    int         in_and_expr;
+#endif
+{
+    Predicate   *q;
+
+    _gen(" /* MR10 Distinct OR context optimization */ \n");
+
+    if (in_and_expr) {
+      gen("zzpf=0,\n");
+      for (q=p->down; q != NULL; q=q->right) {
+        gen("(  ");
+        genCombinedPredTreeContext(q);
+        _gen(" && (zzpf=1, ");
+        genPred(q,j,0);
+        _gen("  )) ||\n");
+      };
+      gen("!zzpf)");
+    } else {
+      require (0,
+            "MR_distinctORcontextOpt: can't get here when using MR_predSimplify");
+#if 0
+**      for (q=p->down; q != NULL; q=q->right) {
+**        gen("(  ");
+**        genCombinedPredTreeContext(q);
+**        _gen(" && ");
+**        genPred(q,j);
+**        if (q->right != NULL) {
+**          _gen("  ) ||\n");
+**        };
+**      };
+**      gen(")");
+#endif
+   };
+}
+
+void
+#ifdef __USE_PROTOS
+genPredTreeOrig( Predicate *p, Node *j, int in_and_expr )
+#else
+genPredTreeOrig( p, j, in_and_expr )
+Predicate *p;
+Node *j;
+int in_and_expr;
+#endif
+{
+
+/* MR10 */  int     allHaveContext=1;
+/* MR10 */  int     noneHaveContext=1;
+
+/* MR10 */  MR_predContextPresent(p,&allHaveContext,&noneHaveContext);
+
+	if ( ! noneHaveContext )                  /* MR10 context guards ignored when -prc off */
+	{
+		_gen("(");
+		genPredTreeGate(p, in_and_expr);
+	}
+
+	/* if leaf node, just gen predicate */
+
+	if ( p->down==NULL )
+	{
+		genPred(p,j,0);
+		if ( ! noneHaveContext ) _gen(")");   /* MR10 context guards ignored when -prc off */
+		return;
+	}
+
+	/* if AND list, do both preds (only two possible) */
+	if ( p->expr == PRED_AND_LIST )
+	{
+#if 0
+**		_gen("(");
+**		genPredTreeOrig(p->down, j, 1);
+**		_gen("&&");
+**		genPredTreeOrig(p->down->right, j, 1);
+**		_gen(")");
+**		if ( ! noneHaveContext ) _gen(")");    /* MR10 context guards ignored when -prc off */
+**		return;
+#endif
+        /* MR11 - make it work with AND with more than two children - like OR */
+
+		Predicate *list;
+		_gen("(");
+		list = p->down;
+		for (; list!=NULL; list=list->right)
+		{
+			genPredTreeOrig(list, j, 1);
+			if ( list->right!=NULL ) _gen("&&");
+		}
+		_gen(")");
+		if ( ! noneHaveContext ) _gen(")");    /* MR10 context guards ignored when -prc off */
+		return;
+    };
+
+	if ( p->expr == PRED_OR_LIST )
+	{
+		Predicate *list;
+		_gen("(");
+		list = p->down;
+		for (; list!=NULL; list=list->right)
+		{
+			genPredTreeOrig(list, j, 0);
+			if ( list->right!=NULL ) _gen("||");
+		}
+		_gen(")");
+		if ( ! noneHaveContext ) _gen(")");    /* MR10 context guards ignored when -prc off */
+		return;
+	}
+
+	fatal_internal("genPredTreeOrig: predicate tree is wacked");
+}
+
+#if 0
+**   Predicate member dummyPredDepth is no longer used in MR10
+**     but we might need it again in the future
+**
+**   if (MRhoisting) {
+**     if ( !noneHaveContext &&
+**          ! in_and_expr &&
+**          p->source != NULL &&
+**          p->source->dummyPredicateDepth > 0 &&
+**          p->down == NULL) {
+** 		_gen("(");
+** 		genCombinedPredTreeContext(p);
+** 		_gen("  )\n");
+** 		return;
+**     };
+**   };
+#endif
+
+/* [genPredTree] */
+
+/* in_and_expr
+
+   what to do if the context is wrong
+   what to do if the context is correct but the predicate is false
+
+   remember: if the context is wrong it's the same as if the
+             predicate is true as far as enabling an alternative
+
+        Consider (AND p q r)
+
+        if in an ... && ... expression then you don't want
+        the entire predicate chain to fail just because the
+        context for one component is wrong: so return true
+
+        Consider (OR p q r)
+
+        if in an ... || ... expression then you don't want
+        the entire predicate chain to succeed just because
+        the context for one component is correct when the
+        corresponding test is false: so return false when
+        the context is correct but the test is false.
+*/
+
+void
+#ifdef __USE_PROTOS
+genPredTree( Predicate *p, Node *j, int in_and_expr, int suppress_sva )
+#else
+genPredTree( p, j, in_and_expr, suppress_sva)
+  Predicate     *p;
+  Node          *j;
+  int           in_and_expr;
+  int           suppress_sva;
+#endif
+{
+
+    int         allHaveContext=1;
+    int         noneHaveContext=1;
+    Tree        *groupTree;
+    Tree        *oneTree;
+    Predicate   *q;
+    int         identicalORcontextOptimization=0;
+    int         identicalANDcontextOptimization=0;
+
+    if (0 && !MR_usingPredNames && !MRhoisting) {
+      genPredTreeOrig(p,j,in_and_expr);
+      return;
+    };
+
+    MR_predContextPresent(p,&allHaveContext,&noneHaveContext);
+
+	if ( ! noneHaveContext ) {                 /* MR10 context guards ignored when -prc off */
+
+      _gen("(");
+
+            /* MR10 optimize OR predicates which are all leaves */
+
+      if (p->expr == PRED_OR_LIST && MR_allPredLeaves(p->down)) {
+        groupTree=MR_compute_pred_tree_context(p);
+        for (q=p->down ; q != NULL ; q=q->right) {
+          oneTree=MR_compute_pred_tree_context(q);
+          if (! MR_tree_equ(groupTree,oneTree)) {
+            Tfree(oneTree);
+            break;
+          };
+          Tfree(oneTree);
+        };
+        Tfree(groupTree);
+        if (q == NULL) {
+          _gen("/* MR10 individual OR gates suppressed when all predicates are leaves");
+          _gen(" with identical context */\n");
+          genPredTreeGate(p,in_and_expr);   /* use the parent's in_and_expr for this gate */
+          identicalORcontextOptimization=1;
+        } else {
+          MR_distinctORcontextOpt(p,j,in_and_expr);
+          return;
+        };
+      } else if (p->expr == PRED_AND_LIST && MR_allPredLeaves(p->down)) {
+
+            /* MR12 optimize AND predicates which are all leaves */
+
+        groupTree=MR_compute_pred_tree_context(p);
+        for (q=p->down ; q != NULL ; q=q->right) {
+          oneTree=MR_compute_pred_tree_context(q);
+          if (! MR_tree_equ(groupTree,oneTree)) {
+            Tfree(oneTree);
+            break;
+          };
+          Tfree(oneTree);
+        };
+        Tfree(groupTree);
+        if (q == NULL) {
+          _gen("/* MR12 individual AND gates suppressed when all predicates are leaves");
+          _gen(" with identical context */\n");
+          genPredTreeGate(p,in_and_expr);   /* use the parent's in_and_expr for this gate */
+          identicalANDcontextOptimization=1;
+        } else {
+          genPredTreeGate(p, in_and_expr);
+        };
+      } else {
+  	    genPredTreeGate(p, in_and_expr);
+      };
+	}
+
+	/* if leaf node, just gen predicate */
+
+	if ( p->down==NULL )
+	{
+		genPred(p,j,suppress_sva);
+		if ( ! noneHaveContext ) _gen(")");   /* MR10 context guards ignored when -prc off */
+		return;
+	}
+
+	/* if AND list, do both preds (only two possible) */
+    /* MR10    not any more ! */
+
+	if ( p->expr == PRED_AND_LIST )
+	{
+		Predicate *list;
+		_gen("(");
+		list = p->down;
+        for (; list != NULL; list=list->right) {
+          if (identicalANDcontextOptimization) {
+            genPred(list, j,suppress_sva);
+          } else {
+	   	    genPredTree(list, j, 1, suppress_sva);  /* in and context */
+          };
+          if ( list->right!=NULL ) _gen("&&");
+        };
+		_gen(")");
+		if ( ! noneHaveContext ) _gen(")");    /* MR10 context guards ignored when -prc off */
+		return;
+	}
+
+	if ( p->expr == PRED_OR_LIST )
+	{
+		Predicate *list;
+		_gen("(");
+		list = p->down;
+		for (; list!=NULL; list=list->right)
+		{
+            if (identicalORcontextOptimization) {
+	          genPred(list, j,suppress_sva);
+            } else {
+	   	      genPredTree(list, j, 0, suppress_sva);
+            };
+			if ( list->right!=NULL ) _gen("||");
+		}
+		_gen(")");
+		if ( ! noneHaveContext ) _gen(")");    /* MR10 context guards ignored when -prc off */
+		return;
+	}
+
+	fatal_internal("predicate tree is wacked");
+}
+
+/* [genPredTreeMainXX] */
+
+Predicate *     /* MR10 */
+#ifdef __USE_PROTOS
+genPredTreeMainXX( Predicate *p, Node *j ,int in_and_expr)
+#else
+genPredTreeMainXX( p, j ,in_and_expr)
+    Predicate   *p;
+    Node        *j;
+    int         in_and_expr;
+#endif
+{
+
+    int     allHaveContext=1;
+    int     noneHaveContext=1;
+
+#if 0
+    fprintf(stderr,"Pred before\n");
+    dumppred(p);
+    fprintf(stderr,"\n");
+    fprintf(stderr,"Pred after\n");
+    dumppred(p);
+    fprintf(stderr,"\n");
+#endif
+
+    p=MR_predSimplifyALL(p);    /* MR10 */
+
+    require (MR_predicate_context_completed(p),"predicate context is not complete");
+
+    MR_cleanup_pred_trees(p);   /* MR10 */
+
+    MR_predContextPresent(p,&allHaveContext,&noneHaveContext);
+    if (!noneHaveContext & !allHaveContext) {
+      warnFL("predicate contains elements both with and without context",
+                FileStr[j->file],j->line);
+    };
+
+    if (InfoP) {
+       _gen("\n#if 0\n\n");
+       MR_dumpPred(p,1);
+       _gen("#endif\n");
+    };
+	genPredTree(p,j,in_and_expr,0);
+    return p;
+}
+
+Predicate *     /* MR10 */
+#ifdef __USE_PROTOS
+genPredTreeMain( Predicate *p, Node *j)
+#else
+genPredTreeMain( p, j)
+    Predicate   *p;
+    Node        *j;
+#endif
+{
+  return genPredTreeMainXX(p,j,1);
+}
+
+static void
+#ifdef __USE_PROTOS
+genExprTreeOriginal( Tree *t, int k )
+#else
+genExprTreeOriginal( t, k )
+Tree *t;
+int k;
+#endif
+{
+	require(t!=NULL, "genExprTreeOriginal: NULL tree");
+	
+	if ( t->token == ALT )
+	{
+		_gen("("); genExprTreeOriginal(t->down, k); _gen(")");
+		if ( t->right!=NULL )
+		{
+			_gen("||");
+			on1line++;
+			if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+			_gen("("); genExprTreeOriginal(t->right, k); _gen(")");
+		}
+		return;
+	}
+	if ( t->down!=NULL ) _gen("(");
+	_gen1("LA(%d)==",k);
+	if ( TokenString(t->token) == NULL ) _gen1("%d", t->token)
+	else _gen1("%s", TokenString(t->token));
+	if ( t->down!=NULL )
+	{
+		_gen("&&");
+		on1line++;
+		if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+		_gen("("); genExprTreeOriginal(t->down, k+1); _gen(")");
+	}
+	if ( t->down!=NULL ) _gen(")");
+	if ( t->right!=NULL )
+	{
+		_gen("||");
+		on1line++;
+		if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+		_gen("("); genExprTreeOriginal(t->right, k); _gen(")");
+	}
+}
+
+#ifdef __USE_PROTOS
+static void MR_LAtokenString(int k,int token)
+#else
+static void MR_LAtokenString(k,token)
+  int   k;
+  int   token;
+#endif
+{
+    char    *ts;
+
+    ts=TokenString(token);
+    if (ts == NULL) {
+      _gen2(" LA(%d)==%d",k,token);
+    } else {
+      _gen2(" LA(%d)==%s",k,ts);
+    };
+}
+
+
+#ifdef __USE_PROTOS
+static int MR_countLeaves(Tree *t)
+#else
+static int MR_countLeaves(t)
+  Tree  *t;
+#endif
+{
+  if (t == NULL) return 0;
+  if (t->token == ALT) {
+    return MR_countLeaves(t->down)+MR_countLeaves(t->right);
+  } else {
+    return 1+MR_countLeaves(t->down)+MR_countLeaves(t->right);
+  };
+}
+
+#ifdef __USE_PROTOS
+static void MR_genOneLine(Tree *tree,int k)
+#else
+static void MR_genOneLine(tree,k)
+  Tree      *tree;
+  int       k;
+#endif
+{
+    if (tree == NULL) return;
+    if (tree->token == ALT) {
+       MR_genOneLine(tree->down,k);
+    } else {
+       MR_LAtokenString(k,tree->token);
+       if (tree->down != NULL &&
+           tree->down->right == NULL) {
+          _gen(" &&");
+          MR_genOneLine(tree->down,k+1);
+       } else if (tree->down != NULL) {
+         _gen(" && (");
+         MR_genOneLine(tree->down,k+1);
+         _gen(")");
+       };
+    };
+    if (tree->right != NULL) {
+      _gen(" ||");
+      MR_genOneLine(tree->right,k);
+    };
+}
+
+static int across;
+static int depth;
+static int lastkonline;
+
+#ifdef __USE_PROTOS
+static void MR_genMultiLine(Tree *tree,int k)
+#else
+static void MR_genMultiLine(tree,k)
+  Tree  *tree;
+  int   k;
+#endif
+{
+    int     i;
+
+    if (tree == NULL) return;
+    if (tree->token == ALT) {
+      MR_genMultiLine(tree,k);
+    } else {
+      MR_LAtokenString(k,tree->token);
+      lastkonline=k;
+      across++;
+      if (tree->down != NULL && tree->down->right == NULL) {
+        if (across > 3) {
+          _gen("\n");
+          across=0;
+          lastkonline=0;
+          for (i=0 ; i < depth+k ; i++) _gen("   ");
+          _gen("&&");
+        } else {
+          _gen(" &&");
+        };
+        MR_genMultiLine(tree->down,k+1);
+      } else if (tree->down != NULL) {
+        _gen("\n");
+        lastkonline=0;
+        across=0;
+        for (i=0 ; i < depth+k ; i++) _gen("   ");
+        _gen("&& (");
+        MR_genMultiLine(tree->down,k+1);
+        _gen(")");
+      };
+    };
+    if (tree->right != NULL) {
+      if (k < lastkonline) {
+        _gen("\n");
+        across=0;
+        lastkonline=0;
+        for (i=0; i < depth+k-1 ; i++) _gen("   ");
+        _gen("||");
+      } else if (across > 3 ) {
+        _gen("\n");
+        across=0;
+        lastkonline=0;
+        for (i=0; i < depth+k ; i++) _gen("   ");
+        _gen("||");
+      } else {
+        _gen(" ||");
+      };
+      MR_genMultiLine(tree->right,k);
+    };
+}
+
+#ifdef __USE_PROTOS
+static void genExprTree(Tree *tree,int k)
+#else
+static void genExprTree(tree,k)
+  Tree  *tree;
+  int   k;
+#endif
+{
+    int     count;
+
+#if 0
+    /* MR20 THM This was probably an error.
+            The routine should probably reference that static 
+            "across" and this declaration hides it.
+    */
+
+    int     across;
+#endif
+  
+    require (tree != NULL,"genExprTree: tree is NULL");
+    require (k > 0,"genExprTree: k <= 0");
+
+    if (0 && !MRhoisting) {   /* MR11 make new version standard */
+      genExprTreeOriginal(tree,k);
+    } else {
+      count=MR_countLeaves(tree);
+      if (count < 5) {
+        MR_genOneLine(tree,k);
+      } else {
+        _gen("\n");
+        across=0;
+        depth=0;
+        lastkonline=0;
+        MR_genMultiLine(tree,k);
+        _gen("\n");
+      };
+    };
+}
+
+
+/*
+ * Generate LL(k) type expressions of the form:
+ *
+ *		 (LA(1) == T1 || LA(1) == T2 || ... || LA(1) == Tn) &&
+ *		 (LA(2) == T1 || LA(2) == T2 || ... || LA(2) == Tn) &&
+ *			.....
+ *		 (LA(k) == T1 || LA(k) == T2 || ... || LA(k) == Tn)
+ *
+ * If GenExprSetsOpt generate:
+ *
+ *		(setwdi[LA(1)]&(1<<j)) && (setwdi[LA(2)]&(1<<j)) ...
+ *
+ * where n is set_deg(expr) and Ti is some random token and k is the last nonempty
+ * set in fset <=CLL_k.
+ * k=1..CLL_k where CLL_k >= 1.
+ *
+ * This routine is visible only to this file and cannot answer a TRANS message.
+ *
+ */
+
+/*  [genExpr] */
+
+static int
+#ifdef __USE_PROTOS
+genExpr( Junction *j )
+#else
+genExpr( j )
+Junction *j;
+#endif
+{
+	int max_k;
+
+	/* if full LL(k) is sufficient, then don't use approximate (-ck) lookahead
+	 * from CLL_k..LL_k
+	 */
+	{
+		int limit;
+		if ( j->ftree!=NULL ) limit = LL_k;
+		else limit = CLL_k;
+		max_k = genExprSets(j->fset, limit);
+	}
+
+	/* Do tests for real tuples from other productions that conflict with
+	 * artificial tuples generated by compression (using sets of tokens
+	 * rather than k-trees).
+	 */
+	if ( j->ftree != NULL )
+	{
+		_gen(" && !("); genExprTree(j->ftree, 1); _gen(")");
+	}
+
+	if ( ParseWithPredicates && j->predicate!=NULL )
+	{
+		Predicate *p = j->predicate;
+		warn_about_using_gk_option();
+		_gen("&&");
+		j->predicate=genPredTreeMain(p, (Node *)j);     /* MR10 */
+	}
+
+	return max_k;
+}
+
+static int
+#ifdef __USE_PROTOS
+genExprSets( set *fset, int limit )
+#else
+genExprSets( fset, limit )
+set *fset;
+int limit;
+#endif
+{
+	int k = 1;
+	int max_k = 0;
+	unsigned *e, *g, firstTime=1;
+
+    if (set_nil(fset[1])) {
+      _gen(" 0 /* MR13 empty set expression  - undefined rule ? infinite left recursion ? */ ");
+      MR_BadExprSets++;
+    };
+
+	if ( GenExprSetsOpt )
+	{
+		while ( k <= limit && !set_nil(fset[k]) )   /* MR11 */
+		{
+			if ( set_deg(fset[k])==1 )	/* too simple for a set? */
+			{
+				int e;
+				_gen1("(LA(%d)==",k);
+				e = set_int(fset[k]);
+				if ( TokenString(e) == NULL ) _gen1("%d)", e)
+				else _gen1("%s)", TokenString(e));
+			}
+			else
+			{
+				NewSet();
+				FillSet( fset[k] );
+				_gen3("(setwd%d[LA(%d)]&0x%x)", wordnum, k, 1<<setnum);
+			}
+			if ( k>max_k ) max_k = k;
+			if ( k == CLL_k ) break;
+			k++;
+			if ( k<=limit && !set_nil(fset[k]) ) _gen(" && ");  /* MR11 */
+			on1line++;
+			if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+		}
+		return max_k;
+	}
+
+	while ( k<= limit &&  !set_nil(fset[k]) )       /* MR11 */
+	{
+		if ( (e=g=set_pdq(fset[k])) == NULL ) fatal_internal("genExpr: cannot allocate IF expr pdq set");
+		for (; *e!=nil; e++)
+		{
+			if ( !firstTime ) _gen(" || ") else { _gen("("); firstTime = 0; }
+			on1line++;
+			if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+			_gen1("LA(%d)==",k);
+			if ( TokenString(*e) == NULL ) _gen1("%d", *e)
+			else _gen1("%s", TokenString(*e));
+		}
+		free( (char *)g );
+		_gen(")");
+		if ( k>max_k ) max_k = k;
+		if ( k == CLL_k ) break;
+		k++;
+		if ( k <= limit && !set_nil(fset[k]) ) { firstTime=1; _gen(" && "); }   /* MR11 */
+		on1line++;
+		if ( on1line > NumExprPerLine ) { on1line=0; _gen("\n"); }
+	}
+	return max_k;
+}
+
+/*
+ * Generate code for any type of block.  If the last alternative in the block is
+ * empty (not even an action) don't bother doing it.  This permits us to handle
+ * optional and loop blocks as well.
+ *
+ * Only do this block, return after completing the block.
+ * This routine is visible only to this file and cannot answer a TRANS message.
+ */
+static set
+#ifdef __USE_PROTOS
+genBlk( Junction *q, int jtype, int *max_k, int *need_right_curly, int * lastAltEmpty /* MR23 */)
+#else
+genBlk( q, jtype, max_k, need_right_curly, lastAltEmpty /* MR23 */)
+Junction *q;
+int jtype;
+int *max_k;
+int *need_right_curly;
+int *lastAltEmpty; /* MR23 */
+#endif
+{
+	set f;
+	Junction *alt;
+	int a_guess_in_block = 0;
+	require(q!=NULL,				"genBlk: invalid node");
+	require(q->ntype == nJunction,	"genBlk: not junction");
+	*need_right_curly=0;
+	*lastAltEmpty = 0;		/* MR23 */
+	if ( q->p2 == NULL )	/* only one alternative?  Then don't need if */
+	{	
+		if (first_item_is_guess_block((Junction *)q->p1)!=NULL )
+		{
+            if (jtype != aLoopBlk && jtype != aOptBlk && jtype != aPlusBlk) {
+  			  warnFL("(...)? as only alternative of block is unnecessary", FileStr[q->file], q->line);
+            };
+   	   	    gen("zzGUESS\n");	/* guess anyway to make output code consistent */
+/* MR10 disable */  /**** gen("if ( !zzrv )\n"); ****/
+/* MR10 */          gen("if ( !zzrv ) {\n"); tabs++; (*need_right_curly)++;
+        };
+		TRANS(q->p1);
+		return empty;		/* no decision to be made-->no error set */
+	}
+
+	f = First(q, 1, jtype, max_k);
+	for (alt=q; alt != NULL; alt= (Junction *) alt->p2 )
+	{
+		if ( alt->p2 == NULL )					/* chk for empty alt */
+		{	
+			Node *p = alt->p1;
+			if ( p->ntype == nJunction )
+			{
+				/* we have empty alt */
+/* MR23
+   There is a conflict between giving good error information for non-exceptions
+   and making life easy for those using parser exception handling.  Consider:
+
+         r: { A } b;
+		 b: B;
+		 
+		   with input "C"
+
+   Before MR21 the error message would be "expecting B - found C".  After MR21
+   the error message would be "expcect A, B - found C".  This was good, but it
+   caused problems for those using parser exceptions because the reference to
+   B was generated inside the {...} where B really wasn't part of the block.
+
+   In MR23 this has been changed for the case where exceptions are in use to
+   not generate the extra check in the tail of the {A} block.
+*/
+
+
+/* MR23 */	if (isEmptyAlt( ((Junction *)p)->p1, (Node *)q->end)) {
+/* MR23 */      *lastAltEmpty = 1;
+/* MR23 */		if (FoundException) {
+/* MR23 */			/* code to restore state if a prev alt didn't follow guess */
+/* MR23 */			if ( a_guess_in_block && jtype != aPlusBlk) {
+/* MR23 */				gen("if ( !zzrv ) zzGUESS_DONE; /* MR28 */\n");
+/* MR23 */			}
+/* MR23 */			break;
+/* MR23 */		};
+/* MR28 */      if (jtype == aPlusBlk) {
+/* MR28 */          break;
+/* MR28 */      }
+/* MR23 */	}
+		}
+	} /* end of for loop on alt */
+
+/* MR10 */        if (alt->p2 == NULL &&
+/* MR10 */               ( q->jtype == aSubBlk || q->jtype == RuleBlk) ) {
+/* MR10 */          if (first_item_is_guess_block(alt)) {
+/* MR10 */               warnFL("(...)? as last alternative of block is unnecessary",
+/* MR10 */                                FileStr[alt->file],alt->line);
+/* MR10 */          };
+/* MR10 */        };
+
+		if ( alt != q ) gen("else ")
+		else
+		{
+			if ( DemandLookahead ) {
+				if ( !GenCC ) {gen1("LOOK(%d);\n", *max_k);}
+				else gen1("look(%d);\n", *max_k);
+			}
+		}
+
+		if ( alt!=q )
+		{
+			_gen("{\n");
+			tabs++;
+			(*need_right_curly)++;
+			/* code to restore state if a prev alt didn't follow guess */
+			if ( a_guess_in_block )
+				gen("if ( !zzrv ) zzGUESS_DONE;\n");
+		}
+		if ( first_item_is_guess_block((Junction *)alt->p1)!=NULL )
+		{
+			a_guess_in_block = 1;
+			gen("zzGUESS\n");
+		}
+		gen("if ( ");
+		if ( first_item_is_guess_block((Junction *)alt->p1)!=NULL ) _gen("!zzrv && ");
+		genExpr(alt);
+		_gen(" ) ");
+		_gen("{\n");
+		tabs++;
+		TRANS(alt->p1);
+		--tabs;
+		gen("}\n");
+/* MR10 */        if (alt->p2 == NULL) {
+/* MR10 */          if (first_item_is_guess_block(alt)) {
+/* MR10 */            gen("/* MR10 */ else {\n");
+/* MR10 */            tabs++;
+/* MR10 */  		  (*need_right_curly)++;
+/* MR10 */  		  /* code to restore state if a prev alt didn't follow guess */
+/* MR10 */            gen("/* MR10 */ if ( !zzrv ) zzGUESS_DONE;\n");
+/* MR10 */            gen("/* MR10 */ if (0) {}     /* last alternative of block is guess block */\n");
+/* MR10 */          };
+/* MR10 */        };
+	}
+	return f;
+}
+
+static int
+#ifdef __USE_PROTOS
+has_guess_block_as_first_item( Junction *q )
+#else
+has_guess_block_as_first_item( q )
+Junction *q;
+#endif
+{
+	Junction *alt;
+
+	for (alt=q; alt != NULL; alt= (Junction *) alt->p2 )
+	{
+		if ( first_item_is_guess_block((Junction *)alt->p1)!=NULL ) return 1;
+	}
+	return 0;
+}
+
+static int
+#ifdef __USE_PROTOS
+has_guess_block_as_last_item( Junction *q )
+#else
+has_guess_block_as_last_item( q )
+Junction *q;
+#endif
+{
+	Junction *alt;
+
+    if (q == NULL) return 0;
+	for (alt=q; alt->p2 != NULL && !( (Junction *) alt->p2)->ignore; alt= (Junction *) alt->p2 ) {};
+    return first_item_is_guess_block( (Junction *) alt->p1) != NULL;
+}
+
+/* MR30 See description of first_item_is_guess_block for background */
+
+Junction *
+#ifdef __USE_PROTOS
+first_item_is_guess_block_extra(Junction *q )
+#else
+first_item_is_guess_block_extra(q)
+Junction *q;
+#endif
+{
+	while ( q!=NULL &&
+            (  ( q->ntype==nAction ) ||
+               ( q->ntype==nJunction &&
+                    (q->jtype==Generic || q->jtype == aLoopBlk) 
+               )
+            )
+          )
+	{
+		if ( q->ntype==nJunction ) q = (Junction *)q->p1;
+		else q = (Junction *) ((ActionNode *)q)->next;
+	}
+
+	if ( q==NULL ) return NULL;
+	if ( q->ntype!=nJunction ) return NULL;
+	if ( q->jtype!=aSubBlk ) return NULL;
+	if ( !q->guess ) return NULL;
+
+	return q;
+}
+
+/* return NULL if 1st item of alt is NOT (...)? block; else return ptr to aSubBlk node
+ * of (...)?;  This function ignores actions and predicates.
+ */
+
+Junction *
+#ifdef __USE_PROTOS
+first_item_is_guess_block( Junction *q )
+#else
+first_item_is_guess_block( q )
+Junction *q;
+#endif
+{
+	Junction * qOriginal = q;	/* DEBUG */
+
+    /* MR14  Couldn't find aSubBlock which was a guess block when it lay
+             behind aLoopBlk.  The aLoopBlk only appear in conjunction with
+             aLoopBegin, but the routine didn't know that.  I think.
+
+       MR14a Added extra parentheses to clarify precedence
+
+	   MR30  This appears to have been a mistake.  The First set was then
+	         computed incorrectly for:
+
+					r : ( (A)? B
+					    | C
+						)*
+			 
+			 The routine analysis_point was seeing the guess block when
+			 it was still analyzing the loopBegin block.  As a consequence,
+			 when it looked for the analysis_point it was processing the B, but
+			 skipping over the C alternative altogether because it thought
+			 it was looking at a guess block, not realizing there was a loop
+			 block in front of the loopBegin.
+
+             loopBegin  loopBlk  subBlk/guess  A  G  EB  G  B EB EB  EB  ER
+			    |          |          |                     ^   ^
+				|		   |                                |   |
+                |          +-> G  C G ----------------------+   |
+                |                                               |
+				+--- G G G -------------------------------------+
+    
+			 Reported by Arpad Beszedes (beszedes@inf.u-szeged.hu).
+
+		MR30  This is still more complicated.  This fix caused ambiguity messages
+		to be reported for "( (A B)? )* A B" but not for "( (A B)? )+".  Why is
+		there a difference when these are outwardly identical ?  It is because the
+		start of a (...)* block is represented by two nodes: a loopBegin block
+		followed by a loopBlock whereas the start of a (...)+ block is
+		represented as a single node: a plusBlock.  So if first_item_is_guess_block
+		is called when the current node is a loopBegin it starts with the
+		loop block rather than the the sub block which follows the loop block.
+		However, we can't just skip past the loop block because some routines
+		depend on the old implementation.  So, we provide a new implementation
+		which does skip the loopBlock.  However, which should be called when ?
+		I'm not sure, but my guess is that first_item_is_guess_block_extra (the
+		new one) should only be called for the ambiguity routines.
+
+    */
+
+	while ( q!=NULL &&
+            (  ( q->ntype==nAction ) ||
+               ( q->ntype==nJunction &&
+                    (q->jtype==Generic /*** || q->jtype == aLoopBlk ***/ ) /*** MR30 Undo MR14 change ***/
+               )
+            )
+          )
+	{
+		if ( q->ntype==nJunction ) q = (Junction *)q->p1;
+		else q = (Junction *) ((ActionNode *)q)->next;
+	}
+
+	if ( q==NULL ) return NULL;
+	if ( q->ntype!=nJunction ) return NULL;
+	if ( q->jtype!=aSubBlk ) return NULL;
+	if ( !q->guess ) return NULL;
+
+	return q;
+}
+
+/* MR1				                 					    */
+/* MR1  10-Apr-97 MR1 Routine to stringize failed semantic predicates msgs  */
+/* MR1				                                                        */
+
+#define STRINGIZEBUFSIZE 1024
+
+static char stringizeBuf[STRINGIZEBUFSIZE];
+char *
+#ifdef __USE_PROTOS
+stringize(char * s)
+#else
+stringize(s)
+char *s;
+#endif
+
+{
+  char		*p;
+  char		*stop;
+
+  p=stringizeBuf;
+  stop=&stringizeBuf[1015];
+
+  if (s != 0) {
+    while (*s != 0) {
+      if (p >= stop) {
+	goto stringizeStop;
+      } else if (*s == '\n') {
+        *p++='\\';
+        *p++='n';
+        *p++='\\';
+	*p++=*s++;
+      } else if (*s == '\\') {
+	*p++=*s;
+	*p++=*s++;
+      } else if (*s == '\"') {
+        *p++='\\';
+	*p++=*s++;
+        while (*s != 0) {
+          if (p >= stop) {
+	     goto stringizeStop;
+	  } else if (*s == '\n') {
+	    *p++='\\';
+	    *p++=*s++;
+	  } else if (*s == '\\') {
+	    *p++=*s++;
+	    *p++=*s++;
+	  } else if (*s == '\"') {
+	    *p++='\\';
+	    *p++=*s++;
+	    break;
+	  } else {
+	    *p++=*s++;
+          };
+        };
+      } else if (*s == '\'') {
+	*p++=*s++;
+        while (*s != 0) {
+          if (p >= stop) {
+	     goto stringizeStop;
+	  } else if (*s == '\'') {
+	    *p++=*s++;
+	    break;
+	  } else if (*s == '\\') {
+	    *p++=*s++;
+	    *p++=*s++;
+	  } else if (*s == '\"') {
+	    *p++='\\';
+	    *p++=*s++;
+	    break;
+	  } else {
+	    *p++=*s++;
+          };
+        };
+      } else {
+        *p++=*s++;
+      };
+    };
+  };
+  goto stringizeExit;
+stringizeStop:
+  *p++='.';        	
+  *p++='.';        	
+  *p++='.';        	
+stringizeExit:
+  *p=0;
+  return stringizeBuf;
+}
+
+#ifdef __USE_PROTOS
+int isNullAction(char *s)
+#else
+int isNullAction(s)
+  char  *s;
+#endif
+{
+  char  *p;
+  for (p=s; *p != '\0' ; p++) {
+    if (*p != ';' && *p !=' ') return 0;
+  };
+  return 1;
+}
+/* MR1									                                    */
+/* MR1	End of Routine to stringize code for failed predicates msgs         */
+/* MR1				                                                        */
+
+/* Generate an action.  Don't if action is NULL which means that it was already
+ * handled as an init action.
+ */
+void
+#ifdef __USE_PROTOS
+genAction( ActionNode *p )
+#else
+genAction( p )
+ActionNode *p;
+#endif
+{
+	require(p!=NULL,			"genAction: invalid node and/or rule");
+	require(p->ntype==nAction,	"genAction: not action");
+
+	if ( !p->done )  /* MR10 */ /* MR11 */
+	{
+		if ( p->is_predicate)
+		{
+			if ( p->guardpred != NULL )
+			{
+                Predicate *guardDup=predicate_dup(p->guardpred); /* MR10 */
+                gen("if (!");
+       			guardDup=genPredTreeMain(guardDup, (Node *)p);
+                predicate_free(guardDup);
+			}
+/* MR10 */  else if (p->ampersandPred != NULL) {
+/* MR10 */      gen("if (!");
+/* MR10 */      p->ampersandPred=genPredTreeMain(p->ampersandPred, (Node *)p);
+/* MR10 */  }
+			else
+			{
+				gen("if (!(");
+				/* make sure that '#line n' is on front of line */
+				if ( GenLineInfo && p->file != -1 ) _gen("\n");
+				dumpPredAction(p,p->action, output, 0, p->file, p->line, 0);
+				_gen(")");
+			}
+
+/* MR23 Change failed predicate macro to have three arguments:
+
+        macro arg 1: The stringized predicate itself
+        macro arg 2: 0 => no user-defined error action
+                     1 => user-defined error action
+        macro arg 3: The user-defined error action
+
+   This gives the user more control of the error action.
+*/
+			tabs++;
+			gen3(") {zzfailed_pred(\"%s\",%s, { %s } );}\n",         /* MR23 */
+					stringize(p->action),	                         /* MR23 */
+                    (p->pred_fail == NULL ?                          /* MR23/MR27 */
+                       	"0 /* report */" : "1 /* user action */"),   /* MR23/MR27 */
+                    (p->pred_fail == NULL ?                          /* MR23 */
+                        "0; /* no user action */" : p->pred_fail));  /* MR23 */
+			tabs--;
+		}
+		else    /* not a predicate */
+		{
+            if (! isNullAction(p->action) && !p->noHoist) {
+  	  		  if ( FoundGuessBlk ) {
+				if ( GenCC ) {
+                  gen("if ( !guessing ) {\n");
+                } else {
+				  gen("zzNON_GUESS_MODE {\n");
+                };
+              };
+			  dumpActionPlus(p, p->action, output, tabs, p->file, p->line, 1); /* MR21 */
+			  if ( FoundGuessBlk ) gen("}\n");
+            };
+		}
+	}
+	TRANS(p->next)
+}
+
+/*
+ *		if invoking rule has !noAST pass zzSTR to rule ref and zzlink it in
+ *		else pass addr of temp root ptr (&_ast) (don't zzlink it in).
+ *
+ *		if ! modifies rule-ref, then never link it in and never pass zzSTR.
+ *		Always pass address of temp root ptr.
+ */
+void
+#ifdef __USE_PROTOS
+genRuleRef( RuleRefNode *p )
+#else
+genRuleRef( p )
+RuleRefNode *p;
+#endif
+{
+	Junction *q;
+	char *handler_id = "";
+	RuleEntry *r, *r2;
+	char *parm = "", *exsig = "";
+
+    int     genRuleRef_emittedGuessGuard=0;     /* MR10 */
+
+	require(p!=NULL,			"genRuleRef: invalid node and/or rule");
+	require(p->ntype==nRuleRef, "genRuleRef: not rule reference");
+	
+	if ( p->altstart!=NULL && p->altstart->exception_label!=NULL )
+		handler_id = p->altstart->exception_label;
+
+	r = (RuleEntry *) hash_get(Rname, p->text);
+	if ( r == NULL )
+	{
+		warnFL( eMsg1("rule %s not defined",
+					  p->text), FileStr[p->file], p->line );
+		return;
+	}
+
+/* MR8 5-Aug-97     Reported by S.Bochnak@microtool.com.pl                  */
+/*                  Don't do assign when no return values declared          */
+/*                  Move definition of q up and use it to guard p->assign   */
+
+	q = RulePtr[r->rulenum];	/* find definition of ref'd rule */  /* MR8 */
+
+	r2 = (RuleEntry *) hash_get(Rname, p->rname);
+	if ( r2 == NULL ) {warnNoFL("Rule hash table is screwed up beyond belief"); return;}
+
+    OutLineInfo(output,p->line,FileStr[p->file]);
+
+	if ( GenCC && GenAST ) {
+		gen("_ast = NULL;\n");
+	}
+
+	if ( FoundGuessBlk && p->assign!=NULL && q->ret != NULL ) {      /* MR8 */
+		if ( GenCC ) {
+          gen("if ( !guessing ) {\n");
+        } else {
+          gen("zzNON_GUESS_MODE {\n");
+        };
+        tabs++;                                                      /* MR11 */
+        genRuleRef_emittedGuessGuard=1;                              /* MR11 */
+    };
+
+	if ( FoundException ) exsig = "&_signal";
+
+	tab();
+	if ( GenAST )
+	{
+		if ( GenCC ) {
+/****			if ( r2->noAST || p->astnode==ASTexclude )
+****/
+			{
+/****				_gen("_ast = NULL;\n");
+****/
+				parm = "&_ast";
+			}
+/*** we always want to set just a pointer now, then set correct
+pointer after
+
+			else {
+				_gen("_astp =
+(_tail==NULL)?(&_sibling):(&(_tail->_right));\n");
+				parm = "_astp";
+			}
+****/
+		}
+		else {
+			if ( r2->noAST || p->astnode==ASTexclude )
+			{
+				_gen("_ast = NULL; ");
+				parm = "&_ast";
+			}
+			else parm = "zzSTR";
+		}
+		if ( p->assign!=NULL && q->ret!=NULL )                       /* MR8 */
+		{
+			if ( !hasMultipleOperands(p->assign) ) {_gen1("%s = ",p->assign);} /* MR23 */
+			else _gen1("{ struct _rv%d _trv; _trv = ", r->rulenum);
+		}
+		if ( FoundException ) {
+			_gen5("%s%s(%s,&_signal%s%s); ",
+				  RulePrefix,
+				  p->text,
+				  parm,
+				  (p->parms!=NULL)?",":"",
+				  (p->parms!=NULL)?p->parms:"");
+			if ( p->ex_group!=NULL ) {
+				_gen("\n");
+				gen("if (_signal) {\n");
+				tabs++;
+				dumpException(p->ex_group, 0);
+				tabs--;
+				gen("}");
+			}
+			else {
+				_gen1("if (_signal) goto %s_handler;", handler_id);
+			}
+		}
+		else {
+			_gen5("%s%s(%s%s%s);",
+				  RulePrefix,
+				  p->text,
+				  parm,
+				  (p->parms!=NULL)?",":"",
+				  (p->parms!=NULL)?p->parms:"");
+		}
+		if ( GenCC && (r2->noAST || p->astnode==ASTexclude) )
+		{
+			/* rule has a ! or element does */
+			/* still need to assign to #i so we can play with it */
+			_gen("\n");
+			gen2("_ast%d%d = (AST *)_ast;", BlkLevel-1, p->elnum);
+		}
+		else if ( !r2->noAST && p->astnode == ASTinclude )
+		{
+			/* rule doesn't have a ! and neither does element */
+/* MR10 */  if (FoundGuessBlk && !genRuleRef_emittedGuessGuard) {
+/* MR10 */    _gen("\n");
+/* MR10 */    if (GenCC) gen ("if (!guessing) {    /* MR10 */")
+/* MR10 */          else gen ("if (!zzguessing) {    /* MR10 */\n");
+/* MR10 */    tabs++;
+/* MR10 */  };
+			if ( GenCC ) {
+				_gen("\n");
+				gen("if ( _tail==NULL ) _sibling = _ast; else _tail->setRight(_ast);\n");
+				gen2("_ast%d%d = (AST *)_ast;\n", BlkLevel-1, p->elnum);
+				tab();
+			}
+			else _gen(" ");
+            if ( GenCC ) {
+                _gen("ASTBase::"); }
+                else _gen("zz");
+			_gen("link(_root, &_sibling, &_tail);");
+
+/* MR10 */  if (FoundGuessBlk && !genRuleRef_emittedGuessGuard) {     /* MR10 */
+/* MR10 */    _gen("\n");
+/* MR10 */    tabs--;
+/* MR10 */    if (GenCC) gen ("};    /* MR10 */")
+/* MR10 */          else gen ("};    /* MR10 */");
+/* MR10 */  };
+		}
+	}
+	else
+	{
+		if ( p->assign!=NULL && q->ret!=NULL )                       /* MR8 */
+		{
+			if ( !hasMultipleOperands(p->assign) ) {_gen1("%s = ",p->assign);} /* MR23 */
+			else _gen1("{ struct _rv%d _trv; _trv = ", r->rulenum);
+		}
+		if ( FoundException ) {
+			_gen4("%s%s(&_signal%s%s); ",
+				  RulePrefix,
+				  p->text,
+				  (p->parms!=NULL)?",":"",
+				  (p->parms!=NULL)?p->parms:"");
+			if ( p->ex_group!=NULL ) {
+				_gen("\n");
+				gen("if (_signal) {\n");
+				tabs++;
+				dumpException(p->ex_group, 0);
+				tabs--;
+				gen("}");
+			}
+			else {
+				_gen1("if (_signal) goto %s_handler;", handler_id);
+			}
+		}
+		else {
+			_gen3("%s%s(%s);",
+				  RulePrefix,
+				  p->text,
+				  (p->parms!=NULL)?p->parms:"");
+		}
+		if ( p->assign!=NULL && q->ret!=NULL ) _gen("\n");           /* MR8 */
+	}
+
+	if ( p->assign!=NULL && q->ret!=NULL) {                          /* MR8 */
+		if ( hasMultipleOperands(p->assign) )                        /* MR23 */
+		{
+			_gen("\n");
+			dumpRetValAssign(p->assign, q->ret, p);                  /* MR30 */
+			_gen("}");
+		}
+	}
+	_gen("\n");
+
+	/* Handle element labels now */
+	if ( p->el_label!=NULL )
+	{
+		if ( GenAST )
+		{
+			if ( GenCC ) {
+				gen3("%s_ast = _ast%d%d;\n", p->el_label, BlkLevel-1, p->elnum);
+			}
+			else {gen1("%s_ast = zzastCur;\n", p->el_label);}
+		}
+       	else if (!GenCC ) {
+			gen1("%s = zzaCur;\n", p->el_label);
+        }
+	}
+
+	if ( FoundGuessBlk && p->assign!=NULL && q->ret!=NULL ) {       /* MR8 */
+		/* in guessing mode, don't branch to handler upon error */
+        tabs--;                                                     /* MR11 */
+		gen("} else {\n");
+        tabs++;                                                     /* MR11 */
+		if ( FoundException ) {
+			gen6("%s%s(%s%s&_signal%s%s);\n",
+				 RulePrefix,
+				 p->text,
+				 parm,
+                 (*parm!='\0')?",":"",
+                 (p->parms!=NULL)?",":"",
+				 (p->parms!=NULL)?p->parms:"");
+		}
+		else {
+			gen5("%s%s(%s%s%s);\n",
+				 RulePrefix,
+				 p->text,
+				 parm,
+				 (p->parms!=NULL && *parm!='\0')?",":"",
+				 (p->parms!=NULL)?p->parms:"");
+		}
+        tabs--;                                                     /* MR11 */
+		gen("}\n");
+	}
+	TRANS(p->next)
+}
+
+/*
+ * Generate code to match a token.
+ *
+ * Getting the next token is tricky.  We want to ensure that any action
+ * following a token is executed before the next GetToken();
+ */
+void
+#ifdef __USE_PROTOS
+genToken( TokNode *p )
+#else
+genToken( p )
+TokNode *p;
+#endif
+{
+	RuleEntry *r;
+	char *handler_id = "";
+	ActionNode *a;
+	char *set_name;
+	char *set_nameErrSet;
+	int complement;
+	int ast_label_in_action = 0;	/* MR27 */
+	int pushedCmodeAST = 0;			/* MR27 */
+
+	require(p!=NULL,			"genToken: invalid node and/or rule");
+	require(p->ntype==nToken,	"genToken: not token");
+	if ( p->altstart!=NULL && p->altstart->exception_label!=NULL )
+		handler_id = p->altstart->exception_label;
+
+	r = (RuleEntry *) hash_get(Rname, p->rname);
+	if ( r == NULL ) {warnNoFL("Rule hash table is screwed up beyond belief"); return;}
+
+/*
+ * MR27 Has the element label been referenced as an AST (with the # operator) ?
+ *      If so, then we'll want to build the AST even though the user has used
+ *      the ! operator.
+ */
+/* MR27 */	if (GenAST && p->el_label != NULL) {
+/* MR27 */		ast_label_in_action = list_search_cstring(r->ast_labels_in_actions,
+/* MR27 */		                                          p->el_label);
+/* MR27 */	}
+	
+    OutLineInfo(output,p->line,FileStr[p->file]);
+
+	if ( !set_nil(p->tset) )	/* implies '.', ~Tok, or tokenclass */
+	{
+		unsigned e;
+		unsigned eErrSet = 0;
+		set b;
+		set bErrSet;					/* MR23 */
+		b = set_dup(p->tset);
+		bErrSet = set_dup(p->tset);	    /* MR23 */
+		complement = p->complement; /* MR23 */
+		if ( p->tclass!=NULL  && complement == 0 /* MR23 */) { /* token class not complemented*/
+			static char buf[MaxRuleName+20];	    /* MR23 */
+			static char bufErrSet[MaxRuleName+20];	/* MR23 */
+			if ( p->tclass->dumped ) {
+				e = p->tclass->setnum;
+				eErrSet = p->tclass->setnumErrSet;
+			}
+			else {
+				e = DefErrSet(&b, 0, TokenString(p->token));
+				eErrSet = DefErrSetWithSuffix(0, &bErrSet, 1, TokenString(p->token), "_errset");
+				p->tclass->dumped = 1;	/* indicate set has been created */
+				p->tclass->setnum = e;
+				p->tclass->setnumErrSet = eErrSet;					/* MR23 */
+			}
+			sprintf(buf, "%s_set", TokenString(p->token));
+			sprintf(bufErrSet, "%s_errset", TokenString(p->token));	/* MR23 */
+			set_name = buf;
+			set_nameErrSet = bufErrSet;								/* MR23 */
+		}
+
+		/* MR23 - Forgot about the case of ~TOKCLASS. */
+
+		else if ( p->tclass!=NULL  && complement != 0 /* MR23 */)
+		{
+			static char buf[MaxRuleName+20];	    /* MR23 */
+			static char bufErrSet[MaxRuleName+20];	/* MR23 */
+			if ( p->tclass->dumpedComplement ) {
+				e = p->tclass->setnumComplement;
+				eErrSet = p->tclass->setnumErrSetComplement;
+			}
+			else {
+				e = DefErrSetWithSuffix(0, &b, 0, TokenString(p->token), "_setbar");
+				eErrSet = DefErrSetWithSuffix(0, &bErrSet, 1, TokenString(p->token), "_errsetbar");
+				p->tclass->dumpedComplement = 1;	/* indicate set has been created */
+				p->tclass->setnumComplement = e;
+				p->tclass->setnumErrSetComplement = eErrSet;					/* MR23 */
+			}
+			sprintf(buf, "%s_setbar", TokenString(p->token));
+			sprintf(bufErrSet, "%s_errsetbar", TokenString(p->token));	/* MR23 */
+			set_name = buf;
+			set_nameErrSet = bufErrSet;								/* MR23 */
+		}
+		else {					/* wild card */
+			static char buf[sizeof("zzerr")+10];
+			static char bufErrSet[sizeof("zzerr")+10];
+			int n = DefErrSet( &b, 0, NULL );
+			int nErrSet = DefErrSetWithSuffix(0, &bErrSet, 1, NULL, "_set");
+			if ( GenCC ) sprintf(buf, "err%d", n);
+			else sprintf(buf, "zzerr%d", n);
+			if ( GenCC ) sprintf(bufErrSet, "err%d", nErrSet);
+			else sprintf(bufErrSet, "zzerr%d", nErrSet);
+			set_name = buf;
+			set_nameErrSet = bufErrSet;
+		}
+
+		if ( !FoundException ) {
+/* MR23 */		gen2("zzsetmatch(%s, %s);", set_name, set_nameErrSet);
+		}
+		else if ( p->ex_group==NULL ) {
+            if ( p->use_def_MT_handler )
+                gen3("zzsetmatch_wdfltsig(%s,(ANTLRTokenType)%d,%s);",
+                     set_name,
+                     p->token,
+                     tokenFollowSet(p))
+            else
+                gen2("zzsetmatch_wsig(%s, %s_handler);",
+                     set_name,
+                     handler_id);
+		}
+		else
+		{
+			gen1("if ( !_setmatch_wsig(%s) ) {\n", set_name);
+			tabs++;
+/* MR6 */	if (FoundGuessBlk) {
+/* MR6 */	  if ( GenCC ) {gen("if ( guessing ) goto fail;\n");}
+/* MR6 */	  else gen("if ( zzguessing ) goto fail;\n");
+/* MR6 */	};
+			gen("_signal=MismatchedToken;\n");
+			dumpException(p->ex_group, 0);
+			tabs--;
+			gen("}\n");
+		}
+		set_free(b);
+		set_free(bErrSet);
+	}
+	else if ( TokenString(p->token)!=NULL )
+	{
+		if ( FoundException ) {
+			if ( p->use_def_MT_handler )
+				gen2("zzmatch_wdfltsig(%s,%s);",TokenString(p->token),tokenFollowSet(p))
+			else if ( p->ex_group==NULL )
+			{
+				gen2("zzmatch_wsig(%s, %s_handler);",
+					 TokenString(p->token),
+					 handler_id);
+			}
+			else
+			{
+/* MR6 */		if (GenCC) {
+/* MR6 */		  gen1("if ( !_match_wsig(%s) ) {\n", TokenString(p->token));
+/* MR6 */		} else {
+/* MR6 */		  gen1("if ( !_zzmatch_wsig(%s) ) {\n", TokenString(p->token));
+/* MR6 */		};
+				tabs++;
+/* MR6 */		if (FoundGuessBlk) {
+/* MR6 */	  	  if ( GenCC ) {gen("if ( guessing ) goto fail;\n");}
+/* MR6 */		  else gen("if ( zzguessing ) goto fail;\n");
+/* MR6 */		};
+				gen("_signal=MismatchedToken;\n");
+				dumpException(p->ex_group, 0);
+				tabs--;
+				gen("}\n");
+			}
+		}
+		else gen1("zzmatch(%s);", TokenString(p->token));
+	}
+	else {
+        if ( FoundException ) {
+            if ( p->use_def_MT_handler )
+				gen2("zzmatch_wdfltsig((ANTLRTokenType)%d,%s);",
+					 p->token,tokenFollowSet(p))
+            else
+                gen2("zzmatch_wsig(%d,%s_handler);",p->token,handler_id);
+        }
+		else {gen1("zzmatch(%d);", p->token);}
+	}
+
+	a = findImmedAction( p->next );
+	/* generate the token labels */
+	if ( GenCC && p->elnum>0 )
+	{
+		/* If building trees in C++, always gen the LT() assigns */
+		if ( set_el(p->elnum, tokensRefdInBlock) || GenAST )
+		{
+/* MR10 */	if ( FoundGuessBlk ) {
+/* MR10 */    gen("\n");
+/* MR10 */    if (p->label_used_in_semantic_pred) {
+/* MR10 */		gen2(" _t%d%d = (ANTLRTokenPtr)LT(1);  /* MR10 */\n", BlkLevel-1, p->elnum);
+/* MR10 */    } else {
+/* MR10 */		gen("if ( !guessing ) {\n"); tab();
+/* MR10 */		_gen2(" _t%d%d = (ANTLRTokenPtr)LT(1);\n", BlkLevel-1, p->elnum);
+/* MR10 */      gen("}\n");
+/* MR10 */    };
+/* MR10 */  } else {
+/* MR10 */	  _gen2(" _t%d%d = (ANTLRTokenPtr)LT(1);", BlkLevel-1, p->elnum);
+/* MR10 */  };
+/* MR10 */
+		}
+
+/*
+ *  MR23 labase is never used in the C++ runtime library.
+ *       and this code is generated only in C++ mode
+ */
+
+/***		if ( LL_k>1 )                                    / * MR23 disabled */
+/***			if ( !DemandLookahead ) _gen(" labase++;");  / * MR23 disabled */
+/***		_gen("\n");                                      / * MR23 disabled */
+/***		tab();                                           / * MR23 disabled */
+	}
+	if ( GenAST )
+	{
+		if ( FoundGuessBlk &&
+				(ast_label_in_action || !(p->astnode == ASTexclude || r->noAST)) )
+		{
+			if ( GenCC ) {_gen("if ( !guessing ) {\n"); tab();}
+			else {_gen("zzNON_GUESS_MODE {\n"); tab();}
+		}
+
+/* MR27 addition when labels referenced when operator ! used */
+
+		pushedCmodeAST = 0; /* MR27 */
+		if (ast_label_in_action && (p->astnode == ASTexclude || r->noAST)) {
+			_gen("\n");
+			if (GenCC) {
+/* MR13 */      if (NewAST) {
+/* MR13 */    	    gen4("_ast%d%d = newAST(_t%d%d); /* MR27 */\n", BlkLevel-1, p->elnum, BlkLevel-1, p->elnum);
+/* MR13 */      } else {
+/* MR13 */    	    gen4("_ast%d%d = new AST(_t%d%d); /* MR27 */\n", BlkLevel-1, p->elnum, BlkLevel-1, p->elnum);
+/* MR13 */      }
+			}
+			else {
+				pushedCmodeAST = 1;
+				gen("zzastPush(zzmk_ast(zzastnew(),zzaCur)); /* MR27 */");
+			}
+		}
+
+/* end MR27 addition for labels referenced when operator ! used */
+
+		if (!r->noAST )
+		{
+			if (GenCC && !(p->astnode == ASTexclude) ) {
+				_gen("\n");
+/* MR13 */      if (NewAST) {
+/* MR13 */    	    gen4("_ast%d%d = newAST(_t%d%d);\n", BlkLevel-1, p->elnum, BlkLevel-1, p->elnum);
+/* MR13 */      } else {
+/* MR13 */    	    gen4("_ast%d%d = new AST(_t%d%d);\n", BlkLevel-1, p->elnum, BlkLevel-1, p->elnum);
+/* MR13 */      }
+				tab();
+			}
+			if ( GenCC && !(p->astnode == ASTexclude) )
+				{_gen2("_ast%d%d->", BlkLevel-1, p->elnum);}
+			else _gen(" ");
+			if ( p->astnode==ASTchild ) {
+				if ( !GenCC ) _gen("zz");
+				_gen("subchild(_root, &_sibling, &_tail);");
+			}
+			else if ( p->astnode==ASTroot ) {
+				if ( !GenCC ) _gen("zz");
+				_gen("subroot(_root, &_sibling, &_tail);");
+			}
+			if ( GenCC && !(p->astnode == ASTexclude) ) {
+				_gen("\n");
+				tab();
+			}
+		}
+		else if ( !GenCC ) {
+			if (! pushedCmodeAST) _gen(" zzastDPush;");
+		}
+		if ( FoundGuessBlk &&
+				(ast_label_in_action || !(p->astnode == ASTexclude || r->noAST)) )
+			{gen("}\n"); tab();}
+	}
+
+	/* Handle element labels now */
+	if ( p->el_label!=NULL )
+	{
+        int     done_NON_GUESSMODE=0;
+
+		_gen("\n");
+
+/* MR10 */    /* do Attrib / Token ptr for token label used in semantic pred */
+/* MR10 */    /* for these cases do assign even in guess mode                */
+/* MR10 */
+/* MR10 */    if (p->label_used_in_semantic_pred) {
+/* MR10 */      if ( GenCC ) {
+/* MR10 */        if ( set_el(p->elnum, tokensRefdInBlock) || GenAST ) {
+/* MR10 */          gen3("%s = _t%d%d;", p->el_label, BlkLevel-1, p->elnum);
+/* MR10 */        } else {
+/* MR10 */          gen1("%s = (ANTLRTokenPtr)LT(1);\n", p->el_label);
+/* MR10 */        };
+/* MR10 */      } else {
+/* MR10 */		  gen1("%s = zzaCur;", p->el_label);
+/* MR10 */      };
+/* MR10 */      if (FoundGuessBlk) _gen("  /* MR10 */");
+/* MR10 */      _gen("\n");
+/* MR10 */    };
+
+		/* Do Attrib / Token ptr */
+
+/* MR10 */  if (! p->label_used_in_semantic_pred) {
+/* MR10 */
+/* MR10 */      if ( FoundGuessBlk ) {
+/* MR10 */        if (! done_NON_GUESSMODE) {
+/* MR10 */          done_NON_GUESSMODE=1;
+/* MR10 */          if ( GenCC ) {gen("if ( !guessing ) {\n"); tab();}
+/* MR10 */          else {gen("zzNON_GUESS_MODE {\n"); tab();}
+/* MR10 */        };
+/* MR10 */      };
+/* MR10 */
+/* MR10 */      if ( GenCC ) {
+/* MR10 */        if ( set_el(p->elnum, tokensRefdInBlock) || GenAST ) {
+/* MR10 */          gen3("%s = _t%d%d;\n", p->el_label, BlkLevel-1, p->elnum);
+/* MR10 */        } else {
+/* MR10 */          gen1("%s = (ANTLRTokenPtr)LT(1);\n", p->el_label);
+/* MR10 */        };
+/* MR10 */      } else {
+/* MR10 */        gen1("%s = zzaCur;\n", p->el_label);
+/* MR10 */      };
+/* MR10 */  };
+
+		/* Do AST ptr */
+
+		if (GenAST && (ast_label_in_action || !(p->astnode == ASTexclude || r->noAST) )) /* MR27 */
+		{
+
+/* MR10 */      if ( FoundGuessBlk ) {
+/* MR10 */        if (! done_NON_GUESSMODE) {
+/* MR10 */          done_NON_GUESSMODE=1;
+/* MR10 */          if ( GenCC ) {gen("if ( !guessing ) {\n"); tab();}
+/* MR10 */          else {gen("zzNON_GUESS_MODE {\n"); tab();}
+/* MR10 */        };
+/* MR10 */      };
+
+			if ( GenCC ) {
+				gen3("%s_ast = _ast%d%d;\n", p->el_label, BlkLevel-1, p->elnum);
+			}
+			else {gen1("%s_ast = zzastCur;\n", p->el_label);}
+		}
+
+/* MR10 */  if (done_NON_GUESSMODE) {
+/* MR10 */    gen("}\n"); tab();
+/* MR10 */  };
+
+	}
+
+	/* Handle any actions immediately following action */
+	if ( a != NULL )  /* MR10 */ /* MR11 */
+    {
+    	/* delay next token fetch until after action */
+		_gen("\n");
+		if ( a->is_predicate)
+		{
+#if 0
+/* Disabled in MR30 ************************************************************
+   And moved into genAction
+   *****************************************************************************
+*/
+ 
+    	    gen("if (!(");
+
+			/* make sure that '#line n' is on front of line */  /* MR14 */
+			if ( GenLineInfo && p->file != -1 ) _gen("\n");     /* MR14 */
+			dumpPredAction(a,a->action, output, 0, a->file, a->line, 0);
+
+/* MR23 Change failed predicate macro to have three arguments:
+
+        macro arg 1: The stringized predicate itself
+        macro arg 2: 0 => no user-defined error action
+                     1 => user-defined error action
+        macro arg 3: The user-defined error action
+
+   This gives the user more control of the error action.
+*/
+			_gen(")) \n");
+			tabs++;
+			gen3(" {zzfailed_pred(\"%s\",%s,{ %s } );}\n",           /* MR23 */
+					stringize(a->action),	                         /* MR23 */
+                    (a->pred_fail == NULL ?                          /* MR23/MR27 */
+                       	"0 /* report */" : "1 /* user action */"),   /* MR23/MR27 */
+                    (a->pred_fail == NULL ?                          /* MR23 */
+                        "0; /* no user action */" : a->pred_fail));  /* MR23 */
+			tabs--;
+/* Disabled in MR30 ************************************************************
+   And moved into genAction
+   *****************************************************************************
+*/
+#endif
+		}
+		else    /* MR9 a regular action - not a predicate action */
+		{
+
+/* MR23: Search an action which is not a predicate for LT(i),
+         LA(i), or LATEXT(i) in order to warn novice users that
+         it refers to the previous matched token, not the next
+         one.  This is different than the case for semantic
+         predicates.
+*/
+                                 
+/* MR23 */    if (GenCC) {
+/* MR23 */	    if (strstr(a->action, "LT(") != NULL) LTinTokenAction = 1;
+/* MR23 */    }
+/* MR23 */    else {
+/* MR23 */      if (strstr(a->action, "LA(") != NULL) LTinTokenAction = 1;            
+/* MR23 */      if (strstr(a->action, "LATEXT(") != NULL) LTinTokenAction = 1;
+/* MR23 */    }
+
+			if ( FoundGuessBlk ) {
+   				if ( GenCC ) {gen("if ( !guessing ) {\n");}
+   				else gen("zzNON_GUESS_MODE {\n");
+			}
+   			dumpActionPlus(a, a->action, output, tabs, a->file, a->line, 1); /* MR21 */
+       		if ( FoundGuessBlk ) gen("}\n");
+			a->done = 1; /* MR30 */
+ 		}
+/***    a->done = 1;  MR30 Moved up into then branch for true actions, but not predicates ***/
+		if ( !DemandLookahead ) {
+			if ( GenCC ) {
+				if ( FoundException && p->use_def_MT_handler ) gen("if (!_signal)");
+				_gen(" consume();")
+                if ( FoundException && p->use_def_MT_handler )
+                    _gen(" _signal=NoSignal;");
+                _gen("\n");
+			}
+            else
+            {
+                if ( FoundException && p->use_def_MT_handler ) _gen("if (!_signal)");
+					_gen(" zzCONSUME;\n");
+                if ( FoundException && p->use_def_MT_handler ) _gen(" _signal=NoSignal;");
+                _gen("\n");
+            }
+		}
+		else gen("\n");
+		if (a->done) {			/* MR30 */
+			TRANS( a->next );   /* MR30 */
+		}						/* MR30 */
+		else {					/* MR30 */
+			TRANS( p->next );	/* MR30 */
+		}						/* MR30 */
+	}
+	else
+	{
+        if ( !DemandLookahead ) {
+			if ( GenCC ) {
+				if (FoundException && p->use_def_MT_handler) _gen("if (!_signal)");
+				_gen(" consume();")
+				if (FoundException&&p->use_def_MT_handler) _gen(" _signal=NoSignal;");
+				_gen("\n");
+			}
+			else {
+				if (FoundException && p->use_def_MT_handler) _gen("if (!_signal)");
+				_gen(" zzCONSUME;");
+				if ( FoundException && p->use_def_MT_handler ) _gen(" _signal=NoSignal;");
+				_gen("\n");
+			}
+		}
+		else _gen("\n");
+		TRANS(p->next);
+	}
+}
+
+/*  MR21
+ *
+ *  There was a bug in the code generation for {...} which causes it
+ *  to omit the optional tokens from the error messages.  The easiest
+ *  way to fix this was to make the opt block look like a sub block:
+ *
+ *          { a | b | c }
+ *
+ *  becomes (internally):
+ *
+ *          ( a | b | c | )
+ *
+ *  The code for genOptBlk is now identical to genSubBlk except for
+ *  cosmetic changes.
+ */
+
+void
+#ifdef __USE_PROTOS
+genOptBlk( Junction *q )
+#else
+genOptBlk( q )
+Junction *q;
+#endif
+{
+	int max_k;
+	set f;
+	int need_right_curly;
+	set savetkref;
+	int lastAltEmpty;			/* MR23 */
+	savetkref = tokensRefdInBlock;
+	require(q->ntype == nJunction,	"genOptBlk: not junction");
+	require(q->jtype == aOptBlk,	"genOptBlk: not opt block");
+
+    OutLineInfo(output,q->line,FileStr[q->file]);
+	BLOCK_Preamble(q);
+	BlkLevel++;
+    BlockPreambleOption(q,q->pFirstSetSymbol); /* MR21 */
+	f = genBlk(q, aOptBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+/* MR23
+   Bypass error clause generation when exceptions are used in {...} block 
+   See multi-line note in genBlk near call to isEmptyAlt.
+*/
+	if (! FoundException) {
+	    if ( q->p2 != NULL ) {tab(); makeErrorClause(q,f,max_k,0 /* use plus block bypass ? */ );}
+	}
+	else {
+		gen("/* MR23 skip error clause for {...} when exceptions in use */\n");
+	}
+	{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+	freeBlkFsets(q);
+	--BlkLevel;
+	BLOCK_Tail();
+
+	if ( q->guess )
+	{
+		gen("zzGUESS_DONE\n");
+	}
+
+	/* must duplicate if (alpha)?; one guesses (validates), the
+	 * second pass matches */
+	if ( q->guess && analysis_point(q)==q )
+	{
+        OutLineInfo(output,q->line,FileStr[q->file]);
+		BLOCK_Preamble(q);
+		BlkLevel++;
+		f = genBlk(q, aSubBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+		if ( q->p2 != NULL ) {tab(); makeErrorClause(q,f,max_k,0 /* use plus block bypass ? */ );}
+		{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+		freeBlkFsets(q);
+		--BlkLevel;
+		BLOCK_Tail();
+	}
+
+	tokensRefdInBlock = savetkref;
+	if (q->end->p1 != NULL) TRANS(q->end->p1);
+}
+
+/*
+ * Generate code for a loop blk of form:
+ *
+ *				 |---|
+ *				 v   |
+ *			   --o-G-o-->o--
+ */
+void
+#ifdef __USE_PROTOS
+genLoopBlk( Junction *begin, Junction *q, Junction *start, int max_k )
+#else
+genLoopBlk( begin, q, start, max_k )
+Junction *begin;
+Junction *q;
+Junction *start;	/* where to start generating code from */
+int max_k;
+#endif
+{
+	set         f;
+	int         need_right_curly;
+	set         savetkref;
+    Junction    *guessBlock;    /* MR10 */
+    int         singleAlt;      /* MR10 */
+	int			lastAltEmpty;	/* MR23 */
+
+	savetkref = tokensRefdInBlock;
+	require(q->ntype == nJunction,	"genLoopBlk: not junction");
+	require(q->jtype == aLoopBlk,	"genLoopBlk: not loop block");
+
+	if ( q->visited ) return;
+	q->visited = TRUE;
+
+    /* first_item_is_guess_block doesn't care what kind of node it is */
+
+    guessBlock=first_item_is_guess_block( (Junction *) q->p1);  /* MR10 */
+    singleAlt=q->p2==NULL;                                      /* MR10 */
+
+	if (singleAlt && !guessBlock)	    /* MR10 */ /* only one alternative? */
+	{
+		if ( DemandLookahead ) {
+			if ( !GenCC ) {gen1("LOOK(%d);\n", max_k);}
+			else gen1("look(%d);\n", max_k);
+		}
+		gen("while ( ");
+		if ( begin!=NULL ) genExpr(begin);
+		else genExpr(q);
+		/* if no predicates have been hoisted for this single alt (..)*
+		 * do so now
+		 */
+        require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+		if ( ParseWithPredicates && begin->predicate==NULL )
+		{
+			Predicate *a = MR_find_predicates_and_supp((Node *)q->p1);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+
+			if ( a!=NULL )
+			{
+				_gen("&&");
+				a=genPredTreeMain(a, (Node *)q);    /* MR10 */
+			}
+/* MR10 */  if (MRhoisting) {
+/* MR10 */    predicate_free(a);
+/* MR10 */  };
+		}
+		_gen(" ) {\n");
+		tabs++;
+		TRANS(q->p1);
+		if ( !GenCC ) gen1("zzLOOP(zztasp%d);\n", BlkLevel-1);
+		if ( DemandLookahead ) {
+			if ( !GenCC ) {gen1("LOOK(%d);\n", max_k);}
+			else gen1("look(%d);\n", max_k);
+		}
+		--tabs;
+		gen("}\n");
+		freeBlkFsets(q);
+		q->visited = FALSE;
+		tokensRefdInBlock = savetkref;
+		return;
+	}
+	gen("for (;;) {\n");        /* MR20 G. Hobbelt */
+	tabs++;
+/* MR6				                					*/
+/* MR6 	   "begin" can never be null when called from genLoopBegin	*/
+/* MR6     because q==(Junction *)begin->p1 and we know q is valid	*/
+/* MR6								                            	*/
+/* MR6	   from genLoopBegin:						                */
+/* MR6			                						            */
+/* MR6		 if ( LL_k>1 && !set_nil(q->fset[2]) )			        */
+/* MR6	 	   genLoopBlk( q, (Junction *)q->p1, q, max_k );	    */
+/* MR6		else genLoopBlk( q, (Junction *)q->p1, NULL, max_k );	*/
+/* MR6				                				            	*/
+	if ( begin!=NULL )
+	{
+		if ( DemandLookahead )
+		{
+			if ( !GenCC ) {gen1("LOOK(%d);\n", max_k);}
+			else gen1("look(%d);\n", max_k);
+		}
+		/* The bypass arc of the (...)* predicts what to do when you fail, but
+		 * ONLY after having tested the loop start expression.  To avoid this,
+		 * we simply break out of the (...)* loop when we find something that
+		 * is not in the prediction of the loop (all alts thereof).
+		 */
+		gen("if ( !(");
+
+/***	TJP says: It used to use the prediction expression for the bypass arc
+     	of the (...)*.  HOWEVER, if a non LL^1(k) decision was found, this
+    	thing would miss the ftree stored in the aLoopBegin node and generate
+    	an LL^1(k) decision anyway.
+
+ ***		genExpr((Junction *)begin->p2);
+ ***/
+
+            genExpr((Junction *)begin);
+            _gen(")) break;\n");
+
+	}
+
+	/* generate code for terminating loop (this is optional branch) */
+
+	f = genBlk(q, aLoopBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+	set_free(f);
+	freeBlkFsets(q);
+
+	/* generate code for terminating loop (this is optional branch) */
+
+/* MR6 						                    			            */
+/* MR6  30-May-97 Bug reported by Manuel Ornato				            */
+/* MR6            A definite bug involving the exit from a loop block   */
+/* MR6 		  In 1.23 and later versions (including 1.33) Instead       */
+/* MR6              exiting the block and reporting a syntax error the  */
+/* MR6		    code loops forever.     				                */
+/* MR6	          Looking at 1.20 which generates proper code it is not */
+/* MR6		    clear which of two changes should be undone.            */
+/* MR6		  This is my best guess.                                    */
+/* MR6		  From earlier MR6 note we know that begin can never be     */
+/* MR6		    null when genLoopBlk called from genLoopBegin           */
+/* MR6 */
+/* MR6 */ if ( begin==NULL) {
+/* MR6 */   /* code for exiting loop "for sure" */
+/* MR6 */   gen("/* Suppressed by MR6 */ /*** else break; ***/\n");
+/* MR6 */ };
+
+/* MR10 */if (singleAlt && guessBlock) {
+/* MR10 */  tabs--;
+/* MR6 */   gen("} else break; /* MR6 code for exiting loop \"for sure\" */\n");
+/* MR10 */  need_right_curly--;
+/* MR10 */ } else {
+/* MR6 */   gen("else break; /* MR6 code for exiting loop \"for sure\" */\n");
+/* MR10 */ };
+
+	{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+	if ( !GenCC ) gen1("zzLOOP(zztasp%d);\n", BlkLevel-1);
+	--tabs;
+	gen("}\n");
+	q->visited = FALSE;
+	tokensRefdInBlock = savetkref;
+}
+
+/*
+ * Generate code for a loop blk of form:
+ *
+ * 				         |---|
+ *					     v   |
+ *			   --o-->o-->o-G-o-->o--
+ *                   |           ^
+ *                   v           |
+ *					 o-----------o
+ *
+ * q->end points to the last node (far right) in the blk.
+ *
+ * Note that q->end->jtype must be 'EndBlk'.
+ *
+ * Generate code roughly of the following form:
+ *
+ *	do {
+ *		... code for alternatives ...
+ *  } while ( First Set of aLoopBlk );
+ *
+ *	OR if > 1 alternative
+ *
+ *	do {
+ *		... code for alternatives ...
+ *		else break;
+ *  } while ( 1 );
+ */
+void
+#ifdef __USE_PROTOS
+genLoopBegin( Junction *q )
+#else
+genLoopBegin( q )
+Junction *q;
+#endif
+{
+	set f;
+	int i;
+	int max_k;
+	set savetkref;
+	savetkref = tokensRefdInBlock;
+	require(q!=NULL,				"genLoopBegin: invalid node and/or rule");
+	require(q->ntype == nJunction,	"genLoopBegin: not junction");
+	require(q->jtype == aLoopBegin,	"genLoopBegin: not loop block");
+	require(q->p2!=NULL,			"genLoopBegin: invalid Loop Graph");
+
+    OutLineInfo(output,q->line,FileStr[q->file]);
+
+	BLOCK_Preamble(q);
+	BlkLevel++;
+    BlockPreambleOption(q,q->pFirstSetSymbol);       /* MR21 */
+	f = First(q, 1, aLoopBegin, &max_k);
+	/* If not simple LL(1), must specify to start at LoopBegin, not LoopBlk */
+	if ( LL_k>1 && !set_nil(q->fset[2]) )
+		genLoopBlk( q, (Junction *)q->p1, q, max_k );
+	else genLoopBlk( q, (Junction *)q->p1, NULL, max_k );
+
+	for (i=1; i<=CLL_k; i++) set_free(q->fset[i]);
+	for (i=1; i<=CLL_k; i++) set_free(((Junction *)q->p2)->fset[i]);
+	--BlkLevel;
+	BLOCK_Tail();
+	set_free(f);
+	tokensRefdInBlock = savetkref;
+/* MR21 */	if (MR_BlkErr) {
+/* MR21 */		set f, fArray[2];
+/* MR21 */		f = ComputeErrorSet(q,1,0 /* use plus block bypass ? */ );
+/* MR21 */      fArray[0]= empty;
+/* MR21 */		fArray[1]= set_dup(f);
+/* MR21 */      gen("if (");
+/* MR21 */      genExprSets(fArray,1);  /* note: destroys set arguments */
+/* MR21 */      _gen(") { /* MR21 option -mrblksynerr */\n");
+/* MR21 */      tabs++;
+/* MR21 */      tab();
+/* MR21 */      _gen("/* nothing */ }\n");
+/* MR21 */      tab();
+/* MR21 */      makeErrorClause(q,f,1,0 /* use plus block bypass ? */ );  /* frees set */
+/* MR21 */      tabs--;
+/* MR21 */	};
+	if (q->end->p1 != NULL) TRANS(q->end->p1);
+}
+
+/*
+ * Generate code for a loop blk of form:
+ *
+ * 					 |---|
+ *					 v   |
+ *			       --o-G-o-->o--
+ *
+ * q->end points to the last node (far right) in the blk.
+ * Note that q->end->jtype must be 'EndBlk'.
+ *
+ * Generate code roughly of the following form:
+ *
+ *	do {
+ *		... code for alternatives ...
+ *  } while ( First Set of aPlusBlk );
+ *
+ *	OR if > 1 alternative
+ *
+ *	do {
+ *		... code for alternatives ...
+ *		else if not 1st time through, break;
+ *  } while ( 1 );
+ */
+void
+#ifdef __USE_PROTOS
+genPlusBlk( Junction *q )
+#else
+genPlusBlk( q )
+Junction *q;
+#endif
+{
+	int         max_k;
+	set         f;
+	int         need_right_curly;
+	int			lastAltEmpty;	/* MR23 */
+	set         savetkref;
+    Junction    *guessBlock;    /* MR10 */
+    int         singleAlt;      /* MR10 */
+
+	savetkref = tokensRefdInBlock;
+	require(q!=NULL,				"genPlusBlk: invalid node and/or rule");
+	require(q->ntype == nJunction,	"genPlusBlk: not junction");
+	require(q->jtype == aPlusBlk,	"genPlusBlk: not Plus block");
+	require(q->p2 != NULL,			"genPlusBlk: not a valid Plus block");
+
+	if ( q->visited ) return;
+	q->visited = TRUE;
+    OutLineInfo(output,q->line,FileStr[q->file]);
+	BLOCK_Preamble(q);
+	BlkLevel++;
+
+    BlockPreambleOption((Junction *)q, q->pFirstSetSymbol);       /* MR21 */
+    
+    /* first_item_is_guess_block  doesn't care what kind of node it is */
+
+    guessBlock=first_item_is_guess_block( (Junction *)q->p1);   /* MR10 */
+
+	/* if the ignore flag is set on the 2nd alt and that alt is empty,
+	 * then it is the implied optional alternative that we added for (...)+
+	 * and, hence, only 1 alt.
+	 */
+
+/* MR10  Reported by Pulkkinen Esa (esap@cs.tut.fi)
+ *       Outer code for guess blocks ignored when there is only one alt
+ *         for a (...)+ block.
+ *       Force use of regular code rather than "optimized" code for that case
+ */
+
+    singleAlt=( ( (Junction *) q->p2)->p2 == NULL) &&
+        	  ( ( (Junction *) q->p2)->ignore );			/* only one alternative? */
+
+    if (singleAlt && !guessBlock)   /* MR10 */
+	{
+
+		Predicate *a=NULL;
+		/* if the only alt has a semantic predicate, hoist it; must test before
+		 * entering loop.
+		 */
+		if ( ParseWithPredicates )
+		{
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+			a = MR_find_predicates_and_supp((Node *)q);
+            require(MR_PredRuleRefStack.count == 0,"PredRuleRef stack not empty");
+
+			if ( a!=NULL ) {
+				gen("if (");
+				a=genPredTreeMain(a, (Node *)q);    /* MR10 */
+				_gen(") {\n");
+			}
+		}
+		gen("do {\n");
+		tabs++;
+		TRANS(q->p1);
+		if ( !GenCC ) gen1("zzLOOP(zztasp%d);\n", BlkLevel-1);
+		f = First(q, 1, aPlusBlk, &max_k);
+		if ( DemandLookahead ) {
+			if ( !GenCC ) {gen1("LOOK(%d);\n", max_k);}
+			else gen1("look(%d);\n", max_k);
+		}
+		--tabs;
+		gen("} while ( ");
+		if ( q->parm!=NULL && q->predparm ) _gen1("(%s) && ", q->parm);
+		genExpr(q);
+		if ( ParseWithPredicates && a!=NULL )
+		{
+            if (! MR_comparePredicates(q->predicate,a)) {
+    			_gen("&&");
+    			a=genPredTreeMain(a, (Node *)q);    /* MR10 */
+            };
+		}
+		_gen(" );\n");
+		if ( ParseWithPredicates && a!=NULL ) gen("}\n");
+		--BlkLevel;
+		BLOCK_Tail();
+		q->visited = FALSE;
+		freeBlkFsets(q);
+		set_free(f);
+		tokensRefdInBlock = savetkref;
+/* MR21 */	if (MR_BlkErr) {
+/* MR21 */		set f, fArray[2];
+/* MR21 */		f = ComputeErrorSet(q,1,1 /* use plus block bypass ? */ );
+/* MR21 */      fArray[0]= empty;
+/* MR21 */		fArray[1]= set_dup(f);
+/* MR21 */      gen("if (");
+/* MR21 */      genExprSets(fArray,1);  /* note: destroys set arguments */
+/* MR21 */      _gen(") { /* MR21 option -mrblksynerr */\n");
+/* MR21 */      tabs++;
+/* MR21 */      tab();
+/* MR21 */      _gen("/* nothing */ }\n");
+/* MR21 */      tab();
+/* MR21 */      makeErrorClause(q,f,1,1 /* use plus block bypass ? */ );  /* frees set */
+/* MR21 */      tabs--;
+/* MR21 */	};
+		if (q->end->p1 != NULL) TRANS(q->end->p1);
+/* MR10 */  if (MRhoisting) {
+/* MR10 */    predicate_free(a);
+/* MR10 */  };
+		return;
+	}
+	gen("do {\n");
+	tabs++;
+	f = genBlk(q, aPlusBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+/* MR6              									        */
+/* MR6	Sinan Karasu	(sinan@tardis.ds.boeing.com)			*/
+/* MR6    Failed to turn off guess mode when leaving block		*/
+/* MR6				                           					*/
+/* MR6  */ if ( has_guess_block_as_last_item(q) ) {
+/* MR10 */   gen("/* MR10 ()+ */ else {\n");
+/* MR10 */   tabs++;
+/* MR10 */   need_right_curly++;
+/* MR10 */   gen("/* MR10 ()+ */ if ( !zzrv ) zzGUESS_DONE;\n");
+/* MR6  */   gen("/* MR10 ()+ */ if ( zzcnt > 1 ) break;\n");
+/* MR10 */ } else {
+/* MR10 */   gen("/* MR10 ()+ */ else {\n");
+/* MR10 */   tabs++;
+/* MR10 */   need_right_curly++;
+/* MR10 */   gen("if ( zzcnt > 1 ) break;\n");
+/* MR10 */ };
+
+/* MR21 */	if (MR_BlkErr && 1 >= max_k) {
+/* MR21 */		set f;
+/* MR21 */		f = ComputeErrorSet(q,1,0 /* use plus block bypass ? */ );
+/* MR21 */      tabs++;
+/* MR21 */      tab();
+/* MR21 */      makeErrorClause(q,f,1,0 /* use plus block bypass ? */ );  /* frees set */
+/* MR21 */      tabs--;
+/* MR21 */	}
+/* MR21 */  else {
+				tab();
+                makeErrorClause(q,f,max_k,1 /* use plus block bypass ? */);
+										    /* MR21 I think this generates the wrong set ? */
+                                            /* MR21 because it includes the plus block bypass ? */
+										    /* MR21 but I'm afraid to change it without additional checking */
+            }
+
+	{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+	freeBlkFsets(q);
+	gen("zzcnt++;");
+	if ( !GenCC ) _gen1(" zzLOOP(zztasp%d);", BlkLevel-1);
+	_gen("\n");
+	if ( DemandLookahead ) {
+		if ( !GenCC ) {gen1("LOOK(%d);\n", max_k);}
+		else gen1("look(%d);\n", max_k);
+	}
+	--tabs;
+	if ( q->parm!=NULL && q->predparm ) {gen1("} while (%s);\n", q->parm);}
+	else gen("} while ( 1 );\n");
+	--BlkLevel;
+	BLOCK_Tail();
+	q->visited = FALSE;
+	tokensRefdInBlock = savetkref;
+/* MR21 */	if (MR_BlkErr) {
+/* MR21 */		set f, fArray[2];
+/* MR21 */		f = ComputeErrorSet(q,1,1 /* use plus block bypass ? */ );
+/* MR21 */      fArray[0]= empty;
+/* MR21 */		fArray[1]= set_dup(f);
+/* MR21 */      gen("if (");
+/* MR21 */      genExprSets(fArray,1);  /* note: destroys set arguments */
+/* MR21 */      _gen(") { /* MR21 option -mrblksynerr */\n");
+/* MR21 */      tabs++;
+/* MR21 */      tab();
+/* MR21 */      _gen("/* nothing */ }\n");
+/* MR21 */      tab();
+/* MR21 */      makeErrorClause(q,f,1,1 /* use plus block bypass ? */ );  /* frees set */
+/* MR21 */      tabs--;
+/* MR21 */	};
+	if (q->end->p1 != NULL) TRANS(q->end->p1);
+}
+
+/*
+ * Generate code for a sub blk of alternatives of form:
+ *
+ *			       --o-G1--o--
+ *					 |     ^
+ *					 v    /|
+ *			         o-G2-o|
+ *					 |     ^
+ *					 v     |
+ *				   ..........
+ *					 |     ^
+ *					 v    /
+ *			         o-Gn-o
+ *
+ * q points to the 1st junction of blk (upper-left).
+ * q->end points to the last node (far right) in the blk.
+ * Note that q->end->jtype must be 'EndBlk'.
+ * The last node in every alt points to q->end.
+ *
+ * Generate code of the following form:
+ *	if ( First(G1) ) {
+ *		...code for G1...
+ *	}
+ *	else if ( First(G2) ) {
+ *		...code for G2...
+ *	}
+ *	...
+ *	else {
+ *		...code for Gn...
+ *	}
+ */
+
+void
+#ifdef __USE_PROTOS
+genSubBlk( Junction *q )
+#else
+genSubBlk( q )
+Junction *q;
+#endif
+{
+	int max_k;
+	set f;
+	int need_right_curly;
+	int lastAltEmpty;		/* MR23 */
+	set savetkref;
+	savetkref = tokensRefdInBlock;
+	require(q->ntype == nJunction,	"genSubBlk: not junction");
+	require(q->jtype == aSubBlk,	"genSubBlk: not subblock");
+
+    OutLineInfo(output,q->line,FileStr[q->file]);
+	BLOCK_Preamble(q);
+	BlkLevel++;
+    BlockPreambleOption(q,q->pFirstSetSymbol);       /* MR21 */
+	f = genBlk(q, aSubBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+
+/* MR23
+   Bypass error clause generation when exceptions are used in a sub block
+   in which the last alternative is epsilon.  Example: "(A | B | )". 
+   See multi-line note in genBlk near call to isEmptyAlt.
+*/
+	if (FoundException && lastAltEmpty) {
+		gen("/* MR23 skip error clause for (...| epsilon) when exceptions in use */\n");
+	}
+	else {
+		if ( q->p2 != NULL ) {tab(); makeErrorClause(q,f,max_k,0 /* use plus block bypass ? */ );}
+	}
+    
+	{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+	freeBlkFsets(q);
+	--BlkLevel;
+	BLOCK_Tail();
+
+	if ( q->guess )
+	{
+		gen("zzGUESS_DONE\n");
+	}
+
+	/* must duplicate if (alpha)?; one guesses (validates), the
+	 * second pass matches */
+	if ( q->guess && analysis_point(q)==q )
+	{
+        OutLineInfo(output,q->line,FileStr[q->file]);
+		BLOCK_Preamble(q);
+		BlkLevel++;
+		f = genBlk(q, aSubBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+		if ( q->p2 != NULL ) {tab(); makeErrorClause(q,f,max_k,0 /* use plus block bypass ? */);}
+		{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+		freeBlkFsets(q);
+		--BlkLevel;
+		BLOCK_Tail();
+	}
+
+	tokensRefdInBlock = savetkref;
+	if (q->end->p1 != NULL) TRANS(q->end->p1);
+}
+
+static int TnodesAllocatedPrevRule=0;
+
+/*
+ * Generate code for a rule.
+ *
+ *		rule--> o-->o-Alternatives-o-->o
+ * Or,
+ *		rule--> o-->o-Alternative-o-->o
+ *
+ * The 1st junction is a RuleBlk.  The second can be a SubBlk or just a junction
+ * (one alternative--no block), the last is EndRule.
+ * The second to last is EndBlk if more than one alternative exists in the rule.
+ *
+ * To get to the init-action for a rule, we must bypass the RuleBlk,
+ * and possible SubBlk.
+ * Mark any init-action as generated so genBlk() does not regenerate it.
+ */
+void
+#ifdef __USE_PROTOS
+genRule( Junction *q )
+#else
+genRule( q )
+Junction *q;
+#endif
+{
+
+	const char * returnValueInitializer;
+
+do {    /* MR10     Change recursion into iteration         */
+
+	int max_k;
+	set follow, rk, f;
+	ActionNode *a;
+	RuleEntry *r;
+	int lastAltEmpty;		/* MR23 */
+	static int file = -1;
+	int need_right_curly;
+	require(q->ntype == nJunction,	"genRule: not junction");
+	require(q->jtype == RuleBlk,	"genRule: not rule");
+
+/* MR14 */    require (MR_BackTraceStack.count == 0,"-alpha MR_BackTraceStack.count != 0");
+/* MR14 */    MR_pointerStackReset(&MR_BackTraceStack);
+/* MR14 */    if (AlphaBetaTrace) MR_MaintainBackTrace=1;
+
+    CurRule=q->rname;                               /* MR11 */
+
+	r = (RuleEntry *) hash_get(Rname, q->rname);
+	if ( r == NULL ) warnNoFL("Rule hash table is screwed up beyond belief");
+	if ( q->file != file )		/* open new output file if need to */
+	{
+/* MR6              									*/
+/* MR6  Simpler to debug when output goes to stdout rather than a file 	*/
+/* MR6				                					*/
+/* MR6 */	if (UseStdout) {
+/* MR6 */	  output = stdout;
+/* MR6 */	} else {
+/* MR6 */  	  if ( output != NULL) fclose( output );
+/* MR6 */	  output = fopen(OutMetaName(outname(FileStr[q->file])), "w");
+/* MR6 */	};
+		require(output != NULL, "genRule: can't open output file");
+
+#ifdef SPECIAL_FOPEN
+       special_fopen_actions(OutMetaName(outname(FileStr[q->file]))); /* MR1 */
+#endif
+		if ( file == -1 ) genHdr1(q->file);
+		else genHdr(q->file);
+		file = q->file;
+	}
+
+    if (InfoM) {
+      fprintf(stderr,"    rule %s\n",q->rname);
+      fflush(output);
+    };
+
+#if 0
+    if (strcmp(q->rname,"***debug***") == 0) {
+      fprintf(stderr,"***debug*** %s reached\n",q->rname);
+      MR_break();
+    };
+#endif
+
+	DumpFuncHeader(q,r);
+	tabs++;
+
+	/* MR23 
+	   
+	   If there is a single return value then it can be initialized in 
+	   the declaration using assignment syntax.  If there are multiple
+	   return values then antlr creates a struct and initialization takes
+	   place element by element for each element of the struct.  For
+       multiple elements the initialization is by assignment so we have
+       to wait until all declarations are done before emitting that code -
+       because of restrictions in C which don't exist in C++.
+
+       In the past (before MR23) the only kind of initialization was
+	   the PURIFY macro which was just a memset() of 0.  Now we allow
+	   the user to specify an initial value.  PURIFY is still used in C
+	   mode because C does not have constructors.  However, PURIFY is
+	   not used in C++ mode because it might overwrite information created
+	   by elements which have their own ctor.
+       
+	*/
+
+	if ( q->ret!=NULL )
+	{
+		if ( hasMultipleOperands(q->ret) )                         /* MR23 */
+		{
+
+            /* Emit initialization code later. */
+
+			gen1("struct _rv%d _retv;\n",r->rulenum);
+		}
+		else
+		{
+            /* Emit initialization code now. */
+
+			tab();
+			DumpType(q->ret, output);
+            returnValueInitializer = getInitializer(q->ret);
+            if (returnValueInitializer == NULL) {                  /* MR23 */
+      			gen(" _retv;\n");                     		    /* MR1 MR3 */
+            }                                                      /* MR23 */
+            else {                                                 /* MR23 */
+                gen1(" _retv = %s;\n", returnValueInitializer);    /* MR23 */
+            }                                                      /* MR23 */
+		}
+	}
+
+    OutLineInfo(output,q->line,FileStr[q->file]);
+
+    if (InfoM) {
+      fflush(output);
+    };
+
+	gen("zzRULE;\n");
+	if ( FoundException )
+	{
+		gen("int _sva=1;\n");
+	}
+	if ( GenCC && GenAST )
+		gen("ASTBase *_ast = NULL, *_sibling = NULL, *_tail = NULL;\n");
+	if ( GenCC ) genTokenPointers(q);
+	if ( GenCC&&GenAST ) genASTPointers(q);
+	if ( q->el_labels!=NULL ) genElementLabels(q->el_labels);
+	if ( FoundException ) gen("int _signal=NoSignal;\n");
+
+	if ( !GenCC ) gen1("zzBLOCK(zztasp%d);\n", BlkLevel);
+
+/* MR10 */  /* move zzTRACEIN to before init action */
+
+/* MR10 */	if ( TraceGen ) {
+/* MR10 */		if ( GenCC ) {gen1("zzTRACEIN(\"%s\");\n", q->rname);}
+/* MR10 */		else gen1("zzTRACEIN((ANTLRChar *)\"%s\");\n", q->rname);
+/* MR10 */	}
+
+/* MR7      Moved PURIFY() to after all local variables have been declared */
+/* MR7      so that the generated code is valid C as well as C++           */
+/* MR7        Jan Mikkelsen 10-June-1997                                   */
+
+
+     /*
+       MR23    Do the PURIFY macro only for C mode.
+               C++ users should use constructors or initialization expressions.
+     */
+
+	if ( q->ret != NULL )                                            /* MR7 */
+	{                                                                /* MR7 */
+		if (hasMultipleOperands(q->ret)) {                           /* MR23 */
+			if (PURIFY == TRUE) {
+                gen1("PCCTS_PURIFY(_retv,sizeof(struct _rv%d))\n",r->rulenum); /* MR23 */
+            }
+        }                                                            /* MR7 */
+		else {                                                       /* MR7 */
+
+			/* MR23
+			   If there were only one return value operand and
+			   it had an initializer then it would have been
+			   initiailized in the declaration.
+			*/
+
+			returnValueInitializer = getInitializer(q->ret);         /* MR23 */
+			if (returnValueInitializer == NULL) {                    /* MR23 */
+    			if (PURIFY == TRUE) {
+        			gen("PCCTS_PURIFY(_retv,sizeof(");               /* MR23 */
+	    			DumpType(q->ret, output);                        /* MR7 */
+					gen("))\n");                                     /* MR7 */
+				}
+			}                                                        /* MR23 */
+		}                                                            /* MR7 */
+
+        if (hasMultipleOperands(q->ret)) {                           /* MR23 */
+          DumpInitializers(output, r, q->ret);                       /* MR23 */
+        }
+
+	}
+	if ( !GenCC ) gen("zzMake0;\n");
+	if ( FoundException ) gen("*_retsignal = NoSignal;\n");
+
+	if ( !GenCC ) gen("{\n");
+
+	if ( has_guess_block_as_first_item((Junction *)q->p1) )
+	{
+		gen("zzGUESS_BLOCK\n");
+	}
+
+	/* L o o k  F o r  I n i t  A c t i o n */
+	if ( ((Junction *)q->p1)->jtype == aSubBlk )
+		a = findImmedAction( ((Junction *)q->p1)->p1 );
+	else
+		a = findImmedAction( q->p1 );	/* only one alternative in rule */
+	if ( a!=NULL && !a->is_predicate)
+	{
+ /* MR21 */ if (!a->noHoist) dumpActionPlus(a, a->action, output, tabs, a->file, a->line, 1);
+  		    a->done = 1;	/* ignore action. We have already handled it */
+	}
+
+	BlkLevel++;
+	q->visited = TRUE;				/* mark RULE as visited for FIRST/FOLLOW */
+    BlockPreambleOption((Junction *)q->p1, NULL);   /* MR21 */
+	f = genBlk((Junction *)q->p1, RuleBlk, &max_k, &need_right_curly, &lastAltEmpty /* MR23 */);
+	if ( q->p1 != NULL )
+		if ( ((Junction *)q->p1)->p2 != NULL )
+			{tab(); makeErrorClause((Junction *)q->p1,f,max_k,0 /* use plus block bypass ? */);}
+	{ int i; for (i=1; i<=need_right_curly; i++) {tabs--; gen("}\n");} }
+	freeBlkFsets((Junction *)q->p1);
+	q->visited = FALSE;
+	--BlkLevel;
+	if ( !GenCC ) gen1("zzEXIT(zztasp%d);\n", BlkLevel);
+
+    genTraceOut(q);
+
+	if ( q->ret!=NULL ) gen("return _retv;\n") else gen("return;\n");
+	/* E r r o r  R e c o v e r y */
+	NewSet();
+	rk = empty;
+
+/* MR14 */    if (r->dontComputeErrorSet) {
+/* MR14 */      follow=empty;
+              } else {
+                MR_pointerStackReset(&MR_BackTraceStack);   /* MR14 */
+                MR_ErrorSetComputationActive=1;
+                REACH(q->end, 1, &rk, follow);
+                MR_ErrorSetComputationActive=0;
+                require (MR_BackTraceStack.count == 0,"K: MR_BackTraceStack.count != 0");
+              }
+
+  FillSet( follow );
+	set_free( follow );
+
+  /* MR20 G. Hobbelt 
+     Isn't it so that "fail:" is ONLY referenced when:
+
+      	 !FoundException || FoundGuessBlk ?
+
+     Therefore add the "if" around this piece of code generation...
+
+     Should guessing mode also use _handler label instead of "fail"
+     when exception handling is active? gen can automatically put 
+     "if (guessing)" there so as to skip all kinds of user code.
+
+   */
+
+	if ( !FoundException || FoundGuessBlk )  /* MR20 G. Hobbelt */
+  {                                          /* MR20 G. Hobbelt */
+	_gen("fail:\n");
+	if ( !GenCC ) gen("zzEXIT(zztasp1);\n");
+	if ( FoundGuessBlk ) {
+	   	if ( !GenCC ) {gen("if ( zzguessing ) zzGUESS_FAIL;\n");}
+		else gen("if ( guessing ) zzGUESS_FAIL;\n");
+	}
+	if ( q->erraction!=NULL )
+		dumpAction(q->erraction, output, tabs, q->file, q->line, 1);
+	if ( GenCC )
+	{
+		gen1("syn(zzBadTok, %s, zzMissSet, zzMissTok, zzErrk);\n",
+			 r->egroup==NULL?"(ANTLRChar *)\"\"":r->egroup);
+	}
+	else
+	{
+		gen1("zzsyn(zzMissText, zzBadTok, %s, zzMissSet, zzMissTok, zzErrk, zzBadText);\n",
+			 r->egroup==NULL?"(ANTLRChar *)\"\"":r->egroup);
+	}
+	gen3("%sresynch(setwd%d, 0x%x);\n", GenCC?"":"zz", wordnum, 1<<setnum);
+
+	if ( q->ret!=NULL ) {
+      genTraceOut(q);
+      gen("return _retv;\n");
+    } else if ( q->exceptions!=NULL ) {
+      genTraceOut(q);
+      gen("return;\n");
+    } else if (!FoundException) {       /* MR10 */
+      genTraceOut(q);                   /* MR10 */
+    };
+
+  }                                        /* MR20 G. Hobbelt */
+
+	if ( !GenCC ) gen("}\n");
+
+	/* Gen code for exception handlers */
+    /* make sure each path out contains genTraceOut() */
+
+	if ( q->exceptions!=NULL )
+	{
+
+		gen("/* exception handlers */\n");
+
+		dumpExceptions(q->exceptions);
+
+        if ( !r->has_rule_exception )
+        {
+            _gen("_handler:\n");
+            gen("zzdflthandlers(_signal,_retsignal);\n");
+        }
+/*  MR20 G. Gobbelt   The label "adios" is never referenced */
+
+#if 0
+	_gen("_adios:\n");
+#endif
+    if ( q->ret!=NULL ) {
+            genTraceOut(q);
+            gen("return _retv;\n");
+        }
+		else {
+            genTraceOut(q);
+            gen("return;\n");
+        }
+	}
+	else if ( FoundException )
+	{
+      _gen("_handler:\n");
+      gen("zzdflthandlers(_signal,_retsignal);\n");
+
+/* MR1                                                                      */
+/* MR1	 7-Apr-97 Fix suggested by: John Bair (jbair@iftime.com)            */
+/* MR1							                                            */
+
+   	  if ( q->ret != NULL) {			                             /* MR1 */
+            genTraceOut(q);                                          /* MR10 */
+            gen("return _retv;\n");			                         /* MR1 */
+      } else {					                                     /* MR1 */
+            genTraceOut(q);                                          /* MR10 */
+            gen("return;\n")    ;				                     /* MR1 */
+      };						                                     /* MR1 */
+	}
+
+	tabs--;
+	gen("}\n");
+
+/* MR10     Tired of looking at stacks that are as deep as the number of    */
+/* MR10       rules.  Changes recursion to iteration.                       */
+
+    MR_releaseResourcesUsedInRule( (Node *) q );      /* MR10 */
+
+    if (InfoT) {
+      fprintf(output,"\n/* tnodes created for rule %s:  %d */\n",
+                q->rname, (TnodesAllocated-TnodesAllocatedPrevRule) );
+    };
+
+    TnodesAllocatedPrevRule=TnodesAllocated;
+
+    if (q->p2 == NULL) dumpAfterActions( output );
+    q=(Junction *)q->p2;
+    require(q==NULL || q->jtype==RuleBlk,"RuleBlk p2 does not point to another RuleBlk");
+
+} while (q != NULL);
+
+/**** The old code                           ****/
+/****	if ( q->p2 != NULL ) {TRANS(q->p2);} ****/ /* generate code for next rule too */
+/****	else dumpAfterActions( output );     ****/
+
+}
+
+
+/* This is for the function definition, not the declaration. */
+
+static void
+#ifdef __USE_PROTOS
+DumpFuncHeader( Junction *q, RuleEntry *r )
+#else
+DumpFuncHeader( q, r )
+Junction *q;
+RuleEntry *r;
+#endif
+{
+/*								                                            */
+/*  MR1 10-Apr-97  MR1  Simplify insertion of commas in function header     */
+/*								                                            */
+	int	needComma;					                                 /* MR1 */
+
+
+	/* A N S I */
+	_gen("\n");
+	if ( q->ret!=NULL )
+	{
+		if ( hasMultipleOperands(q->ret) )                            /* MR23 */
+		{
+			if (GenCC) gen2("%s::_rv%d\n", CurrentClassName, r->rulenum)
+			else gen1("struct _rv%d\n",r->rulenum);
+		}
+		else
+		{
+			DumpType(q->ret, output);
+			gen("\n");
+		}
+	}
+	else
+	{
+		_gen("void\n");
+	}
+/*  MR1			                                                            */
+/*  MR1	10-Apr-97  133MR1	Replace __STDC__ with __USE_PROTOS              */
+/*  MR1								                                        */
+	if ( !GenCC ) _gen("#ifdef __USE_PROTOS\n");		     /* MR1 */
+	if ( !GenCC ) gen2("%s%s(", RulePrefix, q->rname)
+	else gen3("%s::%s%s(", CurrentClassName, RulePrefix,q->rname);
+
+    	/* If we generate C++ method names, we must hide default arguments */
+        /* which can appear in the parameter declaration list.             */
+        /* NOTICE: this is done only here, for the method definition, but  */
+        /*         not for the method declaration inside the class         */
+        /*         definition. This is exactly the behaviour defined in    */
+        /*         C++ standard for default paramters.                     */
+
+	DumpANSIFunctionArgDef(output,q, 0 /* emit initializers ? */);
+	_gen("\n");
+
+	if ( GenCC ) {
+      gen("{\n");
+      return;
+    }
+
+	/* K & R */
+	gen("#else\n");
+	gen2("%s%s(", RulePrefix, q->rname);
+	needComma=0;						                             /* MR1 */
+	if ( GenAST )						                             /* MR1 */
+	{							                                     /* MR1 */
+		_gen("_root");					                             /* MR1 */
+		needComma=1;					                             /* MR1 */
+	}							                                     /* MR1 */
+	if ( FoundException )					                         /* MR1 */
+	{							                                     /* MR1 */
+		if (needComma) {_gen(",");needComma=0;};	                 /* MR1 */
+		_gen("_retsignal");				                             /* MR1 */
+		needComma=1;					                             /* MR1 */
+	}							                                     /* MR1 */
+/* MR5	Change below by Jan Mikkelsen (janm@zeta.org.au) 26-May-97      MR5 */
+	DumpListOfParmNames( q->pdecl, output, needComma );	             /* MR5 */
+	gen(")\n");
+	if ( GenAST ) gen("AST **_root;\n");
+	if ( FoundException ) gen("int *_retsignal;\n");
+	DumpOldStyleParms( q->pdecl, output );
+	gen("#endif\n");
+    gen("{\n");
+}
+
+void
+#ifdef __USE_PROTOS
+DumpANSIFunctionArgDef(FILE *f, Junction *q, int bInitializer)
+#else
+DumpANSIFunctionArgDef(f,q,bInitializer)
+FILE *f;
+Junction *q;
+int bInitializer;
+#endif
+{
+	if ( GenAST )
+	{
+		if ( GenCC ) {fprintf(f,"ASTBase **_root");}
+		else fprintf(f,"AST**_root");
+		if ( !FoundException && q->pdecl!=NULL ) fprintf(f,",");
+	}
+	if ( FoundException )
+	{
+		if ( GenAST ) fprintf(f,",");
+		fprintf(f,"int *_retsignal");
+		if ( q->pdecl!=NULL ) {
+            fprintf(f,",");
+        }
+	}
+	if ( q->pdecl!=NULL ) {
+        DumpFormals(f, q->pdecl, bInitializer);     /* MR23 */
+    }
+	else {
+        if ( !GenAST && !FoundException ) {
+            fprintf(f,"void");
+        }
+    }
+	fprintf(f,")");
+}
+
+void
+#ifdef __USE_PROTOS
+genJunction( Junction *q )
+#else
+genJunction( q )
+Junction *q;
+#endif
+{
+	require(q->ntype == nJunction,	"genJunction: not junction");
+	require(q->jtype == Generic,	"genJunction: not generic junction");
+
+	if ( q->p1 != NULL ) TRANS(q->p1);
+	if ( q->p2 != NULL ) TRANS(q->p2);
+}
+
+void
+#ifdef __USE_PROTOS
+genEndBlk( Junction *q )
+#else
+genEndBlk( q )
+Junction *q;
+#endif
+{
+}
+
+void
+#ifdef __USE_PROTOS
+genEndRule( Junction *q )
+#else
+genEndRule( q )
+Junction *q;
+#endif
+{
+}
+
+void
+#ifdef __USE_PROTOS
+genHdr( int file )
+#else
+genHdr( file )
+int file;
+#endif
+{
+    int     i;
+
+	_gen("/*\n");
+	_gen(" * A n t l r  T r a n s l a t i o n  H e a d e r\n");
+	_gen(" *\n");
+	_gen(" * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001\n");
+	_gen(" * Purdue University Electrical Engineering\n");
+	_gen(" * With AHPCRC, University of Minnesota\n");
+	_gen1(" * ANTLR Version %s\n", Version);
+	_gen(" *\n");
+/* MR10 */    _gen(" *  ");
+/* MR10 */    for (i=0 ; i < Save_argc ; i++) {
+/* MR10 */      _gen(" ");
+/* MR10 */      _gen(Save_argv[i]);
+/* MR10 */    };
+	_gen("\n");
+	_gen(" *\n");
+    _gen(" */\n\n");
+	if (FirstAction != NULL ) dumpAction( FirstAction, output, 0, -1, 0, 1);    /* MR11 MR15b */
+	_gen1("#define ANTLR_VERSION	%s\n", VersionDef);
+	_gen("#include \"pcctscfg.h\"\n");
+	_gen("#include \"pccts_stdio.h\"\n");
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		_gen2("#define %s %s\n", DefaultParserName, ParserName);
+   	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		{_gen1("#include \"%s\"\n", RemapFileName);}
+    OutLineInfo(output,1,FileStr[file]);
+	if ( GenCC ) {
+		if ( UserTokenDefsFile != NULL )
+			fprintf(output, "#include %s\n", UserTokenDefsFile);
+		else
+			fprintf(output, "#include \"%s\"\n", DefFileName);
+	}
+
+	if ( HdrAction != NULL ) dumpAction( HdrAction, output, 0, -1, 0, 1);
+	if ( !GenCC && FoundGuessBlk )
+	{
+		_gen("#define ZZCAN_GUESS\n");
+		_gen("#include \"pccts_setjmp.h\"\n");  /* MR15 K.J. Cummings (cummings@peritus.com) */
+	}
+	if ( FoundException )
+	{
+		_gen("#define EXCEPTION_HANDLING\n");
+		_gen1("#define NUM_SIGNALS %d\n", NumSignals);
+	}
+	if ( !GenCC && OutputLL_k > 1 ) _gen1("#define LL_K %d\n", OutputLL_k);
+	if ( GenAST&&!GenCC ) _gen("#define GENAST\n\n");
+	if ( GenAST ) {
+		if ( GenCC ) {_gen1("#include \"%s\"\n\n", ASTBASE_H);}
+		else _gen("#include \"ast.h\"\n\n");
+	}
+	if ( !GenCC && DemandLookahead ) _gen("#define DEMAND_LOOK\n\n");
+#ifdef DUM
+	if ( !GenCC && LexGen ) {
+		_gen1("#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
+	}
+#endif
+	/* ###WARNING: This will have to change when SetWordSize changes */
+	if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+    if (TraceGen) {
+      _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */
+      _gen("#define zzTRACE_RULES\n");  /* MR20 */
+      _gen("#endif\n");                 /* MR22 */
+    };
+	if ( !GenCC ) {_gen("#include \"antlr.h\"\n");}
+	else {
+		_gen1("#include \"%s\"\n", APARSER_H);
+		_gen1("#include \"%s.h\"\n", CurrentClassName);
+	}
+	if ( !GenCC ) {
+		if ( UserDefdTokens )
+			{_gen1("#include %s\n", UserTokenDefsFile);}
+		/* still need this one as it has the func prototypes */
+		_gen1("#include \"%s\"\n", DefFileName);
+	}
+	/* still need this one as it defines the DLG interface */
+	if ( !GenCC ) _gen("#include \"dlgdef.h\"\n");
+	if ( LexGen && GenCC ) _gen1("#include \"%s\"\n", DLEXERBASE_H);
+	if ( GenCC ) _gen1("#include \"%s\"\n", ATOKPTR_H);
+	if ( !GenCC && LexGen ) _gen1("#include \"%s\"\n", ModeFileName);
+
+/* MR10  Ofer Ben-Ami (gremlin@cs.huji.ac.il)           */
+/* MR10    Finally, a definition of the Purify macro    */
+
+    if (PURIFY == TRUE) {                                                   /* MR23 */
+        _gen("\n/* MR23 In order to remove calls to PURIFY use the antlr"); /* MR23 */
+        _gen(" -nopurify option */\n\n");                                   /* MR23 */
+    	_gen("#ifndef PCCTS_PURIFY\n");
+        _gen("#define PCCTS_PURIFY(r,s) memset((char *) &(r),'\\0',(s));\n");
+        _gen("#endif\n\n");
+    }                                                                       /* MR23 */
+}
+
+void
+#ifdef __USE_PROTOS
+genHdr1( int file )
+#else
+genHdr1( file )
+int file;
+#endif
+{
+	ListNode *p;
+
+	genHdr(file);
+	if ( GenAST )
+	{
+		if ( !GenCC ) {
+			_gen("#include \"ast.c\"\n");
+			_gen("zzASTgvars\n\n");
+		}
+	}
+	if ( !GenCC ) _gen("ANTLR_INFO\n");
+	if ( BeforeActions != NULL )
+	{
+		for (p = BeforeActions->next; p!=NULL; p=p->next)
+		{
+			UserAction *ua = (UserAction *)p->elem;
+			dumpAction( ua->action, output, 0, ua->file, ua->line, 1);
+		}
+	}
+
+	if ( !FoundException ) return;
+
+	if ( GenCC )
+	{
+		_gen1("\nvoid %s::\n", CurrentClassName);
+		_gen("zzdflthandlers( int _signal, int *_retsignal )\n");
+		_gen("{\n");
+	}
+	else
+	{
+		_gen("\nvoid\n");
+/*  MR1				                                                        */
+/*  MR1	10-Apr-97  133MR1	Replace __STDC__ with __USE_PROTOS              */
+/*  MR1	                                                                    */
+	    _gen("#ifdef __USE_PROTOS\n");                               /* MR1 */
+		_gen("zzdflthandlers( int _signal, int *_retsignal )\n");
+		_gen("#else\n");
+		_gen("zzdflthandlers( _signal, _retsignal )\n");
+		_gen("int _signal;\n");
+		_gen("int *_retsignal;\n");
+		_gen("#endif\n");
+		_gen("{\n");
+	}
+	tabs++;
+	if ( DefaultExGroup!=NULL )
+	{
+		dumpException(DefaultExGroup, 1);
+		if ( !hasDefaultException(DefaultExGroup) )
+		{
+			gen("default :\n");
+			tabs++;
+			gen("*_retsignal = _signal;\n");
+			tabs--;
+			gen("}\n");
+		}
+	}
+	else {
+		gen("*_retsignal = _signal;\n");
+	}
+
+	tabs--;
+	_gen("}\n\n");
+}
+
+void
+#ifdef __USE_PROTOS
+genStdPCCTSIncludeFile( FILE *f,char *gate )    /* MR10 */
+#else
+genStdPCCTSIncludeFile( f , gate)               /* MR10 */
+FILE *f;
+char * gate;                                    /* MR10 */
+#endif
+{
+/* MR10 Ramanathan Santhanam (ps@kumaran.com)           */
+/* MR10 Same preprocessor symbol use to gate stdpccts.h */
+/* MR10   even when two grammars are in use.            */
+/* MR10 Derive gate symbol from -fh filename            */
+
+    if (gate == NULL) {
+      fprintf(f,"#ifndef STDPCCTS_H\n");          /* MR10 */
+      fprintf(f,"#define STDPCCTS_H\n");          /* MR10 */
+    } else {
+      fprintf(f,"#ifndef STDPCCTS_%s_H\n",gate);  /* MR10 */
+      fprintf(f,"#define STDPCCTS_%s_H\n",gate);  /* MR10 */
+    };
+	fprintf(f,"/*\n");
+    if (gate == NULL) {
+	  fprintf(f," * %s -- P C C T S  I n c l u d e\n", stdpccts);
+    } else {
+	  fprintf(f," * Standard PCCTS include file with -fh %s -- P C C T S  I n c l u d e\n", stdpccts);
+    }
+	fprintf(f," *\n");
+	fprintf(f," * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(f," * Purdue University Electrical Engineering\n");
+	fprintf(f," * With AHPCRC, University of Minnesota\n");
+	fprintf(f," * ANTLR Version %s\n", Version);
+	fprintf(f," */\n\n");
+
+    fprintf(f,"#ifndef ANTLR_VERSION\n");
+	fprintf(f,"#define ANTLR_VERSION	%s\n", VersionDef);
+    fprintf(f,"#endif\n\n");
+
+    if (FirstAction != NULL ) dumpAction(FirstAction, f, 0, -1, 0, 1);  /* MR11 */
+
+	fprintf(f,"#include \"pcctscfg.h\"\n");
+	fprintf(f,"#include \"pccts_stdio.h\"\n");
+	if ( GenCC )
+	{
+		if ( UserDefdTokens )
+			fprintf(f, "#include %s\n", UserTokenDefsFile);
+		else {
+			fprintf(f, "#include \"%s\"\n", DefFileName);
+		}
+
+		fprintf(f, "#include \"%s\"\n", ATOKEN_H);
+
+		if ( HdrAction != NULL ) dumpAction( HdrAction, f, 0, -1, 0, 1);
+
+		fprintf(f, "#include \"%s\"\n", ATOKENBUFFER_H);
+
+		if ( OutputLL_k > 1 ) fprintf(f,"static const unsigned LL_K=%d;\n", OutputLL_k);
+		if ( GenAST ) {
+			fprintf(f, "#include \"%s\"\n", ASTBASE_H);
+		}
+
+        if (TraceGen) {
+          fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+          fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
+          fprintf(f,"#endif\n");                 /* MR22 */
+        };
+
+		fprintf(f,"#include \"%s\"\n", APARSER_H);
+		fprintf(f,"#include \"%s.h\"\n", CurrentClassName);
+		if ( LexGen ) fprintf(f,"#include \"%s\"\n", DLEXERBASE_H);
+		fprintf(f, "#endif\n");
+		return;
+	}
+
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		fprintf(f, "#define %s %s\n", DefaultParserName, ParserName);
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+		fprintf(f, "#include \"%s\"\n", RemapFileName);
+	if ( UserTokenDefsFile != NULL )
+	   fprintf(f, "#include %s\n", UserTokenDefsFile);
+	if ( HdrAction != NULL ) dumpAction( HdrAction, f, 0, -1, 0, 1);
+	if ( FoundGuessBlk )
+	{
+		fprintf(f,"#define ZZCAN_GUESS\n");
+		fprintf(f,"#include \"pccts_setjmp.h\"\n");
+	}
+    if (TraceGen) {
+      fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+      fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
+      fprintf(f,"#endif\n");                 /* MR22 */
+    };
+	if ( OutputLL_k > 1 ) fprintf(f,"#define LL_K %d\n", OutputLL_k);
+	if ( GenAST ) fprintf(f,"#define GENAST\n");
+	if ( FoundException )
+	{
+/* MR1	 7-Apr-97  1.33MR1					                           */
+/* MR1	 	   Fix suggested by:				                   */
+/* MR1		   Francois-Xavier Fontaine (fontaine_f@istvax.ist.lu)         */
+
+		fprintf(f,"#define EXCEPTION_HANDLING\n");	            /* MR1 */
+		fprintf(f,"#define NUM_SIGNALS %d\n", NumSignals);          /* MR1 */
+	}
+	if ( DemandLookahead ) fprintf(f,"#define DEMAND_LOOK\n");
+#ifdef DUM
+	if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
+#endif
+	/* ###WARNING: This will have to change when SetWordSize changes */
+	fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
+    if (TraceGen) {
+      fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+      fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
+      fprintf(f,"#endif\n");                 /* MR22 */
+    };
+	fprintf(f,"#include \"antlr.h\"\n");
+	if ( GenAST ) fprintf(f,"#include \"ast.h\"\n");
+	if ( UserDefdTokens )
+		fprintf(f, "#include %s\n", UserTokenDefsFile);
+	/* still need this one as it has the func prototypes */
+	fprintf(f, "#include \"%s\"\n", DefFileName);
+	/* still need this one as it defines the DLG interface */
+	fprintf(f,"#include \"dlgdef.h\"\n");
+	/* don't need this one unless DLG is used */
+	if ( LexGen ) fprintf(f,"#include \"%s\"\n", ModeFileName);
+	fprintf(f,"#endif\n");
+}
+
+/* dump action 's' to file 'output' starting at "local" tab 'tabs'
+   Dump line information in front of action if GenLineInfo is set
+   If file == -1 then GenLineInfo is ignored.
+   The user may redefine the LineInfoFormatStr to his/her liking
+   most compilers will like the default, however.
+
+   June '93; changed so that empty lines are left alone so that
+   line information is correct for the compiler/debuggers.
+*/
+void
+#ifdef __USE_PROTOS
+dumpAction( char *s, FILE *output, int tabs, int file, int line,
+int final_newline )
+#else
+dumpAction( s, output, tabs, file, line, final_newline )
+char *s;
+FILE *output;
+int tabs;
+int file;
+int line;
+int final_newline;
+#endif
+{
+    int inDQuote, inSQuote;
+    require(s!=NULL, 		"dumpAction: NULL action");
+    require(output!=NULL,	eMsg1("dumpAction: output FILE is NULL for %s",s));
+
+	if ( GenLineInfo && file != -1 )
+	{
+        OutLineInfo(output,line,FileStr[file]);
+	}
+    PastWhiteSpace( s );
+	/* don't print a tab if first non-white char is a # (preprocessor command) */
+	if ( *s!='#' ) {TAB;}
+    inDQuote = inSQuote = FALSE;
+    while ( *s != '\0' )
+    {
+        if ( *s == '\\' )
+        {
+            fputc( *s++, output ); /* Avoid '"' Case */
+            if ( *s == '\0' ) return;
+            if ( *s == '\'' ) fputc( *s++, output );
+            if ( *s == '\"' ) fputc( *s++, output );
+        }
+        if ( *s == '\'' )
+        {
+            if ( !inDQuote ) inSQuote = !inSQuote;
+        }
+        if ( *s == '"' )
+        {
+            if ( !inSQuote ) inDQuote = !inDQuote;
+        }
+        if ( *s == '\n' )
+        {
+            fputc('\n', output);
+			s++;
+            PastWhiteSpace( s );
+            if ( *s == '}' )
+            {
+                --tabs;
+				TAB;
+                fputc( *s++, output );
+                continue;
+            }
+            if ( *s == '\0' ) return;
+			if ( *s != '#' )	/* #define, #endif etc.. start at col 1 */
+            {
+				TAB;
+			}
+        }
+        if ( *s == '}' && !(inSQuote || inDQuote) )
+        {
+            --tabs;            /* Indent one fewer */
+        }
+        if ( *s == '{' && !(inSQuote || inDQuote) )
+        {
+            tabs++;            /* Indent one more */
+        }
+        fputc( *s, output );
+        s++;
+    }
+    if ( final_newline ) fputc('\n', output);
+}
+
+static void
+#ifdef __USE_PROTOS
+dumpAfterActions( FILE *output )
+#else
+dumpAfterActions( output )
+FILE *output;
+#endif
+{
+	ListNode *p;
+	require(output!=NULL, "dumpAfterActions: output file was NULL for some reason");
+	if ( AfterActions != NULL )
+	{
+		for (p = AfterActions->next; p!=NULL; p=p->next)
+		{
+			UserAction *ua = (UserAction *)p->elem;
+			dumpAction( ua->action, output, 0, ua->file, ua->line, 1);
+		}
+	}
+	fclose( output );
+}
+
+/*
+ * Find the next action in the stream of execution.  Do not pass
+ * junctions with more than one path leaving them.
+ * Only pass generic junctions.
+ *
+ *	Scan forward while (generic junction with p2==NULL)
+ *	If we stop on an action, return ptr to the action
+ *	else return NULL;
+ */
+static ActionNode *
+#ifdef __USE_PROTOS
+findImmedAction( Node *q )
+#else
+findImmedAction( q )
+Node *q;
+#endif
+{
+	Junction *j;
+	require(q!=NULL, "findImmedAction: NULL node");
+	require(q->ntype>=1 && q->ntype<=NumNodeTypes, "findImmedAction: invalid node");
+	
+	while ( q->ntype == nJunction )
+	{
+		j = (Junction *)q;
+		if ( j->jtype != Generic || j->p2 != NULL ) return NULL;
+		q = j->p1;
+		if ( q == NULL ) return NULL;
+	}
+	if ( q->ntype == nAction ) return (ActionNode *)q;
+	return NULL;
+}
+
+static void
+#ifdef __USE_PROTOS
+dumpRetValAssign( char *retval, char *ret_def, RuleRefNode * ruleRef /* MR30 */)
+#else
+dumpRetValAssign( retval, ret_def, ruleRef /* MR30 */)
+char *retval;
+char *ret_def;
+RuleRefNode *ruleRefNode;
+#endif
+{
+	char *q = ret_def;
+	
+	tab();
+	while ( *retval != '\0' && *q != '\0')
+	{
+		while ( isspace((*retval)) ) retval++;
+		while ( *retval!=',' && *retval!='\0' ) fputc(*retval++, output);
+		fprintf(output, " = _trv.");
+		
+		DumpNextNameInDef(&q, output);
+		while ( isspace(*q) ) q++;
+		fputc(';', output); fputc(' ', output);
+		if ( *retval == ',' ) retval++;
+	}
+	if (*retval == '\0' && *q != '\0') {
+/* MR30 */    errFL("Fewer output values than output formals for rule reference",
+/* MR30 */                 FileStr[ruleRef->file],ruleRef->line);
+	}
+	if (*retval != '\0' && *q == '\0') {
+/* MR30 */    errFL("More output actuals than output formals for rule reference",
+/* MR30 */                 FileStr[ruleRef->file],ruleRef->line);
+	}
+}
+
+/* This function computes the set of tokens that can possibly be seen k
+ * tokens in the future from point j
+ */
+
+static set
+#ifdef __USE_PROTOS
+ComputeErrorSet( Junction *j, int k, int usePlusBlockBypass)
+#else
+ComputeErrorSet( j, k, usePlusBlockBypass )
+Junction *j;
+int k;
+int usePlusBlockBypass;
+#endif
+{
+	Junction *alt1;
+	set a, rk, f;
+	require(j->ntype==nJunction, "ComputeErrorSet: non junction passed");
+
+	f = rk = empty;
+	for (alt1=j; alt1!=NULL; alt1 = (Junction *)alt1->p2)
+	{
+        if (alt1->ignore && ! usePlusBlockBypass) continue;     /* MR21 - Ignore aPlusBlk forward p2 */
+		REACH(alt1->p1, k, &rk, a);
+		require(set_nil(rk), "ComputeErrorSet: rk != nil");
+		set_free(rk);
+		set_orin(&f, a);
+		set_free(a);
+	}
+	return f;
+}
+
+static char *
+#ifdef __USE_PROTOS
+tokenFollowSet(TokNode *p)
+#else
+tokenFollowSet(p)
+TokNode *p;
+#endif
+{
+    static char buf[100];
+    set rk, a;
+    int n;
+    rk = empty;
+
+    REACH(p->next, 1, &rk, a);
+    require(set_nil(rk), "rk != nil");
+    set_free(rk);
+    n = DefErrSet( &a, 0, NULL );
+    set_free(a);
+    if ( GenCC )
+        sprintf(buf, "err%d", n);
+    else
+        sprintf(buf, "zzerr%d", n);
+    return buf;
+}
+
+static void
+#ifdef __USE_PROTOS
+makeErrorClause( Junction *q, set f, int max_k, int usePlusBlockBypass )
+#else
+makeErrorClause( q, f, max_k, usePlusBlockBypass )
+Junction *q;
+set f;
+int max_k;
+int usePlusBlockBypass;
+#endif
+{
+    char *  handler_id="";                                           /* MR7 */
+    int     nilf=0;                                                  /* MR13 */
+    RuleEntry *ruleEntry;                                            /* MR14 */
+
+	if ( FoundException )
+	{
+		_gen("else {\n");
+		tabs++;
+		if ( FoundGuessBlk )
+		{
+			if ( GenCC ) {gen("if ( guessing ) goto fail;\n");}
+			else gen("if ( zzguessing ) goto fail;\n");
+		}
+		gen("if (_sva) _signal=NoViableAlt;\n");
+		gen("else _signal=NoSemViableAlt;\n");
+        if (q->outerEG != NULL) {
+          handler_id=q->outerEG->altID;
+#if 0
+        } else {
+          printf("q->curAltNum=%d q->exception_label=%s\n",q->curAltNum,q->exception_label);
+          gen("*** DEBUG *** outerEG==NULL\n");
+#endif
+        };
+		gen1("goto %s_handler;  /* MR7 */\n",handler_id);    /* MR7 */
+		tabs--;
+		gen("}\n");
+		return;
+	}
+
+	if ( max_k == 1 )
+	{
+/* MR13 */  nilf=set_nil(f);
+    	  	if ( GenCC ) {
+              _gen1("else {FAIL(1,err%d", DefErrSet1(1,&f,1,NULL));
+            } else {
+               _gen1("else {zzFAIL(1,zzerr%d", DefErrSet1(1,&f,1,NULL));
+            };
+    		set_free(f);
+	}
+	else
+	{
+		int i;
+		set_free(f);
+		if ( GenCC ) {_gen1("else {FAIL(%d", max_k);}
+		else _gen1("else {zzFAIL(%d", max_k);
+
+    ruleEntry = (RuleEntry *) hash_get(Rname,q->rname);
+
+		for (i=1; i<=max_k; i++)
+		{
+/* MR14 */  if (ruleEntry->dontComputeErrorSet) {
+/* MR14 */    f=empty;
+            } else {
+      	      f = ComputeErrorSet(q, i, usePlusBlockBypass /* use plus block bypass ? */ );
+            }
+
+      if ( GenCC ) {_gen1(",err%d", DefErrSet( &f, 1, NULL ));}
+			else _gen1(",zzerr%d", DefErrSet( &f, 1, NULL ));
+			
+			set_free(f);
+		}
+	}
+	_gen(",&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}\n");
+/* MR13 */  if (nilf) {
+/* MR13 */    errFL("empty error set for alt - probably because of undefined rule or infinite left recursion",
+/* MR13 */                 FileStr[q->file],q->line);
+/* MR13 */    gen(" /* MR13 empty error set for this alt - undef rule ? infinite left recursion ? */");
+/* MR13 */  };
+}
+
+static                                                               /* MR7 */
+#ifdef __USE_PROTOS
+char * findOuterHandlerLabel(ExceptionGroup *eg)                     /* MR7 */
+#else
+char * findOuterHandlerLabel(eg)                                     /* MR7 */
+ExceptionGroup *eg;                                                  /* MR7 */
+#endif
+{
+  char              *label=NULL;                                     /* MR7 */
+  ExceptionGroup    *outerEG;                                        /* MR7 */
+
+  if (eg->forRule == 0) {                                            /* MR7 */
+    if (eg->labelEntry != NULL) {                                    /* MR7 */
+      outerEG=eg->labelEntry->outerEG;                               /* MR7 */
+      if (outerEG != NULL) {                                         /* MR7 */
+        label=outerEG->altID;                                        /* MR7 */
+        outerEG->used=1;                                             /* MR7 */
+      };                                                             /* MR7 */
+    } else if (eg->outerEG != NULL) {                                /* MR7 */
+      outerEG=eg->outerEG;                                           /* MR7 */
+      label=outerEG->altID;                                          /* MR7 */
+      outerEG->used=1;                                               /* MR7 */
+    };                                                               /* MR7 */
+  };                                                                 /* MR7 */
+  return (label==NULL ? "" : label);                                 /* MR7 */
+}                                                                    /* MR7 */
+
+/*** debug ***/
+#if 0
+** static                                                               /* MR7 */
+** #ifdef __USE_PROTOS
+** char * findOuterAltHandlerLabel(Junction *startJ)                    /* MR7 */
+** #else
+** char * findOuterAltHandlerLabel(startJ)                              /* MR7 */
+** Junction *startJ;                                                    /* MR7 */
+** #endif
+** {                                                                    /* MR7 */
+**   char      *label=NULL;                                             /* MR7 */
+**   Junction  *alt;                                                    /* MR7 */
+**                                                                      /* MR7 */
+**   for (alt=startJ; alt != NULL; alt=alt->outerAltstart) {            /* MR7 */
+**     label=alt->exception_label;                                      /* MR7 */
+**     if (label != NULL) break;                                        /* MR7 */
+**   };                                                                 /* MR7 */
+**   return (label==NULL ? "" : label);                                 /* MR7 */
+** }                                                                    /* MR7 */
+#endif
+
+#ifdef __USE_PROTOS
+static void OutLineInfo(FILE *file,int line,char *fileName)
+#else
+static void OutLineInfo(file,line,fileName)
+  FILE *    file;
+  int       line;
+  char *    fileName;
+#endif
+{
+    static  char * prevFileName=NULL;
+    static  char * prevFileNameMS=NULL;
+
+    char *  p;
+    char *  q;
+
+    if (! GenLineInfo) return;
+
+    if (!GenLineInfoMS) {
+	    fprintf(file, LineInfoFormatStr,line,fileName);
+    } else {
+      if (fileName == prevFileName) {
+	    fprintf(file, LineInfoFormatStr,line,prevFileNameMS);
+      } else {
+        if (prevFileNameMS != NULL) free (prevFileNameMS);
+        prevFileNameMS=(char *)calloc(1,strlen(fileName)+1);
+        require(prevFileNameMS != NULL,"why not do this in calloc wrapper");
+        q=prevFileNameMS;
+        for (p=fileName; *p != 0; p++) {
+            *q=*p;
+            if (*q == '\\') *q='/';
+            q++;
+        }
+      }
+      prevFileName=fileName;
+    };
+}
+
+#if 0
+
+/* MR21 */
+
+#ifdef __USE_PROTOS
+void OutFirstSetSymbol(Junction *q, char * pSymbol)
+#else
+void OutFirstSetSymbol(q, pSymbol)
+    Junction* q;
+	char * pSymbol
+#endif
+{
+
+	set f;
+    if (pSymbol == NULL) return;
+	gen1("/** #FirstSetSymbol(%s) **/\n",pSymbol);
+    f = ComputeErrorSet(q, 1, 0 /* use plus block bypass ? */);
+    DefErrSetWithSuffix (0 /* nil ok */, &f,0 /* no substitute */, pSymbol, "");
+    set_free(f);
+}
+#endif
+
+/* MR21 */
+
+#ifdef __USE_PROTOS
+void BlockPreambleOption(Junction *q, char * pSymbol)
+#else
+void BlockPreambleOption(q, pSymbol)
+    Junction* q;
+	char * pSymbol;
+#endif
+{
+	set f = empty;
+    if (pSymbol != NULL) {
+        f = ComputeErrorSet(q, 1, 0 /* use plus block bypass ? */);
+    	gen1("/** #FirstSetSymbol(%s) **/\n",pSymbol);
+        DefErrSetWithSuffix (0 /* nil ok */, &f,0 /* no substitute */, pSymbol, "");
+    }
+    set_free(f);
+}
+
+/* MR21 */
+
+void
+#ifdef __USE_PROTOS
+dumpActionPlus(ActionNode *a, char *s, FILE *output, int tabs, int file, int line,
+int final_newline )
+#else
+dumpActionPlus(a, s, output, tabs, file, line, final_newline )
+ActionNode *a;
+char *s;
+FILE *output;
+int tabs;
+int file;
+int line;
+int final_newline;
+#endif
+{
+    dumpAction(s,output,tabs,file,line,final_newline);
+}
+
+
+#if 0
+** #ifdef __USE_PROTOS
+** void MR_ErrorSets(Junction *q, int max_k, int usePlusBlockBypass)
+** #else
+** void MR_ErrorSets(q, max_k, usePlusBlockBypass)
+** Junction *q;
+** int max_k;
+** int usePlusBlockBypass;
+** #endif
+** {
+**     int k;
+**     set setResult;
+** 	Junction* alt1;
+** 	Junction* p;
+** 	set rk;
+** 
+**     require (max_k <= CLL_k, "k > CLL_k");
+** 
+** 
+**     for (k = 1; k <= CLL_k; k++) {set_clr(q->fset[k]); }
+** 
+**     for (k = 1; k <= max_k; k++) {
+**         for (alt1=q; alt1 != NULL; alt1 = (Junction *)alt1->p2)
+**     	{
+**             if (alt1->ignore && ! usePlusBlockBypass) continue;
+**         	p = analysis_point((Junction *)alt1->p1);
+**     		REACH(p, k, &rk, setResult);
+**     		require(set_nil(rk), "rk != nil");
+**             set_orin(&q->fset[k], setResult);
+**     	}
+**     }
+** }
+#endif
+
+
+#ifdef __USE_PROTOS
+void DumpInitializers(FILE* output, RuleEntry *r, char * pReturn)
+#else
+void DumpInitializers(output, r, pReturn)
+FILE* output;
+RuleEntry *r;
+char * pReturn;
+#endif
+{
+	char *p = pReturn;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+	int nest = 0;
+    char *q;
+
+	require(pReturn!=NULL, "DumpInitializer: invalid string"); 
+
+    while (*p != 0) {
+    	p = endFormal(p,
+    			      &pDataType,
+    				  &pSymbol,
+    				  &pEqualSign,
+    				  &pValue,
+    				  &pSeparator,
+    				  &nest);
+        if (nest != 0) return;
+        if (pValue != NULL) {
+			tab();
+            q = strBetween(pSymbol, pEqualSign, pSeparator);
+            fprintf(output, "_retv.%s", q);
+            q = strBetween(pValue, NULL, pSeparator);
+            fprintf(output, " = %s;\n", q);
+        }
+    }
+}
+
+#ifdef __USE_PROTOS
+void DumpFormals(FILE* output, char * pReturn, int bInitializer)
+#else
+void DumpFormals(output, pReturn, bInitializer)
+FILE* output;
+char * pReturn;
+int bInitializer;
+#endif
+{
+	char *p = pReturn;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+	int nest = 0;
+    char *q;
+    int count = 0;
+
+	require(pReturn!=NULL, "DumpFormals: invalid string"); 
+
+    while (*p != 0) {
+    	p = endFormal(p,
+    			      &pDataType,
+    				  &pSymbol,
+    				  &pEqualSign,
+    				  &pValue,
+    				  &pSeparator,
+    				  &nest);
+        if (nest != 0) return;
+        if (count > 0) fprintf(output,",");
+        if (pDataType != NULL && pSymbol != NULL) {
+            q = strBetween(pDataType, pSymbol, pSeparator);
+            fprintf(output, "%s", q);
+            q = strBetween(pSymbol, pEqualSign, pSeparator);
+            fprintf(output," %s",q);
+            if (pValue != NULL) {
+                q = strBetween(pValue, NULL, pSeparator);
+                if (bInitializer != 0) {
+                    fprintf(output, " = %s", q);
+                }
+            }
+        }
+        count++;
+    }
+}
+
+/* MR23 Check for empty alt in a more intelligent way.
+        Previously, an empty alt for genBlk had to point directly
+		to the endBlock.  This did not work once I changed {...}
+		blocks to look like (...|...| epsilon) since there were
+		intervening generics.  This fixes the problem for this
+		particular case.  Things like actions or empty blocks of
+		various kinds will still cause problems, but I wasnt't
+		prepared to handle pathological cases like (A|()*). It
+		does handle (A | ()), which is a recommended idiom for
+		epsilon.
+
+        Actually, this isn't quite correct since it doesn't handle
+		the case of the ignore bit in the plus block bypass, but
+		I'm too tired to figure out the correct fix, and will just
+		work around it.
+*/
+
+#ifdef __USE_PROTOS
+int isEmptyAlt(Node * alt, Node * endBlock)
+#else
+int isEmptyAlt(alt, endBlock)
+Node * alt;
+Node * endBlock;
+#endif
+{
+	Node * n = alt;
+	Junction * j;
+	while (n != endBlock) {
+		switch (n->ntype) {
+
+			case nRuleRef:
+				return 0;
+
+			case nToken:
+				return 0;
+
+			case nAction:
+				return 0;
+
+			case nJunction:
+				goto JUNCTION;
+
+			default:
+				fatal_internal("Invalid node type");
+				return 0;
+		}
+JUNCTION:
+		j = (Junction *) n;
+
+		switch (j->jtype) {
+			case Generic:
+				{
+					n = j->p1;
+					goto NEXT;
+				}
+
+			case aSubBlk:
+				{
+					n = j->p1;	/* MR26 */
+					goto NEXT;	/* MR26 */
+				}
+
+			case EndBlk:
+					return 0;
+
+			case EndRule:
+					return 1;
+
+			default:
+					return 0;
+		}
+NEXT: continue;
+	}
+	return 1;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/generic.h b/Tools/Source/TianoTools/Pccts/antlr/generic.h
new file mode 100644
index 0000000000..8d736d5200
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/generic.h
@@ -0,0 +1,286 @@
+/*
+ * generic.h -- generic include stuff for new PCCTS ANTLR.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#define StrSame			0
+
+#define DefaultParserName	"zzparser"
+
+/* MR9  JVincent@novell.com     Allow user to override default ZZLEXBUFSIZE  */
+/* MR11 thm                     Raise antlr's own default ZZLEXBUFSIZE to 8k */
+/* MR22 thm                     Raise antlr's own default ZZLEXBUFSIZE to 32k */
+
+#ifndef ZZLEXBUFSIZE
+#define ZZLEXBUFSIZE 32000
+#endif
+
+/* Tree/FIRST/FOLLOW defines -- valid only after all grammar has been read */
+#define ALT			TokenNum+1
+#define SET			TokenNum+2
+#define TREE_REF	TokenNum+3
+
+					/* E r r o r  M a c r o s */
+
+#define fatal(err)	fatalFL(err, __FILE__, __LINE__)
+#define fatal_internal(err)	fatal_intern(err, __FILE__, __LINE__)
+
+
+#define eMsg1(s,a)	eMsg3(s,a,NULL,NULL)
+#define eMsg2(s,a,b)	eMsg3(s,a,b,NULL)
+
+				/* S a n i t y  C h e c k i n g */
+
+#ifndef require
+#define require(expr, err) {if ( !(expr) ) fatal_internal(err);}
+#endif
+
+					/* L i s t  N o d e s */
+
+typedef struct _ListNode {
+			void *elem;			/* pointer to any kind of element */
+			struct _ListNode *next;
+		} ListNode;
+
+/* Define a Cycle node which is used to track lists of cycles for later
+ * reconciliation by ResolveFoCycles().
+ */
+typedef struct _c {
+			int croot;			/* cycle root */
+			set cyclicDep;		/* cyclic dependents */
+			unsigned deg;		/* degree of FOLLOW set of croot */
+		} Cycle;
+
+typedef struct _e {
+			int tok;			/* error class name == TokenStr[tok] */
+			ListNode *elist;	/* linked list of elements in error set */
+			set eset;
+			int setdeg;			/* how big is the set */
+			int lexclass;		/* which lex class is it in? */
+		} ECnode;
+
+typedef struct _TCnode {
+			int tok;			/* token class name */
+			ListNode *tlist;	/* linked list of elements in token set */
+			set tset;
+			int lexclass;		/* which lex class is it in? */
+			unsigned char dumped; /* this def has been been dumped */
+			unsigned char dumpedComplement; /* this def has been been dumped */
+			unsigned setnum;	/* which set number is this guy? (if dumped) */
+			unsigned setnumComplement;		 /* MR23 */
+			unsigned setnumErrSet;			 /* MR23 which set is this #tokclass error set (if dumped) */
+			unsigned setnumErrSetComplement; /* MR23 */
+		} TCnode;
+
+typedef struct _ft {
+			char *token;		/* id of token type to remap */
+			int tnum;			/* move token type to which token position */
+		} ForcedToken;
+
+typedef struct _ContextGuardPredicates {    /* MR13 */
+            Predicate *pred;                /* MR13 */
+        } ContextGuardPredicates;           /* MR13 */
+
+#define newListNode	(ListNode *) calloc(1, sizeof(ListNode));
+#define newCycle	(Cycle *) calloc(1, sizeof(Cycle));
+#define newECnode	(ECnode *) calloc(1, sizeof(ECnode));
+#define newTCnode	(TCnode *) calloc(1, sizeof(TCnode));
+
+
+				/* H a s h  T a b l e  E n t r i e s */
+
+typedef struct _t {				/* Token name or expression */
+			char *str;
+			struct _t *next;
+			int token;			/* token number */
+			unsigned char classname;	/* is it a err/tok class name or token */
+			TCnode *tclass;		/* ptr to token class */
+			char *action;
+            char *akaString;
+		} TermEntry;
+
+typedef struct _r {				/* Rule name and ptr to start of rule */
+			char *str;
+			struct _t *next;
+			int rulenum;		/* RulePtr[rulenum]== ptr to RuleBlk junction */
+			unsigned char noAST;/* gen AST construction code? (def==gen code) */
+			char *egroup;		/* which error group (err reporting stuff) */
+#if 0
+			/* MR27  This appears to never be used.  Delete this code later. */
+
+			ListNode *el_labels;/* list of element labels ref in all of rule */
+#endif
+			ListNode *ast_labels_in_actions; /* MR27 */
+            unsigned char has_rule_exception;
+            char dontComputeErrorSet;    /* MR14 - don't compute error set
+                                          special for rule in alpha part of
+                                          (alpha)? beta block */
+		} RuleEntry;
+
+typedef struct _f {				/* cache Fi/Fo set */
+			char *str;			/* key == (rulename, computation, k) */
+			struct _f *next;
+			set fset;			/* First/Follow of rule */
+			set rk;				/* set of k's remaining to be done after ruleref */
+			int incomplete;		/* only w/FOLLOW sets.  Use only if complete */
+		} CacheEntry;
+
+typedef struct _LabelEntry {	/* element labels */
+			char *str;
+			struct _f *next;
+			Node *elem;			/* which element does it point to? */
+			ExceptionGroup *ex_group;
+								/* Is there an exception attached to label? */
+            ExceptionGroup *outerEG;                                 /* MR7 */
+                                /* next EG if ex_group doesn't catch it MR7 */
+            struct _LabelEntry  *pendingLink;                        /* MR7 */
+                                /* too lazy to use ListNode ?           MR7 */
+            int     curAltNum;                                       /* MR7 */
+		} LabelEntry;
+
+typedef struct _SignalEntry {
+			char *str;
+			struct _f *next;
+			int signum;			/* unique signal number */
+		} SignalEntry;
+
+typedef struct _PredEntry {				/* MR11 predicate name and ptr to string */
+			char              *str;
+            struct _PredEntry *next;
+            int               file;
+            int               line;
+            Predicate         *pred;
+            char              *predLiteral;
+		} PredEntry;
+
+typedef struct _PointerStack {      /* MR10 */
+        int     count;
+        int     size;
+        void    **data;
+        } PointerStack;
+
+#define newTermEntry(s)		(TermEntry *) newEntry(s, sizeof(TermEntry))
+#define newRuleEntry(s)		(RuleEntry *) newEntry(s, sizeof(RuleEntry))
+#define newCacheEntry(s)	(CacheEntry *) newEntry(s, sizeof(CacheEntry))
+#define newLabelEntry(s)	(LabelEntry *) newEntry(s, sizeof(LabelEntry))
+#define newSignalEntry(s)	(SignalEntry *) newEntry(s, sizeof(SignalEntry))
+#define newPredEntry(s)     (PredEntry *) newEntry(s,sizeof(PredEntry))
+
+typedef struct _UserAction {
+			char *action;
+			int file, line;
+		} UserAction;
+
+
+					/* L e x i c a l  C l a s s */
+
+/* to switch lex classes, switch ExprStr and Texpr (hash table) */
+typedef struct _lc {
+			char *classnum, **exprs;
+			Entry **htable;
+		} LClass;
+
+typedef struct _exprOrder {
+			char *expr;
+			int lclass;
+		} Expr;
+
+
+typedef Graph Attrib;
+
+						/* M a x i m u m s */
+
+/* MR20 Note G. Hobbelt These values are superceded by values in hash.h */
+
+#ifndef HashTableSize
+#define HashTableSize	253
+#endif
+#ifndef StrTableSize
+#define StrTableSize	15000	/* all tokens, nonterminals, rexprs stored here */
+#endif
+#define MaxLexClasses	50		/* how many automatons */
+/* TokenStart and EofToken are ignored if #tokdefs meta-op is used */
+#define TokenStart		2		/* MUST be in 1 + EofToken */
+#define EofToken		1		/* Always predefined to be 1 */
+
+#ifndef MaxNumFiles
+#define MaxNumFiles		99
+#endif
+
+/**** MR9 JVincent@novell.com  Move to pcctscfg.h */
+/**** #define MaxFileName		300	****/ /* MR9  Move to pcctscfg.h */ /* largest file name size */
+
+#define MaxRuleName		100		/* largest rule name size */
+#define TSChunk			100		/* how much to expand TokenStr/ExprStr each time */
+#define TIChunk			TSChunk	/* expand TokenInd by same as TokenStr to mirror them */
+#define FoStackSize		100		/* deepest FOLLOW recursion possible */
+
+#define MaxClassDeclStuff   256    /* MR10 */
+
+#define NumPredefinedSignals 3
+
+           /* S t a n d a r d  S i g n a l s */
+
+#define sigNoSignal				0
+#define sigMismatchedToken		1
+#define sigNoViableAlt			2
+#define sigNoSemViableAlt		3
+
+
+
+/* AST token types */
+#define ASTexclude		0
+#define ASTchild		1
+#define ASTroot			2
+#define ASTinclude		3		/* include subtree made by rule ref */
+
+
+#define PredictionVariable				"zzpr_expr"
+#define PredictionLexClassSuffix		"_zzpred"
+
+#define WildCardString					"WildCard"
+
+#if 0
+    /*  Removed in version 1.33MR19
+        Don't understand why this never caused problems before
+    */
+
+    /*********************************************************
+    #ifndef ANTLRm
+	#define ANTLRm(st, f, _m)	zzbufsize = ZZLEXBUFSIZE;\
+					zzmode(_m);					\
+					zzenterANTLR(f);			\
+					st; ++zzasp;				\
+					zzleaveANTLR(f);
+	#endif						
+    *********************************************************/
+#endif
+
+#include "proto.h"
+#include "pcctscfg.h"   /* MR14 */
+#include <string.h>
diff --git a/Tools/Source/TianoTools/Pccts/antlr/globals.c b/Tools/Source/TianoTools/Pccts/antlr/globals.c
new file mode 100644
index 0000000000..59d00320a0
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/globals.c
@@ -0,0 +1,484 @@
+/*
+ * globals.c	--	File containing all variables/tables visible to all files.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+
+#include "pcctscfg.h"
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+
+char Version[] = "1.33MR33" ;	/* PCCTS version number */	                   /* MRXXX */
+char VersionDef[] = "13333";    /* same (except int equiv for preproc symbol) */ /* MRXXX */
+
+char LexStartSymbol[] = "START";/* Name of starting lexical class/automaton */
+char *RemapFileName = "remap.h";
+char *DlgFileName = "parser.dlg";
+char *DefFileName = "tokens.h";
+char *ErrFileName = "err.c";
+char *ModeFileName = "mode.h";
+char *StdMsgName = NULL;
+
+char *ParserName = DefaultParserName;
+
+/* list of PCCTS supplied support symbols; these are renamed when more than
+ * one ANTLR-generated parsers are linked together to avoid name conflicts.
+ * Can't use '##' ANSIC preprocessor concat operator with K&R and:
+ *		#define zzskip	zzparser ## skip
+ * will not work for ANSI/C++ as 'zzparserskip' is created w/o zzparser
+ * being substituted--ack!!!
+ */
+char *StandardSymbols[] = {
+/* ANTLR stuff */
+	"zzStackOvfMsg",
+	"zzasp",
+	"zzaStack",
+	"inf_tokens",
+	"inf_text",
+	"inf_text_buffer",
+	"inf_text_buffer_ptr",
+	"inf_text_buffer_size",
+ 	"inf_labase",
+	"inf_last",
+	"inf_lap",
+	"zztokenLA",
+	"zztextLA",
+	"zzlap",
+	"zzlabase",
+	"zztoktext",
+	"zztoken",
+	"zzdirty",
+	"zzguessing",
+	"zzguess_start",
+	"zzresynch",
+	"zzinf_tokens",
+	"zzinf_text",
+	"zzinf_text_buffer",
+	"zzinf_labase",
+	"zzinf_last",
+	"zzfill_inf_look",
+	"zzFAIL",
+	"zzsave_antlr_state",
+	"zzrestore_antlr_state",
+	"zzsyn",
+	"zzset_el",
+	"zzset_deg",
+	"zzedecode",
+	"_zzsetmatch",
+	"_zzmatch",
+	"_inf_zzgettok",
+    "zzconsumeUntil",
+    "zzconsumeUntilToken",
+    "_zzmatch_wsig",
+    "_zzsetmatch_wsig",
+    "_zzmatch_wdfltsig",
+    "_zzsetmatch_wdfltsig",
+	"zzdflthandlers",
+/* DLG stuff */
+	"zzreal_line",
+	"zzcharfull",
+	"zzerr",
+	"zzlextext",
+	"zzbegexpr",
+	"zzendexpr",
+	"zzbufsize",
+	"zzbegcol",
+	"zzendcol",
+	"zzline",
+	"zzchar",
+	"zzbufovf",
+	"zzrdstream",
+	"zzrdfunc",
+	"zzrdstr",
+	"zzclose_stream",
+	"zzsave_dlg_state",
+	"zzrestore_dlg_state",
+	"zzmode",
+	"zzskip",
+	"zzmore",
+	"zzreplchar",
+	"zzreplstr",
+	"zzgettok",
+	"zzadvance",
+	"zzerrstd",
+	"zzerr_in",
+	"zzconstr_attr",
+	"zzempty_attr",
+	"zzerraction",
+	"zztokens",			/* list of token regular expressions */
+	"dfa",
+	"accepts",
+	"actions",
+    "zzTraceOptionValue",       /* MR10 */
+    "zzTraceGuessOptionValue",  /* MR10 */
+    "zzTraceCurrentRuleName",   /* MR10 */
+    "zzTraceDepth",             /* MR10 */
+    "zzGuessSeq",               /* MR10 */
+    "zzSyntaxErrCount",         /* MR11 */
+    "zzLexErrCount",            /* MR11 */
+    "zzTraceGuessDone",         /* MR13 - BJS */
+    "zzTraceGuessFail",         /* MR13 - BJS */
+    "zzTraceGuessOption",       /* MR13 - BJS */
+    "zzTraceIn",                /* MR13 - BJS */
+    "zzTraceOption",            /* MR13 - BJS */
+    "zzTraceOut",               /* MR13 - BJS */
+    "zzTraceReset",             /* MR13 - BJS */
+	NULL		/* must be present */
+};
+
+/* list of PCCTS supplied support functions; these are renamed when more than
+ * one ANTLR-generated parsers are linked together to avoid name conflicts.
+ */
+char *ASTSymbols[] = {
+	"AST",
+	"zzast_sp",
+	"zzastStack",
+	"zzlink",
+	"zzastnew",
+	"zzsubchild",
+	"zzsubroot",
+	"zzpre_ast",
+	"zzfree_ast",
+	"zztmake",
+	"zzdup_ast",
+	"zztfree",
+	"zzdouble_link",
+	NULL		/* must be present */
+};
+
+/* Current ambiguity examination information */
+int CurAmbigAlt1, CurAmbigAlt2, CurAmbigline, CurAmbigfile;
+char *CurAmbigbtype;
+
+
+						/* M e t h o d  T a b l e s */
+/*
+ * The following tables are used to fill syntax diagram nodes with the correct
+ * function pointers for computing FIRST sets and printing themselves.
+ */
+
+/* fpTraverse[node type] == pointer to function that calculates trees
+ * representing the FIRST sets for that node (maintains spatial info).
+ * We use 'struct _tree' not 'tree' due to a g++ 2.4.3 bug.
+ */
+#ifdef __cplusplus
+struct _tree *(*fpTraverse[NumNodeTypes+1])(... /* Node *, int, set * */) = {
+	NULL,
+	(struct _tree *(*)(...)) tJunc,
+	(struct _tree *(*)(...)) tRuleRef,
+	(struct _tree *(*)(...)) tToken,
+	(struct _tree *(*)(...)) tAction
+};
+#else
+Tree *(*fpTraverse[NumNodeTypes+1])() = {
+	NULL,
+	tJunc,
+	tRuleRef,
+	tToken,
+	tAction
+};
+#endif
+
+/* fpReach[node type] == pointer to function that calculates FIRST set for
+ * that node. (r stands for reach).  We use 'struct _set' not 'set'
+ * due to a g++ 2.4.3 bug.
+ */
+#ifdef __cplusplus
+struct _set (*fpReach[NumNodeTypes+1])(... /* Node *, int, set * */) = {
+	NULL,
+	(struct _set (*)(...)) rJunc,
+	(struct _set (*)(...)) rRuleRef,
+	(struct _set (*)(...)) rToken,
+	(struct _set (*)(...)) rAction
+};
+#else
+set (*fpReach[NumNodeTypes+1])() = {
+	NULL,
+	rJunc,
+	rRuleRef,
+	rToken,
+	rAction
+};
+#endif
+
+/* fpPrint[node type] == pointer to function that knows how to print that node. */
+#ifdef __cplusplus
+void (*fpPrint[NumNodeTypes+1])(... /* Node * */) = {
+	NULL,
+	(void (*)(...)) pJunc,
+	(void (*)(...)) pRuleRef,
+	(void (*)(...)) pToken,
+	(void (*)(...)) pAction
+};
+#else
+void (*fpPrint[NumNodeTypes+1])() = {
+	NULL,
+	pJunc,
+	pRuleRef,
+	pToken,
+	pAction
+};
+#endif
+
+char *decodeJType[] = {
+	"invalid",
+	"aSubBlk",
+	"aOptBlk",
+	"aLoopBlk",
+	"EndBlk",
+	"RuleBlk",
+	"Generic",
+	"EndRule",
+	"aPlusBlk",
+	"aLoopBegin"
+};
+
+
+							/* H a s h  T a b l e s */
+
+Entry	**Tname,			/* Table of all token names (maps name to tok num)*/
+		**Texpr,			/* Table of all token expressions
+							   (maps expr to tok num) */
+		**Rname,			/* Table of all Rules (has ptr to start of rule) */
+		**Fcache,			/* Cache of First/Follow Computations */
+		**Tcache;			/* Tree cache; First/Follow for permute trees */
+Entry	**Elabel;			/* Table of all element label names */
+Entry	**Sname;			/* Signal names */
+Entry   **Pname;            /* symbolic predicate names MR11 */
+
+
+							/* V a r i a b l e s */
+
+int     Save_argc;          /* MR10 */
+char    **Save_argv;        /* MR10 */
+int		EpToken=0;			/* Imaginary Epsilon token number */
+int		WildCardToken=0;
+int		CurFile= -1;		/* Index into FileStr table */
+char    *CurPredName=NULL;  /* MR11 */
+char	*CurRule=NULL;		/* Pointer to current rule name */
+int     CurRuleDebug=0;     /* MR13 debug flag */
+RuleEntry *CurRuleNode=NULL;/* Pointer to current rule node in syntax tree */
+char	*CurRetDef=NULL;	/* Pointer to current return type definition */
+char	*CurParmDef=NULL;	/* Pointer to current parameter definition */
+Junction *CurRuleBlk=NULL;	/* Pointer to current block node for enclosing block */
+ListNode *CurExGroups=NULL;	/* Current list of exception groups for rule/alts */
+ListNode *CurElementLabels=NULL;
+ListNode *CurAstLabelsInActions=NULL; /* MR27 */
+
+/* MR10  used by <<>>? to set "label_used_in_semantic_pred"  */
+/* MR10  this will force LT(i) assignment even in guess mode */
+
+ListNode *CurActionLabels=NULL;     /* MR10 Element Labels appearing in last action */
+int      numericActionLabel=0 ;     /* MR10 << ... $1 ... >> or << ... $1 ... >>?   */
+ListNode *NumericPredLabels=NULL;   /* MR10 << ... $1 ... >>?  ONLY                 */
+ListNode *ContextGuardPredicateList=NULL;  /* MR13 for re-evaluating predicates
+                                                   after meta tokens are defined    */
+
+int		CurBlockID=0;		/* Unique int for each block */
+int		CurAltNum=0;
+Junction *CurAltStart = NULL;	/* Junction node that starts the alt */
+Junction *OuterAltStart = NULL; /* For chaining exception groups        MR7 */
+int		NumRules=0;			/* Rules are from 1 to n */
+FILE	*output=NULL;		/* current parser output file */
+FILE	*input=NULL;		/* current grammar input file */
+char	*FileStr[MaxNumFiles];/* Ptr to array of file names on command-line */
+int		NumFiles=0;			/* current grammar file number */
+#ifdef __cplusplus
+void	(**fpTrans)(...),	/* array of ptrs to funcs that translate nodes */
+	 	(**fpJTrans)(...);	/*  ... that translate junctions */
+#else
+void	(**fpTrans)(),		/* array of ptrs to funcs that translate nodes */
+	 	(**fpJTrans)();		/*  ... that translate junctions */
+#endif
+int		**FoStack;			/* Array of LL_k ptrs to stacks of rule numbers */
+int		**FoTOS;			/* FOLLOW stack top-of-stack pointers */
+Junction *SynDiag = NULL;	/* Pointer to start of syntax diagram */
+int		BlkLevel=1;			/* Current block level.  Set by antlr.g, used by
+							 * scanner to translate $i.j attributes */
+set		reserved_positions;	/* set of token positions reserved by '#token T=i' cmds */
+set		all_tokens;			/* set of all token types */
+set		imag_tokens;		/* set of all imaginary token types (EpToken, errclasses...) */
+set		tokclasses;			/* set of all token class token types */
+ListNode *ForcedTokens = 0;	/* list of token_id/token_num pairs to remap */
+ListNode *MetaTokenNodes=NULL; /* list of meta token refs such as token classes etc... */
+int		*TokenInd=NULL;		/* an indirection level between token num and position
+							 * of that token def in TokenStr and ExprStr */
+int		LastTokenCounted=0;	/* ==TokenNum if no token renumbering (same as old TokenNum) */
+int		TokenNum=TokenStart;
+char	**TokenStr=NULL;	/* map token # to token name */
+char	**ExprStr=NULL;		/* map token # to expr */
+Junction **RulePtr=NULL;	/* map rule # to RuleBlk node of rule */
+ListNode *ExprOrder=NULL;	/* list of exprs as they are found in grammar */
+ListNode *BeforeActions=NULL;/* list of grammar actions before rules */
+ListNode *AfterActions=NULL;/* list of grammar actions after rules */
+ListNode *LexActions=NULL;	/* list of lexical actions */
+
+/* MR1              									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class     */
+/* MR1				via #lexmember <<....>>			            */
+/* MR1				via #lexprefix <<....>>			            */
+/* MR1				                					    */
+
+ListNode *LexMemberActions=NULL;/* list of lexical header member decl   MR1 */
+ListNode *LexPrefixActions=NULL;/* list of lexical header #include decl MR1 */
+ListNode **Cycles=NULL;		/* list of cycles (for each k) found when
+							   doing FOLLOWs */
+ListNode *eclasses=NULL;	/* list of error classes */
+ListNode *tclasses=NULL;	/* list of token classes */
+LClass	 lclass[MaxLexClasses]; /* array of lex class definitions */
+int		 CurrentLexClass;	/* index into lclass */
+int		 NumLexClasses=0;	/* in range 1..MaxLexClasses (init 0) */
+
+char	*HdrAction=NULL;	/* action defined with #header */
+char    *FirstAction=NULL;  /* action defined with #first MR11 */
+FILE	*ErrFile;			/* sets and error recovery stuff */
+FILE	*DefFile=NULL;		/* list of tokens, return value structs, setwd defs */
+FILE    *MRinfoFile=NULL;   /* MR10 information file */
+int     MRinfo=0;           /* MR10 */
+int     MRinfoSeq=0;        /* MR10 */
+int     InfoP=0;            /* MR10 predicates        */
+int     InfoT=0;            /* MR10 tnodes            */
+int     InfoF=0;            /* MR10 first/follow sets */
+int     InfoM=0;            /* MR10 monitor progress  */
+int     InfoO=0;            /* MR12 orphan rules      */
+int     TnodesInUse=0;      /* MR10 */
+int     TnodesPeak=0;       /* MR10 */
+int     TnodesAllocated=0;  /* MR10 */
+int     TnodesReportThreshold=0;    /* MR11 */
+int     PotentialSuppression=0; /* MR10 */
+int     PotentialDummy=0;       /* MR10 */
+int		CannotContinue=FALSE;
+int		OutputLL_k = 1;		/* LL_k for parsing must be power of 2 */
+int		action_file;		/* used to track start of action */
+int		action_line;
+int		FoundGuessBlk=0;	/* there is a (...)? block somewhere in grammar */
+int		FoundException=0;	/* there is an exception somewhere in grammar */
+/* MR6	Distinguish between @ operator and real exception 		    */
+/* MR6    by keeping separate flags for @ operator and real exceptions 	    */
+int		FoundAtOperator=0;					                     /* MR6 */
+int		FoundExceptionGroup=0;			                             /* MR6 */
+int		pLevel=0;			/* print Level */
+int		pAlt1,pAlt2;		/* print "==>" in front of these alts */
+
+/* C++ output stuff */
+FILE	*Parser_h,			/* where subclass of ANTLRParser goes */
+		*Parser_c;			/* where code for subclass of ANTLRParser goes */
+char	Parser_h_Name[MaxFileName+1] = "";
+char	Parser_c_Name[MaxFileName+1] = "";
+char    MRinfoFile_Name[MaxFileName+1] = "";                /* MR10 */
+char    *ClassDeclStuff=NULL;                               /* MR10 */
+char    *BaseClassName=NULL;                                /* MR22 */
+/* list of actions inside the #class {...} defs */
+ListNode *class_before_actions=NULL;
+ListNode *class_after_actions=NULL;
+
+char	CurrentClassName[MaxRuleName]="";
+int		no_classes_found=1;
+char	*UserTokenDefsFile;
+int		UserDefdTokens=0;	/* found #tokdefs? */
+char	*OutputDirectory=TopDirectory;
+ExceptionGroup *DefaultExGroup = NULL;
+int		NumSignals = NumPredefinedSignals;
+int		ContextGuardTRAV=0;
+
+char    *MR_AmbAidRule=NULL;        /* MR11 */
+int     MR_AmbAidLine=0;            /* MR11 */
+int     MR_AmbAidDepth=0;           /* MR11 */
+int     MR_AmbAidMultiple=0;        /* MR11 */
+int     MR_skipped_e3_report=0;     /* MR11 */
+int     MR_usingPredNames=0;        /* MR11 */
+int     MR_BadExprSets=0;           /* MR13 */
+int     MR_Inhibit_Tokens_h_Gen=0;  /* MR13 */
+int     NewAST=0;                   /* MR13 */
+int		tmakeInParser=0;            /* MR23 */
+int     AlphaBetaTrace=0;           /* MR14 */
+int		MR_BlkErr=0;				/* MR21 */
+int     MR_AlphaBetaMessageCount=0; /* MR14 */
+int     MR_AlphaBetaWarning=0;      /* MR14 */
+int     MR_ErrorSetComputationActive=0;     /* MR14 */
+int     MR_MaintainBackTrace=0;             /* MR14 */
+set     MR_CompromisedRules;        /* MR14 */
+
+Junction    *MR_RuleBlkWithHalt;    /* MR10 */
+
+					/* C m d - L i n e  O p t i o n s */
+
+int		LL_k=1;				/* how many tokens of full lookahead */
+int		CLL_k= -1;			/* how many tokens of compressed lookahead */
+int		PrintOut = FALSE;	/* print out the grammar */
+int		PrintAnnotate = FALSE;/* annotate printout with FIRST sets */
+int		CodeGen=TRUE;		/* Generate output code? */
+int		LexGen=TRUE;		/* Generate lexical files? (tokens.h, parser.dlg) */
+int		GenAST=FALSE;		/* Generate AST's? */
+int		GenANSI=FALSE;		/* Generate ANSI code where necessary */
+int		GenExprSetsOpt=TRUE;/* use sets not (LA(1)==tok) expression lists */
+int		GenCR=FALSE;		/* Generate cross reference? */
+int		GenLineInfo=FALSE;	/* Generate # line "file" stuff? */
+int		GenLineInfoMS=FALSE;/* Like -gl but replace "\" with "/" for MS C/C++ systems */
+int		TraceGen=FALSE;		/* Generate code to trace rule invocation */
+int		elevel=1;			/* error level for ambiguity messages */
+int		GenEClasseForRules=0;/* don't generate eclass for each rule */
+int		TreeResourceLimit= -1;/* don't limit tree resource */
+int		DemandLookahead = 0;/* demand/delayed lookahead or not */
+char	*RulePrefix = "";	/* prefix each generated rule with this */
+char	*stdpccts = "stdpccts.h";/* where to generate std pccts include file */
+int		GenStdPccts = 0;	/* don't gen stdpccts.h? */
+int		ParseWithPredicates = 1;
+int		WarningLevel = 1;
+int		UseStdout = 0;					/* MR6 */
+int		TabWidth = 2;					/* MR6 */ /* MR27 */
+int		HoistPredicateContext = 0;
+int     MRhoisting = 0;                 /* MR9 */
+int     MRhoistingk = 0;                /* MR13 */
+int     MR_debugGenRule=0;              /* MR11 */
+
+int		GenCC = 0;			/* Generate C++ output */
+
+PointerStack MR_BackTraceStack={0,0,NULL};            /* MR10 */
+PointerStack MR_PredRuleRefStack={0,0,NULL};          /* MR10 */
+PointerStack MR_RuleBlkWithHaltStack={0,0,NULL};      /* MR10 */
+
+/* DontCopyTokens and Pragma_DupLabeledTokens were a bad idea.  I've just
+   turned them off rather than backpatching the code.  Who knows?  We
+   may need them in the future.
+ */
+int		DontCopyTokens = 1;	/* in C++, don't copy ANTLRToken passed to ANTLR */
+
+/* Remember if LT(i), LA(i), or LATEXT(i) used in an action which is not
+   a predicate.  If so, give a warning for novice users.
+*/
+
+int     LTinTokenAction = 0; /* MR23 */
+int     PURIFY = 1;          /* MR23 */
+
+int     CurBlockID_array[MAX_BLK_LEVEL]; /* MR23 */
+int     CurAltNum_array[MAX_BLK_LEVEL]; /* MR23 */
diff --git a/Tools/Source/TianoTools/Pccts/antlr/hash.c b/Tools/Source/TianoTools/Pccts/antlr/hash.c
new file mode 100644
index 0000000000..68fe8fd227
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/hash.c
@@ -0,0 +1,221 @@
+/*
+ * hash.c
+ *
+ * Manage hash tables.
+ *
+ * The following functions are visible:
+ *
+ *		char	*mystrdup(char *);		Make space and copy string
+ *		Entry 	**newHashTable();		Create and return initialized hash table
+ *		Entry	*hash_add(Entry **, char *, Entry *)
+ *		Entry	*hash_get(Entry **, char *)
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#include "hash.h"
+
+#ifdef __USE_PROTOS
+#include <stdlib.h>
+#else
+#ifdef VAXC
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#endif
+#include <string.h>
+
+#define StrSame		0
+
+#define fatal(err)															\
+			{fprintf(stderr, "%s(%d):", __FILE__, __LINE__);				\
+			fprintf(stderr, " %s\n", err); exit(PCCTS_EXIT_FAILURE);}
+#define require(expr, err) {if ( !(expr) ) fatal(err);}
+
+static unsigned size = HashTableSize;
+static char *strings = NULL;
+static char *strp;
+static unsigned strsize = StrTableSize;
+
+/* create the hash table and string table for terminals (string table only once) */
+Entry **
+#ifdef __USE_PROTOS
+newHashTable( void )
+#else
+newHashTable( )
+#endif
+{
+	Entry **table;
+	
+	table = (Entry **) calloc(size, sizeof(Entry *));
+	require( table != NULL, "cannot allocate hash table");
+	if ( strings == NULL )
+	{
+		strings = (char *) calloc(strsize, sizeof(char));
+		require( strings != NULL, "cannot allocate string table");
+		strp = strings;
+	}
+	return table;
+}
+
+void
+#ifdef __USE_PROTOS
+killHashTable( Entry **table )
+#else
+killHashTable( table )
+Entry **table;
+#endif
+{
+	/* for now, just free table, forget entries */
+	free( (char *) table );     /* MR10 cast */
+}
+
+/* Given a table, add 'rec' with key 'key' (add to front of list). return ptr to entry */
+Entry *
+#ifdef __USE_PROTOS
+hash_add( Entry **table, char *key, Entry *rec )
+#else
+hash_add( table, key, rec )
+Entry **table;
+char *key;
+Entry *rec;
+#endif
+{
+	unsigned h=0;
+	char *p=key;
+	require(table!=NULL && key!=NULL && rec!=NULL, "add: invalid addition");
+	
+	Hash(p,h,size);
+	rec->next = table[h];			/* Add to singly-linked list */
+	table[h] = rec;
+	return rec;
+}
+
+/* Return ptr to 1st entry found in table under key (return NULL if none found) */
+Entry *
+#ifdef __USE_PROTOS
+hash_get( Entry **table, char *key )
+#else
+hash_get( table, key )
+Entry **table;
+char *key;
+#endif
+{
+	unsigned h=0;
+	char *p=key;
+	Entry *q;
+/*	require(table!=NULL && key!=NULL, "get: invalid table and/or key");*/
+	if ( !(table!=NULL && key!=NULL) ) *((char *) 34) = 3;
+	
+	Hash(p,h,size);
+	for (q = table[h]; q != NULL; q = q->next)
+	{
+		if ( strcmp(key, q->str) == StrSame ) return( q );
+	}
+	return( NULL );
+}
+
+#ifdef DEBUG_HASH
+void
+#ifdef __USE_PROTOS
+hashStat( Entry **table )
+#else
+hashStat( table )
+Entry **table;
+#endif
+{
+	static unsigned short count[20];
+	int i,n=0,low=0, hi=0;
+	Entry **p;
+	float avg=0.0;
+	
+	for (i=0; i<20; i++) count[i] = 0;
+	for (p=table; p<&(table[size]); p++)
+	{
+		Entry *q = *p;
+		int len;
+		
+		if ( q != NULL && low==0 ) low = p-table;
+		len = 0;
+		if ( q != NULL ) fprintf(stderr, "[%d]", p-table);
+		while ( q != NULL )
+		{
+			len++;
+			n++;
+			fprintf(stderr, " %s", q->str);
+			q = q->next;
+			if ( q == NULL ) fprintf(stderr, "\n");
+		}
+		count[len]++;
+		if ( *p != NULL ) hi = p-table;
+	}
+
+	fprintf(stderr, "Storing %d recs used %d hash positions out of %d\n",
+					n, size-count[0], size);
+	fprintf(stderr, "%f %% utilization\n",
+					((float)(size-count[0]))/((float)size));
+	for (i=0; i<20; i++)
+	{
+		if ( count[i] != 0 )
+		{
+			avg += (((float)(i*count[i]))/((float)n)) * i;
+			fprintf(stderr, "Bucket len %d == %d (%f %% of recs)\n",
+							i, count[i], ((float)(i*count[i]))/((float)n));
+		}
+	}
+	fprintf(stderr, "Avg bucket length %f\n", avg);
+	fprintf(stderr, "Range of hash function: %d..%d\n", low, hi);
+}
+#endif
+
+/* Add a string to the string table and return a pointer to it.
+ * Bump the pointer into the string table to next avail position.
+ */
+char *
+#ifdef __USE_PROTOS
+mystrdup( char *s )
+#else
+mystrdup( s )
+char *s;
+#endif
+{
+	char *start=strp;
+	require(s!=NULL, "mystrdup: NULL string");
+
+	while ( *s != '\0' )
+	{
+		require( strp <= &(strings[strsize-2]),
+				 "string table overflow\nIncrease StrTableSize in hash.h and recompile hash.c\n");
+		*strp++ = *s++;
+	}
+	*strp++ = '\0';
+
+	return( start );
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/hash.h b/Tools/Source/TianoTools/Pccts/antlr/hash.h
new file mode 100644
index 0000000000..3969c40b4a
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/hash.h
@@ -0,0 +1,73 @@
+/*
+ * hash.h -- define hash table entries, sizes, hash function...
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+				/* H a s h  T a b l e  S t u f f */
+
+#ifndef HashTableSize
+#define HashTableSize	553
+#endif
+
+#ifndef StrTableSize
+#ifdef PC32
+#define StrTableSize	1000000
+#endif
+#endif
+
+#ifndef StrTableSize
+#ifdef PC
+#define StrTableSize 655200
+#endif
+#endif
+
+#ifndef StrTableSize
+#define StrTableSize 1000000
+#endif
+
+typedef struct _entry {		/* Minimum hash table entry -- superclass */
+			char *str;
+			struct _entry *next;
+		} Entry;
+
+/* Hash 's' using 'size', place into h (s is modified) */
+#define Hash(s,h,size)								\
+	{while ( *s != '\0' ) h = (h<<1) + *s++;		\
+	h %= size;}
+
+#ifdef __USE_PROTOS
+Entry	*hash_get(Entry **, char *),
+		**newHashTable(void),
+		*hash_add(Entry **, char *, Entry *);
+
+void	killHashTable(Entry **);
+
+#else
+Entry *hash_get(), **newHashTable(), *hash_add();
+void	killHashTable();        /* MR9 23-Sep-97 */
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/antlr/lex.c b/Tools/Source/TianoTools/Pccts/antlr/lex.c
new file mode 100644
index 0000000000..8c524fe465
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/lex.c
@@ -0,0 +1,878 @@
+/*
+ * lex.c	--	Generate all of the lexical type files: parser.dlg tokens.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+/* MR1						                                                */
+/* MR1  10-Apr-97  MR1	Replace use of __STDC__ with __USE_PROTOS	    */
+/* MR1				                                                        */
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+
+#define DLGErrorString "invalid token"
+
+/* Generate a complete lexical description of the lexemes found in the grammar */
+void
+#ifdef __USE_PROTOS
+genLexDescr( void )
+#else
+genLexDescr( )
+#endif
+{
+	ListNode *p;
+	FILE *dlgFile = fopen(OutMetaName(DlgFileName), "w");
+	require(dlgFile!=NULL, eMsg1("genLexFile: cannot open %s", OutMetaName(DlgFileName)) );
+#ifdef SPECIAL_FOPEN
+	special_fopen_actions(OutMetaName(DlgFileName));	             /* MR1 */
+#endif
+	fprintf(dlgFile, "<<\n");
+	fprintf(dlgFile, "/* %s -- DLG Description of scanner\n", DlgFileName);
+	fprintf(dlgFile, " *\n");
+	fprintf(dlgFile, " * Generated from:");
+	{int i; for (i=0; i<NumFiles; i++) fprintf(dlgFile, " %s", FileStr[i]);}
+	fprintf(dlgFile, "\n");
+	fprintf(dlgFile, " *\n");
+	fprintf(dlgFile, " * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(dlgFile, " * Purdue University Electrical Engineering\n");
+	fprintf(dlgFile, " * With AHPCRC, University of Minnesota\n");
+	fprintf(dlgFile, " * ANTLR Version %s\n", Version);
+	fprintf(dlgFile, " */\n\n");
+    if (FirstAction != NULL ) dumpAction( FirstAction, dlgFile, 0, -1, 0, 1 );  /* MR11 MR15b */
+    fprintf(dlgFile, "#define ANTLR_VERSION	%s\n", VersionDef);
+	if ( GenCC )
+	{
+		if ( !UserDefdTokens ) fprintf(dlgFile, "#include \"%s\"\n", DefFileName);
+		else fprintf(dlgFile, "#include %s\n", UserTokenDefsFile);
+		fprintf(dlgFile, "#include \"%s\"\n", ATOKEN_H);
+		if ( GenAST ) fprintf(dlgFile, "#include \"%s\"\n", ASTBASE_H);
+		if ( HdrAction != NULL ) dumpAction( HdrAction, dlgFile, 0, -1, 0, 1 );
+	}
+	else
+	{
+		fprintf(dlgFile, "#include \"pcctscfg.h\"\n");
+		fprintf(dlgFile, "#include \"pccts_stdio.h\"\n");
+		if ( strcmp(ParserName, DefaultParserName)!=0 )
+			fprintf(dlgFile, "#define %s %s\n", DefaultParserName, ParserName);
+		if ( strcmp(ParserName, DefaultParserName)!=0 )
+			fprintf(dlgFile, "#include \"%s\"\n", RemapFileName);
+		if ( HdrAction != NULL ) dumpAction( HdrAction, dlgFile, 0, -1, 0, 1 );
+		if ( FoundGuessBlk )
+		{
+			fprintf(dlgFile, "#define ZZCAN_GUESS\n");
+			fprintf(dlgFile, "#include \"pccts_setjmp.h\"\n");
+		}
+		if ( OutputLL_k > 1 ) fprintf(dlgFile, "#define LL_K %d\n", OutputLL_k);
+		if ( DemandLookahead ) fprintf(dlgFile, "#define DEMAND_LOOK\n");
+        if (TraceGen) {
+          fprintf(dlgFile,"#ifndef zzTRACE_RULES\n");  /* MR20 */
+          fprintf(dlgFile,"#define zzTRACE_RULES\n");  /* MR20 */
+          fprintf(dlgFile,"#endif\n");  /* MR22 */
+        };
+		fprintf(dlgFile, "#include \"antlr.h\"\n");
+		if ( GenAST ) {
+			fprintf(dlgFile, "#include \"ast.h\"\n");
+		}
+		if ( UserDefdTokens )
+			fprintf(dlgFile, "#include %s\n", UserTokenDefsFile);
+		/* still need this one as it has the func prototypes */
+		fprintf(dlgFile, "#include \"%s\"\n", DefFileName);
+		fprintf(dlgFile, "#include \"dlgdef.h\"\n");
+		fprintf(dlgFile, "LOOKAHEAD\n");
+		fprintf(dlgFile, "\n");
+		fprintf(dlgFile, "void\n");
+		fprintf(dlgFile, "#ifdef __USE_PROTOS\n");
+		fprintf(dlgFile, "zzerraction(void)\n");
+		fprintf(dlgFile, "#else\n");
+		fprintf(dlgFile, "zzerraction()\n");
+		fprintf(dlgFile, "#endif\n");
+		fprintf(dlgFile, "{\n");
+		fprintf(dlgFile, "\t(*zzerr)(\"%s\");\n", DLGErrorString);
+		fprintf(dlgFile, "\tzzadvance();\n");
+		fprintf(dlgFile, "\tzzskip();\n");
+		fprintf(dlgFile, "}\n");
+	}
+	fprintf(dlgFile, ">>\n\n");
+
+	/* dump all actions */
+
+/* MR1									                                    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class     */
+/* MR1	 	   	  via <<%%lexmember ....>> & <<%%lexprefix ...>>            */
+/* MR1				                					    */
+          if (LexActions != NULL) {
+            for (p = LexActions->next; p!=NULL; p=p->next)
+		{
+/* MR1 */	fprintf(dlgFile, "<<%%%%lexaction\n");
+			dumpAction( (char *)p->elem, dlgFile, 0, -1, 0, 1 );
+			fprintf(dlgFile, ">>\n\n");
+		}
+	  };
+
+/* MR1 */ if (GenCC) {
+/* MR1 */   fprintf(dlgFile,"<<%%%%parserclass %s>>\n\n",CurrentClassName);
+/* MR1 */ };
+
+/* MR1 */ if (LexPrefixActions != NULL) {
+/* MR1 */   for (p = LexPrefixActions->next; p!=NULL; p=p->next)
+/* MR1 */       {
+/* MR1 */               fprintf(dlgFile, "<<%%%%lexprefix\n");
+/* MR1 */               dumpAction( (char *)p->elem, dlgFile, 0, -1, 0, 1 );
+/* MR1 */               fprintf(dlgFile, ">>\n\n");
+/* MR1 */       }
+/* MR1 */ };
+
+/* MR1 */ if (LexMemberActions != NULL) {
+/* MR1 */   for (p = LexMemberActions->next; p!=NULL; p=p->next)
+/* MR1 */       {
+/* MR1 */               fprintf(dlgFile, "<<%%%%lexmember\n");
+/* MR1 */               dumpAction( (char *)p->elem, dlgFile, 0, -1, 0, 1 );
+/* MR1 */               fprintf(dlgFile, ">>\n\n");
+/* MR1 */       }
+/* MR1 */ };
+
+	/* dump all regular expression rules/actions (skip sentinel node) */
+	if ( ExprOrder == NULL ) {
+		warnNoFL("no regular expressions found in grammar");
+	}
+	else dumpLexClasses(dlgFile);
+	fprintf(dlgFile, "%%%%\n");
+	fclose( dlgFile );
+}
+
+/* For each lexical class, scan ExprOrder looking for expressions
+ * in that lexical class.  Print out only those that match.
+ * Each element of the ExprOrder list has both an expr and an lclass
+ * field.
+ */
+void
+#ifdef __USE_PROTOS
+dumpLexClasses( FILE *dlgFile )
+#else
+dumpLexClasses( dlgFile )
+FILE *dlgFile;
+#endif
+{
+	int i;
+	TermEntry *t;
+	ListNode *p;
+	Expr *q;
+
+	for (i=0; i<NumLexClasses; i++)
+	{
+		fprintf(dlgFile, "\n%%%%%s\n\n", lclass[i].classnum);
+		for (p=ExprOrder->next; p!=NULL; p=p->next)
+		{
+			q = (Expr *) p->elem;
+			if ( q->lclass != i ) continue;
+			lexmode(i);
+			t = (TermEntry *) hash_get(Texpr, q->expr);
+			require(t!=NULL, eMsg1("genLexDescr: rexpr %s not in hash table",q->expr) );
+			if ( t->token == EpToken ) continue;
+			fprintf(dlgFile, "%s\n\t<<\n", StripQuotes(q->expr));
+			/* replace " killed by StripQuotes() */
+			q->expr[ strlen(q->expr) ] = '"';
+			if ( !GenCC ) {
+				if ( TokenString(t->token) != NULL )
+					fprintf(dlgFile, "\t\tNLA = %s;\n", TokenString(t->token));
+				else
+					fprintf(dlgFile, "\t\tNLA = %d;\n", t->token);
+			}
+			if ( t->action != NULL ) dumpAction( t->action, dlgFile, 2,-1,0,1 );
+			if ( GenCC ) {
+				if ( TokenString(t->token) != NULL )
+					fprintf(dlgFile, "\t\treturn %s;\n", TokenString(t->token));
+				else
+					fprintf(dlgFile, "\t\treturn (ANTLRTokenType)%d;\n", t->token);
+			}
+			fprintf(dlgFile, "\t>>\n\n");
+		}
+	}
+}
+
+/* Strip the leading path (if any) from a filename */
+char *
+#ifdef __USE_PROTOS
+StripPath( char *fileName )
+#else
+StripPath( fileName )
+char *fileName;
+#endif
+{
+	char *p;
+	static char dirSym[2] = DirectorySymbol;
+
+	if(NULL != (p = strrchr(fileName, dirSym[0])))
+		p++;
+	else
+		p = fileName;
+
+	return(p);
+}
+
+/* Generate a list of #defines && list of struct definitions for
+ * aggregate retv's */
+void
+#ifdef __USE_PROTOS
+genDefFile( void )
+#else
+genDefFile( )
+#endif
+{
+	int i;
+
+	/* If C++ mode and #tokdef used, then don't need anything in here since
+	 * C++ puts all definitions in the class file name.
+	 */
+	if ( GenCC && UserTokenDefsFile ) return;
+    if ( MR_Inhibit_Tokens_h_Gen) return;
+
+	DefFile = fopen(OutMetaName(DefFileName), "w");
+	require(DefFile!=NULL, eMsg1("genDefFile: cannot open %s", OutMetaName(DefFileName)) );
+#ifdef SPECIAL_FOPEN
+	special_fopen_actions(OutMetaName(DefFileName));	             /* MR1 */
+#endif
+	fprintf(DefFile, "#ifndef %s\n", StripPath(gate_symbol(DefFileName)));
+	fprintf(DefFile, "#define %s\n", StripPath(gate_symbol(DefFileName)));
+
+	fprintf(DefFile, "/* %s -- List of labelled tokens and stuff\n", DefFileName);
+	fprintf(DefFile, " *\n");
+	fprintf(DefFile, " * Generated from:");
+	for (i=0; i<NumFiles; i++) fprintf(DefFile, " %s", FileStr[i]);
+	fprintf(DefFile, "\n");
+	fprintf(DefFile, " *\n");
+	fprintf(DefFile, " * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001\n");
+	fprintf(DefFile, " * Purdue University Electrical Engineering\n");
+	fprintf(DefFile, " * ANTLR Version %s\n", Version);
+	fprintf(DefFile, " */\n");
+
+	if ( !GenCC && LexGen ) {
+		fprintf(DefFile,"#define zzEOF_TOKEN %d\n",
+				TokenInd!=NULL?TokenInd[EofToken]:EofToken);
+	}
+
+	if ( !UserDefdTokens )
+	{
+		int first=1;
+
+		if ( GenCC ) fprintf(DefFile, "enum ANTLRTokenType {\n");
+		for (i=1; i<TokenNum; i++)
+		{
+			/* Don't do EpToken or expr w/o labels */
+			if ( TokenString(i)!=NULL && i != EpToken )
+			{
+				TermEntry *p;
+				
+				if ( WarningLevel>1 )
+				{
+					int j;
+					/* look in all lexclasses for the reg expr */
+
+/* MR10  Derek Pappas                                                */
+/* MR10     A #tokclass doesn't have associated regular expressiones */
+/* MR10        so don't warn user about it's omission                */
+
+                    p = (TermEntry *) hash_get(Tname, TokenString(i));
+
+                    if (p != NULL && ! p->classname) {
+    					for (j=0; j<NumLexClasses; j++)
+    					{
+    						lexmode(j);
+    						if ( ExprString(i)!=NULL ) break;
+    					}
+    					if ( j>=NumLexClasses )
+    					{
+    						warnNoFL(eMsg1("token label has no associated rexpr: %s",TokenString(i)));
+    					}
+                    };
+				}
+				require((p=(TermEntry *)hash_get(Tname, TokenString(i))) != NULL,
+						"token not in sym tab when it should be");
+				if ( !p->classname )
+				{
+					if ( GenCC ) {
+						if ( !first ) fprintf(DefFile, ",\n");
+						first = 0;
+						fprintf(DefFile, "\t%s=%d", TokenString(i), i);
+					}
+					else
+						fprintf(DefFile, "#define %s %d\n", TokenString(i), i);
+				}
+			}
+		}
+/* MR1									                                    */
+/* MR1  10-Apr-97 133MR1	Prevent use of varying sizes of integer	    */
+/* MR1				for the enum ANTLRTokenType                             */
+/* MR1								           */
+		if ( GenCC ) {				                                 /* MR1 */
+ 		 	 if ( !first ) fprintf(DefFile, ",\n");                  /* MR14 */
+		     fprintf(DefFile, "\tDLGminToken=0");                 /* MR1 */
+		     fprintf(DefFile, ",\n\tDLGmaxToken=9999};\n");          /* MR1 */
+                };						                             /* MR1 */
+	}
+
+	if ( !GenCC ) GenRulePrototypes(DefFile, SynDiag);
+
+	fprintf(DefFile, "\n#endif\n");
+}
+
+void
+#ifdef __USE_PROTOS
+GenRemapFile( void )
+#else
+GenRemapFile( )
+#endif
+{
+	if ( strcmp(ParserName, DefaultParserName)!=0 )
+	{
+		FILE *f;
+		int i;
+
+		f = fopen(OutMetaName(RemapFileName), "w");
+		require(f!=NULL, eMsg1("GenRemapFile: cannot open %s", OutMetaName(RemapFileName)) );
+#ifdef SPECIAL_FOPEN
+		special_fopen_actions(OutMetaName(RemapFileName));           /* MR1 */
+#endif
+		fprintf(f, "/* %s -- List of symbols to remap\n", RemapFileName);
+		fprintf(f, " *\n");
+		fprintf(f, " * Generated from:");
+		for (i=0; i<NumFiles; i++) fprintf(f, " %s", FileStr[i]);
+		fprintf(f, "\n");
+		fprintf(f, " *\n");
+		fprintf(f, " * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001\n");
+		fprintf(f, " * Purdue University Electrical Engineering\n");
+		fprintf(f, " * ANTLR Version %s\n", Version);
+		fprintf(f, " */\n");
+
+		GenRuleFuncRedefs(f, SynDiag);
+		GenPredefinedSymbolRedefs(f);
+		if ( GenAST ) GenASTSymbolRedefs(f);
+		GenSetRedefs(f);
+
+		fclose(f);
+	}
+}
+
+/* Generate a bunch of #defines that rename all functions to be "ParserName_func" */
+void
+#ifdef __USE_PROTOS
+GenRuleFuncRedefs( FILE *f, Junction *p )
+#else
+GenRuleFuncRedefs( f, p )
+FILE *f;
+Junction *p;
+#endif
+{
+	fprintf(f, "\n/* rename rule functions to be 'ParserName_func' */\n");
+	while ( p!=NULL )
+	{
+		fprintf(f, "#define %s %s_%s\n", p->rname, ParserName, p->rname);
+		p = (Junction *)p->p2;
+	}
+}
+
+/* Generate a bunch of #defines that rename all standard symbols to be
+ * "ParserName_symbol".  The list of standard symbols to change is in
+ * globals.c.
+ */
+void
+#ifdef __USE_PROTOS
+GenPredefinedSymbolRedefs( FILE *f )
+#else
+GenPredefinedSymbolRedefs( f )
+FILE *f;
+#endif
+{
+	char **p;
+
+	fprintf(f, "\n/* rename PCCTS-supplied symbols to be 'ParserName_symbol' */\n");
+	for (p = &StandardSymbols[0]; *p!=NULL; p++)
+	{
+		fprintf(f, "#define %s %s_%s\n", *p, ParserName, *p);
+	}
+}
+
+/* Generate a bunch of #defines that rename all AST symbols to be
+ * "ParserName_symbol".  The list of AST symbols to change is in
+ * globals.c.
+ */
+void
+#ifdef __USE_PROTOS
+GenASTSymbolRedefs( FILE *f )
+#else
+GenASTSymbolRedefs( f )
+FILE *f;
+#endif
+{
+	char **p;
+
+	fprintf(f, "\n/* rename PCCTS-supplied AST symbols to be 'ParserName_symbol' */\n");
+	for (p = &ASTSymbols[0]; *p!=NULL; p++)
+	{
+		fprintf(f, "#define %s %s_%s\n", *p, ParserName, *p);
+	}
+}
+
+/* redefine all sets generated by ANTLR; WARNING:  'zzerr', 'setwd' must match
+ * use in bits.c (DumpSetWd() etc...)
+ */
+void
+#ifdef __USE_PROTOS
+GenSetRedefs( FILE *f )
+#else
+GenSetRedefs( f )
+FILE *f;
+#endif
+{
+	int i;
+
+	for (i=1; i<=wordnum; i++)
+	{
+		fprintf(f, "#define setwd%d %s_setwd%d\n", i, ParserName, i);
+	}
+	for (i=1; i<=esetnum; i++)
+	{
+		fprintf(f, "#define zzerr%d %s_err%d\n", i, ParserName, i);
+	}
+}
+
+/* Find all return types/parameters that require structs and def
+ * all rules with ret types.
+ *
+ * This is for the declaration, not the definition.
+ */
+void
+#ifdef __USE_PROTOS
+GenRulePrototypes( FILE *f, Junction *p )
+#else
+GenRulePrototypes( f, p )
+FILE *f;
+Junction *p;
+#endif
+{
+	int i;
+
+	i = 1;
+	while ( p!=NULL )
+	{
+		if ( p->ret != NULL )
+		{
+/* MR23 */	if ( hasMultipleOperands(p->ret) )
+			{
+				DumpRetValStruct(f, p->ret, i);
+			}
+			fprintf(f, "\n#ifdef __USE_PROTOS\n");
+/* MR23 */	if ( hasMultipleOperands(p->ret) ) 
+			{
+				fprintf(f, "extern struct _rv%d", i);
+			}
+			else
+			{
+				fprintf(f, "extern ");
+				DumpType(p->ret, f);
+			}
+			fprintf(f, " %s%s(", RulePrefix, p->rname);
+			DumpANSIFunctionArgDef(f,p,1 /* emit initializers ? */);
+			fprintf(f, ";\n");
+			fprintf(f, "#else\n");
+/* MR23 */	if ( hasMultipleOperands(p->ret) )
+			{
+				fprintf(f, "extern struct _rv%d", i);
+			}
+			else
+			{
+				fprintf(f, "extern ");
+				DumpType(p->ret, f);
+			}
+			fprintf(f, " %s%s();\n", RulePrefix, p->rname);
+			fprintf(f, "#endif\n");
+		}
+		else
+		{
+			fprintf(f, "\n#ifdef __USE_PROTOS\n");
+			fprintf(f, "void %s%s(", RulePrefix, p->rname);
+			DumpANSIFunctionArgDef(f,p, 1 /* emit initializers ? */ );
+			fprintf(f, ";\n");
+#ifdef OLD
+			if ( p->pdecl != NULL || GenAST )
+			{
+				if ( GenAST ) {
+					fprintf(f, "AST **%s",(p->pdecl!=NULL)?",":"");
+				}
+				if ( p->pdecl!=NULL ) fprintf(f, "%s", p->pdecl);
+			}
+			else fprintf(f, "void");
+			fprintf(f, ");\n");
+#endif
+			fprintf(f, "#else\n");
+			fprintf(f, "extern void %s%s();\n", RulePrefix, p->rname);
+			fprintf(f, "#endif\n");
+		}
+		i++;
+		p = (Junction *)p->p2;
+	}
+}
+
+/* Define all rules in the class.h file; generate any required
+ * struct definitions first, however.
+ */
+void
+#ifdef __USE_PROTOS
+GenRuleMemberDeclarationsForCC( FILE *f, Junction *q )
+#else
+GenRuleMemberDeclarationsForCC( f, q )
+FILE *f;
+Junction *q;
+#endif
+{
+	Junction *p = q;
+	int i;
+
+	fprintf(f, "private:\n");
+
+	/* Dump dflt handler declaration */
+	fprintf(f, "\tvoid zzdflthandlers( int _signal, int *_retsignal );\n\n");
+
+	fprintf(f, "public:\n");
+
+	/* Dump return value structs */
+	i = 1;
+	while ( p!=NULL )
+	{
+		if ( p->ret != NULL )
+		{
+/* MR23 */	if ( hasMultipleOperands(p->ret) )
+			{
+				DumpRetValStruct(f, p->ret, i);
+			}
+		}
+		i++;
+		p = (Junction *)p->p2;
+	}
+
+	/* Dump member func defs && CONSTRUCTOR */
+	fprintf(f, "\t%s(ANTLRTokenBuffer *input);\n", CurrentClassName);
+/*
+	fprintf(f, "\t%s(ANTLRTokenBuffer *input, ANTLRTokenType eof);\n",
+			   CurrentClassName);
+*/
+
+	i = 1;
+	p = q;
+	while ( p!=NULL )
+	{
+		if ( p->ret != NULL )
+		{
+/* MR23 */	if ( hasMultipleOperands(p->ret) )
+			{
+				fprintf(f, "\tstruct _rv%d", i);
+			}
+			else
+			{
+				fprintf(f, "\t");
+				DumpType(p->ret, f);
+			}
+			fprintf(f, " %s%s(",RulePrefix,p->rname);
+			DumpANSIFunctionArgDef(f,p, 1 /* emit initializers ? */ );
+			fprintf(f, ";\n");
+#ifdef OLD
+			if ( p->pdecl != NULL || GenAST )
+			{
+				if ( GenAST ) fprintf(f, "ASTBase **%s",(p->pdecl!=NULL)?",":"");
+				if ( p->pdecl!=NULL ) fprintf(f, "%s", p->pdecl);
+			}
+			fprintf(f, ");\n");
+#endif
+		}
+		else
+		{
+			fprintf(f, "\tvoid %s%s(",RulePrefix,p->rname);
+			DumpANSIFunctionArgDef(f,p, 1 /* emit initializers ? */);
+			fprintf(f, ";\n");
+#ifdef OLD
+			if ( p->pdecl != NULL || GenAST )
+			{
+				if ( GenAST ) fprintf(f, "ASTBase **%s",(p->pdecl!=NULL)?",":"");
+				if ( p->pdecl!=NULL ) fprintf(f, "%s", p->pdecl);
+			}
+			fprintf(f, ");\n");
+#endif
+		}
+		i++;
+		p = (Junction *)p->p2;
+	}
+}
+
+/* Given a list of ANSI-style parameter declarations, print out a
+ * comma-separated list of the symbols (w/o types).
+ * Basically, we look for a comma, then work backwards until start of
+ * the symbol name.  Then print it out until 1st non-alnum char.  Now,
+ * move on to next parameter.
+ *
+ */
+
+/* MR5 	Jan Mikkelsen 26-May-97 - added initalComma parameter              */
+
+void
+#ifdef __USE_PROTOS
+DumpListOfParmNames(char *pdecl, FILE *output, int initialComma)    /* MR5 */
+#else
+DumpListOfParmNames(pdecl, output, initialComma)		            /* MR5 */
+char *pdecl;	             		 			  	                /* MR5 */
+FILE *output;							                            /* MR5 */
+int initialComma;			                                        /* MR5 */
+#endif
+{
+	int firstTime = 1, done = 0;
+	require(output!=NULL, "DumpListOfParmNames: NULL parm");
+
+	if ( pdecl == NULL ) return;
+	while ( !done )
+	{
+		if ( !firstTime || initialComma ) putc(',', output);        /* MR5 */
+		done = DumpNextNameInDef(&pdecl, output);
+		firstTime = 0;
+	}
+}
+
+/* given a list of parameters or return values, dump the next
+ * name to output.  Return 1 if last one just printed, 0 if more to go.
+ */
+
+/* MR23 Total rewrite */
+
+int
+#ifdef __USE_PROTOS
+DumpNextNameInDef( char **q, FILE *output )
+#else
+DumpNextNameInDef( q, output )
+char **q;
+FILE *output;
+#endif
+{
+	char *p;
+	char *t;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+	int nest = 0;
+
+	p = endFormal(*q,
+			      &pDataType,
+				  &pSymbol,
+				  &pEqualSign,
+				  &pValue,
+				  &pSeparator,
+				  &nest);
+
+    /* MR26 Handle rule arguments such as: IIR_Bool (IIR_Decl::*contstraint)()
+       For this we need to strip off anything which follows the symbol.
+     */
+
+/* MR26 */  t = pSymbol;
+/* MR26 */	if (t != NULL) {
+/* MR26 */		for (t = pSymbol; *t != 0; t++) {
+/* MR26 */			if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break;
+/* MR26 */		}
+/* MR26 */	}
+/* MR26 */	fprintf(output,strBetween(pSymbol, t, pSeparator));
+
+    *q = p;
+    return (*pSeparator  == 0);
+}
+
+/* Given a list of ANSI-style parameter declarations, dump K&R-style
+ * declarations, one per line for each parameter.  Basically, convert
+ * comma to semi-colon, newline.
+ */
+void
+#ifdef __USE_PROTOS
+DumpOldStyleParms( char *pdecl, FILE *output )
+#else
+DumpOldStyleParms( pdecl, output )
+char *pdecl;
+FILE *output;
+#endif
+{
+	require(output!=NULL, "DumpOldStyleParms: NULL parm");
+
+	if ( pdecl == NULL ) return;
+	while ( *pdecl != '\0' )
+	{
+		if ( *pdecl == ',' )
+		{
+			pdecl++;
+			putc(';', output); putc('\n', output);
+			while ( *pdecl==' ' || *pdecl=='\t' || *pdecl=='\n' ) pdecl++;
+		}
+		else {putc(*pdecl, output); pdecl++;}
+	}
+	putc(';', output);
+	putc('\n', output);
+}
+
+/* Take in a type definition (type + symbol) and print out type only */
+/* MR23 Total rewrite */
+
+void
+#ifdef __USE_PROTOS
+DumpType( char *s, FILE *f )
+#else
+DumpType( s, f )
+char *s;
+FILE *f;
+#endif
+{
+	char *p;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+	int nest = 0;
+
+	require(s!=NULL, "DumpType: invalid type string"); 
+
+	p = endFormal(s,
+			      &pDataType,
+				  &pSymbol,
+				  &pEqualSign,
+				  &pValue,
+				  &pSeparator,
+				  &nest);
+	fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
+}
+
+/* check to see if string e is a word in string s */
+int
+#ifdef __USE_PROTOS
+strmember( char *s, char *e )
+#else
+strmember( s, e )
+char *s;
+char *e;
+#endif
+{
+    register char *p;
+    require(s!=NULL&&e!=NULL, "strmember: NULL string");
+
+    if ( *e=='\0' ) return 1;   /* empty string is always member */
+    do {
+	while ( *s!='\0' && !isalnum(*s) && *s!='_' )
+	++s;
+	p = e;
+	while ( *p!='\0' && *p==*s ) {p++; s++;}
+	if ( *p=='\0' ) {
+	    if ( *s=='\0' ) return 1;
+	    if ( !isalnum (*s) && *s != '_' ) return 1;
+	}
+	while ( isalnum(*s) || *s == '_' )
+	++s;
+    } while ( *s!='\0' );
+    return 0;
+}
+
+#if 0
+
+/* MR23 Replaced by hasMultipleOperands() */
+
+int
+#ifdef __USE_PROTOS
+HasComma( char *s )
+#else
+HasComma( s )
+char *s;
+#endif
+{
+	while (*s!='\0')
+		if ( *s++ == ',' ) return 1;
+	return 0;
+}
+#endif
+
+
+/* MR23 Total rewrite */
+
+void
+#ifdef __USE_PROTOS
+DumpRetValStruct( FILE *f, char *ret, int i )
+#else
+DumpRetValStruct( f, ret, i )
+FILE *f;
+char *ret;
+int i;
+#endif
+{
+	char *p = ret;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+    int nest = 0;
+
+	fprintf(f, "\nstruct _rv%d {\n", i);
+	while (*p != 0 && nest == 0) {
+		p = endFormal(p,
+			          &pDataType,
+					  &pSymbol,
+					  &pEqualSign,
+					  &pValue,
+					  &pSeparator,
+					  &nest);
+		fprintf(f,"\t");
+		fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
+		fprintf(f," ");
+		fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator));
+		fprintf(f,";\n");
+    }
+	fprintf(f,"};\n");
+}
+
+/* given "s" yield s -- DESTRUCTIVE (we modify s if starts with " else return s) */
+char *
+#ifdef __USE_PROTOS
+StripQuotes( char *s )
+#else
+StripQuotes( s )
+char *s;
+#endif
+{
+	if ( *s == '"' )
+	{
+		s[ strlen(s)-1 ] = '\0';    /* remove last quote */
+		return( s+1 );				/* return address past initial quote */
+	}
+	return( s );
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/main.c b/Tools/Source/TianoTools/Pccts/antlr/main.c
new file mode 100644
index 0000000000..051ee4ec5d
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/main.c
@@ -0,0 +1,1747 @@
+/*
+ * main.c -- main program for PCCTS ANTLR.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+/* To set a breakpoint just before exit look for "cleanUp".    */
+/* To set a breakpoint for fatal error look for "fatal_intern" */
+
+#include <stdio.h>
+
+#include "pcctscfg.h"
+#include "stdpccts.h"
+
+#define MAX_INT_STACK 50
+static int istack[MAX_INT_STACK];		/* Int stack */
+static int isp = MAX_INT_STACK;
+
+static int DontAcceptFiles = 0;			/* if stdin, don't read files */
+static int DontAcceptStdin = 0;			/* if files seen first, don't accept stdin */
+
+static int tnodes_used_in_guard_predicates_etc;     /* MR10 */
+
+		/* C m d - L i n e  O p t i o n  S t r u c t  &  F u n c s */
+
+typedef struct _Opt {
+			char *option;
+			int  arg;
+#ifdef __cplusplus
+			void (*process)(...);
+#else
+			void (*process)();
+#endif
+			char *descr;
+		} Opt;
+
+#ifdef __USE_PROTOS
+extern void ProcessArgs(int, char **, Opt *);
+#else
+extern void ProcessArgs();
+#endif
+
+#ifdef __USE_PROTOS
+int ci_strequ(char *a,char *b)
+#else
+int ci_strequ(a,b)
+  char  *a;
+  char  *b;
+#endif
+{
+  for ( ;*a != 0 && *b != 0; a++, b++) {
+    if (toupper(*a) != toupper(*b)) return 0;
+  }
+  return (*a == *b);
+}
+
+static void
+#ifdef __USE_PROTOS
+pStdin( void )
+#else
+pStdin( )
+#endif
+{
+	if ( DontAcceptStdin )
+	{
+		warnNoFL("'-' (stdin) ignored as files were specified first");
+		return;
+	}
+
+	require(NumFiles<MaxNumFiles,"exceeded max # of input files");
+	FileStr[NumFiles++] = "stdin";
+	DontAcceptFiles = 1;
+}
+
+static void
+#ifdef __USE_PROTOS
+pFile( char *s )
+#else
+pFile( s )
+char *s;
+#endif
+{
+	if ( *s=='-' ) { warnNoFL( eMsg1("invalid option: '%s'",s) ); return; }
+	if ( DontAcceptFiles )
+	{
+		warnNoFL(eMsg1("file '%s' ignored as '-' (stdin option) was specified first",s));
+		return;
+	}
+
+	require(NumFiles<MaxNumFiles,"exceeded max # of input files");
+	FileStr[NumFiles++] = s;
+	DontAcceptStdin = 1;
+}
+
+/* MR14
+        Allow input to be a file containing a list of files
+        Bernard Giroud (b_giroud@decus.ch)
+*/
+
+static void
+#ifdef __USE_PROTOS
+pFileList( char *s, char *t )
+#else
+pFileList( s, t )
+char *s;
+char *t;
+#endif
+{
+#define MaxFLArea 1024
+	FILE *fl;
+	static char Fn_in_Fl[MaxFLArea] = "";
+        char one_fn[MaxFileName];
+	char *flp = &Fn_in_Fl[0];
+	int fnl, left = MaxFLArea, i;
+
+	if ( *t=='-' ) { warnNoFL( eMsg1("invalid option: '%s'",t) ); return; }
+	if ( DontAcceptFiles )
+	{
+		warnNoFL(eMsg1("file '%s' ignored as '-' (stdin option) was specified first",t));
+		return;
+	}
+
+        if ((fl = fopen(t, "r")) == NULL)
+	{
+		warnNoFL(eMsg1("file '%s' can't be opened", t));
+		return;
+	}
+        for (;;)
+	{
+		if (fgets(one_fn, 128 - 1, fl) == NULL)
+			break;
+		fnl = strlen(one_fn);
+		require(fnl<=left, "no more room in File List Area");
+		/* drop the trailing LF */
+		if (one_fn[fnl - 1] == 0x0a) one_fn[fnl - 1] = ' ';
+		strcat(Fn_in_Fl, one_fn);
+		left = left - fnl;
+		require(NumFiles<MaxNumFiles,"exceeded max # of input files");
+		FileStr[NumFiles++] = flp;
+		flp = flp + fnl;
+	}
+	fclose(fl);
+	for (i=0;i < MaxFLArea;i++) if (Fn_in_Fl[i] == ' ') Fn_in_Fl[i] = '\0';
+	DontAcceptStdin = 1;
+}
+
+static void
+#ifdef __USE_PROTOS
+pLLK( char *s, char *t )
+#else
+pLLK( s, t )
+char *s;
+char *t;
+#endif
+{
+	LL_k = atoi(t);
+	if ( LL_k <= 0 ) {
+		warnNoFL("must have at least one token of lookahead (setting to 1)");
+		LL_k = 1;
+	}
+}
+
+static void
+#ifdef __USE_PROTOS
+pCk( char *s, char *t )
+#else
+pCk( s, t )
+char *s;
+char *t;
+#endif
+{
+	CLL_k = atoi(t);
+	if ( CLL_k <= 0 ) {
+		warnNoFL("must have at least one token of look-ahead (setting to 1)");
+		CLL_k = 1;
+	}
+}
+
+static void						                                     /* MR6 */
+#ifdef __USE_PROTOS
+pTab( char *s, char *t )			                        	     /* MR6 */
+#else
+pTab( s, t )				                    		             /* MR6 */
+char *s;							                                 /* MR6 */
+char *t;							                                 /* MR6 */
+#endif
+{								                                     /* MR6 */
+	TabWidth = atoi(t);					                             /* MR6 */
+	if ( TabWidth < 0 || TabWidth > 8 ) {	            		     /* MR6 */
+		warnNoFL("tab width must be between 1 and 8");               /* MR6 */
+	  TabWidth=0;						                             /* MR6 */
+	}							                                     /* MR6 */
+}							                                         /* MR6 */
+
+static int ambAidDepthSpecified=0;                                   /* MR11 */
+
+static void						                                     /* MR11 */
+#ifdef __USE_PROTOS
+pAAd( char *s, char *t )			                        	     /* MR11 */
+#else
+pAAd( s, t )				                    		             /* MR11 */
+char *s;							                                 /* MR11 */
+char *t;							                                 /* MR11 */
+#endif
+{								                                     /* MR11 */
+    ambAidDepthSpecified=1;                                          /* MR11 */
+	MR_AmbAidDepth = atoi(t);				                         /* MR11 */
+}							                                         /* MR11 */
+
+static void						                                     /* MR11 */
+#ifdef __USE_PROTOS
+pTreport( char *s, char *t )			                       	     /* MR11 */
+#else
+pTreport( s, t )				                  		             /* MR11 */
+    char *s;							                             /* MR11 */
+    char *t;							                             /* MR11 */
+#endif
+{								                                     /* MR11 */
+	TnodesReportThreshold = atoi(t);				                 /* MR11 */
+}							                                         /* MR11 */
+
+#ifdef __USE_PROTOS
+void chkGTFlag(void)	                                    /* 7-Apr-97 MR1 */
+#else
+void chkGTFlag()                                            /* 7-Apr-97 MR1 */
+#endif
+{
+	if ( !GenAST )
+		warn("#-variable or other AST item referenced w/o -gt option");
+}
+
+
+#ifdef __USE_PROTOS
+static void pInfo(char *s, char *t)                         /* MR10 */
+#else
+static void pInfo(s,t)                                      /* MR10 */
+  char  *s;
+  char  *t;
+#endif
+{
+  char  *p;
+  int   q;
+  for (p=t; *p != 0; p++) {
+    q=tolower(*p);
+    if (q=='t') {
+      InfoT=1;
+    } else if (q=='p') {
+      InfoP=1;
+    } else if (q=='m') {
+      InfoM=1;
+    } else if (q=='o') {
+      InfoO=1;
+    } else if (q=='0') {
+      ; /* nothing */
+    } else if (q=='f') {
+      InfoF=1;
+    } else {
+      warnNoFL(eMsgd("unrecognized -info option \"%c\"",(int)*p));
+    };
+  };
+}
+
+#ifdef __USE_PROTOS
+static void pCGen(void)	{ CodeGen = FALSE; LexGen = FALSE; }
+static void pLGen(void)	{ LexGen = FALSE; }
+static void pXTGen(void){ MR_Inhibit_Tokens_h_Gen = TRUE; }
+static void pTGen(void)	{ TraceGen = TRUE; }
+static void pSGen(void)	{ GenExprSetsOpt = FALSE; }
+static void pPrt(void)	{ PrintOut = TRUE; pCGen(); pLGen(); }
+static void pPrtA(void)	{ PrintOut = TRUE; PrintAnnotate = TRUE; pCGen(); pLGen(); }
+static void pAst(void)	{ GenAST = TRUE; }
+static void pANSI(void)	{ GenANSI = TRUE; }
+static void pCr(void)	{ GenCR = TRUE; }
+static void pNOPURIFY(void)	{ PURIFY = FALSE; }
+/*static void pCt(void)	{ warnNoFL("-ct option is now the default"); }*/
+static void pLI(void)	{ GenLineInfo = TRUE; GenLineInfoMS = FALSE; } /* MR14 */
+static void pLIms(void)	{ GenLineInfo = TRUE; GenLineInfoMS = TRUE; }  /* MR14 */
+static void pFr(char *s, char *t) {RemapFileName = t;}
+static void pFe(char *s, char *t) {ErrFileName = t;}
+static void pFl(char *s, char *t) {DlgFileName = t;}
+static void pFm(char *s, char *t) {ModeFileName = t;}
+static void pFt(char *s, char *t) {DefFileName = t;}
+
+static void pE1(void)	{ elevel = 1; }
+static void pE2(void)	{ elevel = 2; }
+static void pE3(void)	{ elevel = 3; }
+static void pEGen(void)	{ GenEClasseForRules = 1; }
+static void pDL(void)
+	{
+	    DemandLookahead = 1;
+	    if ( GenCC ) {
+			warnNoFL("-gk does not work currently in C++ mode; -gk turned off");
+			DemandLookahead = 0;
+	    }
+	}
+
+static void pAA(char *s,char *t) {MR_AmbAidRule = t;}               /* MR11 */
+static void pAAm(char *s){MR_AmbAidMultiple = 1;}                   /* MR11 */
+static void pGHdr(void)	{ GenStdPccts = 1; }
+static void pFHdr(char *s, char *t) { stdpccts = t; pGHdr(); }
+static void pW1(void) { WarningLevel = 1; }
+static void pNewAST(void) { NewAST = 1; }                           /* MR13 */
+static void ptmakeInParser(void) { tmakeInParser = 1; }             /* MR23 */
+static void pAlpha(void) { AlphaBetaTrace = 1; }                    /* MR14 */
+static void pMR_BlkErr(void) { MR_BlkErr = 1; }                     /* MR21 */
+static void pStdout(void) {UseStdout = 1; }		                    /* MR6 */
+static void pW2(void) { WarningLevel = 2; }
+static void pCC(void) { GenCC = TRUE; }
+#else
+static void pCGen()	{ CodeGen = FALSE; LexGen = FALSE; }
+static void pLGen()	{ LexGen = FALSE; }
+static void pXTGen(){ MR_Inhibit_Tokens_h_Gen = TRUE; }             /* MR14 */
+static void pTGen()	{ TraceGen = TRUE; }
+static void pSGen()	{ GenExprSetsOpt = FALSE; }
+static void pPrt()		{ PrintOut = TRUE; pCGen(); pLGen(); }
+static void pPrtA()	{ PrintOut = TRUE; PrintAnnotate = TRUE; pCGen(); pLGen(); }
+static void pAst()		{ GenAST = TRUE; }
+static void pANSI()	{ GenANSI = TRUE; }
+static void pCr()		{ GenCR = TRUE; }
+static void pNOPURIFY()	{ PURIFY = FALSE; }
+
+/*static void pCt()		{ warnNoFL("-ct option is now the default"); }*/
+static void pLI()	    { GenLineInfo = TRUE; GenLineInfoMS = FALSE; }  /* MR14 */
+static void pLIms()	    { GenLineInfo = TRUE; GenLineInfoMS = TRUE; }   /* MR14 */
+static void pFr(s,t) char *s, *t; {RemapFileName = t;}
+static void pFe(s,t) char *s, *t; {ErrFileName = t;}
+static void pFl(s,t) char *s, *t; {DlgFileName = t;}
+static void pFm(s,t) char *s, *t; {ModeFileName = t;}
+static void pFt(s,t) char *s, *t; {DefFileName = t;}
+
+static void pE1()		{ elevel = 1; }
+static void pE2()		{ elevel = 2; }
+static void pE3()		{ elevel = 3; }
+static void pEGen()	{ GenEClasseForRules = 1; }
+static void pDL()
+	{
+	    DemandLookahead = 1;
+	    if ( GenCC ) {
+          warnNoFL("-gk does not work currently in C++ mode; -gk turned off");
+	      DemandLookahead = 0;
+	    }
+	}
+
+static void pAA(s,t) char *s; char *t; {MR_AmbAidRule = t;}          /* MR11 BJS 20-Mar-98 */
+static void pAAm(s) char *s; {MR_AmbAidMultiple = 1;}                /* MR11 BJS 20-Mar-98 */
+static void pGHdr()	{ GenStdPccts = 1; }
+static void pFHdr(s,t) char *s, *t; { stdpccts = t; pGHdr(); }
+static void pW1() { WarningLevel = 1; }
+static void pNewAST() { NewAST = 1; }                                /* MR13 */
+static void ptmakeInParser() { tmakeInParser = 1; }                  /* MR23 */
+static void pAlpha() { AlphaBetaTrace = 1; }                         /* MR14 */
+static void pMR_BlkErr() { MR_BlkErr = 1; }                          /* MR21 */
+static void pStdout() {UseStdout = 1; }	                             /* MR6 */
+static void pW2() { WarningLevel = 2; }
+static void pCC() { GenCC = TRUE; }
+#endif
+
+static void
+#ifdef __USE_PROTOS
+pPre( char *s, char *t )
+#else
+pPre( s, t )
+char *s;
+char *t;
+#endif
+{
+	RulePrefix = t;
+}
+
+static void
+#ifdef __USE_PROTOS
+pOut( char *s, char *t )
+#else
+pOut( s, t )
+char *s;
+char *t;
+#endif
+{
+	OutputDirectory = t;
+}
+
+static void
+#ifdef __USE_PROTOS
+pPred( void )
+#else
+pPred( )
+#endif
+{
+	warnNoFL("-pr is no longer used (predicates employed if present); see -prc, -mrhoist, -mrhoistk");
+/*
+**	if ( DemandLookahead )
+**		warnNoFL("-gk conflicts with -pr; -gk turned off");
+**	DemandLookahead = 0;
+**	HoistPredicateContext = 0;
+*/
+}
+
+static void
+#ifdef __USE_PROTOS
+pPredCtx( char *s, char *t )
+#else
+pPredCtx(s,t)
+char *s;
+char *t;
+#endif
+{
+	if ( ci_strequ(t,"on")) HoistPredicateContext = 1;
+	else if ( ci_strequ(t,"off")) HoistPredicateContext = 0;
+	if ( DemandLookahead )
+	{
+		warnNoFL("-gk incompatible with semantic predicate usage; -gk turned off");
+		DemandLookahead = 0;
+	}
+}
+
+static void
+#ifdef __USE_PROTOS
+pMRhoist( char *s, char *t )
+#else
+pMRhoist(s,t)
+char *s;
+char *t;
+#endif
+{
+	if ( ci_strequ(t,"on")) MRhoisting = 1;
+	else if ( ci_strequ(t,"off")==0 ) MRhoisting = 0;
+    if (MRhoisting) {
+        fprintf(stderr,"Maintenance Release style hoisting enabled for predicates with lookahead depth = 1\n");
+        fprintf(stderr,"  No longer considered experimental\n");
+        fprintf(stderr,"  Can't consider suppression for predicates with lookahead depth > 1\n");
+        fprintf(stderr,"  Implies -prc on but does *not* imply -mrhoistk for k>1 predicates\n");
+        fprintf(stderr,"  This is a reminder, not a warning or error.\n");
+    };
+}
+
+static void
+#ifdef __USE_PROTOS
+pMRhoistk( char *s, char *t )
+#else
+pMRhoistk(s,t)
+char *s;
+char *t;
+#endif
+{
+	if ( ci_strequ(t,"on")) MRhoistingk = 1;
+	else if ( ci_strequ(t,"off")==0 ) MRhoistingk = 0;
+    if (MRhoistingk) {
+        fprintf(stderr,"EXPERIMENTAL Maintenance Release style hoisting enabled\n");
+        fprintf(stderr,"  Applies to predicates with lookahead depth > 1\n");
+        fprintf(stderr,"  Implies -prc on and -mrhoist on\n");
+    };
+}
+
+static void
+#ifdef __USE_PROTOS
+pTRes( char *s, char *t )
+#else
+pTRes( s, t )
+char *s;
+char *t;
+#endif
+{
+	TreeResourceLimit = atoi(t);
+	if ( TreeResourceLimit <= 0 )
+	{
+		warnNoFL("analysis resource limit (# of tree nodes) must be greater than 0");
+		TreeResourceLimit = -1; /* set to no limit */
+	}
+}
+
+Opt options[] = {
+#ifdef __cplusplus
+    { "-CC", 0, (void (*)(...)) pCC,	"Generate C++ output (default=FALSE)"},
+    { "-ck", 1, (void (*)(...)) pCk,	"Set compressed lookahead depth; fast approximate lookahead"},
+    { "-cr", 0, (void (*)(...)) pCr,	"Generate cross reference (default=FALSE)"},
+    { "-e1", 0, (void (*)(...)) pE1,	"Ambiguities/errors shown in low detail (default)"},
+    { "-e2", 0, (void (*)(...)) pE2,	"Ambiguities/errors shown in more detail"},
+    { "-e3", 0, (void (*)(...)) pE3,
+    	"Ambiguities for k>1 grammars shown with exact tuples (not lookahead sets)"},
+    { "-f",  1, (void (*)(...)) pFileList,"Read names of grammar files from specified file"}, /* MR14 */
+    { "-fe", 1, (void (*)(...)) pFe,	"Rename err.c"},
+    { "-fh", 1, (void (*)(...)) pFHdr,	"Rename stdpccts.h header (turns on -gh)"},
+    { "-fl", 1, (void (*)(...)) pFl,	"Rename lexical output--parser.dlg"},
+    { "-fm", 1, (void (*)(...)) pFm,	"Rename mode.h"},
+    { "-fr", 1, (void (*)(...)) pFr,	"Rename remap.h"},
+    { "-ft", 1, (void (*)(...)) pFt,	"Rename tokens.h"},
+    { "-ga", 0, (void (*)(...)) pANSI,	"Generate ANSI-compatible code (default=FALSE)"},
+    { "-gc", 0, (void (*)(...)) pCGen,	"Do not generate output parser code (default=FALSE)"},
+    { "-gd", 0, (void (*)(...)) pTGen,	"Generate code to trace rule invocation (default=FALSE)"},
+    { "-ge", 0, (void (*)(...)) pEGen,	"Generate an error class for each non-terminal (default=FALSE)"},
+    { "-gh", 0, (void (*)(...)) pGHdr,	"Generate stdpccts.h for non-ANTLR-generated-files to include"},
+    { "-gk", 0, (void (*)(...)) pDL,	"Generate parsers that delay lookahead fetches until needed"},
+    { "-gl", 0, (void (*)(...)) pLI,	"Generate line info about grammar actions in parser"},
+    { "-glms", 0, (void (*)(...)) pLIms,"Like -gl but replace '\\' with '/' in #line filenames for MS C/C++ systems"},
+    { "-gp", 1, (void (*)(...)) pPre,	"Prefix all generated rule functions with a string"},
+    { "-gs", 0, (void (*)(...)) pSGen,	"Do not generate sets for token expression lists (default=FALSE)"},
+    { "-gt", 0, (void (*)(...)) pAst,	"Generate code for Abstract-Syntax-Trees (default=FALSE)"},
+    { "-gx", 0, (void (*)(...)) pLGen,	"Do not generate lexical (dlg-related) files (default=FALSE)"},
+    { "-gxt",0, (void (*)(...)) pXTGen,	"Do not generate tokens.h (default=FALSE)"},
+    { "-k",  1, (void (*)(...)) pLLK,	"Set full LL(k) lookahead depth (default==1)"},
+    { "-o",  1, (void (*)(...)) pOut,	OutputDirectoryOption},
+    { "-p",  0, (void (*)(...)) pPrt,	"Print out the grammar w/o actions (default=no)"},
+    { "-pa", 0, (void (*)(...)) pPrtA,	"Print out the grammar w/o actions & w/FIRST sets (default=no)"},
+    { "-pr",0, (void (*)(...)) pPred,	"no longer used; predicates employed if present"},
+    { "-prc", 1, (void (*)(...)) pPredCtx,"Turn on/off computation of context for hoisted predicates"},
+   	{ "-rl", 1, (void (*)(...)) pTRes,	"Limit max # of tree nodes used by grammar analysis"},
+    { "-stdout",0,  (void (*)(...)) pStdout,"Send grammar.c/grammar.cpp to stdout"},           /* MR6 */
+	{ "-tab", 1, (void (*)(...)) pTab,	"Width of tabs (1 to 8) for grammar.c/grammar.cpp files"}, /* MR6 */
+	{ "-w1", 0, (void (*)(...)) pW1,	"Set the warning level to 1 (default)"},
+	{ "-w2", 0, (void (*)(...)) pW2,	"Ambiguities yield warnings even if predicates or (...)? block"},
+	{ "-",   0, (void (*)(...)) pStdin,	"Read grammar from stdin" },
+    { "-mrhoist",1, (void (*)(...)) pMRhoist,                                                  /* MR9 */
+                                        "Turn on/off k=1 Maintenance Release style hoisting"},  /* MR9 */
+    { "-mrhoistk",1, (void (*)(...)) pMRhoistk,                                                  /* MR9 */
+                                        "Turn on/off EXPERIMENTAL k>1 Maintenance Release style hoisting"},  /* MR13 */
+    { "-aa"  , 1, (void (*)(...)) pAA,  "Ambiguity aid for a rule (rule name or line number)"},          /* MR11 */
+    { "-aam" , 0, (void (*)(...)) pAAm,
+                                         "Lookahead token may appear multiple times in -aa listing"},    /* MR11 */
+    { "-aad" , 1, (void (*)(...)) pAAd,
+                                         "Limits exp growth of -aa listing - default=1 (max=ck value)"}, /* MR11 */
+	{ "-info", 1, (void (*)(...)) pInfo,
+      "Extra info: p=pred t=tnodes f=first/follow m=monitor o=orphans 0=noop"},                          /* MR12 */
+    { "-treport",1,(void (*)(...)) pTreport,
+                        "Report when tnode usage exceeds value during ambiguity resolution"},            /* MR11 */
+	{ "-newAST", 0, (void (*)(...)) pNewAST,
+                 "In C++ mode use \"newAST(...)\" rather than \"new AST(...)\""},                        /* MR13 */
+	{ "-tmake", 0, (void (*)(...)) ptmakeInParser,
+                 "In C++ mode use parser's tmake method rather than \"ASTBase::tmake(...)\""},			 /* MR23 */
+    { "-alpha",0,(void (*)(...)) pAlpha,
+                 "Provide additional information for \"(alpha)? beta\" error messages"},                 /* MR14 */
+    { "-mrblkerr",0,(void (*)(...)) pMR_BlkErr,                                        /* MR21 */
+                 "EXPERIMENTAL change to (...)* and (...)+ syntax error sets"},        /* MR21 */
+	{ "-nopurify",0,(void (*)(...)) pNOPURIFY,
+		"Don't use the notorious PURIFY macro (replaced by MR23 initial value syntax) to zero return arguments of rules"},   /* MR23 */
+    { "*",   0, (void (*)(...)) pFile, 	"" },	/* anything else is a file */
+#else
+    { "-CC", 0, pCC,	"Generate C++ output (default=FALSE)"},
+    { "-cr", 0, pCr,	"Generate cross reference (default=FALSE)"},
+    { "-ck", 1, pCk,	"Set compressed lookahead depth; fast approximate lookahead"},
+    { "-e1", 0, pE1,	"Ambiguities/errors shown in low detail (default)"},
+    { "-e2", 0, pE2,	"Ambiguities/errors shown in more detail"},
+    { "-e3", 0, pE3,   	"Ambiguities for k>1 grammars shown with exact tuples (not lookahead sets)"},
+    { "-f",  1, pFileList,"Read names of grammar files from specified file"},   /* MR14 */
+    { "-fe", 1, pFe,	"Rename err.c"},
+    { "-fh", 1, pFHdr,	"Rename stdpccts.h header (turns on -gh)"},
+    { "-fl", 1, pFl,	"Rename lexical output--parser.dlg"},
+    { "-fm", 1, pFm,	"Rename mode.h"},
+    { "-fr", 1, pFr,	"Rename remap.h"},
+    { "-ft", 1, pFt,	"Rename tokens.h"},
+    { "-ga", 0, pANSI,	"Generate ANSI-compatible code (default=FALSE)"},
+    { "-gc", 0, pCGen,	"Do not generate output parser code (default=FALSE)"},
+    { "-gd", 0, pTGen,	"Generate code to trace rule invocation (default=FALSE)"},
+    { "-ge", 0, pEGen,	"Generate an error class for each non-terminal (default=FALSE)"},
+    { "-gh", 0, pGHdr,	"Generate stdpccts.h for non-ANTLR-generated-files to include"},
+    { "-gk", 0, pDL,	"Generate parsers that delay lookahead fetches until needed"},
+    { "-gl", 0, pLI,	"Generate line info about grammar actions in C parser"},
+    { "-glms", 0, pLIms,"Like -gl but replace '\\' with '/' in #line filenames for MS C/C++ systems"},
+    { "-gp", 1, pPre,	"Prefix all generated rule functions with a string"},
+    { "-gs", 0, pSGen,	"Do not generate sets for token expression lists (default=FALSE)"},
+    { "-gt", 0, pAst,	"Generate code for Abstract-Syntax-Trees (default=FALSE)"},
+    { "-gx", 0, pLGen,	"Do not generate lexical (dlg-related) files (default=FALSE)"},
+    { "-gxt",0, pXTGen,	"Do not generate tokens.h (default=FALSE)"},
+    { "-k",  1, pLLK,	"Set full LL(k) lookahead depth (default==1)"},
+    { "-o",  1, pOut,	OutputDirectoryOption},
+    { "-p",  0, pPrt,	"Print out the grammar w/o actions (default=no)"},
+    { "-pa", 0, pPrtA,	"Print out the grammar w/o actions & w/FIRST sets (default=no)"},
+    { "-pr",0, pPred,	"no longer used; predicates employed if present"},
+    { "-prc", 1, pPredCtx,"Turn on/off computation of context for hoisted predicates"},
+    { "-rl", 1, pTRes,	"Limit max # of tree nodes used by grammar analysis"},
+    { "-stdout",0, pStdout,	"Send grammar.c/grammar.cpp to stdout"},               /* MR6 */
+    { "-tab", 1, pTab,	"Width of tabs (1 to 8) for grammar.c/grammar.cpp files"}, /* MR6 */
+	{ "-w1", 0, pW1,	"Set the warning level to 1 (default)"},
+	{ "-w2", 0, pW2,	"Ambiguities yield warnings even if predicates or (...)? block"},
+    { "-mrhoist",1,pMRhoist,                                                       /* MR9 */
+                         "Turn on/off k=1 Maintenance Release style hoisting"},  /* MR9 */
+    { "-mrhoistk",1,pMRhoistk,                                                       /* MR13 */
+                         "Turn on/off k>1 EXPERIMENTAL Maintenance Release style hoisting"},  /* MR13 */
+    { "-aa"  ,1,pAA,     "Ambiguity aid for a rule (rule name or line number)"},          /* MR11 */
+    { "-aam" ,0,pAAm,
+                         "Lookahead token may appear multiple times in -aa listing"},     /* MR11 */
+    { "-aad" ,1,pAAd,
+                         "Limits exp growth of -aa listing - default=1 (max=ck value)"},  /* MR11 */
+	{ "-info",1,pInfo,
+      "Extra info: p=pred t=tnodes f=first/follow m=monitor o=orphans 0=noop"},           /* MR11 */
+    { "-treport",1,pTreport,
+                        "Report when tnode usage exceeds value during ambiguity resolution"},   /* MR11 */
+	{ "-newAST", 0, pNewAST,
+                 "In C++ mode use \"newAST(...)\" rather than \"new AST(...)\""},         /* MR13 */
+	{ "-tmake", 0, ptmakeInParser,
+                 "In C++ mode use parser's tmake method rather than \"ASTBase::tmake(...)\""},   /* MR23 */
+    { "-alpha",0, pAlpha,
+                 "Provide additional information for \"(alpha)? beta\" error messages"},  /* MR14 */
+    { "-mrblkerr",0,pMR_BlkErr,                                                           /* MR21 */
+                 "EXPERIMENTAL change to (...)* and (...)+ syntax error sets"},           /* MR21 */
+	{ "-nopurify",0,pNOPURIFY,
+		"Don't use the notorious PURIFY macro (replaced by MR23 initial value syntax) to zero return arguments of rules"},   /* MR23 */
+	{ "-",   0, pStdin,	"Read grammar from stdin" },
+	{ "*",   0, pFile, 	"" },	/* anything else is a file */
+#endif
+	{ NULL,  0, NULL }
+ };
+
+void readDescr();
+void cleanUp();
+
+#ifdef __USE_PROTOS
+static void buildRulePtr( void );
+static void help( void );
+static void init( void );
+static void CompleteTokenSetRefs( void );
+static void ensure_no_C_file_collisions(char *);
+static void CompleteContextGuards(void);
+#else
+static void buildRulePtr( );
+static void help( );
+static void init( );
+static void CompleteTokenSetRefs( );
+static void ensure_no_C_file_collisions();
+static void CompleteContextGuards();
+#endif
+
+static void
+#ifdef __USE_PROTOS  /* <BJS> */
+report_numericPredLabels(ActionNode *a)
+#else
+report_numericPredLabels(a)
+ActionNode *a;
+#endif
+{                                                                           /* MR10 */
+  warnFL("numeric references to attributes (e.g. $i or $i.j) in semantic pred will be null during guess mode",  /* MR10 */
+            FileStr[a->file],a->line);                                      /* MR10 */
+}                                                                           /* MR10 */
+
+								/* M a i n */
+
+int
+#ifdef __USE_PROTOS
+main( int argc, char *argv[] )
+#else
+main( argc, argv )
+int argc;
+char *argv[];
+#endif
+{
+	int i;
+	static char EPSTR[] = "[Ep]";
+
+    Save_argc=argc;                                                  /* MR10 */
+    Save_argv=argv;                                                  /* MR10 */
+
+/*	malloc_debug(8);*/
+
+#ifdef SPECIAL_INITS
+    special_inits();                                                 /* MR1 */
+#endif
+	fprintf(stderr, "Antlr parser generator   Version %s   1989-2001\n", Version);
+	if ( argc == 1 ) { help(); zzDIE; }
+	ProcessArgs(argc-1, &(argv[1]), options);
+
+/* MR14 */    if (MR_AmbAidRule && AlphaBetaTrace) {
+/* MR14 */       fatal("Can't specify both -aa (ambiguity aid) and -alpha (\"(alpha)? beta\" aid)");
+/* MR14 */    }
+
+    if (MRhoistingk) {              /* MR13 */
+      HoistPredicateContext=1;      /* MR13 */
+      MRhoisting=1;                 /* MR13 */
+    };                              /* MR13 */
+    if (MRhoisting && ! HoistPredicateContext) {
+/***      warnNoFL("Using \"-mrhoist\" forces \"-prc on\"");    ***/
+      HoistPredicateContext=1;
+    };
+    if (HoistPredicateContext && ! MRhoisting) {
+        warnNoFL("When using predicate context (-prc on) -mrhoist on is recommended");
+    }
+	/* Fix lookahead depth */
+	/* Compressed lookahead must always be larger than or equal to full lookahead */
+	if ( CLL_k < LL_k  && CLL_k>0 )
+	{
+		warnNoFL("must have compressed lookahead >= full LL(k) lookahead (setting -ck to -k)");
+		CLL_k = LL_k;
+	}
+	if ( CLL_k == -1 ) CLL_k = LL_k;
+	OutputLL_k = CLL_k;
+	if ( ((CLL_k-1)&CLL_k)!=0 ) { /* output ll(k) must be power of 2 */
+		int n;
+		for(n=1; n<CLL_k; n<<=1) {;}
+		OutputLL_k = n;
+	};
+
+	if (MR_BlkErr) {
+		warnNoFL("The -mrblkerr option is EXPERIMENTAL");
+        if (LL_k > 1) {
+    		warnNoFL("The -mrblkerr option is designed only for k=1 ck=1 grammars");
+        }
+	};
+
+    if ( ! ambAidDepthSpecified) {
+      MR_AmbAidDepth=1;
+    } else {
+      if (MR_AmbAidDepth > CLL_k || MR_AmbAidDepth <= 0) {
+        warnNoFL(eMsgd(
+            "Ambiguity aid depth (\"-aad ...\") must be a number between 1 and max(k,ck)=%d",CLL_k));
+        MR_AmbAidDepth=1;
+      };
+      if (MR_AmbAidDepth == 0) {
+        MR_AmbAidDepth=2;
+      };
+    };
+
+    if (MR_AmbAidRule != NULL) MR_AmbAidLine=atoi(MR_AmbAidRule);
+
+	fpTrans = &(C_Trans[0]);		/* Translate to C Language */
+	fpJTrans = &(C_JTrans[0]);
+	init();
+	lexclass(LexStartSymbol);
+
+	readDescr();
+	LastTokenCounted = TokenNum;
+	RemapForcedTokens();
+	if ( CannotContinue ) {cleanUp(); zzDIE;}
+	if ( GenCC && no_classes_found ) fatal("required grammar class not found (exiting...)");
+	if ( WarningLevel>1 && HdrAction == NULL )
+	   warnNoFL("no #header action was found");
+	if ( FoundAtOperator && ! FoundExceptionGroup) {
+	   warnNoFL("found the exception operator '@' - but no exception group was found");
+	};
+	EpToken = addTname(EPSTR);		/* add imaginary token epsilon */
+	set_orel(EpToken, &imag_tokens);
+
+	/* this won't work for hand-built scanners since EofToken is not
+	 * known.  Forces EOF to be token type 1.
+	 */
+	set_orel(EofToken, &imag_tokens);
+
+	set_size(NumWords(TokenNum-1));
+
+	/* compute the set of all known token types
+	 * It represents the set of tokens from 1 to last_token_num + the
+	 * reserved positions above that (if any).  Don't include the set of
+	 * imaginary tokens such as the token/error classes or EOF.
+	 */
+	{
+		set a;
+		a = set_dup(reserved_positions);
+		for (i=1; i<TokenNum; i++) { set_orel(i, &a); }
+		all_tokens = set_dif(a, imag_tokens);
+		set_free(a);
+	}
+
+	ComputeTokSets();				/* Compute #tokclass sets */
+	CompleteTokenSetRefs();			/* Change complex nodes in syn diag */
+    CompleteContextGuards();        /* MR13 */
+
+	if ( CodeGen ) genDefFile();	/* create tokens.h */
+	if ( LexGen ) genLexDescr();	/* create parser.dlg */
+
+	if ( GenStdPccts )
+	{
+		FILE *f = fopen(OutMetaName(stdpccts), "w");
+		if ( f==NULL ) {warnNoFL( eMsg1("can't create %s",OutMetaName(stdpccts)) );}
+		else
+		{
+#ifdef SPECIAL_FOPEN
+			special_fopen_actions(OutMetaName(stdpccts));            /* MR1 */
+#endif
+            if (strcmp(stdpccts,"stdpccts.h") == 0) {                /* MR10 */
+ 	  	      genStdPCCTSIncludeFile(f,NULL);                        /* MR10 */
+            } else {                                                 /* MR10 */
+ 	  	      genStdPCCTSIncludeFile(f,pcctsBaseName(stdpccts));     /* MR32 */
+            };
+			fclose(f);
+		}
+	}
+
+	buildRulePtr();					/* create mapping from rule # to RuleBlk junction */
+	ComputeErrorSets();
+	FoLink( (Node *)SynDiag );		/* add follow links to end of all rules */
+	
+	if ( GenCR ) GenCrossRef( SynDiag );
+
+	if ( CodeGen )
+	{
+		if ( SynDiag == NULL )
+		{
+			warnNoFL("no grammar description recognized");
+			cleanUp();
+			zzDIE;
+		}
+		else if ( !GenCC ) {
+			ErrFile = fopen(OutMetaName(ErrFileName), "w");
+			require(ErrFile != NULL, "main: can't open err file");
+#ifdef SPECIAL_FOPEN
+	              special_fopen_actions(OutMetaName(ErrFileName));   /* MR1 */
+#endif
+			NewSetWd();
+			GenErrHdr();
+			TRANS(SynDiag);			/* Translate to the target language */
+			DumpSetWd();
+			DumpRemainingTokSets();
+			fclose( ErrFile );
+		}
+		else {
+			strcpy(Parser_h_Name, CurrentClassName);
+			strcat(Parser_h_Name, ".h");
+			strcpy(Parser_c_Name, CurrentClassName);
+			strcat(Parser_c_Name, CPP_FILE_SUFFIX);
+			ensure_no_C_file_collisions(Parser_c_Name);
+			Parser_h = fopen(OutMetaName(Parser_h_Name), "w");
+			require(Parser_h != NULL, "main: can't open class Parserx.h file");
+#ifdef SPECIAL_FOPEN
+		    special_fopen_actions(OutMetaName(Parser_h_Name));       /* MR1 */
+#endif
+			Parser_c = fopen(OutMetaName(Parser_c_Name), "w");
+			require(Parser_c != NULL, "main: can't open class Parserx.c file");
+#ifdef SPECIAL_FOPEN
+		    special_fopen_actions(OutMetaName(Parser_c_Name));       /* MR1 */
+#endif
+			GenParser_h_Hdr();
+			if ( class_before_actions != NULL )
+			{
+				ListNode *p;
+				for (p = class_before_actions->next; p!=NULL; p=p->next)
+				{
+					UserAction *ua = (UserAction *)p->elem;
+					dumpAction( ua->action, Parser_h, 0, ua->file, ua->line, 1);
+				}
+			}
+			GenParser_c_Hdr();
+			fprintf(Parser_h, "protected:\n");  /* MR20 */
+			NewSetWd();
+			TRANS(SynDiag);			/* Translate to the target language */
+			DumpSetWd();
+			GenRuleMemberDeclarationsForCC(Parser_h, SynDiag);
+			if ( class_after_actions != NULL )
+			{
+				ListNode *p;
+				for (p = class_after_actions->next; p!=NULL; p=p->next)
+				{
+					UserAction *ua = (UserAction *)p->elem;
+					dumpAction( ua->action, Parser_h, 0, ua->file, ua->line, 1);
+				}
+			}
+			DumpRemainingTokSets();
+			fprintf(Parser_h, "};\n");
+			fprintf(Parser_h, "\n#endif /* %s_h */\n", CurrentClassName);
+			fclose( Parser_h );
+			fclose( Parser_c );
+		}
+	}
+
+    MR_orphanRules(stderr);
+    if (LTinTokenAction && WarningLevel >= 2) {
+		if (GenCC) {
+			warnNoFL("At least one <<action>> following a token match contains a reference to LT(...)\n      this will reference the immediately preceding token,\n      not the one which follows as is the case with semantic predicates.");
+		}
+			warnNoFL("At least one <<action>> following a token match contains a reference to LA(...) or LATEXT(...)\n      this will reference the immediately preceding token,\n      not the one which follows as is the case with semantic predicates.");
+	}
+
+	if ( PrintOut )
+	{
+		if ( SynDiag == NULL ) {warnNoFL("no grammar description recognized");}
+		else PRINT(SynDiag);
+	}
+
+#ifdef DBG_LL1
+#endif
+	GenRemapFile();					/* create remap.h */
+/* MR10 */    if (FoundGuessBlk) {
+#ifdef __cplusplus__
+/* MR10 */      list_apply(NumericPredLabels, (void (*)(void *))report_numericPredLabels);
+#else
+#ifdef __USE_PROTOS
+/* MR10 */      list_apply(NumericPredLabels, (void (*)(void *))report_numericPredLabels);
+#else
+/* MR10 */      list_apply(NumericPredLabels,report_numericPredLabels);
+#endif
+#endif
+/* MR10 */    };
+
+    if (InfoT && TnodesAllocated > 0) {
+      if (TnodesPeak > 10000) {
+        fprintf(stdout,"\nTree Nodes:  peak %dk  created %dk  lost %d\n",
+                        (TnodesPeak/1000),
+                        (TnodesAllocated/1000),
+                        TnodesInUse-tnodes_used_in_guard_predicates_etc);
+       } else {
+         fprintf(stdout,"\nTree Nodes:  peak %d  created %d  lost %d\n",
+                        TnodesPeak,
+                        TnodesAllocated,
+                        TnodesInUse-tnodes_used_in_guard_predicates_etc);
+       };
+    };
+    if (InfoF) {
+      DumpFcache();
+    };
+    if (MR_skipped_e3_report) {
+      fprintf(stderr,"note: use -e3 to get exact information on ambiguous tuples\n");
+    };
+    if (MR_BadExprSets != 0) {
+      fprintf(stderr,"note: Unreachable C or C++ code was generated for empty expression sets,\n");
+      fprintf(stderr,"        probably due to undefined rules or infinite left recursion.\n");
+      fprintf(stderr,"      To locate: search the generated code for \"empty set expression\"\n");
+    };
+    if (MR_AmbAidRule != NULL && MR_matched_AmbAidRule==0) {
+      RuleEntry *q = (RuleEntry *) hash_get(Rname,MR_AmbAidRule);
+      if (MR_AmbAidLine == 0 && q == NULL) {
+         warnNoFL(eMsg2("there is no rule \"%s\" so \"-aa %s\" will never match",
+                                                        MR_AmbAidRule,MR_AmbAidRule));
+      } else {
+        warnNoFL(eMsg1("there was no ambiguity that matched \"-aa %s\"",MR_AmbAidRule));
+      };
+    };
+    if (AlphaBetaTrace) {
+
+      if (MR_AlphaBetaMessageCount == 0) {
+         fprintf(stderr,"note: there were no messages about \"(alpha)? beta\" blocks added to the generated code\n");
+      } else {
+         fprintf(stderr,"note: there were %d messages about \"(alpha)? beta\" blocks added to the generated code\n",
+                    MR_AlphaBetaMessageCount);
+      }
+
+      if (set_null(MR_CompromisedRules)) {
+         fprintf(stderr,"note: the list of rules with compromised follow sets is empty\n");
+      } else {
+         fprintf(stderr,"note: the following is a list of rules which *may* have incorrect\n");
+         fprintf(stderr,"      follow sets computed as a result of an \"(alpha)? beta\" block\n");
+         fprintf(stderr,"\n");
+         MR_dumpRuleSet(MR_CompromisedRules);
+         fprintf(stderr,"\n");
+      }
+    }
+	cleanUp();
+	exit(PCCTS_EXIT_SUCCESS);
+    return 0;           /* MR11 make compilers happy */ 
+}
+
+static void 
+#ifdef __USE_PROTOS 
+init( void )
+#else
+init( )
+#endif
+{
+	SignalEntry *q;
+
+	Tname = newHashTable();
+	Rname = newHashTable();
+	Fcache = newHashTable();
+	Tcache = newHashTable();
+	Sname = newHashTable();
+    Pname = newHashTable();     /* MR11 */
+
+	/* Add default signal names */
+	q = (SignalEntry *)hash_add(Sname,
+							  "NoViableAlt",
+							  (Entry *)newSignalEntry("NoViableAlt"));
+	require(q!=NULL, "cannot alloc signal entry");
+	q->signum = sigNoViableAlt;
+	q = (SignalEntry *)hash_add(Sname,
+							  "MismatchedToken",
+							  (Entry *)newSignalEntry("MismatchedToken"));
+	require(q!=NULL, "cannot alloc signal entry");
+	q->signum = sigMismatchedToken;
+	q = (SignalEntry *)hash_add(Sname,
+							  "NoSemViableAlt",
+							  (Entry *)newSignalEntry("NoSemViableAlt"));
+	require(q!=NULL, "cannot alloc signal entry");
+	q->signum = sigNoSemViableAlt;
+	
+	reserved_positions = empty;
+	all_tokens = empty;
+	imag_tokens = empty;
+	tokclasses = empty;
+	TokenStr = (char **) calloc(TSChunk, sizeof(char *));
+	require(TokenStr!=NULL, "main: cannot allocate TokenStr");
+	FoStack = (int **) calloc(CLL_k+1, sizeof(int *));
+	require(FoStack!=NULL, "main: cannot allocate FoStack");
+	FoTOS = (int **) calloc(CLL_k+1, sizeof(int *));
+	require(FoTOS!=NULL, "main: cannot allocate FoTOS");
+	Cycles = (ListNode **) calloc(CLL_k+1, sizeof(ListNode *));
+	require(Cycles!=NULL, "main: cannot allocate Cycles List");
+    MR_CompromisedRules=empty;  /* MR14 */
+}
+
+static void
+#ifdef __USE_PROTOS
+help( void )
+#else
+help( )
+#endif
+{
+	Opt *p = options;
+	fprintf(stderr, "antlr [options] f1 f2 ... fn\n");
+	while ( *(p->option) != '*' )
+	{
+		fprintf(stderr, "    %-9s%s   %s\n",
+						p->option,
+						(p->arg)?"___":"   ",
+						p->descr);
+		p++;
+	}
+}
+
+/* The RulePtr array is filled in here.  RulePtr exists primarily
+ * so that sets of rules can be maintained for the FOLLOW caching
+ * mechanism found in rJunc().  RulePtr maps a rule num from 1 to n
+ * to a pointer to its RuleBlk junction where n is the number of rules.
+ */
+static void
+#ifdef __USE_PROTOS
+buildRulePtr( void )
+#else
+buildRulePtr( )
+#endif
+{
+	int r=1;
+	Junction *p  = SynDiag;
+	RulePtr = (Junction **) calloc(NumRules+1, sizeof(Junction *));
+	require(RulePtr!=NULL, "cannot allocate RulePtr array");
+	
+	while ( p!=NULL )
+	{
+		require(r<=NumRules, "too many rules???");
+		RulePtr[r++] = p;
+		p = (Junction *)p->p2;
+	}
+}
+
+void
+#ifdef __USE_PROTOS
+dlgerror(const char *s)
+#else
+dlgerror(s)
+char *s;
+#endif
+{
+	fprintf(stderr, ErrHdr, FileStr[CurFile], zzline);
+	fprintf(stderr, " lexical error: %s (text was '%s')\n",
+					((s == NULL) ? "Lexical error" : s), zzlextext);
+}
+
+void
+#ifdef __USE_PROTOS
+readDescr( void )
+#else
+readDescr( )
+#endif
+{
+	zzerr = dlgerror;
+	input = NextFile();
+	if ( input==NULL ) fatal("No grammar description found (exiting...)");
+	ANTLR(grammar(), input);
+    tnodes_used_in_guard_predicates_etc=TnodesInUse;    /* MR10 */
+}
+
+FILE *
+#ifdef __USE_PROTOS
+NextFile( void )
+#else
+NextFile( )
+#endif
+{
+	FILE *f;
+
+	for (;;)
+	{
+		CurFile++;
+		if ( CurFile >= NumFiles ) return(NULL);
+		if ( ci_strequ(FileStr[CurFile],"stdin")) return stdin;
+		f = fopen(FileStr[CurFile], "r");
+		if ( f == NULL )
+		{
+			warnNoFL( eMsg1("file %s doesn't exist; ignored", FileStr[CurFile]) );
+		}
+		else
+		{
+			return(f);
+		}
+	}
+}
+
+/*
+ * Return a string corresponding to the output file name associated
+ * with the input file name passed in.
+ *
+ * Observe the following rules:
+ *
+ *		f.e		--> f".c"
+ *		f		--> f".c"
+ *		f.		--> f".c"
+ *		f.e.g	--> f.e".c"
+ *
+ * Where f,e,g are arbitrarily long sequences of characters in a file
+ * name.
+ *
+ * In other words, if a ".x" appears on the end of a file name, make it
+ * ".c".  If no ".x" appears, append ".c" to the end of the file name.
+ *
+ * C++ mode using .cpp not .c.
+ *
+ * Use malloc() for new string.
+ */
+
+char *
+#ifdef __USE_PROTOS
+outname( char *fs )
+#else
+outname( fs )
+char *fs;
+#endif
+{
+    if ( GenCC) {
+      return outnameX(fs,CPP_FILE_SUFFIX);
+    } else {
+      return outnameX(fs,".c");
+    };
+}
+
+char *
+#ifdef __USE_PROTOS
+outnameX( char *fs ,char *suffix)
+#else
+outnameX( fs , suffix )
+char *fs;
+char *suffix;
+#endif
+{
+	static char buf[MaxFileName+1];
+	char *p;
+	require(fs!=NULL&&*fs!='\0', "outname: NULL filename");
+
+	p = buf;
+	strcpy(buf, fs);
+	while ( *p != '\0' )  {p++;}			/* Stop on '\0' */
+	while ( *p != '.' && p != buf ) {--p;}	/* Find '.' */
+	if ( p != buf ) *p = '\0';				/* Found '.' */
+	require(strlen(buf) + 2 < (size_t)MaxFileName, "outname: filename too big");
+    strcat(buf,suffix);
+	return( buf );
+}
+
+void
+#ifdef __USE_PROTOS
+fatalFL( char *err_, char *f, int l )
+#else
+fatalFL( err_, f, l )
+char *err_;
+char *f;
+int l;
+#endif
+{
+	fprintf(stderr, ErrHdr, f, l);
+	fprintf(stderr,	" %s\n", err_);
+	cleanUp();
+	exit(PCCTS_EXIT_FAILURE);
+}
+
+void
+#ifdef __USE_PROTOS
+fatal_intern( char *err_, char *f, int l )
+#else
+fatal_intern( err_, f, l )
+char *err_;
+char *f;
+int l;
+#endif
+{
+	fprintf(stderr, ErrHdr, f, l);
+	fprintf(stderr,	" #$%%*&@# internal error: %s\n", err_);
+	fprintf(stderr, ErrHdr, f, l);
+	fprintf(stderr, " [complain to nearest government official\n");
+	fprintf(stderr, ErrHdr, f, l);
+	fprintf(stderr, "  or send hate-mail to parrt@parr-research.com;\n");
+	fprintf(stderr, ErrHdr, f, l);
+	fprintf(stderr, "  please pray to the ``bug'' gods that there is a trival fix.]\n");
+	cleanUp();
+	exit(PCCTS_EXIT_FAILURE);
+}
+
+void
+#ifdef __USE_PROTOS
+cleanUp( void )
+#else
+cleanUp( )
+#endif
+{
+	if ( DefFile != NULL) fclose( DefFile );
+}
+
+/* sprintf up to 3 strings */
+char *
+#ifdef __USE_PROTOS
+eMsg3( char *s, char *a1, char *a2, char *a3 )
+#else
+eMsg3( s, a1, a2, a3 )
+char *s;
+char *a1;
+char *a2;
+char *a3;
+#endif
+{
+	static char buf[250];			/* DANGEROUS as hell !!!!!! */
+	
+	sprintf(buf, s, a1, a2, a3);
+	return( buf );
+}
+
+/* sprintf a decimal */
+char *
+#ifdef __USE_PROTOS
+eMsgd( char *s, int d )
+#else
+eMsgd( s, d )
+char *s;
+int d;
+#endif
+{
+	static char buf[250];			/* DANGEROUS as hell !!!!!! */
+	
+	sprintf(buf, s, d);
+	return( buf );
+}
+
+char *
+#ifdef __USE_PROTOS
+eMsgd2( char *s, int d1,int d2)
+#else
+eMsgd2( s, d1, d2 )
+char *s;
+int d1;
+int d2;
+#endif
+{
+	static char buf[250];			/* DANGEROUS as hell !!!!!! */
+	
+	sprintf(buf, s, d1, d2);
+	return( buf );
+}
+
+void
+#ifdef __USE_PROTOS
+s_fprT( FILE *f, set e )
+#else
+s_fprT( f, e )
+FILE *f;
+set e;
+#endif
+{
+	register unsigned *p;
+	unsigned *q;
+
+	if ( set_nil(e) ) return;
+	if ( (q=p=set_pdq(e)) == NULL ) fatal_internal("Can't alloc space for set_pdq");
+	fprintf(f, "{");
+	while ( *p != nil )
+	{
+		fprintf(f, " %s", TerminalString(*p));
+		p++;
+	}
+	fprintf(f, " }");
+	free((char *)q);
+}
+
+/* Return the token name or regular expression for a token number. */
+char *
+#ifdef __USE_PROTOS
+TerminalString( int token )
+#else
+TerminalString( token )
+int token;
+#endif
+{
+	int     j;
+        static    char    imag_name[20];
+
+	/* look in all lexclasses for the token */
+	if ( TokenString(token) != NULL ) return TokenString(token);
+	for (j=0; j<NumLexClasses; j++)
+	{
+		lexmode(j);
+		if ( ExprString(token) != NULL ) return ExprString(token);
+	}
+
+    if (1) {
+      sprintf(imag_name,"UnknownToken#%d",token);           /* MR13 */
+      return imag_name;                                     /* MR13 */
+    }
+
+	require(j<NumLexClasses, eMsgd("No label or expr for token %d",token));
+	return "invalid";
+}
+
+                    /* S i m p l e  I n t  S t a c k */
+
+void
+#ifdef __USE_PROTOS
+pushint( int i )
+#else
+pushint( i )
+int i;
+#endif
+{
+	require(isp>0, "pushint: stack overflow");
+	istack[--isp] = i;
+}
+
+int
+#ifdef __USE_PROTOS
+popint( void )
+#else
+popint( )
+#endif
+{
+	require(isp<MAX_INT_STACK, "popint: stack underflow");
+	return istack[isp++];
+}
+
+int
+#ifdef __USE_PROTOS
+istacksize( void )
+#else
+istacksize( )
+#endif
+{
+	return MAX_INT_STACK-isp;
+}
+
+void
+#ifdef __USE_PROTOS
+istackreset( void )
+#else
+istackreset( )
+#endif
+{
+	isp = MAX_INT_STACK;
+}
+
+int
+#ifdef __USE_PROTOS
+istackempty( void )
+#else
+istackempty( )
+#endif
+{
+	return isp==MAX_INT_STACK;
+}
+
+int
+#ifdef __USE_PROTOS
+topint( void )
+#else
+topint( )
+#endif
+{
+	require(isp<MAX_INT_STACK, "topint: stack underflow");
+	return istack[isp];
+}
+
+void
+#ifdef __USE_PROTOS
+ProcessArgs( int argc, char **argv, Opt *options )
+#else
+ProcessArgs( argc, argv, options )
+int argc;
+char **argv;
+Opt *options;
+#endif
+{
+	Opt *p;
+	require(argv!=NULL, "ProcessArgs: command line NULL");
+
+	while ( argc-- > 0 )
+	{
+		p = options;
+		while ( p->option != NULL )
+		{
+			if ( strcmp(p->option, "*") == 0 ||
+				 ci_strequ(p->option, *argv) == 1 )
+			{
+				if ( p->arg )
+				{
+/* MR9  26-Sep-97   Check for argv valid                */
+                    if (argc-- > 0) {
+  				     	(*p->process)( *argv, *(argv+1) );
+					    argv++;
+                    } else {
+fprintf(stderr,"error: required argument for option %s omitted\n",*argv);
+exit(PCCTS_EXIT_FAILURE);
+                    };
+				}
+				else
+					(*p->process)( *argv );
+				break;
+			}
+			p++;
+		}
+		argv++;
+	}
+}
+
+static void 
+#ifdef __USE_PROTOS
+CompleteContextGuards(void)
+#else
+CompleteContextGuards()
+#endif
+{
+    ListNode *      p;
+    Predicate *     pred;
+
+    if (ContextGuardPredicateList == NULL) return;
+
+    for (p=ContextGuardPredicateList->next; p != NULL; p=p->next) {
+      pred=(Predicate *)p->elem;
+      recomputeContextGuard(pred);
+    }
+}
+
+/* Go back into the syntax diagram and compute all meta tokens; i.e.
+ * turn all '.', ranges, token class refs etc... into actual token sets
+ */
+static void
+#ifdef __USE_PROTOS
+CompleteTokenSetRefs(void)
+#else
+CompleteTokenSetRefs()
+#endif
+{
+	ListNode *p;
+
+	if ( MetaTokenNodes==NULL ) return;
+	for (p = MetaTokenNodes->next; p!=NULL; p=p->next)
+	{
+		set a,b;
+
+		TokNode *q = (TokNode *)p->elem;
+		if ( q->wild_card )
+		{
+			q->tset = all_tokens;
+		}
+		else if ( q->tclass!=NULL )
+		{
+			if ( q->complement ) q->tset = set_dif(all_tokens, q->tclass->tset);
+			else q->tset = q->tclass->tset;
+		}
+		else if ( q->upper_range!=0 )
+		{
+			/* we have a range on our hands: make a set from q->token .. q->upper_range */
+			int i;
+			a = empty;
+			for (i=q->token; i<=q->upper_range; i++) { set_orel(i, &a); }   /* MR13 */
+
+/* MR13 */    if (q->complement) {
+/* MR13 */      q->tset = set_dif(all_tokens, a);
+/* MR13 */        set_free(a);
+/* MR13 */      } else {
+/* MR13 */	      q->tset = a;
+/* MR13 */      }
+
+        }
+
+		/* at this point, it can only be a complemented single token */
+		else if ( q->complement )
+		{
+			a = set_of(q->token);
+			b = set_dif(all_tokens, a);
+			set_free(a);
+			q->tset=b;
+		}
+		else fatal("invalid meta token");
+	}
+}
+
+/* MR10: Jeff Vincent
+   MR10: Changed to remove directory information from n only if
+   MR10: if OutputDirectory was changed by user (-o option)
+*/
+
+char *
+#ifdef __USE_PROTOS
+OutMetaName(char *n)
+#else
+OutMetaName(n)
+char *n;
+#endif
+{	
+    static char *dir_sym = DirectorySymbol;
+    static char newname[MaxFileName+1];
+    char *p;
+
+	/* If OutputDirectory is same as TopDirectory (platform default) then leave n alone. */
+    if (strcmp(OutputDirectory, TopDirectory) == 0)		/* TopDirectory is "." on Unix. */
+		return n;
+
+	/* p will point to filename without path information */
+	if ((p = strrchr(n, *dir_sym)) != NULL)				/* Directory symbol is "/" on Unix. */
+		p++;
+	else
+		p = n;
+
+	/* Copy new output directory into newname[] */
+	strcpy(newname, OutputDirectory);
+
+	/* if new output directory does not have trailing dir_sym, add it! */
+	if (newname[strlen(newname)-1] != *dir_sym) {
+		strcat(newname, dir_sym);
+	}
+	strcat(newname, p);
+	return newname;
+}
+
+char *
+#ifdef __USE_PROTOS
+pcctsBaseName(char *n) /* MR32 */
+#else
+pcctsBaseName(n)
+char *n;
+#endif
+{
+    static char newname[MaxFileName+1];
+    static char* dir_sym = DirectorySymbol;
+    int count = 0;
+    char *p;
+
+    p = n;
+
+    while ( *p != '\0' )  {p++;}                    /* go to end of string */
+    while ( (*p != *dir_sym) && (p != n) ) {--p;}   /* Find last DirectorySymbol */
+    while ( *p == *dir_sym) p++;                    /* step forward if we're on a dir symbol */
+    while ( *p != '\0' && *p != '.')
+    {
+        newname[count++] = *p;
+        p++;
+    }                                               /* create a new name */
+    newname[count] = '\0';
+    return newname;
+}
+
+static void
+#ifdef __USE_PROTOS
+ensure_no_C_file_collisions(char *class_c_file)
+#else
+ensure_no_C_file_collisions(class_c_file)
+char *class_c_file;
+#endif
+{
+	int i;
+
+	for (i=0; i<NumFiles; i++)
+	{
+
+#ifdef PCCTS_CASE_INSENSITIVE_FILE_NAME
+		/* assume that file names are case insensitive */
+		if ( STRICMP(outname(FileStr[i]), class_c_file)==0 )
+#else
+		if ( strcmp(outname(FileStr[i]), class_c_file)==0 )
+#endif
+		{
+			fatal(eMsg1("class def output file conflicts with parser output file: %s",
+						outname(FileStr[i])));
+		}
+	}
+}
+
+void
+#ifdef __USE_PROTOS
+warnNoFL(char *err)
+#else
+warnNoFL(err)
+char *err;
+#endif
+{
+	fprintf(stderr, "warning: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+warnFL(char *err,char *f,int l)
+#else
+warnFL(err,f,l)
+char *f;
+int l;
+char *err;
+#endif
+{
+	fprintf(stderr, ErrHdr, f, l);						
+	fprintf(stderr, " warning: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+warn(char *err)												
+#else
+warn(err)												
+char *err;
+#endif
+{
+	/* back up the file number if we hit an error at the end of the last file */
+	if ( CurFile >= NumFiles && CurFile >= 1 ) CurFile--;
+	fprintf(stderr, ErrHdr, FileStr[CurFile], zzline);
+	fprintf(stderr, " warning: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+warnNoCR( char *err )
+#else
+warnNoCR( err )											
+char *err;
+#endif
+{
+	/* back up the file number if we hit an error at the end of the last file */
+	if ( CurFile >= NumFiles && CurFile >= 1 ) CurFile--;
+	fprintf(stderr, ErrHdr, FileStr[CurFile], zzline);
+	fprintf(stderr, " warning: %s", err);
+}
+
+void
+#ifdef __USE_PROTOS
+errNoFL(char *err)
+#else
+errNoFL(err)
+char *err;
+#endif
+{
+	fprintf(stderr, "error: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+errFL(char *err,char *f,int l)
+#else
+errFL(err,f,l)
+char *err;
+char *f;
+int l;
+#endif
+{
+	fprintf(stderr, ErrHdr, f, l);						
+	fprintf(stderr, " error: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+err(char *err)												
+#else
+err(err)												
+char *err;
+#endif
+{
+	/* back up the file number if we hit an error at the end of the last file */
+	if ( CurFile >= NumFiles && CurFile >= 1 ) CurFile--;
+	fprintf(stderr, ErrHdr, FileStr[CurFile], zzline);
+	fprintf(stderr, " error: %s\n", err);
+}
+
+void
+#ifdef __USE_PROTOS
+errNoCR( char *err )											
+#else
+errNoCR( err )											
+char *err;
+#endif
+{
+	/* back up the file number if we hit an error at the end of the last file */
+	if ( CurFile >= NumFiles && CurFile >= 1 ) CurFile--;
+	fprintf(stderr, ErrHdr, FileStr[CurFile], zzline);
+	fprintf(stderr, " error: %s", err);
+}
+
+UserAction *
+#ifdef __USE_PROTOS
+newUserAction(char *s)
+#else
+newUserAction(s)
+char *s;
+#endif
+{
+	UserAction *ua = (UserAction *) calloc(1, sizeof(UserAction));
+	require(ua!=NULL, "cannot allocate UserAction");
+
+	ua->action = (char *) calloc(strlen(LATEXT(1))+1, sizeof(char));
+	strcpy(ua->action, s);
+	return ua;
+}
+
+/* Added by TJP September 1994 */
+/* Take in file.h and return file_h; names w/o '.'s are left alone */
+char *
+#ifdef __USE_PROTOS
+gate_symbol(char *name)
+#else
+gate_symbol(name)
+char *name;
+#endif
+{
+	static char buf[100];
+	char *p;
+	sprintf(buf, "%s", name);
+
+	for (p=buf; *p!='\0'; p++)
+	{
+		if ( *p=='.' ) *p = '_';
+	}
+	return buf;
+}
+
+char *
+#ifdef __USE_PROTOS
+makeAltID(int blockid, int altnum)
+#else
+makeAltID(blockid, altnum)
+int blockid;
+int altnum;
+#endif
+{
+	static char buf[100];
+	char *p;
+	sprintf(buf, "_blk%d_alt%d", blockid, altnum);
+	p = (char *)malloc(strlen(buf)+1);
+	strcpy(p, buf);
+	return p;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile b/Tools/Source/TianoTools/Pccts/antlr/makefile
new file mode 100644
index 0000000000..a528001bdf
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile
@@ -0,0 +1,218 @@
+#
+# Makefile for ANTLR 1.33
+#
+# SOFTWARE RIGHTS
+#
+# We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+# Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+# company may do whatever they wish with source code distributed with
+# PCCTS or the code generated by PCCTS, including the incorporation of
+# PCCTS, or its output, into commerical software.
+# 
+# We encourage users to develop software with PCCTS.  However, we do ask
+# that credit is given to us for developing PCCTS.  By "credit",
+# we mean that if you incorporate our source code into one of your
+# programs (commercial product, research project, or otherwise) that you
+# acknowledge this fact somewhere in the documentation, research report,
+# etc...  If you like PCCTS and have developed a nice tool with the
+# output, please mention that you developed it using PCCTS.  In
+# addition, we ask that this header remain intact in our source code.
+# As long as these guidelines are kept, we expect to continue enhancing
+# this system and expect to make other tools available as they are
+# completed.
+#
+# ANTLR 1.33
+# Terence Parr
+# Parr Research Corporation
+# with Purdue University
+# and AHPCRC, University of Minnesota
+# 1989-1995
+#
+# Ported to Borland C++, IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+## (both targets and 'make' variable definitions)
+## Note that UNIX is the default
+##
+
+#
+#   OS/2 & DOS 16 bit using MSC 6.0
+#
+#CC=cl
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=/NOD:LLIBCE LLIBCEP
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egamn.obj
+#       link @<<
+#$** /NOI
+#$@ /STACK:14336
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        bind $@ c:\os2\doscalls.lib
+#        copy *.exe ..\bin
+#
+
+#
+#   Borland C++ for DOS
+#
+#CC=bcc
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= emu mathl cl
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#       tlink @&&|
+#C0L $**
+#$@ /Tde /c
+#
+#$(LIBS)
+#$(DEF_FILE) $(LFLAGS) ;
+#|
+#        copy *.exe ..\bin
+#
+
+#
+# C-Set/2 for OS/2
+#
+#CC=icc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 -DUSER_ZZSYN -D__STDC__
+#OUT_OBJ = -Fo
+#LIBS=
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#        link386 @<<
+#$** /NOI
+#$@ /STACK:32768
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        copy *.exe ..\bin
+#
+
+#
+# Borland C++ for OS/2
+#
+#CC=bcc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -v -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= c2 os2
+#
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj
+#        tlink @&&|
+#c02 $** -c -v
+#antlr.exe
+#
+#C2 os2
+#
+#|
+#        copy *.exe ..\bin
+#
+
+# *********** Target list of PC machines ***********
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+#	$(ANTLR) antlr.g
+#
+#antlr.$(OBJ_EXT): antlr.c mode.h tokens.h
+#
+#scan.$(OBJ_EXT): scan.c mode.h tokens.h
+#
+#scan.c mode.h: parser.dlg
+#	$(DLG) -C2 parser.dlg scan.c
+#
+#set.$(OBJ_EXT): $(SET)/set.c
+#	$(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c
+
+
+
+#
+#   UNIX  (default)
+#
+CC=gcc
+COPT=-O
+ANTLR=../bin/antlr
+DLG=../bin/dlg
+OBJ_EXT=o
+OUT_OBJ = -o
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536
+#
+# SGI Users, use this CFLAGS
+#
+#CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -woff 3262
+OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
+        globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o
+
+antlr : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/antlr $(OBJ)
+
+# what files does PCCTS generate (both ANTLR and DLG)
+PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
+
+SRC=antlr.c scan.c err.c bits.c build.c fset2.c fset.c gen.c globals.c \
+	hash.c lex.c main.c misc.c $(SET)/set.c pred.c egman.c mrhoist.c fcache.c
+
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+#	$(ANTLR) -gh antlr.g
+
+antlr.o : antlr.c mode.h tokens.h
+
+scan.o : scan.c mode.h tokens.h
+
+#scan.c mode.h: parser.dlg
+#	$(DLG) -C2 parser.dlg scan.c
+
+set.o : $(SET)/set.c
+	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
+
+
+#
+# ****** These next targets are common to UNIX and PC world ********
+#
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
+
+#remove everything in clean plus the PCCTS files generated
+scrub:
+	rm -f $(PCCTS_GEN) *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile1 b/Tools/Source/TianoTools/Pccts/antlr/makefile1
new file mode 100644
index 0000000000..5c4a275d59
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile1
@@ -0,0 +1,96 @@
+#
+# Makefile for ANTLR 1.33
+#
+# SOFTWARE RIGHTS
+#
+# We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+# Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+# company may do whatever they wish with source code distributed with
+# PCCTS or the code generated by PCCTS, including the incorporation of
+# PCCTS, or its output, into commerical software.
+# 
+# We encourage users to develop software with PCCTS.  However, we do ask
+# that credit is given to us for developing PCCTS.  By "credit",
+# we mean that if you incorporate our source code into one of your
+# programs (commercial product, research project, or otherwise) that you
+# acknowledge this fact somewhere in the documentation, research report,
+# etc...  If you like PCCTS and have developed a nice tool with the
+# output, please mention that you developed it using PCCTS.  In
+# addition, we ask that this header remain intact in our source code.
+# As long as these guidelines are kept, we expect to continue enhancing
+# this system and expect to make other tools available as they are
+# completed.
+#
+# ANTLR 1.33
+# Terence Parr
+# Parr Research Corporation
+# with Purdue University
+# and AHPCRC, University of Minnesota
+# 1989-1995
+#
+# Ported to Borland C++, IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+#
+#   UNIX  (default)
+#
+CC=cc
+ANTLR=../bin/antlr
+DLG=../bin/dlg
+OBJ_EXT=o
+OUT_OBJ = -o
+ANSI=-ansi
+AOTHER=
+CFLAGS= -O0 -g -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) $(ANSI) -DZZLEXBUFSIZE=32000
+#
+# SGI Users, use this CFLAGS
+#
+#CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -woff 3262
+
+OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o \
+        globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o $(OBJOTHER)
+
+antlr : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o antlr $(OBJ)
+		mv antlr ../bin
+
+# what files does PCCTS generate (both ANTLR and DLG)
+PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h
+
+SRC=antlr.c scan.c err.c bits.c build.c fset2.c fset.c gen.c globals.c \
+	hash.c lex.c main.c misc.c $(SET)/set.c pred.c egman.c mrhoist.c fcache.c
+
+#
+# Don't worry about the ambiguity messages coming from antlr
+# for making antlr.c etc...  [should be 10 of them, I think]
+#
+antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g
+	$(ANTLR) -gh antlr.g $(AOTHER)
+
+antlr.o : antlr.c mode.h tokens.h
+
+scan.o : scan.c mode.h tokens.h
+
+scan.c mode.h: parser.dlg
+	$(DLG) -C2 parser.dlg scan.c
+
+set.o : $(SET)/set.c
+	$(CC) $(CFLAGS) -c -o set.o $(SET)/set.c
+
+
+#
+# ****** These next targets are common to UNIX and PC world ********
+#
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
+
+#remove everything in clean plus the PCCTS files generated
+scrub:
+	rm -f $(PCCTS_GEN) *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/Pccts/antlr/misc.c b/Tools/Source/TianoTools/Pccts/antlr/misc.c
new file mode 100644
index 0000000000..3f58da34c5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/misc.c
@@ -0,0 +1,1864 @@
+/*
+ * misc.c
+ *
+ * Manage tokens, regular expressions.
+ * Print methods for debugging
+ * Compute follow lists onto tail ends of rules.
+ *
+ * The following functions are visible:
+ *
+ *		int		addTname(char *);		Add token name
+ *		int		addTexpr(char *);		Add token expression
+ *		int		Tnum(char *);			Get number of expr/token
+ *		void	Tklink(char *, char *);	Link a name with an expression
+ *		int		hasAction(expr);		Does expr already have action assigned?
+ *		void	setHasAction(expr);		Indicate that expr now has an action
+ *		Entry	*newEntry(char *,int);	Create new table entry with certain size
+ *		void	list_add(ListNode **list, char *e)
+ *      void    list_free(ListNode **list, int freeData);   *** MR10 ***
+ *		void	list_apply(ListNode *list, void (*f)())
+ *		void	lexclass(char *m);		switch to new/old lexical class
+ *		void	lexmode(int i);			switch to old lexical class i
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+#include <ctype.h>
+
+static int tsize=TSChunk;		/* size of token str arrays */
+
+static void
+#ifdef __USE_PROTOS
+RemapForcedTokensInSyntaxDiagram(Node *);
+#else
+RemapForcedTokensInSyntaxDiagram();
+#endif
+
+				/* T o k e n  M a n i p u l a t i o n */
+
+/*
+ * add token 't' to the TokenStr/Expr array.  Make more room if necessary.
+ * 't' is either an expression or a token name.
+ *
+ * There is only one TokenStr array, but multiple ExprStr's.  Therefore,
+ * for each lex class (element of lclass) we must extend the ExprStr array.
+ * ExprStr's and TokenStr are always all the same size.
+ *
+ * Also, there is a Texpr hash table for each automaton.
+ */
+static void
+#ifdef __USE_PROTOS
+Ttrack( char *t )
+#else
+Ttrack( t )
+char *t;
+#endif
+{
+	if ( TokenNum >= tsize )	/* terminal table overflow? */
+	{
+		char **p;
+		int i, more, j;
+
+		more = TSChunk * (1 + ((TokenNum-tsize) / TSChunk));
+		tsize += more;
+		TokenStr = (char **) realloc((char *)TokenStr, tsize*sizeof(char *));
+		require(TokenStr != NULL, "Ttrack: can't extend TokenStr");
+		for (i=0; i<NumLexClasses; i++)
+		{
+			lclass[i].exprs = (char **)
+							  realloc((char *)lclass[i].exprs, tsize*sizeof(char *));
+			require(lclass[i].exprs != NULL, "Ttrack: can't extend ExprStr");
+			for (p= &lclass[i].exprs[tsize-more],j=1; j<=more; j++) *p++ = NULL;
+		}
+		for (p= &TokenStr[tsize-more],i=1; i<=more; i++) *p++ = NULL;
+		lexmode( CurrentLexClass ); /* reset ExprStr in case table moved */
+	}
+	/* note: we use the actual ExprStr/TokenStr array
+	 * here as TokenInd doesn't exist yet
+	 */
+	if ( *t == '"' ) ExprStr[TokenNum] = t;
+	else TokenStr[TokenNum] = t;
+}
+
+static Expr *
+#ifdef __USE_PROTOS
+newExpr( char *e )
+#else
+newExpr( e )
+char *e;
+#endif
+{
+	Expr *p = (Expr *) calloc(1, sizeof(Expr));
+	require(p!=NULL, "newExpr: cannot alloc Expr node");
+
+	p->expr = e;
+	p->lclass = CurrentLexClass;
+	return p;
+}
+
+/* switch to lexical class/mode m.  This amounts to creating a new
+ * lex mode if one does not already exist and making ExprStr point
+ * to the correct char string array.  We must also switch Texpr tables.
+ *
+ * BTW, we need multiple ExprStr arrays because more than one automaton
+ * may have the same label for a token, but with different expressions.
+ * We need to track an expr for each automaton.  If we disallowed this
+ * feature, only one ExprStr would be required.
+ */
+void
+#ifdef __USE_PROTOS
+lexclass( char *m )
+#else
+lexclass( m )
+char *m;
+#endif
+{
+	int i;
+	TermEntry *p;
+	static char EOFSTR[] = "\"@\"";
+
+	if ( hash_get(Tname, m) != NULL )
+	{
+		warn(eMsg1("lexclass name conflicts with token/errclass label '%s'",m));
+	}
+	/* does m already exist? */
+	i = LexClassIndex(m);
+	if ( i != -1 ) {lexmode(i); return;}
+	/* must make new one */
+	NumLexClasses++;
+	CurrentLexClass = NumLexClasses-1;
+	require(NumLexClasses<=MaxLexClasses, "number of allowable lexclasses exceeded\nIncrease MaxLexClasses in generic.h and recompile all C files");
+	lclass[CurrentLexClass].classnum = m;
+	lclass[CurrentLexClass].exprs = (char **) calloc(tsize, sizeof(char *));
+	require(lclass[CurrentLexClass].exprs!=NULL,
+			"lexclass: cannot allocate ExprStr");
+	lclass[CurrentLexClass].htable = newHashTable();
+	ExprStr = lclass[CurrentLexClass].exprs;
+	Texpr = lclass[CurrentLexClass].htable;
+	/* define EOF for each automaton */
+	p = newTermEntry( EOFSTR );
+	p->token = EofToken;	/* couldn't have remapped tokens yet, use EofToken */
+	hash_add(Texpr, EOFSTR, (Entry *)p);
+	list_add(&ExprOrder, (void *)newExpr(EOFSTR));
+	/* note: we use the actual ExprStr array
+	 * here as TokenInd doesn't exist yet
+	 */
+	ExprStr[EofToken] = EOFSTR;
+}
+
+void
+#ifdef __USE_PROTOS
+lexmode( int i )
+#else
+lexmode( i )
+int i;
+#endif
+{
+	require(i<NumLexClasses, "lexmode: invalid mode");
+	ExprStr = lclass[i].exprs;
+	Texpr = lclass[i].htable;
+	CurrentLexClass = i;
+}
+
+/* return index into lclass array of lexical class. return -1 if nonexistent */
+int
+#ifdef __USE_PROTOS
+LexClassIndex( char *cl )
+#else
+LexClassIndex( cl )
+char *cl;
+#endif
+{
+	int i;
+
+	for (i=0; i<NumLexClasses; i++)
+	{
+		if ( strcmp(lclass[i].classnum, cl) == 0 ) return i;
+	}
+	return -1;
+}
+
+int
+#ifdef __USE_PROTOS
+hasAction( char *expr )
+#else
+hasAction( expr )
+char *expr;
+#endif
+{
+	TermEntry *p;
+	require(expr!=NULL, "hasAction: invalid expr");
+
+	p = (TermEntry *) hash_get(Texpr, expr);
+	require(p!=NULL, eMsg1("hasAction: expr '%s' doesn't exist",expr));
+	return (p->action!=NULL);
+}
+
+void
+#ifdef __USE_PROTOS
+setHasAction( char *expr, char *action )
+#else
+setHasAction( expr, action )
+char *expr;
+char *action;
+#endif
+{
+	TermEntry *p;
+	require(expr!=NULL, "setHasAction: invalid expr");
+
+	p = (TermEntry *) hash_get(Texpr, expr);
+	require(p!=NULL, eMsg1("setHasAction: expr '%s' doesn't exist",expr));
+	p->action = action;
+}
+
+ForcedToken *
+#ifdef __USE_PROTOS
+newForcedToken(char *token, int tnum)
+#else
+newForcedToken(token, tnum)
+char *token;
+int tnum;
+#endif
+{
+	ForcedToken *ft = (ForcedToken *) calloc(1, sizeof(ForcedToken));
+	require(ft!=NULL, "out of memory");
+	ft->token = token;
+	ft->tnum = tnum;
+	return ft;
+}
+
+/*
+ * Make a token indirection array that remaps token numbers and then walk
+ * the appropriate symbol tables and SynDiag to change token numbers
+ */
+void
+#ifdef __USE_PROTOS
+RemapForcedTokens(void)
+#else
+RemapForcedTokens()
+#endif
+{
+	ListNode *p;
+	ForcedToken *q;
+	int max_token_number=0;     /* MR9 23-Sep-97 Removed "unsigned" */
+	int i;
+
+	if ( ForcedTokens == NULL ) return;
+
+	/* find max token num */
+	for (p = ForcedTokens->next; p!=NULL; p=p->next)
+	{
+		q = (ForcedToken *) p->elem;
+		if ( q->tnum > max_token_number ) max_token_number = q->tnum;
+	}
+	fprintf(stderr, "max token number is %d\n", max_token_number);
+
+	/* make token indirection array */
+	TokenInd = (int *) calloc(max_token_number+1, sizeof(int));
+	LastTokenCounted = TokenNum;
+	TokenNum = max_token_number+1;
+	require(TokenInd!=NULL, "RemapForcedTokens: cannot allocate TokenInd");
+
+	/* fill token indirection array and change token id htable ; swap token indices */
+	for (i=1; i<TokenNum; i++) TokenInd[i] = i;
+	for (p = ForcedTokens->next; p!=NULL; p=p->next)
+	{
+		TermEntry *te;
+		int old_pos, t;
+
+		q = (ForcedToken *) p->elem;
+		fprintf(stderr, "%s forced to %d\n", q->token, q->tnum);
+		te = (TermEntry *) hash_get(Tname, q->token);
+		require(te!=NULL, "RemapForcedTokens: token not in hash table");
+		old_pos = te->token;
+		fprintf(stderr, "Before: TokenInd[old_pos==%d] is %d\n", old_pos, TokenInd[old_pos]);
+		fprintf(stderr, "Before: TokenInd[target==%d] is %d\n", q->tnum, TokenInd[q->tnum]);
+		q = (ForcedToken *) p->elem;
+		t = TokenInd[old_pos];
+		TokenInd[old_pos] = q->tnum;
+		TokenInd[q->tnum] = t;
+		te->token = q->tnum;		/* update token type id symbol table */
+		fprintf(stderr, "After: TokenInd[old_pos==%d] is %d\n", old_pos, TokenInd[old_pos]);
+		fprintf(stderr, "After: TokenInd[target==%d] is %d\n", q->tnum, TokenInd[q->tnum]);
+
+		/* Change the token number in the sym tab entry for the exprs
+		 * at the old position of the token id and the target position
+		 */
+		/* update expr at target (if any) of forced token id */
+		if ( q->tnum < TokenNum )	/* is it a valid position? */
+		{
+			for (i=0; i<NumLexClasses; i++)
+			{
+				if ( lclass[i].exprs[q->tnum]!=NULL )
+				{
+					/* update the symbol table for this expr */
+					TermEntry *e = (TermEntry *) hash_get(lclass[i].htable, lclass[i].exprs[q->tnum]);
+					require(e!=NULL, "RemapForcedTokens: expr not in hash table");
+					e->token = old_pos;
+					fprintf(stderr, "found expr '%s' at target %d in lclass[%d]; changed to %d\n",
+							lclass[i].exprs[q->tnum], q->tnum, i, old_pos);
+				}
+			}
+		}
+		/* update expr at old position (if any) of forced token id */
+		for (i=0; i<NumLexClasses; i++)
+		{
+			if ( lclass[i].exprs[old_pos]!=NULL )
+			{
+				/* update the symbol table for this expr */
+				TermEntry *e = (TermEntry *) hash_get(lclass[i].htable, lclass[i].exprs[old_pos]);
+				require(e!=NULL, "RemapForcedTokens: expr not in hash table");
+				e->token = q->tnum;
+				fprintf(stderr, "found expr '%s' for id %s in lclass[%d]; changed to %d\n",
+						lclass[i].exprs[old_pos], q->token, i, q->tnum);
+			}
+		}
+	}
+
+	/* Update SynDiag */
+	RemapForcedTokensInSyntaxDiagram((Node *)SynDiag);
+}
+
+static void
+#ifdef __USE_PROTOS
+RemapForcedTokensInSyntaxDiagram(Node *p)
+#else
+RemapForcedTokensInSyntaxDiagram(p)
+Node *p;
+#endif
+{
+	Junction *j = (Junction *) p;
+	RuleRefNode *r = (RuleRefNode *) p;
+	TokNode *t = (TokNode *)p;
+
+	if ( p==NULL ) return;
+	require(p->ntype>=1 && p->ntype<=NumNodeTypes,	"Remap...: invalid diagram node");
+	switch ( p->ntype )
+	{
+		case nJunction :
+			if ( j->visited ) return;
+			if ( j->jtype == EndRule ) return;
+			j->visited = TRUE;
+			RemapForcedTokensInSyntaxDiagram( j->p1 );
+			RemapForcedTokensInSyntaxDiagram( j->p2 );
+			j->visited = FALSE;
+			return;
+		case nRuleRef :
+			RemapForcedTokensInSyntaxDiagram( r->next );
+			return;
+		case nToken :
+			if ( t->remapped ) return;	/* we've been here before */
+			t->remapped = 1;
+			fprintf(stderr, "remapping %d to %d\n", t->token, TokenInd[t->token]);
+			t->token = TokenInd[t->token];
+			RemapForcedTokensInSyntaxDiagram( t->next );
+			return;
+		case nAction :
+			RemapForcedTokensInSyntaxDiagram( ((ActionNode *)p)->next );
+			return;
+		default :
+			fatal_internal("invalid node type");
+	}
+}
+
+/*
+ * Add a token name.  Return the token number associated with it.  If it already
+ * exists, then return the token number assigned to it.
+ *
+ * Track the order in which tokens are found so that the DLG output maintains
+ * that order.  It also lets us map token numbers to strings.
+ */
+int
+#ifdef __USE_PROTOS
+addTname( char *token )
+#else
+addTname( token )
+char *token;
+#endif
+{
+	TermEntry *p;
+	require(token!=NULL, "addTname: invalid token name");
+
+	if ( (p=(TermEntry *)hash_get(Tname, token)) != NULL ) return p->token;
+	p = newTermEntry( token );
+	Ttrack( p->str );
+	p->token = TokenNum++;
+	hash_add(Tname, token, (Entry *)p);
+	return p->token;
+}
+
+/* This is the same as addTname except we force the TokenNum to be tnum.
+ * We don't have to use the Forced token stuff as no tokens will have
+ * been defined with #tokens when this is called.  This is only called
+ * when a #tokdefs meta-op is used.
+ */
+int
+#ifdef __USE_PROTOS
+addForcedTname( char *token, int tnum )
+#else
+addForcedTname( token, tnum )
+char *token;
+int tnum;
+#endif
+{
+	TermEntry *p;
+	require(token!=NULL, "addTname: invalid token name");
+
+	if ( (p=(TermEntry *)hash_get(Tname, token)) != NULL ) return p->token;
+	p = newTermEntry( token );
+	Ttrack( p->str );
+	p->token = tnum;
+	hash_add(Tname, token, (Entry *)p);
+	return p->token;
+}
+
+/*
+ * Add a token expr.  Return the token number associated with it.  If it already
+ * exists, then return the token number assigned to it.
+ */
+int
+#ifdef __USE_PROTOS
+addTexpr( char *expr )
+#else
+addTexpr( expr )
+char *expr;
+#endif
+{
+	TermEntry *p;
+	require(expr!=NULL, "addTexpr: invalid regular expression");
+
+	if ( (p=(TermEntry *)hash_get(Texpr, expr)) != NULL ) return p->token;
+	p = newTermEntry( expr );
+	Ttrack( p->str );
+	/* track the order in which they occur */
+	list_add(&ExprOrder, (void *)newExpr(p->str));
+	p->token = TokenNum++;
+	hash_add(Texpr, expr, (Entry *)p);
+	return p->token;
+}
+
+/* return the token number of 'term'.  Return 0 if no 'term' exists */
+int
+#ifdef __USE_PROTOS
+Tnum( char *term )
+#else
+Tnum( term )
+char *term;
+#endif
+{
+	TermEntry *p;
+	require(term!=NULL, "Tnum: invalid terminal");
+	
+	if ( *term=='"' ) p = (TermEntry *) hash_get(Texpr, term);
+	else p = (TermEntry *) hash_get(Tname, term);
+	if ( p == NULL ) return 0;
+	else return p->token;
+}
+
+/* associate a Name with an expr.  If both have been already assigned
+ * token numbers, then an error is reported.  Add the token or expr
+ * that has not been added if no error.  This 'represents' the #token
+ * ANTLR pseudo-op.  If both have not been defined, define them both
+ * linked to same token number.
+ */
+void
+#ifdef __USE_PROTOS
+Tklink( char *token, char *expr )
+#else
+Tklink( token, expr )
+char *token;
+char *expr;
+#endif
+{
+	TermEntry *p, *q;
+	require(token!=NULL && expr!=NULL, "Tklink: invalid token name and/or expr");
+
+	p = (TermEntry *) hash_get(Tname, token);
+	q = (TermEntry *) hash_get(Texpr, expr);
+	if ( p != NULL && q != NULL )	/* both defined */
+	{
+		warn( eMsg2("token name %s and rexpr %s already defined; ignored",
+					token, expr) );
+		return;
+	}
+	if ( p==NULL && q==NULL )		/* both not defined */
+	{
+		int t = addTname( token );
+		q = newTermEntry( expr );
+		hash_add(Texpr, expr, (Entry *)q);
+		q->token = t;
+		/* note: we use the actual ExprStr array
+		 * here as TokenInd doesn't exist yet
+		 */
+		ExprStr[t] = q->str;
+		/* track the order in which they occur */
+		list_add(&ExprOrder, (void *)newExpr(q->str));
+		return;
+	}
+	if ( p != NULL )				/* one is defined, one is not */
+	{
+		q = newTermEntry( expr );
+		hash_add(Texpr, expr, (Entry *)q);
+		q->token = p->token;
+		ExprStr[p->token] = q->str;	/* both expr and token str defined now */
+		list_add(&ExprOrder, (void *)newExpr(q->str));
+	}
+	else							/* trying to associate name with expr here*/
+	{
+		p = newTermEntry( token );
+		hash_add(Tname, token, (Entry *)p);
+		p->token = q->token;
+		TokenStr[p->token] = p->str;/* both expr and token str defined now */
+	}
+}
+
+/*
+ * Given a string, this function allocates and returns a pointer to a
+ * hash table record of size 'sz' whose "str" pointer is reset to a position
+ * in the string table.
+ */
+Entry *
+#ifdef __USE_PROTOS
+newEntry( char *text, int sz )
+#else
+newEntry( text, sz )
+char *text;
+int sz;
+#endif
+{
+	Entry *p;
+	require(text!=NULL, "new: NULL terminal");
+	
+	if ( (p = (Entry *) calloc(1,sz)) == 0 )
+	{
+		fatal_internal("newEntry: out of memory for terminals\n");
+		exit(PCCTS_EXIT_FAILURE);
+	}
+	p->str = mystrdup(text);
+	
+	return(p);
+}
+
+/*
+ * add an element to a list.
+ *
+ * Any non-empty list has a sentinel node whose 'elem' pointer is really
+ * a pointer to the last element.  (i.e. length(list) = #elemIn(list)+1).
+ * Elements are appended to the list.
+ */
+void
+#ifdef __USE_PROTOS
+list_add( ListNode **list, void *e )
+#else
+list_add( list, e )
+ListNode **list;
+void *e;
+#endif
+{
+	ListNode *p, *tail;
+	require(e!=NULL, "list_add: attempting to add NULL list element");
+
+	p = newListNode;
+	require(p!=NULL, "list_add: cannot alloc new list node");
+	p->elem = e;
+	if ( *list == NULL )
+	{
+		ListNode *sentinel = newListNode;
+		require(sentinel!=NULL, "list_add: cannot alloc sentinel node");
+		*list=sentinel;
+		sentinel->next = p;
+		sentinel->elem = (char *)p;		/* set tail pointer */
+	}
+	else								/* find end of list */
+	{
+		tail = (ListNode *) (*list)->elem;	/* get tail pointer */
+		tail->next = p;
+		(*list)->elem = (char *) p;		/* reset tail */
+	}
+}
+
+/* MR10 list_free() frees the ListNode elements in the list       */
+/* MR10   if freeData then free the data elements of the list too */
+
+void
+#ifdef __USE_PROTOS
+list_free(ListNode **list,int freeData)
+#else
+list_free(list,freeData)
+  ListNode      **list;
+  int           freeData;
+#endif
+{
+	ListNode *p;
+    ListNode *next;
+
+	if (list == NULL) return;
+    if (*list == NULL) return;
+	for (p=*list; p != NULL; p=next) {
+      next=p->next;
+      if (freeData && p->elem != NULL) {
+        free( (char *) p->elem);
+      };
+      free( (char *) p);
+    };
+    *list=NULL;
+}
+
+void
+#ifdef __USE_PROTOS
+list_apply( ListNode *list, void (*f)(void *) )
+#else
+list_apply( list, f )
+ListNode *list;
+void (*f)();
+#endif
+{
+	ListNode *p;
+	require(f!=NULL, "list_apply: NULL function to apply");
+
+	if ( list == NULL ) return;
+	for (p = list->next; p!=NULL; p=p->next) (*f)( p->elem );
+}
+
+/* MR27 */
+
+#ifdef __USE_PROTOS
+int list_search_cstring(ListNode *list, char * cstring)
+#else
+int list_search_cstring(list, cstring)
+  ListNode * list;
+  char * cstring;
+#endif
+{
+	ListNode *p;
+	if (list == NULL ) return 0;
+	for (p = list->next; p!=NULL; p=p->next) {
+		if (p->elem == NULL) continue;
+		if (0 == strcmp((char *) p->elem , cstring)) return 1;
+	}
+	return 0;
+}
+
+			/* F O L L O W  C y c l e  S t u f f */
+		
+/* make a key based upon (rulename, computation, k value).
+ * Computation values are 'i'==FIRST, 'o'==FOLLOW.
+ */
+
+/* MR10  Make the key all characters so it can be read easily   */
+/* MR10    by a simple dump program.  Also, separates           */
+/* MR10   'o' and 'i' from rule name                            */
+
+char *
+#ifdef __USE_PROTOS
+Fkey( char *rule, int computation, int k )
+#else
+Fkey( rule, computation, k )
+char *rule;
+int computation;
+int k;
+#endif
+{
+	static char key[MaxRuleName+2+2+1];                                 /* MR10 */
+	int i;
+	
+	if ( k > 99 )                                                       /* MR10 */
+		fatal("k>99 is too big for this implementation of ANTLR!\n");   /* MR10 */
+	if ( (i=strlen(rule)) > MaxRuleName )                               /* MR10 */
+		fatal( eMsgd("rule name > max of %d\n", MaxRuleName) );         /* MR10 */
+	strcpy(key,rule);
+
+/* MR10 */     key[i]='*';
+/* MR10 */     key[i+1] = (char) computation; /* MR20 G. Hobbelt */
+/* MR10 */     if (k < 10) {
+/* MR10 */       key[i+2] = (char) ( '0' + k);
+/* MR10 */  	 key[i+3] = '\0';
+/* MR10 */     } else {
+/* MR10 */       key[i+2] = (char) ( '0' + k/10);
+/* MR10 */       key[i+3] = (char) ( '0' + k % 10);
+/* MR10 */       key[i+4] = '\0';
+/* MR10 */     };
+
+	return key;
+}
+
+/* Push a rule onto the kth FOLLOW stack */
+void
+#ifdef __USE_PROTOS
+FoPush( char *rule, int k )
+#else
+FoPush( rule, k )
+char *rule;
+int k;
+#endif
+{
+	RuleEntry *r;
+	require(rule!=NULL, "FoPush: tried to push NULL rule");
+	require(k<=CLL_k,	"FoPush: tried to access non-existent stack");
+
+	/*fprintf(stderr, "FoPush(%s)\n", rule);*/
+	r = (RuleEntry *) hash_get(Rname, rule);
+	if ( r == NULL ) {fatal_internal( eMsg1("rule %s must be defined but isn't", rule) );}
+	if ( FoStack[k] == NULL )		/* Does the kth stack exist yet? */
+	{
+		/*fprintf(stderr, "allocating FoStack\n");*/
+		FoStack[k] = (int *) calloc(FoStackSize, sizeof(int));
+		require(FoStack[k]!=NULL, "FoPush: cannot allocate FOLLOW stack\n");
+	}
+	if ( FoTOS[k] == NULL )
+	{
+		FoTOS[k]=FoStack[k];
+		*(FoTOS[k]) = r->rulenum;
+	}
+	else
+	{
+#ifdef MEMCHK
+		require(valid(FoStack[k]), "FoPush: invalid FoStack");
+#endif
+		if ( FoTOS[k] >= &(FoStack[k][FoStackSize-1]) )
+			fatal( eMsgd("exceeded max depth of FOLLOW recursion (%d)\n",
+						FoStackSize) );
+		require(FoTOS[k]>=FoStack[k],
+				eMsg1("FoPush: FoStack stack-ptr is playing out of its sandbox",
+					  rule));
+		++(FoTOS[k]);
+		*(FoTOS[k]) = r->rulenum;
+	}
+	{
+		/*
+****		int *p;
+****		fprintf(stderr, "FoStack[k=%d]:\n", k);
+****		for (p=FoStack[k]; p<=FoTOS[k]; p++)
+****		{
+****			fprintf(stderr, "\t%s\n", RulePtr[*p]->rname);
+****		}
+		*/
+	}
+}
+
+/* Pop one rule off of the FOLLOW stack.  TOS ptr is NULL if empty. */
+void
+#ifdef __USE_PROTOS
+FoPop( int k )
+#else
+FoPop( k )
+int k;
+#endif
+{
+	require(k<=CLL_k, "FoPop: tried to access non-existent stack");
+	/*fprintf(stderr, "FoPop\n");*/
+	require(FoTOS[k]>=FoStack[k]&&FoTOS[k]<=&(FoStack[k][FoStackSize-1]),
+			"FoPop: FoStack stack-ptr is playing out of its sandbox");
+	if ( FoTOS[k] == FoStack[k] ) FoTOS[k] = NULL;
+	else (FoTOS[k])--;
+}
+
+/* Compute FOLLOW cycle.
+ * Mark all FOLLOW sets for rules in cycle as incomplete.
+ * Then, save cycle on the cycle list (Cycles) for later resolution.
+ * The Cycle is stored in the form:
+ *		(head of cycle==croot, rest of rules in cycle==cyclicDep)
+ *
+ * e.g. (Fo means "FOLLOW of", "-->" means requires or depends on)
+ *
+ *		Fo(x)-->Fo(a)-->Fo(b)-->Fo(c)-->Fo(x)
+ *										   ^----Infinite recursion (cycle)
+ *
+ * the cycle would be: x -> {a,b,c} or stored as (x,{a,b,c}).  Fo(x) depends
+ * on the FOLLOW of a,b, and c.  The root of a cycle is always complete after
+ * Fo(x) finishes.  Fo(a,b,c) however are not.  It turns out that all rules
+ * in a FOLLOW cycle have the same FOLLOW set.
+ */
+void
+#ifdef __USE_PROTOS
+RegisterCycle( char *rule, int k )
+#else
+RegisterCycle( rule, k )
+char *rule;
+int k;
+#endif
+{
+	CacheEntry *f;
+	Cycle *c;
+	int *p;
+	RuleEntry *r;
+	require(rule!=NULL, "RegisterCycle: tried to register NULL rule");
+	require(k<=CLL_k,	"RegisterCycle: tried to access non-existent stack");
+
+	/*fprintf(stderr, "RegisterCycle(%s)\n", rule);*/
+	/* Find cycle start */
+	r = (RuleEntry *) hash_get(Rname, rule);
+	require(r!=NULL,eMsg1("rule %s must be defined but isn't", rule));
+	require(FoTOS[k]>=FoStack[k]&&FoTOS[k]<=&(FoStack[k][FoStackSize-1]),
+			eMsg1("RegisterCycle(%s): FoStack stack-ptr is playing out of its sandbox",
+				  rule));
+/***	if ( FoTOS[k]<FoStack[k]||FoTOS[k]>&(FoStack[k][FoStackSize-1]) )
+****	{
+****		fprintf(stderr, "RegisterCycle(%s): FoStack stack-ptr is playing out of its sandbox\n",
+****						rule);
+****		fprintf(stderr, "RegisterCycle: sp==0x%x out of bounds 0x%x...0x%x\n",
+****						FoTOS[k], FoStack[k], &(FoStack[k][FoStackSize-1]));
+****		exit(PCCTS_EXIT_FAILURE);
+****	}
+****/
+
+#ifdef MEMCHK
+	require(valid(FoStack[k]), "RegisterCycle: invalid FoStack");
+#endif
+	for (p=FoTOS[k]; *p != r->rulenum && p >= FoStack[k]; --p) {;}
+	require(p>=FoStack[k], "RegisterCycle: FoStack is screwed up beyond belief");
+	if ( p == FoTOS[k] ) return;	/* don't worry about cycles to oneself */
+	
+	/* compute cyclic dependents (rules in cycle except head) */
+	c = newCycle;
+	require(c!=NULL, "RegisterCycle: couldn't alloc new cycle");
+	c->cyclicDep = empty;
+	c->croot = *p++;		/* record root of cycle */
+	for (; p<=FoTOS[k]; p++)
+	{
+		/* Mark all dependent rules as incomplete */
+		f = (CacheEntry *) hash_get(Fcache, Fkey(RulePtr[*p]->rname,'o',k));
+		if ( f==NULL )
+		{
+			f = newCacheEntry( Fkey(RulePtr[*p]->rname,'o',k) );
+			hash_add(Fcache, Fkey(RulePtr[*p]->rname,'o',k), (Entry *)f);
+		}
+		f->incomplete = TRUE;
+		
+		set_orel(*p, &(c->cyclicDep)); /* mark rule as dependent of croot */
+	}
+	list_add(&(Cycles[k]), (void *)c);
+}
+
+/* make all rules in cycle complete
+ *
+ * while ( some set has changed ) do
+ *		for each cycle do
+ *			if degree of FOLLOW set for croot > old degree then
+ *				update all FOLLOW sets for rules in cyclic dependency
+ *				change = TRUE
+ *			endif
+ *		endfor
+ * endwhile
+ */
+void
+#ifdef __USE_PROTOS
+ResolveFoCycles( int k )
+#else
+ResolveFoCycles( k )
+int k;
+#endif
+{
+	ListNode *p, *q;
+	Cycle *c;
+	int changed = 1;
+	CacheEntry *f,*g;
+	int r;
+/*  int i;  */  /* MR10 not useful */
+	unsigned d;
+
+    unsigned    *cursor;        /* MR10 */
+    unsigned    *origin;        /* MR10 */
+	
+	/*fprintf(stderr, "Resolving following cycles for %d\n", k);*/
+	while ( changed )
+	{
+		changed = 0;
+/* MR10 i = 0;  */
+		for (p = Cycles[k]->next; p!=NULL; p=p->next)
+		{
+			c = (Cycle *) p->elem;
+			/*fprintf(stderr, "cycle %d: %s -->", i++, RulePtr[c->croot]->rname);*/
+			/*s_fprT(stderr, c->cyclicDep);*/
+			/*fprintf(stderr, "\n");*/
+			f = (CacheEntry *)
+					hash_get(Fcache, Fkey(RulePtr[c->croot]->rname,'o',k));
+			require(f!=NULL, eMsg1("FOLLOW(%s) must be in cache but isn't", RulePtr[c->croot]->rname) );
+			if ( (d=set_deg(f->fset)) > c->deg )
+			{
+				/*fprintf(stderr, "Fo(%s) has changed\n", RulePtr[c->croot]->rname);*/
+				changed = 1;
+				c->deg = d;		/* update cycle FOLLOW set degree */
+
+/* MR10 */      origin=set_pdq(c->cyclicDep);
+/* MR10 */      for (cursor=origin; *cursor != nil; cursor++) {
+/* MR10 */         r=*cursor;
+
+/********		while ( !set_nil(c->cyclicDep) ) {      *****/
+/********					r = set_int(c->cyclicDep);  *****/
+/********					set_rm(r, c->cyclicDep);    *****/
+
+					/*fprintf(stderr, "updating Fo(%s)\n", RulePtr[r]->rname);*/
+					g = (CacheEntry *)
+							hash_get(Fcache, Fkey(RulePtr[r]->rname,'o',k));
+					require(g!=NULL, eMsg1("FOLLOW(%s) must be in cache but isn't", RulePtr[r]->rname) );
+					set_orin(&(g->fset), f->fset);
+					g->incomplete = FALSE;
+				}
+/* MR10 */      free( (char *) origin);
+/* MR10 */      origin=NULL;
+			}
+		}
+/* MR10 - this if statement appears to be meaningless since i is always 0 */
+/* MR10		if ( i == 1 ) changed = 0;	*/ /* if only 1 cycle, no need to repeat */
+	}
+	/* kill Cycle list */
+	for (q = Cycles[k]->next; q != NULL; q=p)
+	{
+		p = q->next;
+		set_free( ((Cycle *)q->elem)->cyclicDep );
+		free((char *)q);
+	}
+	free( (char *)Cycles[k] );
+	Cycles[k] = NULL;
+}
+
+
+			/* P r i n t i n g  S y n t a x  D i a g r a m s */
+
+static void
+#ifdef __USE_PROTOS
+pBlk( Junction *q, int btype )
+#else
+pBlk( q, btype )
+Junction *q;
+int btype;
+#endif
+{
+	int k,a;
+	Junction *alt, *p;
+
+	q->end->pvisited = TRUE;
+	if ( btype == aLoopBegin )
+	{
+		require(q->p2!=NULL, "pBlk: invalid ()* block");
+		PRINT(q->p1);
+		alt = (Junction *)q->p2;
+		PRINT(alt->p1);
+		if ( PrintAnnotate )
+		{
+			printf(" /* Opt ");
+			k = 1;
+			while ( !set_nil(alt->fset[k]) )
+			{
+				s_fprT(stdout, alt->fset[k]);
+				if ( k++ == CLL_k ) break;
+				if ( !set_nil(alt->fset[k]) ) printf(", ");
+			}
+			printf(" */\n");
+		}
+		return;
+	}
+	for (a=1,alt=q; alt != NULL; alt= (Junction *) alt->p2, a++)
+	{
+		if ( alt->p1 != NULL ) PRINT(alt->p1);
+		if ( PrintAnnotate )
+		{
+			printf( " /* [%d] ", alt->altnum);
+			k = 1;
+			while ( !set_nil(alt->fset[k]) )
+			{
+				s_fprT(stdout, alt->fset[k]);
+				if ( k++ == CLL_k ) break;
+				if ( !set_nil(alt->fset[k]) ) printf(", ");
+			}
+			if ( alt->p2 == NULL && btype == aOptBlk )
+				printf( " (optional branch) */\n");
+			else printf( " */\n");
+		}
+
+		/* ignore implied empty alt of Plus blocks */
+		if ( alt->p2 != NULL && ((Junction *)alt->p2)->ignore ) break;
+
+		if ( alt->p2 != NULL && !(((Junction *)alt->p2)->p2==NULL && btype == aOptBlk) )
+		{
+			if ( pLevel == 1 )
+			{
+				printf("\n");
+				if ( a+1==pAlt1 || a+1==pAlt2 ) printf("=>");
+				printf("\t");
+			}
+			else printf(" ");
+			printf("|");
+			if ( pLevel == 1 )
+			{
+				p = (Junction *) ((Junction *)alt->p2)->p1;
+				while ( p!=NULL )
+				{
+					if ( p->ntype==nAction )
+					{
+						p=(Junction *)((ActionNode *)p)->next;
+						continue;
+					}
+					if ( p->ntype!=nJunction )
+					{
+						break;
+					}
+					if ( p->jtype==EndBlk || p->jtype==EndRule )
+					{
+						p = NULL;
+						break;
+					}
+					p = (Junction *)p->p1;
+				}
+				if ( p==NULL ) printf("\n\t");	/* Empty alt? */
+			}
+		}
+	}
+	q->end->pvisited = FALSE;
+}
+
+/* How to print out a junction */
+void
+#ifdef __USE_PROTOS
+pJunc( Junction *q )
+#else
+pJunc( q )
+Junction *q;
+#endif
+{
+	int dum_k;
+	int doing_rule;
+	require(q!=NULL, "pJunc: NULL node");
+	require(q->ntype==nJunction, "pJunc: not junction");
+	
+	if ( q->pvisited == TRUE ) return;
+	q->pvisited = TRUE;
+	switch ( q->jtype )
+	{
+		case aSubBlk :
+			if ( PrintAnnotate ) First(q, 1, q->jtype, &dum_k);
+			if ( q->end->p1 != NULL && ((Junction *)q->end->p1)->ntype==nJunction &&
+				 ((Junction *)q->end->p1)->jtype == EndRule ) doing_rule = 1;
+			else doing_rule = 0;
+			pLevel++;
+			if ( pLevel==1 )
+			{
+				if ( pAlt1==1 ) printf("=>");
+				printf("\t");
+			}
+			else printf(" ");
+			if ( doing_rule )
+			{
+				if ( pLevel==1 ) printf(" ");
+				pBlk(q,q->jtype);
+			}
+			else {
+				printf("(");
+				if ( pLevel==1 ) printf(" ");
+				pBlk(q,q->jtype);
+				if ( pLevel>1 ) printf(" ");
+				printf(")");
+			}
+			if ( q->guess ) printf("?");
+			pLevel--;
+			if ( PrintAnnotate ) freeBlkFsets(q);
+			if ( q->end->p1 != NULL ) PRINT(q->end->p1);
+			break;
+		case aOptBlk :
+			if ( PrintAnnotate ) First(q, 1, q->jtype, &dum_k);
+			pLevel++;
+			if ( pLevel==1 )
+			{
+				if ( pAlt1==1 ) printf("=>");
+				printf("\t");
+			}
+			else printf(" ");
+			printf("{");
+			if ( pLevel==1 ) printf(" ");
+			pBlk(q,q->jtype);
+			if ( pLevel>1 ) printf(" ");
+			else printf("\n\t");
+			printf("}");
+			pLevel--;
+			if ( PrintAnnotate ) freeBlkFsets(q);
+			if ( q->end->p1 != NULL ) PRINT(q->end->p1);
+			break;
+		case aLoopBegin :
+			if ( PrintAnnotate ) First(q, 1, q->jtype, &dum_k);
+			pLevel++;
+			if ( pLevel==1 )
+			{
+				if ( pAlt1==1 ) printf("=>");
+				printf("\t");
+			}
+			else printf(" ");
+			printf("(");
+			if ( pLevel==1 ) printf(" ");
+			pBlk(q,q->jtype);
+			if ( pLevel>1 ) printf(" ");
+			else printf("\n\t");
+			printf(")*");
+			pLevel--;
+			if ( PrintAnnotate ) freeBlkFsets(q);
+			if ( q->end->p1 != NULL ) PRINT(q->end->p1);
+			break;
+		case aLoopBlk :
+			if ( PrintAnnotate ) First(q, 1, q->jtype, &dum_k);
+			pBlk(q,q->jtype);
+			if ( PrintAnnotate ) freeBlkFsets(q);
+			break;
+		case aPlusBlk :
+			if ( PrintAnnotate ) First(q, 1, q->jtype, &dum_k);
+			pLevel++;
+			if ( pLevel==1 )
+			{
+				if ( pAlt1==1 ) printf("=>");
+				printf("\t");
+			}
+			else printf(" ");
+			printf("(");
+			if ( pLevel==1 ) printf(" ");
+			pBlk(q,q->jtype);
+			if ( pLevel>1 ) printf(" ");
+			printf(")+");
+			pLevel--;
+			if ( PrintAnnotate ) freeBlkFsets(q);
+			if ( q->end->p1 != NULL ) PRINT(q->end->p1);
+			break;
+		case EndBlk :
+			break;
+		case RuleBlk :
+			printf( "\n%s :\n", q->rname);
+			PRINT(q->p1);
+			if ( q->p2 != NULL ) PRINT(q->p2);
+			break;
+		case Generic :
+			if ( q->p1 != NULL ) PRINT(q->p1);
+			q->pvisited = FALSE;
+			if ( q->p2 != NULL ) PRINT(q->p2);
+			break;
+		case EndRule :
+			printf( "\n\t;\n");
+			break;
+	}
+	q->pvisited = FALSE;
+}
+
+/* How to print out a rule reference node */
+void
+#ifdef __USE_PROTOS
+pRuleRef( RuleRefNode *p )
+#else
+pRuleRef( p )
+RuleRefNode *p;
+#endif
+{
+	require(p!=NULL, "pRuleRef: NULL node");
+	require(p->ntype==nRuleRef, "pRuleRef: not rule ref node");
+	
+	printf( " %s", p->text);
+	PRINT(p->next);
+}
+
+/* How to print out a terminal node */
+void
+#ifdef __USE_PROTOS
+pToken( TokNode *p )
+#else
+pToken( p )
+TokNode *p;
+#endif
+{
+	require(p!=NULL, "pToken: NULL node");
+	require(p->ntype==nToken, "pToken: not token node");
+
+	if ( p->wild_card ) printf(" .");
+	printf( " %s", TerminalString(p->token));
+	PRINT(p->next);
+}
+
+/* How to print out a terminal node */
+void
+#ifdef __USE_PROTOS
+pAction( ActionNode *p )
+#else
+pAction( p )
+ActionNode *p;
+#endif
+{
+	require(p!=NULL, "pAction: NULL node");
+	require(p->ntype==nAction, "pAction: not action node");
+	
+	PRINT(p->next);
+}
+
+					/* F i l l  F o l l o w  L i s t s */
+
+/*
+ * Search all rules for all rule reference nodes, q to rule, r.
+ * Add q->next to follow list dangling off of rule r.
+ * i.e.
+ *
+ *		r: -o-R-o-->o--> Ptr to node following rule r in another rule
+ *					|
+ *					o--> Ptr to node following another reference to r.
+ *
+ * This is the data structure employed to avoid FOLLOW set computation.  We
+ * simply compute the FIRST (reach) of the EndRule Node which follows the
+ * list found at the end of all rules which are referenced elsewhere.  Rules
+ * not invoked by other rules have no follow list (r->end->p1==NULL).
+ * Generally, only start symbols are not invoked by another rule.
+ *
+ * Note that this mechanism also gives a free cross-reference mechanism.
+ *
+ * The entire syntax diagram is layed out like this:
+ *
+ * SynDiag
+ *	|
+ *	v
+ *	o-->R1--o
+ *	|
+ *	o-->R2--o
+ *	|
+ *	...
+ *	|
+ *	o-->Rn--o
+ *
+ */
+void
+#ifdef __USE_PROTOS
+FoLink( Node *p )
+#else
+FoLink( p )
+Node *p;
+#endif
+{
+	RuleEntry *q;
+	Junction *j = (Junction *) p;
+	RuleRefNode *r = (RuleRefNode *) p;
+
+	if ( p==NULL ) return;
+	require(p->ntype>=1 && p->ntype<=NumNodeTypes,
+			eMsgd("FoLink: invalid diagram node: ntype==%d",p->ntype));
+	switch ( p->ntype )
+	{
+		case nJunction :
+			if ( j->fvisited ) return;
+			if ( j->jtype == EndRule ) return;
+			j->fvisited = TRUE;
+			FoLink( j->p1 );
+			FoLink( j->p2 );
+/* MR14 */
+/* MR14 */  /* Need to determine whether the guess block is an         */
+/* MR14 */  /* of the form (alpha)? beta before follow sets are        */
+/* MR14 */  /* computed.  This is necessary to solve problem           */
+/* MR14 */  /* of doing follow on the alpha of an (alpha)? beta block. */
+/* MR14 */
+/* MR14 */  /* This is performed by analysis_point as a side-effect.   */
+/* MR14 */
+/* MR14 */
+/* MR14 */  if (j->jtype == aSubBlk && j->guess) {
+/* MR14 */    Junction *ignore;
+/* MR14 */    ignore=analysis_point(j);
+/* MR14 */  }
+/* MR14 */
+			return;
+		case nRuleRef :
+			if ( r->linked ) return;
+			q = (RuleEntry *) hash_get(Rname, r->text);
+			if ( q == NULL )
+			{
+				warnFL( eMsg1("rule %s not defined",r->text), FileStr[r->file], r->line );
+			}
+			else
+			{
+				if ( r->parms!=NULL && RulePtr[q->rulenum]->pdecl==NULL )
+				{
+					warnFL( eMsg1("rule %s accepts no parameter(s)", r->text),
+							FileStr[r->file], r->line );
+				}
+				if ( r->parms==NULL && RulePtr[q->rulenum]->pdecl!=NULL )
+				{
+					warnFL( eMsg1("rule %s requires parameter(s)", r->text),
+							FileStr[r->file], r->line );
+				}
+				if ( r->assign!=NULL && RulePtr[q->rulenum]->ret==NULL )
+				{
+					warnFL( eMsg1("rule %s yields no return value(s)", r->text),
+							FileStr[r->file], r->line );
+				}
+				if ( r->assign==NULL && RulePtr[q->rulenum]->ret!=NULL )
+				{
+					warnFL( eMsg1("rule %s returns a value(s)", r->text),
+							FileStr[r->file], r->line );
+				}
+				if ( !r->linked )
+				{
+					addFoLink(	r->next, r->rname, RulePtr[q->rulenum] );
+					r->linked = TRUE;
+				}
+			}
+			FoLink( r->next );
+			return;
+		case nToken :
+			FoLink( ((TokNode *)p)->next );
+			return;
+		case nAction :
+			FoLink( ((ActionNode *)p)->next );
+			return;
+		default :
+			fatal_internal("invalid node type");
+	}
+}
+
+/*
+ * Add a reference to the end of a rule.
+ *
+ * 'r' points to the RuleBlk node in a rule.  r->end points to the last node
+ * (EndRule jtype) in a rule.
+ *
+ * Initial:
+ *		r->end --> 	o
+ *
+ * After:
+ *		r->end --> 	o-->o--> Ptr to node following rule r in another rule
+ *						|
+ *						o--> Ptr to node following another reference to r.
+ *
+ * Note that the links are added to the head of the list so that r->end->p1
+ * always points to the most recently added follow-link.  At the end, it should
+ * point to the last reference found in the grammar (starting from the 1st rule).
+ */
+void
+#ifdef __USE_PROTOS
+addFoLink( Node *p, char *rname, Junction *r )
+#else
+addFoLink( p, rname, r )
+Node *p;
+char *rname;
+Junction *r;
+#endif
+{
+	Junction *j;
+	require(r!=NULL,				"addFoLink: incorrect rule graph");
+	require(r->end!=NULL,			"addFoLink: incorrect rule graph");
+	require(r->end->jtype==EndRule,	"addFoLink: incorrect rule graph");
+	require(p!=NULL,				"addFoLink: NULL FOLLOW link");
+
+	j = newJunction();
+	j->rname = rname;			/* rname on follow links point to target rule */
+	j->p1 = p;					/* link to other rule */
+	j->p2 = (Node *) r->end->p1;/* point to head of list */
+	r->end->p1 = (Node *) j;	/* reset head to point to new node */
+}
+
+void
+#ifdef __USE_PROTOS
+GenCrossRef( Junction *p )
+#else
+GenCrossRef( p )
+Junction *p;
+#endif
+{
+	set a;
+	Junction *j;
+	RuleEntry *q;
+	unsigned e;
+	require(p!=NULL, "GenCrossRef: why are you passing me a null grammar?");
+
+	printf("Cross Reference:\n\n");
+	a = empty;
+	for (; p!=NULL; p = (Junction *)p->p2)
+	{
+		printf("Rule %20s referenced by {", p->rname);
+		/* make a set of rules for uniqueness */
+		for (j = (Junction *)(p->end)->p1; j!=NULL; j = (Junction *)j->p2)
+		{
+			q = (RuleEntry *) hash_get(Rname, j->rname);
+			require(q!=NULL, "GenCrossRef: FoLinks are screwed up");
+			set_orel(q->rulenum, &a);
+		}
+		for (; !set_nil(a); set_rm(e, a))
+		{
+			e = set_int(a);
+			printf(" %s", RulePtr[e]->rname);
+		}
+		printf(" }\n");
+	}
+	set_free( a );
+}
+
+/*
+   The single argument is a pointer to the start of an element of a
+   C++ style function prototypet list.  Given a pointer to the start of
+   an formal we must locate the comma (or the end of the string)
+   and locate the datatype, formal name, and initial value expression.
+
+   The function returns a pointer to the character following the comma
+   which terminates the formal declaration, or a pointer to the end of
+   the string if none was found.
+
+   I thought we were parsing specialists, how come I'm doing this by
+   hand written code ?
+
+   Examples of input:
+ 
+        Foo f,
+        Foo f = Foo(1),
+        Foo f = Foo(1,2),
+        Foo f = &farray[1,2],
+        Foo f = ",",
+        Foo f = ',',
+        TFoo<int,char> f = TFoo<int,char>(1,2),
+
+   A non-zero value for nesting indicates a problem matching '(' and ')',
+   '[' and ']', '<' and '>', '{' and '}', or improperly terminated string
+   or character literal.
+
+*/
+
+
+/*
+ *  Don't care if it is a valid string literal or not, just find the end
+ *  Start with pointer to leading "\""
+ */
+
+#ifdef __USE_PROTOS
+char * skipStringLiteral(char *pCurrent)
+#else
+char * skipStringLiteral(pCurrent)
+char *pCurrent;
+#endif
+{
+  char *p = pCurrent;
+  if (*p == 0) return p;
+  require (*p == '\"', "skipStringLiteral")
+  p++;
+  for (p = p; *p != 0; p++) {
+    if (*p == '\\') {
+      p++;
+      if (*p == 0) break;
+      p++;
+    }
+    if (*p == '\"') {
+      p++;
+      break;
+    }
+  }
+  return p;
+}
+
+/*
+ *  Don't care if it is a valid character literal or not, just find the end
+ *  Start with pointer to leading "'"
+ */
+
+#ifdef __USE_PROTOS
+char * skipCharLiteral(char *pStart)
+#else
+char * skipCharLiteral(pStart)
+ char *pStart;
+#endif
+{
+  char *p = pStart;
+  if (*p == 0) return p;
+  require (*p == '\'', "skipCharLiteral")
+  p++;
+  for (p = p; *p != 0; p++) {
+    if (*p == '\\') {
+      p++;
+      if (*p == 0) break;
+      p++;
+    }
+    if (*p == '\'') {
+      p++;
+      break;
+    }
+  }
+  return p;
+}
+
+#ifdef __USE_PROTOS
+char * skipSpaces(char *pStart)
+#else
+char * skipSpaces(pStart)
+char * pStart;
+#endif
+{
+  char *p = pStart;
+  while (*p != 0 && isspace(*p)) p++;
+  return p;
+}
+
+#ifdef __USE_PROTOS
+char * skipToSeparatorOrEqualSign(char *pStart, int *pNest)
+#else
+char * skipToSeparatorOrEqualSign(pStart, pNest)
+char *pStart;
+int *pNest;
+#endif
+{
+  char *p = pStart;
+  
+  int nest = 0;
+
+  *pNest = (-1);
+
+  while (*p != 0) {
+    switch (*p) {
+
+      case '(' :
+      case '[' :
+      case '<' :
+      case '{' :
+        nest++;
+        p++;
+        break;
+
+      case ')' :
+      case ']' :
+      case '>' :
+      case '}' :
+        nest--;
+        p++;
+        break;
+      
+      case '"' :
+        p = skipStringLiteral(p);
+        break;
+  
+      case '\'' :
+        p = skipCharLiteral(p);
+        break;
+
+      case '\\':
+        p++;
+        if (*p == 0) goto EXIT;
+        p++;
+        break;
+
+      case ',':
+      case '=':
+        if (nest == 0) goto EXIT;
+		p++;
+        break;
+
+      default:
+        p++;
+    }
+  }
+EXIT:
+  *pNest = nest;
+  return p;
+}
+
+#ifdef __USE_PROTOS
+char * skipToSeparator(char *pStart, int *pNest)
+#else
+char * skipToSeparator(pStart, pNest)
+char *pStart;
+int *pNest;
+#endif
+{
+  char * p = pStart;
+  for ( ; ; ) {
+    p = skipToSeparatorOrEqualSign(p, pNest);
+    if (*pNest != 0) return p;
+    if (*p == ',') return p;
+    if (*p == 0) return p;
+	p++;
+  }
+}
+
+/* skip to just past the "=" separating the declaration from the initialization value */
+
+#ifdef __USE_PROTOS
+char * getInitializer(char *pStart)
+#else
+char * getInitializer(pStart)
+char * pStart;
+#endif
+{
+	char *p;
+	char *pDataType;
+	char *pSymbol;
+	char *pEqualSign;
+	char *pValue;
+	char *pSeparator;
+	int nest = 0;
+
+	require(pStart!=NULL, "getInitializer: invalid string"); 
+
+	p = endFormal(pStart,
+			      &pDataType,
+				  &pSymbol,
+				  &pEqualSign,
+				  &pValue,
+				  &pSeparator,
+				  &nest);
+    if (nest != 0) return NULL;
+    if (pEqualSign == NULL) return NULL;
+    if (pValue == NULL) return NULL;
+	return strBetween(pValue, NULL, pSeparator);
+}
+
+/*
+   Examines the string from pStart to pEnd-1.
+   If the string has 0 length or is entirely white space
+   returns 1.  Otherwise 0.
+*/
+
+#ifdef __USE_PROTOS
+int isWhiteString(const char *pStart, const char *pEnd)
+#else
+int isWhiteString(pStart, pEnd)
+const char *pStart;
+const char *pEnd;
+#endif
+{
+  const char *p;
+  for (p = pStart; p < pEnd; p++) {
+    if (! isspace(*p)) return 0;
+  }
+  return 1;
+}
+
+/*
+   This replaces HasComma() which couldn't distinguish
+
+        foo ["a,b"]
+
+   from:
+
+        foo[a,b]
+
+*/
+
+#ifdef __USE_PROTOS
+int hasMultipleOperands(char *pStart)
+#else
+int hasMultipleOperands(pStart)
+char *pStart;
+#endif
+{
+  char *p = pStart;
+  int nest = 0;
+
+  p = skipSpaces(p);
+  if (*p == 0) return 0;
+  p = skipToSeparator(p, &nest);
+  if (nest == 0 && *p == ',') return 1;
+  return 0;
+}
+
+
+#define MAX_STR_BETWEEN_WORK_AREA 1000
+
+static char strBetweenWorkArea[MAX_STR_BETWEEN_WORK_AREA];
+
+
+/*
+	strBetween(pStart, pNext, pStop)
+
+    Creates a null terminated string by copying the text between two pointers
+	to a work area.  The start of the string is pStart.  The end of the string
+	is the character before pNext, or if pNext is null then the character before
+	pStop.  Trailing spaces are not included in the copy operation.
+	
+	This is used when a string contains several parts.  The pNext part may be
+	optional.  The pStop will stop the scan when the optional part is not present
+	(is a null pointer).
+*/
+
+#ifdef __USE_PROTOS
+char *strBetween(char *pStart, char *pNext, char *pStop)
+#else
+char *strBetween(pStart, pNext, pStop)
+char *pStart;
+char *pNext;
+char *pStop;
+#endif
+{
+  char *p;
+  char *q = strBetweenWorkArea;
+  const char *pEnd;
+
+  pEnd = (pNext != NULL) ? pNext : pStop;
+
+  require (pEnd != NULL, "pEnd == NULL");
+  require (pEnd >= pStart, "pEnd < pStart");
+  for (pEnd--; pEnd >= pStart; pEnd--) { /* MR31 */
+	if (! isspace(*pEnd)) break;
+  }
+  for (p = pStart;
+       p <= pEnd && q < &strBetweenWorkArea[MAX_STR_BETWEEN_WORK_AREA-2];
+	   p++, q++) {
+	 *q = *p;
+  }
+  *q = 0;
+  return strBetweenWorkArea;
+}
+
+/*
+   function     Returns pointer to character following separator at
+   value        which to continue search for next formal.  If at the
+                end of the string a pointer to the null byte at the
+                end of the string is returned.
+
+   pStart       Pointer to the starting position of the formal list
+
+                This may be the middle of a longer string, for example
+                when looking for the end of formal #3 starting from
+                the middle of the complete formal list.
+
+   ppDataType   Returns a pointer to the start of the data type in the
+                formal. Example: pointer to "Foo".
+
+   ppSymbol     Returns a pointer to the start of the formal symbol.
+                Example: pointer to "f".
+
+   ppEqualSign  Returns a pointer to the equal sign separating the
+                formal symbol from the initial value.  If there is 
+                no "=" then this will be NULL.
+
+   ppValue      Returns a pointer to the initial value part of the
+                formal declaration.  Example: pointer to "&farray[1,2]"
+
+   ppSeparator  Returns a pointer to the character which terminated the
+                scan.  This should be a pointer to a comma or a null
+                byte which terminates the string.
+
+   pNest        Returns the nesting level when a separator was found.
+                This is non-zero for any kind of error.  This is zero
+                for a successful parse of this portion of the formal
+                list.
+
+*/ 
+ 
+#ifdef __USE_PROTOS
+char * endFormal(char *pStart,
+                 char **ppDataType,
+                 char **ppSymbol,
+                 char **ppEqualSign,
+                 char **ppValue,
+                 char **ppSeparator,
+                 int *pNest)
+#else
+char * endFormal(pStart,
+			     ppDataType,
+				 ppSymbol,
+				 ppEqualSign,
+				 ppValue,
+				 ppSeparator,
+				 pNest)
+char *pStart;
+char **ppDataType;
+char **ppSymbol;
+char **ppEqualSign;
+char **ppValue;
+char **ppSeparator;
+int *pNest;
+
+#endif
+{
+  char *p = pStart;
+  char *q;
+
+  *ppDataType = NULL;
+  *ppSymbol = NULL;
+  *ppEqualSign = NULL;
+  *ppValue = NULL;
+  *ppSeparator = NULL;
+
+  *pNest = 0;
+
+  /* The first non-blank is the start of the datatype */
+
+  p = skipSpaces(p);
+  if (*p == 0) goto EXIT;
+  *ppDataType = p;
+
+  /* We are not looking for the symbol, we are looking
+     for the separator that follows the symbol.  Then
+     we'll back up.
+   
+     Search for the ',' or '=" or null terminator.
+   */
+
+  p = skipToSeparatorOrEqualSign(p, pNest);
+
+  if (*pNest != 0) goto EXIT;
+
+  /*
+     Work backwards to find start of symbol
+     Skip spaces between the end of symbol and separator
+     Assume that there are no spaces in the formal, but
+     there is a space preceding the formal
+  */
+
+  for (q = &p[-1]; q >= *ppDataType; q--) {
+    if (! isspace(*q)) break;
+  }
+  if (q < *ppDataType) goto EXIT;
+
+  /*
+     MR26 Handle things like: IIR_Bool (IIR_Decl::*constraint)()
+     Backup until we hit the end of a symbol string, then find the
+     start of the symbol string.  This wont' work for functions
+     with prototypes, but works for the most common cases.  For
+     others, use typedef names.
+   */
+
+/* MR26 */  for (q = q; q >= *ppDataType; q--) {
+/* MR26 */    if (isalpha(*q) || isdigit(*q) || *q == '_' || *q == '$') break;
+/* MR26 */  }
+/* MR26 */  if (q < *ppDataType) goto EXIT;
+
+  for (q = q; q >= *ppDataType; q--) {
+    if ( ! (isalpha(*q) || isdigit(*q) || *q == '_' || *q == '$')) break;
+  }
+
+  *ppSymbol = &q[1];
+
+  if (*p == ',' || *p == 0) {
+    *ppSeparator = p;
+    goto EXIT;
+  }
+
+  *ppEqualSign = p;
+  p = skipSpaces(++p);
+  *ppValue = p;
+  if (*p == 0) goto EXIT;
+
+
+  while (*p != 0 && *pNest == 0 && *p != ',') {
+      p = skipToSeparator(p, pNest);
+  }
+  if (*pNest == 0) *ppSeparator = p;
+
+EXIT:
+  if (*p == ',') p++;
+  return p;
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/mode.h b/Tools/Source/TianoTools/Pccts/antlr/mode.h
new file mode 100644
index 0000000000..c08bf31ac7
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/mode.h
@@ -0,0 +1,12 @@
+#define START 0
+#define STRINGS 1
+#define ACTION_STRINGS 2
+#define ACTION_CHARS 3
+#define ACTION_COMMENTS 4
+#define TOK_DEF_COMMENTS 5
+#define TOK_DEF_CPP_COMMENTS 6
+#define ACTION_CPP_COMMENTS 7
+#define CPP_COMMENTS 8
+#define COMMENTS 9
+#define ACTIONS 10
+#define PARSE_ENUM_FILE 11
diff --git a/Tools/Source/TianoTools/Pccts/antlr/mrhoist.c b/Tools/Source/TianoTools/Pccts/antlr/mrhoist.c
new file mode 100644
index 0000000000..110bf5996f
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/mrhoist.c
@@ -0,0 +1,3030 @@
+/*
+ * mrhoist.c
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33MR10
+ *
+ */
+
+#include <stdio.h>
+
+#include "pcctscfg.h"
+
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+#include <ctype.h>
+
+#ifdef __USE_PROTOS
+void dumppred(Predicate *);
+#else
+void dumppred();
+#endif
+
+/*
+  Try to determine whether predicate "first" is true for
+    all cases where "second" is true.  Comparison takes place
+    without regard to context.
+  Assumes that predicate symbols have been expanded.
+  Assumes that there are no NAND or NOR nodes
+
+*/
+
+#ifdef __USE_PROTOS
+int MR_secondPredicateUnreachable(Predicate *first,Predicate *second)
+#else
+int MR_secondPredicateUnreachable(first,second)
+  Predicate     *first;
+  Predicate     *second;
+#endif
+{
+  Predicate     *f;
+  Predicate     *s;
+
+  if (first == NULL) {
+    return 1;
+  } else if (second == NULL) {
+    return 0;
+  } else if (first->down == NULL && second->down == NULL) {
+    if (first->source == second->source &&
+        first->inverted == second->inverted) {
+      return 1; /* look identical - will never reach alt2 */
+    } else {
+      return 0; /* look different */
+    };
+  } else if (first->down == NULL && second->down != NULL) {
+
+    if (second->expr == PRED_AND_LIST) {
+
+      /* unreachable if first covers any child of second */
+
+      for (s=second->down; s != NULL; s=s->right) {
+        if (MR_secondPredicateUnreachable(first,s)) {
+          return 1;
+        };
+      };
+      return 0;
+    } else if (second->expr == PRED_OR_LIST) {
+
+      /* unreachable if first covers every child of second */
+
+      for (s=second->down; s != NULL; s=s->right) {
+        if (!MR_secondPredicateUnreachable(first,s)) {
+          return 0;
+        };
+      };
+      return 1;
+    } else {
+      require (0,"Illegal pred->expr");
+      return 0; /* MR20 Make compiler happy */
+    };
+  } else if (first->down != NULL && second->down == NULL) {
+    if (first->expr == PRED_AND_LIST) {
+
+      /* unreachable if every child of first covers second */
+
+      for (f=first->down; f != NULL; f=f->right) {
+        if (!MR_secondPredicateUnreachable(f,second)) {
+          return 0;
+        };
+      };
+      return 1;
+    } else if (first->expr == PRED_OR_LIST) {
+
+      /* unreachable if any child of first covers second */
+
+      for (f=first->down; f != NULL; f=f->right) {
+        if (MR_secondPredicateUnreachable(f,second)) {
+          return 1;
+        };
+      };
+      return 0;
+    } else {
+      require (0,"Illegal predicate->expr");
+      return 0; /* MR20 Make compiler happy */
+    };
+  } else {
+
+    if (first->expr == PRED_AND_LIST && second->expr == PRED_AND_LIST) {
+
+      /* unreachable if each child of first covers at least one child of second */
+
+      for (f=first->down; f != NULL ; f=f->right) {
+        for (s=second->down; s != NULL ; s=s->right) {
+          if (MR_secondPredicateUnreachable(f,s)) goto A_next_f;
+        };
+        return 0;
+A_next_f:
+        continue;
+      };
+      return 1;
+
+    } else if (first->expr == PRED_AND_LIST && second->expr == PRED_OR_LIST) {
+
+      /* unreachable if each child of first covers ALL of second's children */
+
+      for (f=first->down; f != NULL ; f=f->right) {
+        for (s=second->down; s != NULL ; s=s->right) {
+          if (!MR_secondPredicateUnreachable(f,s)) return 0;
+        };
+      };
+      return 1;
+
+    } else if (first->expr == PRED_OR_LIST && second->expr == PRED_AND_LIST) {
+
+      /* unreachable if any child of second is covered by any child of first */
+
+      for (f=first->down; f != NULL ; f=f->right) {
+        for (s=second->down; s != NULL ; s=s->right) {
+          if (MR_secondPredicateUnreachable(f,s)) return 1;
+        };
+      };
+      return 0;
+
+    } else if (first->expr == PRED_OR_LIST && second->expr == PRED_OR_LIST) {
+
+      /* unreachable if every child of second is covered by some child of first */
+
+      for (f=first->down; f != NULL ; f=f->right) {
+        for (s=second->down; s != NULL ; s=s->right) {
+          if (MR_secondPredicateUnreachable(f,s)) goto B_next_f;
+        };
+        return 0;
+B_next_f:
+       continue;
+      };
+      return 1;
+
+    } else {
+      require (0,"Illegal predicate->expr");
+      return 0; /* MR20 Make compiler happy */
+    };
+  };
+  return 0; /* MR20 MSVC 5.0 complains about missing return statement */
+}
+
+#ifdef __USE_PROTOS
+void MR_xxxIndent(FILE *f,int depth)
+#else
+void MR_xxxIndent(f,depth)
+  FILE  *f;
+  int   depth;
+#endif
+{
+  int   i;
+
+  for (i=0; i<depth ; i++) {
+    fprintf(f,"  ");
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_stderrIndent(int depth)
+#else
+void MR_stderrIndent(depth)
+  int   depth;
+#endif
+{
+  MR_xxxIndent(stderr,depth);
+}
+
+#ifdef __USE_PROTOS
+void MR_outputIndent(int depth)
+#else
+void MR_outputIndent(depth)
+  int   depth;
+#endif
+{
+  MR_xxxIndent(output,depth);
+}
+
+#ifdef __USE_PROTOS
+void MR_set_reuse(set *s)
+#else
+void MR_set_reuse(s)
+  set   *s;
+#endif
+{
+  set_free(*s);
+  *s=empty;
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpPredRuleRefStack(FILE *iounit,int indent)
+#else
+void MR_dumpPredRuleRefStack(iounit,indent)
+  FILE  *iounit;
+  int   indent;
+#endif
+{
+    int             i;
+    int             j;
+    int             count=MR_PredRuleRefStack.count;
+    RuleRefNode     *rrn=NULL;
+    Junction        *lastOne;
+
+    if (count == 0) {
+      fprintf(iounit,"empty\n");
+      return;
+    };
+    for (i=0; i < count; i++) {
+      rrn=(RuleRefNode *) MR_PredRuleRefStack.data[i];
+      for (j=0; j<indent; j++) fprintf(iounit," ");
+      fprintf(iounit,"#%-2d in rule %s (line %d %s) to rule %s\n",
+            i,rrn->rname,rrn->line,FileStr[rrn->file],rrn->text);
+    };
+    lastOne=MR_ruleReferenced(rrn);
+    if (lastOne != NULL) {
+      for (j=0; j<indent; j++) fprintf(iounit," ");
+      fprintf(iounit,"#%-2d in rule %s (line %d %s)\n",
+        count,lastOne->rname,lastOne->line,FileStr[lastOne->file]);
+    };
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpTreeF(FILE *f,int depth,Tree *tree,int across)
+#else
+void MR_dumpTreeF(f,depth,tree,across)
+  FILE  *f;
+  Tree  *tree;
+  int   depth;
+  int   across;
+#endif
+{
+    int     newAcross=across;
+
+	if (tree == NULL ) return;
+	if (tree->down != NULL ) {
+      fprintf(output,"\n");
+      MR_outputIndent(depth);
+      fprintf(output, "(root =");
+    };
+	if (tree->token == ALT ) {
+      fprintf(output," %-16s","Alt");
+	} else if (tree->token==EpToken ) {
+      fprintf(output,"(%d)%13s",tree->v.rk," ");
+	} else {
+      fprintf(output," %-16s",TerminalString(tree->token));
+    };
+    if (tree->down != NULL) {
+      fprintf(output,"\n");
+      MR_outputIndent(depth+1);
+      MR_dumpTreeF(f,depth+1,tree->down,1);
+      newAcross=0;
+      fprintf(output,"\n");
+      MR_outputIndent(depth);
+      fprintf(output,")");
+    };
+    if (newAcross > 3) {
+      fprintf(output,"\n");
+      MR_outputIndent(depth);
+      newAcross=0;
+    };
+    MR_dumpTreeF(f,depth,tree->right,newAcross+1);
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpTreeX(int depth,Tree *tree,int across)
+#else
+void MR_dumpTreeX(depth,tree,across)
+  Tree  *tree;
+  int   depth;
+  int   across;
+#endif
+{
+  MR_dumpTreeF(output,depth,tree,across);
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpTokenSet(FILE *f,int depth,set s)
+#else
+void MR_dumpTokenSet(f,depth,s)
+  FILE  *f;
+  int   depth;
+  set   s;
+#endif
+{
+    int     i;
+    int     j;
+
+    unsigned  *pdq;
+
+    if (set_nil(s)) {
+      fprintf(f,"\n");
+      MR_xxxIndent(f,depth+1);
+      fprintf(f,"nil\n");
+      return;
+    };
+
+    pdq=set_pdq(s);
+    require(pdq != NULL,"set_pdq failed");
+    i=0;
+    for (i=0 ; ; i=i+4) {
+      fprintf(f,"\n");
+      MR_xxxIndent(f,depth+1);
+      for (j=0; j < 4 ; j++) {
+        if (pdq[i+j] == nil) break;
+        fprintf(f," %-16s",TerminalString(pdq[i+j]));
+      };
+      if (pdq[i+j] == nil) break;
+    };
+    fprintf(f,"\n");
+    free( (char *) pdq);
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpPred1(int depth,Predicate *p,int withContext)
+#else
+void MR_dumpPred1(depth,p,withContext)
+  int           depth;
+  Predicate     *p;
+  int           withContext;
+#endif
+{
+  unsigned      k;
+
+  if (p == NULL) {
+    MR_outputIndent(depth);
+    fprintf(output,"The predicate is empty (or always true)\n\n");
+    return;
+  };
+  if (p->down != NULL) {
+    MR_outputIndent(depth);
+    if (p->inverted) {
+
+        /* MR14a Left out print expression in fprintf
+                 Reported by Manuel Kessler (mlkessle@cip.physik.uni-wuerzburg.de)
+        */
+
+      if (p->expr == PRED_AND_LIST) fprintf(output,"%s NAND (not AND) expr\n\n",p->expr);
+      if (p->expr == PRED_OR_LIST) fprintf(output,"%s NOR (not OR) expr\n\n",p->expr);
+    } else {
+      fprintf(output,"%s expr\n\n",p->expr);
+    };
+  } else {
+    MR_outputIndent(depth);
+    fprintf(output,"pred %s <<%s>>?\n",
+            (p->inverted ? " *not*" : ""),
+            (p->expr == NULL ? "null expr" : p->expr));
+    MR_outputIndent(depth+1);
+    fprintf(output,"              ");
+    fprintf(output,"  depth=k=%d",p->k);
+    if (p->source != NULL && p->source->guardpred) {
+      fprintf(output,"  (\"=>\" guard)");
+    }
+    if (p->source != NULL && p->source->ampersandPred != NULL) {
+      fprintf(output,"  (\"&&\" guard)");
+    };
+    k=set_int(p->completionSet);
+    if (k != nil) {
+      fprintf(output," Incomplete Set at k=%d !",k);
+    };
+    k=set_int(p->completionTree);
+    if (k != nil) {
+      fprintf(output," Incomplete Tree at k=%d !",k);
+    };
+    if (p->source != NULL) {
+      fprintf(output,"  rule %s  line %d  %s",
+                    p->source->rname,p->source->line,FileStr[p->source->file]);
+    };
+    fprintf(output,"\n");
+    if (withContext &&
+            (HoistPredicateContext ||
+             ! set_nil(p->scontext[1]) ||
+             p->tcontext != NULL)) {
+      if (p->k == 1) {
+        MR_outputIndent(depth+1);
+        fprintf(output,"set context: ");
+        MR_dumpTokenSet(output,depth+1,p->scontext[1]);
+      }
+      if (p->k != 1) {
+        MR_outputIndent(depth+1);
+        fprintf(output,"tree context:");
+        if (p->tcontext == NULL) {
+          fprintf(output," null");
+        } else {
+          MR_dumpTreeX(depth+2,p->tcontext,0);
+        };
+        fprintf(output,"\n");
+      };
+    };
+    fprintf(output,"\n");
+  };
+  if (p->down != NULL) {
+    MR_dumpPred1(depth+1,p->down,withContext);
+  };
+  if (p->right != NULL) {
+    MR_dumpPred1(depth,p->right,withContext);
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpPred(Predicate *p,int withContext)
+#else
+void MR_dumpPred(p,withContext)
+  Predicate     *p;
+  int           withContext;
+#endif
+{
+  MR_dumpPred1(0,p,withContext);
+}
+
+#ifdef __USE_PROTOS
+Tree * MR_make_tree_from_set(set s)
+#else
+Tree * MR_make_tree_from_set(s)
+  set   s;
+#endif
+{
+  Tree  *t=NULL;
+  Tree  *node;
+  Tree  **tp=&t;
+  int   i;
+
+  unsigned *pdq=set_pdq(s);
+
+  if (pdq != NULL) {
+    for (i=0 ; pdq[i] != nil ; i++) {
+      node=tnode( (int) pdq[i]);
+      *tp=node;
+      tp=&(node->right);
+    };
+    *tp=NULL;
+    free ( (char *) pdq);
+  };
+  return t;
+}
+
+#ifdef __USE_PROTOS
+void MR_check_pred_too_long(Predicate *p,set completion)
+#else
+void MR_check_pred_too_long(p,completion)
+  Predicate     *p;
+  set           completion;
+#endif
+{
+  if (p != NULL &&
+      p->source != NULL &&
+      ! p->source->predTooLong) {
+    if ( !set_nil(completion)) {
+      p->source->predTooLong=1;
+warnFL("It is unusual (but ok) for a semantic predicate to test context past the end of its own rule",
+                                FileStr[p->source->file],p->source->line);
+    };
+  };
+}
+
+#ifdef __USE_PROTOS
+int MR_predicate_context_completed(Predicate *p)
+#else
+int MR_predicate_context_completed(p)
+  Predicate     *p;
+#endif
+{
+  if (p == NULL) return 1;
+  if (p->expr != PRED_AND_LIST &&
+      p->expr != PRED_OR_LIST) {
+    if ( ! set_nil(p->completionSet)) return 0;
+    if ( ! set_nil(p->completionTree)) return 0;
+  };
+  return MR_predicate_context_completed(p->down) &
+         MR_predicate_context_completed(p->right);
+}
+
+#ifdef __USE_PROTOS
+Node * MR_advance(Node *n)
+#else
+Node * MR_advance(n)
+  Node  *n;
+#endif
+{
+    if (n == NULL) return NULL;
+    switch (n->ntype) {
+      case nJunction:   return ((Junction *)n)->p1;
+      case nToken:      return ((TokNode *)n)->next;
+      case nRuleRef:    return ((RuleRefNode *)n)->next;
+      case nAction:     return ((ActionNode *)n)->next;
+      default:          return NULL;
+    };
+  return NULL; /* MSVC 5.0 complains about missing return statement */
+}
+
+#ifdef __USE_PROTOS
+Junction * MR_find_endRule(Node *n)
+#else
+Junction * MR_find_endRule(n)
+  Node  *n;
+#endif
+{
+    Node    *next;
+    if (n == NULL) return NULL;
+    for (next=n; next != NULL; next=MR_advance(next)) {
+      if (next->ntype == nJunction &&
+            ( (Junction *) next)->jtype == EndRule) {
+        break;
+      };
+    };
+    return (Junction *)next;
+}
+
+/*
+   Intersection:  a branch which is shorter is chosen
+   over one which is longer: (A B C) intersect (A B) yields (A B).
+
+   AND: a branch which is longer is chosen over the one
+   which is shorter: (A B C) AND (A B) yields (A B C)
+
+*/
+
+#ifdef __USE_PROTOS
+Tree *MR_computeTreeIntersection(Tree *l,Tree *r)
+#else
+Tree *MR_computeTreeIntersection(l,r)
+    Tree    *l;
+    Tree    *r;
+#endif
+{
+    Tree    *result=NULL;
+    Tree    **tail;
+    Tree    *p;
+    Tree    *q;
+    Tree    *match;
+
+    if (l == NULL || r == NULL) return NULL;
+    for (p=l; p != NULL; p=p->right) {
+      require(p->token != EpToken,"MR_computeTreeIntersection: p->EpToken unexpected\n");
+      require (p->token != ALT,"MR_computeTreeIntersection: p->ALT unexpected\n");
+    };
+    for (q=r; q != NULL; q=q->right) {
+      require(q->token != EpToken,"MR_computeTreeIntersection: q->EpToken unexpected\n");
+      require(q->token != ALT,"MR_computeTreeIntersection: q->ALT unexpected\n");
+    };
+
+    result=tnode(ALT);
+    tail=&(result->down);
+
+    for (p=l; p != NULL ; p=p->right) {
+      for (q=r; q != NULL ; q=q->right) {
+        if (p->token == q->token) {
+          match=tnode(p->token);
+          match->down=MR_computeTreeIntersection(p->down,q->down);
+          *tail=match;
+          tail=&(match->right);
+        };
+      };
+    };
+
+    *tail=NULL;
+    result=tshrink(result);
+    result=tflatten( result );
+    result=tleft_factor( result );
+    return result;
+}
+
+/* the predicates which are ANDed together have a common
+   context:  they must all have common roots.  Thus the
+   AND operation is more like an OR operation because
+   branches which are longer are grafted onto shorter
+   branches of the AND tree.  For instance combining
+   (A B C) with (A B C D) gives (A B C D).  There
+   should never be a case of (A B C) and (A B D) because
+   they have the same context.
+
+   Actually, this may not be true once one throws in
+   guard predicates which are defined by the user, not
+   the context.
+*/
+
+/* requires input trees to be in "canonical" format */
+
+#ifdef __USE_PROTOS
+Tree *MR_computeTreeAND(Tree *l,Tree *r)
+#else
+Tree *MR_computeTreeAND(l,r)
+    Tree    *l;
+    Tree    *r;
+#endif
+{
+    Tree    *result=NULL;
+    Tree    **tail;
+    Tree    *p;
+    Tree    *q;
+    Tree    *match;
+
+    if (l == NULL) return tdup(r);
+    if (r == NULL) return tdup(l);
+
+    for (p=l; p != NULL; p=p->right) {
+/**** require(p->token != EpToken,"MR_computeTreeAND: p->EpToken unexpected\n"); ****/
+      require (p->token != ALT,"MR_computeTreeAND: p->ALT unexpected\n");
+    };
+    for (q=r; q != NULL; q=q->right) {
+/**** require(q->token != EpToken,"MR_computeTreeAND: q->EpToken unexpected\n"); ****/
+      require(q->token != ALT,"MR_computeTreeAND: q->ALT unexpected\n");
+    };
+
+    result=tnode(ALT);
+    tail=&(result->down);
+
+    for (p=l; p != NULL ; p=p->right) {
+      for (q=r; q != NULL ; q=q->right) {
+        if (p->token == q->token) {
+          match=tnode(p->token);
+          match->down=MR_computeTreeAND(p->down,q->down);
+          *tail=match;
+          tail=&(match->right);
+        };
+      };
+    };
+
+    *tail=NULL;
+    result=tshrink(result);
+    result=tflatten( result );
+    result=tleft_factor( result );
+    return result;
+}
+
+#ifdef __USE_PROTOS
+void MR_union_plain_sets1(Predicate *p,set *theUnion)
+#else
+void MR_union_plain_sets1(p,theUnion)
+  Predicate     *p;
+  set           *theUnion;
+#endif
+{
+  if (p == NULL) return;
+  MR_union_plain_sets1(p->down,theUnion);
+  MR_union_plain_sets1(p->right,theUnion);
+  set_orin(theUnion,p->plainSet);
+  return;
+}
+
+#ifdef __USE_PROTOS
+set MR_union_plain_sets(Predicate *p)
+#else
+set MR_union_plain_sets(p)
+  Predicate     *p;
+#endif
+{
+  set   theUnion;
+
+  theUnion=empty;
+
+  MR_union_plain_sets1(p,&theUnion);
+  return theUnion;
+}
+
+/* does NOT left factor: do not want to merge
+     (A B) with (A) to get (A B)
+   in fact the opposite: (A B) with (A) gives (A)
+*/
+
+#ifdef __USE_PROTOS
+Tree *MR_compute_pred_tree_ctxXX(Predicate *p)
+#else
+Tree *MR_compute_pred_tree_ctxXX(p)
+  Predicate     *p;
+#endif
+{
+    Tree        *result=NULL;
+    Predicate   *q;
+    Tree        *t;
+
+    if (p == NULL) return NULL;
+
+/* this appears strange: why do we OR the context
+   of and AND predicate ?  It is because of the way
+   that predicates are evaluated: if the context is
+   wrong then it's the same as if the predicate was
+   true.  That means that even when one leg of an
+   AND has unmatched context, if the other leg has
+   matched context and is true then the predicate
+   succeeds.  It's only when all the legs have unmatched
+   context that this one can skip evaluation of the
+   predicates.
+*/
+    if (p->expr == PRED_OR_LIST ||
+        p->expr == PRED_AND_LIST) {
+      for (q=p->down; q != NULL ; q=q->right) {
+        t=MR_compute_pred_tree_ctxXX(q);
+        result=tappend(result,t);
+        t=NULL;
+      };
+
+      result=tshrink(result);
+      result=tflatten( result );
+
+/* does NOT left factor: do not want to merge
+     (A B) with (A) to get (A B)
+   in fact the opposite: (A B) with (A) gives (A)
+*/
+
+/**** result=tleft_factor( result ); ****/
+      return result;
+    };
+
+#if 0
+**    if (p->expr == PRED_AND_LIST) {
+**
+**      Predicate     *l;
+**      Predicate     *r;
+**      Tree          *l1;
+**      Tree          *r1;
+**      Tree          *prevl1;
+**
+**      l=p->down;
+**      require (l->right != NULL,"MR_compute_pred_tree - AND has only one child");
+**
+**/* l1 and r1 should already be in "canonical" format */
+**
+**      l1=MR_compute_pred_tree(l);
+**      for (r=l->right; r != NULL; r=r->right) {
+**        r1=MR_compute_pred_tree(r);
+**        prevl1=l1;
+**        l1=MR_computeTreeAND(l1,r1);
+**        Tfree(r1);
+**        Tfree(prevl1);
+**      };
+**
+**/* result from computeTreeAND should be in "canonical" format */
+**
+**      result=l1;
+**
+**/* result of MR_computeTreeAND should be in "canonical" format */
+**
+**      return result;
+**    };
+#endif
+
+    if (p->k == 1) {
+      result=MR_make_tree_from_set(p->scontext[1]);
+    } else {
+      result=tdup(p->tcontext);
+      result=MR_remove_epsilon_from_tree(result);
+      result=tshrink(result);
+      result=tflatten(result);
+      result=tleft_factor(result);
+    };
+    return result;
+}
+
+#ifdef __USE_PROTOS
+void MR_pred_depth(Predicate *p,int *maxDepth)
+#else
+void MR_pred_depth(p,maxDepth)
+  Predicate     *p;
+  int           *maxDepth;
+#endif
+{
+  if (p == NULL) return;
+  if (p->expr != PRED_OR_LIST &&
+      p->expr != PRED_AND_LIST) {
+    if (p->k > *maxDepth) *maxDepth=p->k;
+  };
+  MR_pred_depth(p->down,maxDepth);
+  MR_pred_depth(p->right,maxDepth);
+}
+
+/* this computes the OR of all the contexts */
+
+#ifdef __USE_PROTOS
+set MR_compute_pred_set(Predicate *p)
+#else
+set MR_compute_pred_set(p)
+  Predicate     *p;
+#endif
+{
+    set         result;
+    Predicate   *q;
+
+    result=empty;
+
+    if (p == NULL) return empty;
+
+    if (p->expr == PRED_OR_LIST ||
+        p->expr == PRED_AND_LIST) {         /* yes, I do mean PRED_AND_LIST !   */
+                                            /* remember: r1: (A)? => <<p>>? r2; */
+                                            /*           r2: (B)? => <<q>>? r3; */
+      set   t;
+
+      t=empty;
+      result=empty;
+
+      for (q=p->down; q != NULL; q=q->right) {
+        t=MR_compute_pred_set(q);
+        set_orin(&result,t);
+        set_free(t);
+      };
+      return result;
+    } else if (p->k > 1) {
+      return empty;
+    } else {
+      return set_dup(p->scontext[1]);
+    };
+}
+
+#ifdef __USE_PROTOS
+set MR_First(int ck,Junction *j,set *incomplete)
+#else
+set MR_First(ck,j,incomplete)
+  int       ck;
+  Junction  *j;
+  set       *incomplete;
+#endif
+{
+    Junction    *p;
+    set         tokensUsed;
+
+    tokensUsed=empty;
+
+	require(j->ntype==nJunction, "MR_First: non junction passed");
+
+	p = analysis_point((Junction *)j->p1);
+
+	REACH(p,ck,incomplete,tokensUsed);
+
+    return tokensUsed;
+}
+
+#ifdef __USE_PROTOS
+void MR_cleanup_pred_trees(Predicate *p)
+#else
+void MR_cleanup_pred_trees(p)
+  Predicate     *p;
+#endif
+{
+  Tree      *t;
+
+  if (p == NULL) return;
+  if (p->expr != PRED_OR_LIST &&
+      p->expr != PRED_AND_LIST) {
+    t=p->tcontext;
+    t=tshrink(t);
+    t=tflatten(t);
+    t=tleft_factor(t);
+    p->tcontext=t;
+  };
+  MR_cleanup_pred_trees(p->down);
+  MR_cleanup_pred_trees(p->right);
+}
+
+/* does NOT return canonical tree */
+
+#ifdef __USE_PROTOS
+Tree * MR_remove_epsilon_from_tree(Tree *t)
+#else
+Tree * MR_remove_epsilon_from_tree(t)
+  Tree  *t;
+#endif
+{
+  if (t == NULL) return NULL;
+
+  /* I think ALT can be ignored as a special case */
+
+  if (t->token != EpToken) {
+    t->down=MR_remove_epsilon_from_tree(t->down);
+    t->right=MR_remove_epsilon_from_tree(t->right);
+    return t;
+  } else {
+    Tree    *u;
+    u=MR_remove_epsilon_from_tree(t->right);
+    t->right=NULL;
+    Tfree(t);
+    return u;
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_complete_set(int predDepth,set *tokensUsed,set *incomplete)
+#else
+void MR_complete_set(predDepth,tokensUsed,incomplete)
+  int       predDepth;
+  set       *tokensUsed;
+  set       *incomplete;
+#endif
+{
+    int             i;
+    RuleRefNode     *ruleRef;
+	set             rk2;
+    set             b;
+	int             k2;
+    Junction        *save_MR_RuleBlkWithHalt;
+
+    if (set_int(*incomplete) > (unsigned) predDepth) {
+      return;
+    };
+
+    require(MR_PredRuleRefStack.count == MR_RuleBlkWithHaltStack.count,
+                "RuleRefStack and RuleBlkWithHaltStack not same size");
+
+    require(MR_RuleBlkWithHalt == NULL ||
+         (MR_RuleBlkWithHalt->jtype == RuleBlk && MR_RuleBlkWithHalt->end->halt == TRUE),
+                     "RuleBlkWithHalt has no halt set");
+
+    save_MR_RuleBlkWithHalt=MR_RuleBlkWithHalt;
+
+    if (MR_RuleBlkWithHalt != NULL) {
+      MR_RuleBlkWithHalt->end->halt=FALSE;
+    };
+
+    for (i=MR_PredRuleRefStack.count-1; i >= 0 ; i--) {
+      ruleRef=(RuleRefNode *)MR_PredRuleRefStack.data[i];
+      if (ruleRef == NULL) continue;
+
+      MR_RuleBlkWithHalt=(Junction *)MR_RuleBlkWithHaltStack.data[i];
+      if (MR_RuleBlkWithHalt != NULL) MR_RuleBlkWithHalt->end->halt=TRUE;
+
+      rk2=empty;
+      b=empty;
+
+      while ( !set_nil(*incomplete) ) {
+		k2=set_int(*incomplete);
+        if (k2 > predDepth) break;                    /* <=== another exit from loop */
+		set_rm(k2,*incomplete);
+        REACH(ruleRef->next,k2,&rk2,b);
+		set_orin(tokensUsed,b);
+		set_free(b);
+      };
+
+      if (MR_RuleBlkWithHalt != NULL) MR_RuleBlkWithHalt->end->halt=FALSE;
+
+	  set_orin(incomplete,rk2);                       /* remember what we couldn't do */
+      set_free(rk2);
+	  if (set_int(*incomplete) > (unsigned) predDepth) break;    /* <=== another exit from loop */
+    };
+
+    MR_RuleBlkWithHalt=save_MR_RuleBlkWithHalt;
+    if (MR_RuleBlkWithHalt != NULL) {
+      MR_RuleBlkWithHalt->end->halt=TRUE;
+    };
+}
+
+#ifdef __USE_PROTOS
+void MR_complete_tree(int predDepth,Tree **t,set *incomplete)
+#else
+void MR_complete_tree(predDepth,t,incomplete)
+  int       predDepth;
+  Tree      **t;
+  set       *incomplete;
+#endif
+{
+    int             i;
+    RuleRefNode     *ruleRef;
+	set             rk2;
+    Tree            *u;
+	unsigned        k2;
+    Junction        *save_MR_RuleBlkWithHalt;
+    int             saveConstrainSearch;
+
+    if (set_int(*incomplete) > (unsigned) predDepth) {
+      return;
+    };
+
+    require(MR_PredRuleRefStack.count == MR_RuleBlkWithHaltStack.count,
+                "RuleRefStack and RuleBlkWithHaltStack not same size");
+
+    require(MR_RuleBlkWithHalt == NULL ||
+         (MR_RuleBlkWithHalt->jtype == RuleBlk && MR_RuleBlkWithHalt->end->halt == TRUE),
+                     "RuleBlkWithHalt has no halt set");
+
+    save_MR_RuleBlkWithHalt=MR_RuleBlkWithHalt;
+    saveConstrainSearch=ConstrainSearch;
+    ConstrainSearch=0;
+
+    if (MR_RuleBlkWithHalt != NULL) {
+      MR_RuleBlkWithHalt->end->halt=FALSE;
+    };
+
+    for (i=MR_PredRuleRefStack.count-1; i >= 0 ; i--) {
+      ruleRef=(RuleRefNode *)MR_PredRuleRefStack.data[i];
+      if (ruleRef == NULL) continue;
+
+      MR_RuleBlkWithHalt=(Junction *)MR_RuleBlkWithHaltStack.data[i];
+
+      if (MR_RuleBlkWithHalt != NULL) MR_RuleBlkWithHalt->end->halt=TRUE;
+
+      rk2=empty;
+
+      while ( !set_nil(*incomplete) ) {	
+		k2 = set_int(*incomplete);
+        if (k2 > (unsigned) predDepth) break;       /* <=== another exit from loop */
+		set_rm(k2,*incomplete);
+		u = NULL;
+
+        TRAV(ruleRef->next,k2,&rk2,u);
+
+			/* any subtrees missing k2 tokens, add u onto end */
+
+		*t=tlink(*t,u,k2);
+        Tfree(u);
+      }
+
+	  set_orin(incomplete,rk2);         /* remember what we couldn't do */
+      set_free(rk2);
+
+      if (MR_RuleBlkWithHalt != NULL) MR_RuleBlkWithHalt->end->halt=FALSE;
+
+	  if (set_int(*incomplete) > (unsigned) predDepth) break;    /* <=== another exit from loop */
+    };
+
+    MR_RuleBlkWithHalt=save_MR_RuleBlkWithHalt;
+
+    if (MR_RuleBlkWithHalt != NULL) {
+      MR_RuleBlkWithHalt->end->halt=TRUE;
+    };
+    ConstrainSearch=saveConstrainSearch;
+}
+
+#ifdef __USE_PROTOS
+void MR_complete_predicates(int predDepth,Predicate *pred)
+#else
+void MR_complete_predicates(predDepth,pred)
+  int           predDepth;
+  Predicate     *pred;
+#endif
+{
+  if (pred == NULL) return;
+  if (pred->expr != PRED_AND_LIST &&
+      pred->expr != PRED_OR_LIST) {
+    MR_complete_set(predDepth,&(pred->scontext[1]),&(pred->completionSet));
+    MR_complete_tree(predDepth,&(pred->tcontext),&(pred->completionTree));
+  };
+  MR_complete_predicates(predDepth,pred->down);
+  MR_complete_predicates(predDepth,pred->right);
+}
+
+#ifdef __USE_PROTOS
+Junction * MR_junctionWithoutP2(Junction *j)
+#else
+Junction * MR_junctionWithoutP2(j)
+  Junction  *j;
+#endif
+{
+  Junction  *thisAlt;
+
+/* don't want to follow p2 to the next alternative of this rule */
+/* insert a generic node with null p2 if necessary              */
+/* however FIRST requires a junction                            */
+
+  thisAlt=j;
+  if (thisAlt->p2 != NULL) {
+    if (thisAlt->p1->ntype == nJunction) {
+      thisAlt=(Junction *) thisAlt->p1;
+    } else {
+      thisAlt=newJunction();
+      thisAlt->p1=j->p1;
+      thisAlt->rname=j->rname;
+      thisAlt->file=j->file;
+      thisAlt->line=j->line;
+      j->p1=(Node *)thisAlt;
+    };
+  };
+  return thisAlt;
+}
+
+#ifdef __USE_PROTOS
+int MR_tree_equ(Tree *big, Tree *small) {
+#else
+int MR_tree_equ(big,small)
+  Tree  *big;
+  Tree  *small;
+{
+#endif
+
+  Tree      *b;
+  Tree      *s;
+  int       bcount=0;
+  int       scount=0;
+
+  if (small == NULL && big == NULL) return 1;
+  if (small == NULL) return 0;
+  if (big == NULL) return 0;
+
+  if (small->token == ALT) {
+    require(small->right == NULL,
+                "MR_tree_equ: small: ALT node has siblings");
+    return MR_tree_equ(big,small->down);
+  };
+  if (big->token == ALT) {
+    require(big->right == NULL,
+                "MR_tree_equ: big: ALT node has siblings");
+    return MR_tree_equ(big->down,small);
+  };
+  for (s=small; s != NULL; s=s->right) {
+    scount++;
+    require(s->token != EpToken,"MR_tree_equ: s->EpToken unexpected\n");
+  };
+  for (b=big; b != NULL; b=b->right) {
+    bcount++;
+    require(b->token != EpToken,"MR_tree_equ: b->EpToken unexpected\n");
+  };
+
+  if (bcount != scount) return 0;
+
+  for (s=small; s != NULL; s=s->right) {
+    for (b=big; b!= NULL; b=b->right) {
+      if (s->token == b->token) {
+        if (MR_tree_equ(b->down,s->down)) goto next_s;
+      };
+    };
+    return 0;
+next_s:
+    continue;
+  };
+  return 1;
+}
+
+/* this does not compare sources - only contexts ! */
+
+#ifdef __USE_PROTOS
+int MR_identicalContext(Predicate *p,Predicate *q)
+#else
+int MR_identicalContext(p,q)
+  Predicate     *p;
+  Predicate     *q;
+#endif
+{
+  if (p->k != q->k) return 0;
+  require ( (p->tcontext == NULL) == (q->tcontext == NULL),
+        "tcontext inconsistent");
+  if (p->k == 1) {
+    return set_equ(p->scontext[1],q->scontext[1]);
+  } else {
+    return MR_tree_equ(p->tcontext,q->tcontext);
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_reportSetSuppression(int predDepth,
+            set predSet,set plainSet,Junction *jPred,Junction *jPlain,Predicate *p)
+#else
+void MR_reportSetSuppression(predDepth,predSet,plainSet,jPred,jPlain,p)
+  int       predDepth;
+  set       predSet;
+  set       plainSet;
+  Junction  *jPred;
+  Junction  *jPlain;
+  Predicate *p;
+#endif
+{
+  if (InfoP) {
+    fprintf(output,"\n#if 0\n\n");
+    fprintf(output,"Hoisting of predicate suppressed by alternative without predicate.\n");
+    fprintf(output,"The alt without the predicate includes all cases where the predicate is false.\n\n");
+    fprintf(output,"   WITH predicate: line %d  %s\n",jPred->line,FileStr[jPred->file]);
+    if (jPlain != NULL) {
+      fprintf(output,"   WITHOUT predicate: line %d  %s\n",jPlain->line,FileStr[jPlain->file]);
+    } else {
+      fprintf(output,"   WITHOUT predicate: all alternatives without predicates (combined)\n");
+    };
+    if (predDepth == 1) {
+      fprintf(output,"\nThe context set for the predicate:\n");
+      MR_dumpTokenSet(output,1,predSet);
+    };
+    fprintf(output,"\nThe lookahead set for the alt WITHOUT the semantic predicate:\n");
+    MR_dumpTokenSet(output,1,plainSet);
+    fprintf(output,"\nThe predicate:\n\n");
+    MR_dumpPred1(1,p,1);
+    fprintf(output,"Chain of referenced rules:\n\n");
+    MR_dumpPredRuleRefStack(output,4);
+    fprintf(output,"\n#endif\n");
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_reportSetRestriction(int predDepth,set predSet,set plainSet,
+            Junction *jPred,Junction *jPlain,Predicate *origPred,Predicate *newPred)
+#else
+void MR_reportSetRestriction(predDepth,predSet,plainSet,jPred,jPlain,origPred,newPred)
+  int       predDepth;
+  set       predSet;
+  set       plainSet;
+  Junction  *jPred;
+  Junction  *jPlain;
+  Predicate *origPred;
+  Predicate *newPred;
+#endif
+{
+  set       intersect;
+
+  intersect=empty;
+
+  if (! InfoP) return;
+  fprintf(output,"\n#if 0\n\n");
+  fprintf(output,"Restricting the context of a predicate because of overlap in the lookahead set\n");
+  fprintf(output,"  between the alternative with the semantic predicate and one without\n");
+  fprintf(output,"Without this restriction the alternative without the predicate could not\n");
+  fprintf(output,"  be reached when input matched the context of the predicate and the predicate\n");
+  fprintf(output,"  was false.\n\n");
+
+  fprintf(output,"   WITH predicate: line %d  %s\n",jPred->line,FileStr[jPred->file]);
+  if (jPlain != NULL) {
+    fprintf(output,"   WITHOUT predicate: line %d  %s\n",jPlain->line,FileStr[jPlain->file]);
+  } else {
+    fprintf(output,"   WITHOUT predicate: all alternatives without predicates (combined)\n");
+  };
+  if (predDepth == 1) {
+    fprintf(output,"\nThe original context set for the predicate:\n");
+    MR_dumpTokenSet(output,1,predSet);
+  };
+  fprintf(output,"\nThe lookahead set for the alt WITHOUT the semantic predicate:\n");
+  MR_dumpTokenSet(output,1,plainSet);
+  if (predDepth == 1) {
+    fprintf(output,"\nThe intersection of the two sets\n");
+    intersect=set_and(predSet,plainSet);
+    MR_dumpTokenSet(output,1,intersect);
+    set_free(intersect);
+  };
+  fprintf(output,"\nThe original predicate:\n\n");
+  MR_dumpPred1(1,origPred,1);
+  fprintf(output,"The new (modified) form of the predicate:\n\n");
+  MR_dumpPred1(1,newPred,1);
+  fprintf(output,"#endif\n");
+}
+
+/* don't use Pass3 by itself unless you know that inverted is not important */
+
+#ifdef __USE_PROTOS
+Predicate * MR_removeRedundantPredPass3(Predicate *p)
+#else
+Predicate * MR_removeRedundantPredPass3(p)
+  Predicate *p;
+#endif
+{
+  Predicate     *q;
+
+  if (p == NULL) return NULL;
+  p->right=MR_removeRedundantPredPass3(p->right);
+  p->down=MR_removeRedundantPredPass3(p->down);
+  if (p->redundant) {
+    q=p->right;
+    p->right=NULL;
+    predicate_free(p);
+    return q;
+  };
+  if (p->expr == PRED_AND_LIST ||
+      p->expr == PRED_OR_LIST) {
+    if (p->down == NULL) {
+      q=p->right;
+      p->right=NULL;
+      predicate_free(p);
+      return q;
+    };
+    if (p->down != NULL && p->down->right == NULL) {
+      q=p->down;
+      q->right=p->right;
+      p->right=NULL;
+      p->down=NULL;
+      return q;
+    };
+  };
+  return p;
+}
+
+#ifdef __USE_PROTOS
+void MR_removeRedundantPredPass2(Predicate *p)
+#else
+void MR_removeRedundantPredPass2(p)
+  Predicate *p;
+#endif
+{
+  Predicate     *q;
+
+  if (p == NULL) return;
+
+  if (p->expr == PRED_AND_LIST) {
+    for (q=p->down ; q != NULL ; q=q->right) {
+      MR_removeRedundantPredPass2(q);
+      if (q->isConst) {
+        if (q->constValue == 0) {
+          p->isConst=1;
+          p->constValue=0;
+          return;
+        } else {
+          q->redundant=1;
+        };
+      };
+    };
+  };
+
+  if (p->expr == PRED_OR_LIST) {
+    for (q=p->down ; q != NULL ; q=q->right) {
+      MR_removeRedundantPredPass2(q);
+      if (q->isConst) {
+        if (q->constValue == 0) {
+          q->redundant=1;
+        } else {
+          p->isConst=1;
+          p->constValue=1;
+          return;
+        };
+      };
+    };
+  };
+
+  return;
+}
+
+#if 0
+   this totally ignores the implications of guarded predicates
+     in which the part after the guard could possibly cover a predicate.
+   that would be much harder:
+
+        rule : (A)? => <<p>>? sub1;     /* 1 */
+             | (B)? => <<r>>? sub2      /* 2 */
+        sub1 : (A)? => <<q>>? A B       /* 3 */
+             | B                        /* 4 - suppresses line 2 */
+             ;
+#endif
+
+#ifdef __USE_PROTOS
+void MR_apply_restriction1(Predicate *pred,set *plainSet,int *changed)
+#else
+void MR_apply_restriction1(pred,plainSet,changed)
+  Predicate     *pred;
+  set           *plainSet;
+  int           *changed;
+#endif
+{
+  if (pred == NULL) return;
+  MR_apply_restriction1(pred->right,plainSet,changed);
+  if (pred->down != NULL) {
+    MR_apply_restriction1(pred->down,plainSet,changed);
+  } else {
+    set     t;
+    if (pred->k == 1) {
+      t=set_dif(pred->scontext[1],*plainSet);
+      if (*changed == 0 &&
+          !set_equ(t,pred->scontext[1])) {
+        *changed=1;
+      };
+      if (set_nil(t)) {
+        pred->redundant=1;
+      };
+      set_free(pred->scontext[1]);
+      pred->scontext[1]=t;
+    };
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_orin_plainSet(Predicate *p,set plainSet)
+#else
+void MR_orin_plainSet(p,plainSet)
+  Predicate     *p;
+  set           plainSet;
+#endif
+{
+  if (p == NULL) return;
+  MR_orin_plainSet(p->down,plainSet);
+  MR_orin_plainSet(p->right,plainSet);
+  set_orin(&p->plainSet,plainSet);
+}
+
+Predicate   *PRED_SUPPRESS;
+
+#ifdef __USE_PROTOS
+Predicate * MR_find_in_aSubBlk(Junction *alt)
+#else
+Predicate * MR_find_in_aSubBlk(alt)
+  Junction  *alt;
+#endif
+{
+    Predicate       *root=NULL;
+    Predicate       **tail=NULL;
+
+	Junction        *p;
+
+    int             nAlts=0;
+    Junction        **jList;
+    Predicate       **predList;
+    int             *matchList;
+    set             predSet;
+    int             i;
+    int             j;
+    int             m;
+    int             predDepth;
+    set             incomplete;
+    set             union_plainSet;
+    set             setChange;
+    int             changed;
+    Predicate       *newPred;
+    set             setDif;
+    Predicate       *origPred;
+    int             depth1=1;             /* const int */
+    set             *plainContext;
+    set             plainSet;
+
+    predSet=empty;
+    incomplete=empty;
+    union_plainSet=empty;
+    setChange=empty;
+    setDif=empty;
+    plainSet=empty;
+
+    if (PRED_SUPPRESS == NULL) {
+      PRED_SUPPRESS=new_pred();
+      PRED_SUPPRESS->expr="Predicate Suppressed";
+    };
+
+    /* this section just counts the number of "interesting" alternatives  */
+    /*   in order to allocate arrays                                      */
+
+	for (p=alt; p!=NULL; p=(Junction *)p->p2) {
+	  /* ignore empty alts */
+	  if ( p->p1->ntype != nJunction ||
+	        ((Junction *)p->p1)->jtype != EndBlk )	{
+        nAlts++;
+      };
+    };
+
+    /* if this is a (...)+ block then don't count the last alt because
+       it can't be taken until at least one time through the block.
+       In other words it isn't a real choice until the (...)+ is entered
+         at which point the hoisting issue is moot.
+       Maybe look at "ignore" instead ?
+    */
+
+    if (alt->jtype == aPlusBlk) {
+      nAlts--;
+    };
+
+    jList=(Junction **)calloc(nAlts,sizeof(Junction *));
+    require(jList!=NULL,"cannot allocate MR_find_in_aSubBlk jList");
+
+    plainContext=(set *)calloc(nAlts,sizeof(set));
+    require(plainContext!=NULL,"cannot allocate MR_find_in_aSubBlk plainContext");
+    for (m=0; m < nAlts; m++) plainContext[m]=empty;
+
+    predList=(Predicate **)calloc(nAlts,sizeof(Predicate *));
+    require(predList!=NULL,"cannot allocate MR_find_in_aSubBlk predList");
+
+    matchList=(int *)calloc(nAlts,sizeof(int));
+    require(matchList!=NULL,"cannot allocate MR_find_in_aSubBlk matchList");
+
+    /* this section just fills in the arrays previously allocated       */
+    /* the most interesting one is matchList[]                          */
+    /*                                                                  */
+    /*   bit 0 => this alt has a semantic pred which is "covered"       */
+    /*              by an alt without a semantic pred.  Don't hoist.    */
+
+	for (i=0,p=alt;
+         p!=NULL && i<nAlts;
+         i++,p=(Junction *)p->p2) {
+
+	  /* ignore empty alts */
+
+	  if ( p->p1->ntype != nJunction ||
+	        ((Junction *)p->p1)->jtype != EndBlk )	{
+        jList[i]=MR_junctionWithoutP2(p);
+        predList[i]=find_predicates(p->p1);      /* should be jList ????? */
+        if (predList[i] != NULL) {
+          MR_cleanup_pred_trees(predList[i]);    /* flatten & left factor */
+          plainContext[i]=MR_union_plain_sets(predList[i]);
+        } else {
+          MR_set_reuse(&plainSet);
+          MR_set_reuse(&incomplete);
+          plainSet=MR_First(depth1,jList[i],&incomplete);
+          MR_complete_set(depth1,&plainSet,&incomplete);
+          require(set_nil(incomplete),"couldn't complete k=1");
+          plainContext[i]=plainSet;
+          plainSet=empty;
+        };
+        set_orin(&union_plainSet,plainContext[i]);
+      };
+    };
+
+    if (nAlts == 1) {
+      goto EXIT_SIMPLE;
+    };
+
+/*
+ *  Looking for cases where alt i has a semantic pred and alt j does not.
+ *  Don't care about cases where lookahead for semantic predicates overlap
+ *    because normal predicate hoisting does the correct thing automatically.
+ *  Don't care about cases where lookahead for alts without semantic predicates
+ *    overlap because normal prediction does the correct thing automatically.
+ *
+ *  When we find such a case check for one of three subcases:
+ *
+ *      1.  if lookahead for alt i is contained in the lookahead for any
+ *          alt j then ignore semantic predicate of alt i
+ *      2.  if lookahead for alt i is not contained in the lookahead for
+ *          any alt j then add add predicate i to the OR list to be hoisted
+ *      3.  if lookahead for alt i overlaps the lookahead for some alt j then
+ *          add a dummy semantic predicate for alt j
+ *
+ *  There is an implicit assumption that the context of all alternatives following
+ *  the rule being processed here are identical (but may vary from hoist to
+ *  hoist depending on the place where the rule was invoked that led to hoisting
+ *  these predicates.  In othere words in the fragment:
+ *
+ *            ( <<a>>? a1 a2 a3 | <<b>>? b1 b2 b3 )
+ *
+ *  both a3 and b3 have the same follow sets  because they are both at the end of
+ *  alternatives in the same block.
+ */
+
+    for (i=0; i < nAlts; i++) {
+      if (jList[i] == NULL) continue;
+      if (predList[i] == NULL) continue;
+
+        /* if the predicate depth turns out to be one token only */
+        /*   then it is can be easily represented as a set and   */
+        /*   compared to the junction set create by MR_First()   */
+
+      predDepth=0;
+      MR_pred_depth(predList[i],&predDepth);
+      require (predDepth >= 1,"MR_find_in_aSubBlk: pred depth < 1");
+      require (predDepth <= CLL_k,"MR_find_in_aSubBlk: predDepth > CLL_k");
+
+        /* complete predicates to predDepth
+           If completed to depth=1 then the context would be incomplete.
+           The context would be truncated and the predicate simplify routine
+             would have incomplete information.  It would lead to
+             either false matches of failure to find true matches.
+        */
+
+      MR_complete_predicates(predDepth,predList[i]);
+
+      if (predList[i] != NULL) {
+        MR_cleanup_pred_trees(predList[i]);    /* flatten & left factor */
+      };
+
+      /* If the predicate depth is 1 then it is possible to suppress
+           a predicate completely using a single plain alt.  Check for suppression
+           by a single plain alt first because it gives better messages.  If that
+           fails try the union of all the plain alts.
+      */
+
+      if (predDepth == 1) {
+
+        MR_set_reuse(&predSet);
+        predSet=MR_compute_pred_set(predList[i]);   /* ignores k>1 predicates */
+
+        for (j=0; j < nAlts; j++) {
+          if (jList[j] == NULL) continue;
+          if (j == i) continue;
+
+          MR_set_reuse(&setDif);
+          setDif=set_dif(predSet,plainContext[j]);
+          if (set_nil(setDif)) {
+            matchList[i] |= 1;
+            MR_reportSetSuppression(predDepth,predSet,plainContext[j],jList[i],jList[j],predList[i]);
+            predicate_free(predList[i]);
+            predList[i]=PRED_SUPPRESS;
+            goto next_i;
+          };
+
+        }; /* end loop on j */
+
+        changed=0;
+
+        /* predicate_dup is only to give good error messages */
+        /* remember to do a predicate_free()                 */
+
+        origPred=predicate_dup(predList[i]);
+        MR_apply_restriction1(predList[i],&union_plainSet,&changed);
+        if (changed) {
+
+          /* don't use Pass3 by itself unless you know that inverted is not important */
+
+          newPred=MR_removeRedundantPredPass3(predList[i]);
+          newPred=MR_predSimplifyALL(newPred);
+          if (newPred == NULL) {
+            matchList[i] |= 1;
+            MR_reportSetSuppression(predDepth,predSet,union_plainSet,jList[i],
+                                                            NULL,origPred);
+            predList[i]=PRED_SUPPRESS;
+          } else {
+            MR_reportSetRestriction(predDepth,predSet,union_plainSet,jList[i],
+                                                    NULL,origPred,newPred);
+            predList[i]=newPred;
+          };
+        };
+        predicate_free(origPred);
+        origPred=NULL;
+      };
+
+      /*
+         If the predicate depth is > 1 then it can't be suppressed completely
+           because the code doesn't support inspection of such things.  They're
+           much messier than k=1 sets.
+      */
+
+      if (predDepth > 1 ) {
+
+        changed=0;
+
+        /* predicate_dup is only to give good error messages */
+        /* remember to do a predicate_free()                 */
+
+        origPred=predicate_dup(predList[i]);
+        MR_apply_restriction1(predList[i],&union_plainSet,&changed);
+        if (changed) {
+          newPred=MR_removeRedundantPredPass3(predList[i]);
+          newPred=MR_predSimplifyALL(newPred);
+          if (newPred == NULL) {
+            matchList[i] |= 1;
+            MR_reportSetSuppression(predDepth,predSet,union_plainSet,jList[i],
+                                                            NULL,origPred);
+            predList[i]=PRED_SUPPRESS;
+          } else {
+            MR_reportSetRestriction(predDepth,predSet,union_plainSet,jList[i],
+                                                    NULL,origPred,newPred);
+            predList[i]=newPred;
+          };
+        };
+        predicate_free(origPred);
+        origPred=NULL;
+      };
+next_i:
+      continue;
+    };
+
+EXIT_SIMPLE:
+
+    root = new_pred();
+    root->expr=PRED_OR_LIST;
+    tail = &(root->down);
+
+    for (i=0 ; i< nAlts ; i++) {
+      if (jList[i] == NULL) continue;
+
+      if (predList[i] == NULL) {
+        continue;
+      } else if ( (matchList[i] & 1) != 0) {
+        if (predList[i] != PRED_SUPPRESS) {
+          predicate_free(predList[i]);
+        };
+        continue;
+      };
+
+      /* make an OR list of predicates */
+
+      *tail=predList[i];
+      tail=&(predList[i]->right);
+    };
+
+	/* if just one pred, remove OR root */
+
+	if (root->down == NULL) {
+      predicate_free(root);
+      root=NULL;
+    } else if (root->down->right == NULL) {
+      Predicate     *p=root->down;
+      root->down=NULL;
+      predicate_free(root);
+      root=p;
+	}
+
+    root=MR_predSimplifyALL(root);
+
+    MR_orin_plainSet(root,union_plainSet);
+
+    set_free(predSet);
+    set_free(union_plainSet);
+    set_free(incomplete);
+    set_free(setChange);
+    set_free(setDif);
+
+    for (m=0; m < nAlts; m++) set_free(plainContext[m]);
+
+    free ( (char *) jList);
+    free ( (char *) predList);
+    free ( (char *) matchList);
+    free ( (char *) plainContext);
+
+	return root;
+}
+
+#ifdef __USE_PROTOS
+void MR_predContextPresent(Predicate *p,int *allHaveContext,int *noneHaveContext)
+#else
+void MR_predContextPresent(p,allHaveContext,noneHaveContext)
+  Predicate     *p;
+  int           *allHaveContext;
+  int           *noneHaveContext;
+#endif
+{
+  if (p == NULL) return;
+  MR_predContextPresent(p->right,allHaveContext,noneHaveContext);
+  if (p->expr != PRED_AND_LIST &&
+      p->expr != PRED_OR_LIST) {
+    if (set_nil(p->scontext[1]) == 0 ||
+            (p->tcontext != NULL)) {
+      *noneHaveContext=0;
+    } else {
+      *allHaveContext=0;
+    };
+  };
+  MR_predContextPresent(p->down,allHaveContext,noneHaveContext);
+}
+
+#ifdef __USE_PROTOS
+int MR_pointerStackPush(PointerStack *ps,void *dataPointer)
+#else
+int MR_pointerStackPush(ps,dataPointer)
+  PointerStack  *ps;
+  void          *dataPointer;
+#endif
+{
+  void             **newStack;
+  int              newSize;
+  int              i;
+
+  if (ps->count == ps->size) {
+    newSize=20+ps->size*2;
+    newStack=(void **)calloc(newSize,sizeof(void *));
+    require (newStack != NULL,"cannot allocate PointerStack");
+    for (i=0; i < ps->size; i++) {
+      newStack[i]=ps->data[i];
+    };
+    if (ps->data != NULL) free( (char *) ps->data);
+    ps->data=newStack;
+    ps->size=newSize;
+  };
+  ps->data[ps->count]=dataPointer;
+  ps->count++;
+  return ps->count-1;
+}
+
+#ifdef __USE_PROTOS
+void * MR_pointerStackPop(PointerStack *ps)
+#else
+void * MR_pointerStackPop(ps)
+  PointerStack  *ps;
+#endif
+{
+  void  *dataPointer;
+
+  require(ps->count > 0,"MR_pointerStackPop underflow");
+
+  dataPointer=ps->data[ps->count-1];
+  ps->data[ps->count-1]=NULL;
+  (ps->count)--;
+  return dataPointer;
+}
+
+#ifdef __USE_PROTOS
+void * MR_pointerStackTop(PointerStack *ps)
+#else
+void * MR_pointerStackTop(ps)
+  PointerStack  *ps;
+#endif
+{
+  require(ps->count > 0,"MR_pointerStackTop underflow");
+  return ps->data[ps->count-1];
+}
+
+#ifdef __USE_PROTOS
+void MR_pointerStackReset(PointerStack *ps)
+#else
+void MR_pointerStackReset(ps)
+  PointerStack  *ps;
+#endif
+{
+  int i;
+  if (ps->data != NULL) {
+    for (i=0; i < ps->count ; i++) {
+       ps->data[i]=NULL;
+    };
+  };
+  ps->count=0;
+}
+
+#ifdef __USE_PROTOS
+Junction *MR_nameToRuleBlk(char *name)
+#else
+Junction *MR_nameToRuleBlk(name)
+  char  *name;
+#endif
+{
+    RuleEntry *q;
+
+    require (RulePtr != NULL,"MR_nameToRule: RulePtr not initialized");
+
+    if (name == NULL) return NULL;
+
+    q = (RuleEntry *) hash_get(Rname,name);
+
+	if ( q == NULL ) {
+      return NULL;
+    } else {
+      return RulePtr[q->rulenum];
+    };
+}
+
+#ifdef __USE_PROTOS
+Junction * MR_ruleReferenced(RuleRefNode *rrn)
+#else
+Junction * MR_ruleReferenced(rrn)
+  RuleRefNode   *rrn;
+#endif
+{
+    return MR_nameToRuleBlk(rrn->text);
+}
+
+#ifdef __USE_PROTOS
+void MR_comparePredLeaves(Predicate *me,Predicate *myParent,Predicate *him,Predicate *hisParent)
+#else
+void MR_comparePredLeaves(me,myParent,him,hisParent)
+    Predicate *me;
+    Predicate *myParent;
+    Predicate *him;
+    Predicate *hisParent;
+#endif
+{
+    if (me == NULL) return;
+    if (me == him) {
+      MR_comparePredLeaves(me->right,myParent,him,hisParent);
+      return;
+    } else if (me->expr == PRED_AND_LIST ||
+               me->expr == PRED_OR_LIST) {
+      MR_comparePredLeaves(me->down,me,him,hisParent);
+      MR_comparePredLeaves(me->right,myParent,him,hisParent);
+      return;
+    } else {
+      if (me->source != NULL) {
+
+        /* predicate->invert can be set only in the predEntry predicates        */
+        /* thus they are only visible after the predEntry predicates have been "unfolded" */
+
+        int     sameSource=(me->source == him->source);
+        int     sameInvert=1 &
+                 (1 + me->inverted + him->inverted + me->source->inverted + him->source->inverted);
+        int     samePredEntry=(me->source->predEntry != NULL
+                                 && him->source->predEntry != NULL
+                                    && me->source->predEntry == him->source->predEntry);
+        if (sameInvert && (sameSource || samePredEntry)) {
+          if (MR_identicalContext(me,him)) {
+
+            /* identical predicates */
+
+            if (hisParent->expr == PRED_OR_LIST &&
+                myParent->expr == PRED_OR_LIST) {
+              me->redundant=1;
+            } else if (hisParent->expr == PRED_AND_LIST &&
+                       myParent->expr == PRED_AND_LIST) {
+              me->redundant=1;
+            } else if (  (hisParent->expr == PRED_OR_LIST &&
+                          myParent->expr == PRED_AND_LIST)
+                       ||
+                         (hisParent->expr == PRED_AND_LIST &&
+                          myParent->expr == PRED_OR_LIST)
+                      ) {
+              myParent->redundant=1;
+            } else {
+              require (0,"MR_comparePredLeaves: not both PRED_LIST");
+            };
+          };
+        };  /* end same source or same predEntrr with same invert sense */
+
+        /* same predEntry but opposite invert sense */
+
+        if (!sameInvert && (sameSource || samePredEntry)) {
+          if (MR_identicalContext(me,him)) {
+            if (hisParent->expr == PRED_OR_LIST &&
+                myParent->expr == PRED_OR_LIST) {
+              myParent->isConst=1;
+              myParent->constValue=1;
+            } else if (hisParent->expr == PRED_AND_LIST &&
+                       myParent->expr == PRED_AND_LIST) {
+              myParent->isConst=1;
+              myParent->constValue=0;
+            } else if (  (hisParent->expr == PRED_OR_LIST &&
+                          myParent->expr == PRED_AND_LIST)
+                       ||
+                         (hisParent->expr == PRED_AND_LIST &&
+                          myParent->expr == PRED_OR_LIST)
+                      ) {
+              me->redundant=1;
+            } else {
+              require (0,"MR_comparePredLeaves: not both PRED_LIST");
+            };
+          };
+        };  /* end same predEntry with opposite invert sense */
+      };
+
+      MR_comparePredLeaves(me->right,myParent,him,hisParent);
+      return;
+    };
+}
+
+#ifdef __USE_PROTOS
+void MR_removeRedundantPredPass1(Predicate *me,Predicate *myParent)
+#else
+void MR_removeRedundantPredPass1(me,myParent)
+  Predicate     *me;
+  Predicate     *myParent;
+#endif
+{
+    if (me == NULL) return;
+    if (me->redundant) {
+      MR_removeRedundantPredPass1(me->right,myParent);
+      return;
+    };
+    if (me->expr == PRED_AND_LIST ||
+        me->expr == PRED_OR_LIST) {
+      MR_removeRedundantPredPass1(me->down,me);
+      MR_removeRedundantPredPass1(me->right,myParent);
+    } else {
+      require (me->source != NULL,"me->source == NULL");
+      if (myParent != NULL) {
+        MR_comparePredLeaves(myParent->down,myParent,me,myParent);
+      };
+      MR_removeRedundantPredPass1(me->right,myParent);
+    };
+}
+
+/* pretty much ignores things with the inverted bit set */
+
+#ifdef __USE_PROTOS
+Predicate *MR_predFlatten(Predicate *p)
+#else
+Predicate *MR_predFlatten(p)
+  Predicate     *p;
+#endif
+{
+    if (p == NULL) return NULL;
+    if (p->expr == PRED_OR_LIST
+        || p->expr == PRED_AND_LIST) {
+
+      Predicate     *child;
+      Predicate     *gchild;
+      Predicate     **tail;
+      Predicate     *next;
+      char          *PRED_XXX_LIST=p->expr;
+
+      require (p->down != NULL,"MR_predFlatten AND/OR no child");
+
+
+      p->down=MR_predFlatten(p->down);
+      p->right=MR_predFlatten(p->right);
+      child=p->down;
+      if (child->right == NULL) {
+        child->right=p->right;
+        p->right=NULL;
+        p->down=NULL;
+        if (p->inverted) child->inverted=!child->inverted;
+        predicate_free(p);
+        return child;
+      };
+
+      /* make a single list of all children and grandchildren */
+
+      tail=&(p->down);
+      for (child=p->down; child != NULL; child=next) {
+        if (child->expr != PRED_XXX_LIST
+              || child->inverted
+                || child->predEntry != NULL) {
+          *tail=child;
+          tail=&(child->right);
+          next=child->right;
+        } else {
+          for (gchild=child->down;
+               gchild != NULL;
+               gchild=gchild->right) {
+            *tail=gchild;
+            tail=&(gchild->right);
+          };
+          next=child->right;
+          child->right=NULL;
+          child->down=NULL;
+          predicate_free(child);
+        };
+      };
+      *tail=NULL;
+      return p;
+    } else {
+      p->right=MR_predFlatten(p->right);
+      return p;
+    };
+}
+
+static char *alwaysFalseWarning=NULL;
+
+#ifdef __USE_PROTOS
+Predicate *checkPredicateConflict(Predicate *p)
+#else
+Predicate *checkPredicateConflict(p)
+  Predicate     *p;
+#endif
+{
+  if (p->isConst) {
+    if (p->constValue == 1) {
+      predicate_free(p);
+      return NULL;
+    } else {
+      if (InfoP && !p->conflictReported) {
+        p->conflictReported=1;
+        fprintf(output,"\n#if 0\n\n");
+        fprintf(output,"The following predicate expression will always be false:\n\n");
+        MR_dumpPred1(1,p,1);
+        fprintf(output,"\n#endif\n");
+      };
+
+      if (alwaysFalseWarning != CurRule) {
+        alwaysFalseWarning=CurRule;
+        if (InfoP) {
+          warnNoFL(eMsg1("one (or more) predicate expression hoisted into rule \"%s\" are always false \
+- see output file for more information",CurRule));
+        } else {
+          warnNoFL(eMsg1("one (or more) predicate expressions hoisted into rule \"%s\" are always false \
+- use \"-info p\" for more information",CurRule));
+        };
+      };
+    };
+  };
+  return p;
+}
+
+
+#ifdef __USE_PROTOS
+int MR_countPredNodes(Predicate *p)
+#else
+int MR_countPredNodes(p)
+  Predicate     *p;
+#endif
+{
+  if (p == NULL) return 0;
+  return 1 + MR_countPredNodes(p->down) + MR_countPredNodes(p->right);
+}
+
+#ifdef __USE_PROTOS
+Predicate *MR_predSimplifyALLX(Predicate *p,int skipPass3)
+#else
+Predicate *MR_predSimplifyALLX(p,skipPass3)
+  Predicate     *p;
+  int           skipPass3;
+#endif
+{
+  int       countBefore;
+  int       countAfter;
+
+  countAfter=MR_countPredNodes(p);
+
+  do {
+      if (p == NULL) return NULL;
+      if (p->right == NULL && p->down == NULL) return p;
+      countBefore=countAfter;
+      MR_simplifyInverted(p,0);
+      p=MR_predFlatten(p);
+      MR_removeRedundantPredPass1(p,NULL);
+      MR_removeRedundantPredPass2(p);
+      if (! skipPass3) {
+        p=checkPredicateConflict(p);
+        p=MR_removeRedundantPredPass3(p);
+      };
+      countAfter=MR_countPredNodes(p);
+  } while (countBefore != countAfter);
+
+  return p;
+}
+
+#ifdef __USE_PROTOS
+Predicate *MR_predSimplifyALL(Predicate *p)
+#else
+Predicate *MR_predSimplifyALL(p)
+  Predicate     *p;
+#endif
+{
+  return MR_predSimplifyALLX(p,0);
+}
+
+#ifdef __USE_PROTOS
+void MR_releaseResourcesUsedInRule(Node *n)
+#else
+void MR_releaseResourcesUsedInRule(n)
+  Node  *n;
+#endif
+{
+   Node         *next;
+   Junction     *j;
+   int          i;
+
+   if (n == NULL) return;
+   if (n->ntype == nJunction) {
+     j=(Junction *) n;
+
+     if (j->predicate != NULL) {
+       predicate_free(j->predicate);
+       j->predicate=NULL;
+     };
+     for (i=0; i< CLL_k; i++) {
+       set_free(j->fset[i]);
+       j->fset[i]=empty;
+     };
+     if (j->ftree != NULL) {
+       Tfree(j->ftree);
+       j->ftree=NULL;
+     };
+     if (j->jtype == EndRule) return;
+     if (j->jtype != RuleBlk && j->jtype != EndBlk) {
+       if (j->p2 != NULL && !j->ignore) {   /* MR11 */
+          MR_releaseResourcesUsedInRule(j->p2);
+       };
+     };
+   };
+   next=MR_advance(n);
+   MR_releaseResourcesUsedInRule(next);
+}
+
+#ifdef __USE_PROTOS
+int MR_allPredLeaves(Predicate *p)
+#else
+int MR_allPredLeaves(p)
+  Predicate *p;
+#endif
+{
+  Predicate     *q;
+
+  if (p == NULL) return 1;
+
+  for (q=p; q != NULL; q=q->right) {
+   if (q->down != NULL) return 0;
+  };
+  return 1;
+}
+
+/* make sure it works for the last rule in a file */
+
+#ifdef __USE_PROTOS
+int MR_offsetFromRule(Node *n)
+#else
+int MR_offsetFromRule(n)
+  Node      *n;
+#endif
+{
+  Junction  *j;
+  int       offset=(-1);
+
+  for (j=SynDiag; j != NULL; j=(Junction *)j->p2) {
+
+    require (j->ntype == nJunction && j->jtype == RuleBlk,"Not a rule block");
+
+    if (n->file < j->file) {
+      return offset;
+    };
+    if (n->file == j->file) {
+      if (n->line < j->line) {
+        return (offset < 0) ? 0 : offset;
+      } else {
+        offset=n->line - j->line;
+        if (offset == 0) return 0;
+      };
+    };
+  };
+  return offset;
+}
+
+#define ruleNameMax 50
+
+static char ruleNameStatic1[ruleNameMax];
+static char ruleNameStatic2[ruleNameMax+10];
+
+#ifdef __USE_PROTOS
+char * MR_ruleNamePlusOffset(Node *n)
+#else
+char * MR_ruleNamePlusOffset(n)
+  Node      *n;
+#endif
+{
+    int     offset=MR_offsetFromRule(n);
+
+    strncpy(ruleNameStatic1,n->rname,ruleNameMax);
+    if (offset < 0) {
+      sprintf(ruleNameStatic2,"%s/?",ruleNameStatic1);
+    } else {
+      sprintf(ruleNameStatic2,"%s/%d",ruleNameStatic1,offset+1);
+    };
+    return ruleNameStatic2;
+}
+
+#ifdef __USE_PROTOS
+int MR_max_height_of_tree(Tree *t)
+#else
+int MR_max_height_of_tree(t)
+  Tree  *t;
+#endif
+{
+  int       h;
+  int       height=0;
+  Tree      *u;
+
+  if (t == NULL) return 0;
+
+  require (t->token != ALT && t->token != EpToken,"MR_max_height_of_tree ALT or EpToken");
+
+  for (u=t; u != NULL; u=u->right) {
+    h=MR_max_height_of_tree(u->down)+1;
+    if (h > height) height=h;
+  };
+  return height;
+}
+
+#ifdef __USE_PROTOS
+int MR_all_leaves_same_height(Tree *t,int depth)
+#else
+int MR_all_leaves_same_height(t,depth)
+  Tree  *t;
+  int   depth;
+#endif
+{
+  if (t == NULL) {
+    return (depth==0);
+  };
+
+  require (t->token != ALT && t->token != EpToken,"MR_all_leaves_same_height ALT or EpToken");
+
+  if (depth == 0) {
+    return 0;
+  } else {
+    if ( ! MR_all_leaves_same_height(t->down,depth-1)) {
+      return 0;
+    };
+    if (t->right == NULL) {
+      return 1;
+    } else {
+      return MR_all_leaves_same_height(t->right,depth);
+    };
+  };
+}
+
+#ifdef __USE_PROTOS
+void MR_projectTreeOntoSet(Tree *tree,int ck,set *ckset)
+#else
+void MR_projectTreeOntoSet(tree,ck,ckset)
+  Tree  *tree;
+  int   ck;
+  set   *ckset;
+#endif
+{
+    if (tree == NULL) return;
+
+    require(tree->token != EpToken,"MR_projectTreeOntoSet: EpToken unexpected\n");
+
+    MR_projectTreeOntoSet(tree->right,ck,ckset);
+    if (tree->token == ALT) {
+      MR_projectTreeOntoSet(tree->down,ck,ckset);
+    } else {
+      if (ck > 1) {
+        MR_projectTreeOntoSet(tree->down,ck-1,ckset);
+      } else {
+        set_orel(tree->token,ckset);
+      };
+    };
+}
+
+#ifdef __USE_PROTOS
+int MR_comparePredicates(Predicate *a,Predicate *b)
+#else
+int MR_comparePredicates(a,b)
+  Predicate     *a;
+  Predicate     *b;
+#endif
+{
+  Predicate     *p;
+  Predicate     *q;
+
+  if (a == b) return 1;
+  if (a == NULL || b == NULL ) return 0;
+  if (a->down == NULL && b->down == NULL) {
+
+    /* predicate->invert can be set only in the predEntry predicates                  */
+    /* thus they are only visible after the predEntry predicates have been "unfolded" */
+
+    int     sameSource=(a->source == b->source);
+    int     sameInvert= 1 & (1 +a->inverted + b->inverted +
+                                a->source->inverted + b->source->inverted);
+    int     samePredEntry=(a->source->predEntry != NULL
+                                 && b->source->predEntry != NULL
+                                    && a->source->predEntry == b->source->predEntry);
+    if (sameInvert && (sameSource || samePredEntry)) {
+      if (MR_identicalContext(a,b)) {
+         return 1;
+      };
+    };
+    return 0;
+  };
+  if (a->down == NULL || b->down == NULL) return 0;
+  if (a->expr != b->expr) return 0;
+
+  for (p=a->down; p != NULL; p=p->right) {
+    for (q=b->down; q != NULL; q=q->right) {
+      if (MR_comparePredicates(p,q)) goto NEXT_P;
+    };
+    return 0;
+NEXT_P:
+    continue;
+  };
+  return 1;
+}
+
+/*
+ *  action->inverted can be set only when a predicate symbol appears in
+ *      a rule:  "rule : <<!XXX>>? X".  It cannot be set under any
+ *      other circumstances.  In particular it cannot be set by
+ *      "#pred NotA !A" or by "#pred Nota <<!A>>?".  The first case
+ *      creates a predEntry and the predicate expression of that predEntry
+ *      has inverted set.  In the second case, the code for handling "!"
+ *      is only present in buildAction, which is not called by the #pred
+ *      semantic routines, only when a <<...>>? is recognized as part of
+ *      a rule definition.
+ *
+ *  predicate->inverted can only be set by a predicate created by a #pred
+ *      expression, such as "#pred NotA !A" or "#pred NotXY ! (X && Y) or
+ *      "#pred XbarY !(X && Y)".  In particular, it cannot be set by any
+ *      predicate expression occurring under any other circumstances.
+ *      The #pred predicate expresssions are stored with in predEntry->pred
+ *      and do not normally appear anywhere else until the predicates are
+ *      "unfolded" in order to recognize redundancies, conflicts, and
+ *      tautologies.
+ *
+ *  The unfold routine expands all references to #pred expressions.
+ *
+ *  The simplifyInvert goes through and propagates the invert bit so that
+ *      all OR and AND nodes are un-inverted.
+ *
+ *  Note that !(A and B) => (!A or !B)
+ *            !(A or B)  => (!A and !B)
+ *
+ *  MR_unfold() is called to expand predicate symbols by replacing predicates
+ *    that reference predicate entries with the copies of the predicate entries.
+ *    Each reference receives a duplicate of the original.  This is necessary
+ *    because the next phase involves simplification and removal of redundant
+ *    predicate nodes.  Anyway, the point I'm making is that predicate->invert
+ *    should not be set in any predicate until it has been expanded.
+ *
+ *    This is a recursive structure, but there is no need for "recursive expansion"
+ *    by which I mean a predicate symbol refers to other predicate symbols which
+ *    must also be expanded.
+ *
+ *    Recursive expansion is *not* performed by this routine because it is not
+ *    necessary.  Expansion of references is performed by predPrimary when
+ *    a new predicate symbol is created by referring to others in the pred expr.
+ */
+
+#ifdef __USE_PROTOS
+Predicate *MR_unfold(Predicate *pred)
+#else
+Predicate *MR_unfold(pred)
+  Predicate     *pred;
+#endif
+{
+  Predicate     *result;
+
+  if (pred == NULL) return NULL;
+
+  pred->right=MR_unfold(pred->right);
+
+  if (pred->down == NULL) {
+    if (pred->source->predEntry != NULL) {
+      if (pred->source->predEntry->pred == NULL) {
+        ; /* do nothing */ /* a reference to a literal #pred (perhaps with "!" */
+      } else {
+        result=predicate_dup_without_context(pred->source->predEntry->pred);
+        if (pred->inverted) {
+          result->inverted=!result->inverted;
+        };
+        if (pred->source->inverted) {
+          result->inverted=!result->inverted;
+        };
+        result->right=pred->right;
+        pred->right=NULL;
+        predicate_free(pred);
+/***    result=MR_unfold(result); *** not necessary */    /* recursive expansion */
+        return result;
+      };
+    } else {
+      ; /* do nothing */ /* an inline literal predicate */
+    };
+  } else {
+    pred->down=MR_unfold(pred->down);
+  };
+  return pred;
+}
+
+/* this should be called immediately after MR_unfold() and
+   at no other times
+*/
+
+#ifdef __USE_PROTOS
+void MR_simplifyInverted(Predicate *pred,int inverted)
+#else
+void MR_simplifyInverted(pred,inverted)
+  Predicate     *pred;
+  int           inverted;
+#endif
+{
+  int       newInverted;
+
+  if (pred == NULL) return;
+
+  MR_simplifyInverted(pred->right,inverted);
+
+  newInverted= 1 & (inverted + pred->inverted);
+
+  if (pred->down == NULL) {
+    pred->inverted=newInverted;
+  } else {
+    if (newInverted != 0) {
+      if (pred->expr == PRED_AND_LIST) {
+        pred->expr=PRED_OR_LIST;
+      } else {
+        pred->expr=PRED_AND_LIST;
+      };
+    };
+    pred->inverted=0;
+    MR_simplifyInverted(pred->down,newInverted);
+  };
+}
+
+/* only remove it from AND and OR nodes, not leaves */
+
+#ifdef __USE_PROTOS
+void MR_clearPredEntry(Predicate *p)
+#else
+void MR_clearPredEntry(p)
+  Predicate     *p;
+#endif
+{
+   if (p == NULL) return;
+   MR_clearPredEntry(p->down);
+   MR_clearPredEntry(p->right);
+   if (p->down != NULL) p->predEntry=NULL;
+}
+
+
+#ifdef __USE_PROTOS
+void MR_orphanRules(FILE *f)
+#else
+void MR_orphanRules(f)
+  FILE      *f;
+#endif
+{
+	set         a;
+    Junction    *p;
+    unsigned    e;
+    RuleEntry   *re;
+
+	a=empty;
+
+    if (! InfoO) return;
+
+	for (p=SynDiag; p!=NULL; p = (Junction *)p->p2)	{
+      if ( (Junction *) (p->end)->p1 == NULL) {
+        re=(RuleEntry *) hash_get(Rname,p->rname);
+        require (re != NULL,"RuleEntry == NULL");
+		set_orel(re->rulenum, &a);
+      }
+  	}
+
+    if (set_deg(a) > 1) {
+      fprintf(f,"note: Start rules: {");
+      for (; !set_nil(a); set_rm(e,a)) {
+        e=set_int(a);
+        fprintf(f," %s",RulePtr[e]->rname);
+      };
+      fprintf(f," }\n");
+    };
+	set_free( a );
+}
+
+/*  merge (X Y) and (X) to create (X)  */
+
+static int      *mergeChain;
+static Tree     *mergeTree;
+
+#ifdef __USE_PROTOS
+Tree *MR_merge_tree_contexts_client(Tree *t,int chain[])
+#else
+Tree *MR_merge_tree_contexts_client(t,chain)
+  Tree  *t;
+  int   chain[];
+#endif
+{
+  if (t == NULL)  return NULL;
+  if (chain[0] == 0) {
+    Tree    *u=t->right;
+    t->right=NULL;
+    Tfree(t);
+    return MR_merge_tree_contexts_client(u,&chain[0]);
+  }
+  if (chain[0] == t->token) {
+    t->down=MR_merge_tree_contexts_client(t->down,&chain[1]);
+  };
+  t->right=MR_merge_tree_contexts_client(t->right,&chain[0]);
+  return t;
+}
+
+#ifdef __USE_PROTOS
+void MR_iterateOverTreeContexts(Tree *t,int chain[])
+#else
+void MR_iterateOverTreeContexts(t,chain)
+  Tree          *t;
+  int           chain[];
+#endif
+{
+  if (t == NULL) return;
+  chain[0]=t->token;
+  if (t->down != NULL) {
+    MR_iterateOverTreeContexts(t->down,&chain[1]);
+  } else {
+    MR_merge_tree_contexts_client(mergeTree,mergeChain);
+  };
+  MR_iterateOverTreeContexts(t->right,&chain[0]);
+  chain[0]=0;
+}
+
+#ifdef __USE_PROTOS
+Tree *MR_merge_tree_contexts(Tree *t)
+#else
+Tree *MR_merge_tree_contexts(t)
+  Tree  *t;
+#endif
+{
+    int     h=MR_max_height_of_tree(t);
+
+    mergeTree=t;
+    mergeChain=(int *) calloc(h+1,sizeof(int));
+    require (mergeChain != NULL,"MR_merge_tree_contexts: can't alloc chain");
+    MR_iterateOverTreeContexts(t,mergeChain);
+    t=tshrink(t);
+    t=tflatten(t);
+    t=tleft_factor(t);
+    free ( (char *) mergeChain);
+    mergeChain=NULL;
+    return t;
+}
+
+#ifdef __USE_PROTOS
+Tree *MR_compute_pred_tree_context(Predicate *p)
+#else
+Tree *MR_compute_pred_tree_context(p)
+  Predicate *p;
+#endif
+{
+  Tree  *t;
+
+  t=MR_compute_pred_tree_ctxXX(p);
+  MR_merge_tree_contexts(t);
+  return t;
+}
+
+#ifdef __USE_PROTOS
+void MR_guardPred_plainSet(ActionNode *anode,Predicate *pred)
+#else
+void MR_guardPred_plainSet(anode,pred)
+  ActionNode    *anode;
+  Predicate     *pred;
+#endif
+{
+  Junction      *j;
+  Predicate     *workPred;
+  set           maskSet;
+
+  maskSet=empty;
+
+  if (!MRhoisting) return;
+
+  /* it doesn't really matter whether the predicate has
+     depth k=1 or k>1 because we're not really looking
+     at the predicate itself, just the stuff "behind"
+     the predicate.
+  */
+
+  /* shouldn't have to worry about REACHing off the end
+     of the rule containing the predicate because the
+     Rule->end->halt should have been set already by the
+     the code which handles RuleRef nodes.
+
+     We don't want to REACH off the end of the rule because
+     this would give the "global" follow context rather than
+     the "local" context.
+
+         r1a : (A)? => <<p>>? r2 (A|B)
+         r1b : (A)? => <<p>>? r2 (A|C)
+         r2  : ();
+
+     For r1a we want follow of predicate = {A B}
+             we want plainSet = {B}
+     For r1b we want follow of predicate = {A C}
+             we want plainSet = {C}
+  */
+
+  require (anode->next->ntype == nJunction,"MR_guardpred_plainSet not Junction");
+  j=(Junction *)(anode->next);
+
+  workPred=predicate_dup_without_context(pred);
+  workPred->k=1;
+  workPred->scontext[1]=MR_First(1,j, &(workPred->completionSet) );
+  MR_complete_predicates(1,workPred);
+  if (pred->k == 1) {
+    maskSet=pred->scontext[1];
+  } else {
+    MR_projectTreeOntoSet(pred->tcontext,1,&maskSet);
+  }
+  pred->plainSet=set_dif(workPred->scontext[1],maskSet);
+  predicate_free(workPred);
+}
+
+/*******************************************************************************/
+
+static Tree *       suppressTree;
+static int *        suppressChain;  /* element 0 not used */
+static set *        suppressSets;
+static Node *       suppressNode;
+static int          suppressChainLength;
+int                 MR_SuppressSearch=0;
+static int          suppressSucceeded;
+static Predicate *  suppressPredicate;
+
+#ifdef __USE_PROTOS
+int MR_isChain(Tree *t)
+#else
+int MR_isChain(t)
+  Tree  *t;
+#endif
+{
+  Tree  *u;
+
+  for (u=t; u != NULL; u=u->down) {
+    if (u->right != NULL) return 0;
+  }
+  return 1;
+}
+
+#ifdef __USE_PROTOS
+int MR_suppressK_client(Tree *tree,int tokensInChain[])
+#else
+int MR_suppressK_client(tree,tokensInChain)
+  Tree      *tree;
+  int       tokensInChain[];
+#endif
+{
+  int       i;
+  set       *save_fset;
+  int       save_ConstrainSearch;
+  set       incomplete;
+  Tree      *t;
+
+  suppressSucceeded=0;  /* volatile */
+
+  if (suppressSets == NULL) {
+    suppressSets=(set *) calloc (CLL_k+1,sizeof(set));
+    require (suppressSets != NULL,"MR_suppressK_client: suppressSets alloc");
+  };
+
+  for (suppressChainLength=1;
+       tokensInChain[suppressChainLength+1] != 0;
+       suppressChainLength++) {};
+
+  require (suppressChainLength != 0,"MR_suppressK_client: chain empty");
+
+  for (i=1 ; i <= suppressChainLength ; i++) {
+    set_clr(suppressSets[i]);
+    set_orel( (unsigned) tokensInChain[i],
+                              &suppressSets[i]);
+  };
+
+  save_fset=fset;
+  save_ConstrainSearch=ConstrainSearch;
+
+  fset=suppressSets;
+
+  MR_SuppressSearch=1;
+  MR_AmbSourceSearch=1;
+  MR_MaintainBackTrace=1;
+  ConstrainSearch=1;
+
+  maxk = suppressChainLength;
+
+  incomplete=empty;
+  t=NULL;
+
+/***  constrain = &(fset[1]); ***/
+
+  MR_setConstrainPointer(&(fset[1]));	/* MR18 */
+  
+  MR_pointerStackReset(&MR_BackTraceStack);
+
+  TRAV(suppressNode,maxk,&incomplete,t);
+
+  Tfree(t);
+
+  require (set_nil(incomplete),"MR_suppressK_client TRAV incomplete");
+  require (MR_BackTraceStack.count == 0,
+            "MR_suppressK_client: MR_BackTraceStack.count != 0");
+  set_free(incomplete);
+
+  ConstrainSearch=save_ConstrainSearch;
+  fset=save_fset;
+
+  MR_AmbSourceSearch=0;
+  MR_MaintainBackTrace=0;
+  MR_SuppressSearch=0;
+  return suppressSucceeded;
+}
+
+#ifdef __USE_PROTOS
+Tree * MR_iterateOverTreeSuppressK(Tree *t,int chain[])
+#else
+Tree * MR_iterateOverTreeSuppressK(t,chain)
+  Tree          *t;
+  int           chain[];
+#endif
+{
+  if (t == NULL) return NULL;
+  t->right=MR_iterateOverTreeSuppressK(t->right,&chain[0]);
+  chain[0]=t->token;
+  if (t->down != NULL) {
+    t->down=MR_iterateOverTreeSuppressK(t->down,&chain[1]);
+    if (t->down == NULL) {
+      Tree *u=t->right;
+      t->right=NULL;
+      Tfree(t);
+      chain[0]=0;
+      return u;
+    };
+  } else {
+    MR_suppressK_client(suppressTree,suppressChain);
+    if (suppressSucceeded) {
+      Tree  *u=t->right;
+      t->right=NULL;
+      Tfree(t);
+      chain[0]=0;
+      return u;
+    };
+  };
+  chain[0]=0;
+  return t;
+}
+
+/* @@@ */
+
+#ifdef __USE_PROTOS
+Predicate * MR_suppressK(Node *j,Predicate *p)
+#else
+Predicate * MR_suppressK(j,p)
+  Node          *j;
+  Predicate     *p;
+#endif
+{
+  Predicate     *result;
+  int           guardPred=0;
+  int           ampersandPred=0;
+  Node          *nodePrime;
+
+  if (! MRhoistingk) {
+     return p;
+  }
+
+  if (! MRhoisting) return p;
+  if (CLL_k == 1) return p;
+
+  if (suppressChain == NULL) {
+    suppressChain=(int *) calloc(CLL_k+2,sizeof(int));
+    require (suppressChain != NULL,"MR_suppressK: can't allocate chain");
+  }
+
+  if (p == NULL) return NULL;
+
+  if (j->ntype == nJunction) {
+    nodePrime=(Node *) MR_junctionWithoutP2( (Junction *) j);
+  } else {
+    nodePrime=j;
+  };
+
+  p->down=MR_suppressK(j,p->down);
+  p->right=MR_suppressK(j,p->right);
+  if (p->down != NULL) {
+    result=p;
+    goto EXIT;
+  };
+  if (p->k == 1) {
+    result=p;
+    goto EXIT;
+  };
+
+  if (p->source != NULL) {
+    if (p->source->guardpred != NULL) guardPred=1;
+    if (p->source->ampersandPred != NULL) ampersandPred=1;
+  }
+
+  suppressPredicate=p;
+  suppressNode=nodePrime;   /* was j*/
+
+  suppressTree=p->tcontext;
+
+  if (guardPred || ampersandPred) {
+    p->tcontext=MR_iterateOverTreeSuppressK(suppressTree,&suppressChain[1]);
+    if (p->tcontext == NULL) {
+      predicate_free(p);
+      result=NULL;
+      goto EXIT;
+    };
+  } else {
+    if (MR_isChain(p->tcontext)) {
+      p->tcontext=MR_iterateOverTreeSuppressK(suppressTree,&suppressChain[1]);
+      if (p->tcontext == NULL) {
+        predicate_free(p);
+        result=NULL;
+        goto EXIT;
+      };
+    }
+  }
+  result=p;
+EXIT:
+  return result;
+}
+
+#ifdef __USE_PROTOS
+void MR_suppressSearchReport(void)
+#else
+void MR_suppressSearchReport()
+#endif
+{
+  int       i;
+  Node      *p;
+  TokNode   *tn;
+  int       depth;
+  set       setAnd;
+
+  /* number of tokens in back trace stack matches length of chain */
+
+  depth=0;
+  for (i=0; i < MR_BackTraceStack.count ; i++) {
+    p=(Node *) MR_BackTraceStack.data[i];
+    if (p->ntype == nToken) depth++;
+  };
+
+  require (depth == suppressChainLength,"depth > suppressChainLength");
+
+  /* token codes match chain */
+
+  depth=0;
+  for (i=0; i < MR_BackTraceStack.count ; i++) {
+    p=(Node *) MR_BackTraceStack.data[i];
+    if (p->ntype != nToken) continue;
+    tn=(TokNode *) p;
+    depth++;
+    if (set_nil(tn->tset)) {
+      require(set_el( (unsigned) tn->token,fset[depth]),
+        "MR_suppressSearchReport: no match to #token in chain");
+    } else {
+      setAnd=set_and(fset[depth],tn->tset);
+      require(!set_nil(setAnd),
+        "MR_suppressSearchReport: no match to #token set in chain");
+      set_free(setAnd);
+    };
+  };
+
+  /* have a match - now remove it from the predicate */
+
+  suppressSucceeded=1;
+
+  if (suppressSucceeded) {
+    fprintf(output,"\n");
+    fprintf(output,"#if 0\n");
+    fprintf(output,"\n");
+    fprintf(output,"Part (or all) of predicate with depth > 1 suppressed by ");
+        fprintf(output,"alternative without predicate\n\n");
+    MR_dumpPred(suppressPredicate,1);
+    fprintf(output,"The token sequence which is suppressed:");
+    fprintf(output," (");
+    for (i=1; i <= suppressChainLength; i++) {
+      fprintf(output," %s",TerminalString(suppressChain[i]));
+    };
+    fprintf(output," )\n");
+    fprintf(output,"The sequence of references which generate that sequence of tokens:\n\n");
+
+    MR_backTraceDumpItemReset();
+
+    for (i=0; i < MR_BackTraceStack.count ; i++) {
+       MR_backTraceDumpItem(output,0,(Node *) MR_BackTraceStack.data[i]);
+    };
+    fprintf(output,"\n");
+    fprintf(output,"#endif\n");
+  }
+}
+
+#ifdef __USE_PROTOS
+void MR_markCompromisedRule(Node *n)
+#else
+void MR_markCompromisedRule(n)
+  Node *n;
+#endif
+{
+  RuleEntry     *q;
+  Node          *mark=NULL;
+  Junction      *j;
+
+  if (n->ntype == nRuleRef) {
+    mark=(Node *) MR_ruleReferenced( (RuleRefNode *) n);
+  } else if (n->ntype == nToken) {
+    mark=n;
+  } else if (n->ntype == nJunction) {
+    j=(Junction *)n;
+    switch (j->jtype) {
+      case aOptBlk:
+      case aLoopBlk:
+      case RuleBlk:
+      case EndRule:
+      case aPlusBlk:
+      case aLoopBegin:
+        mark=n;
+        break;
+      default:
+        break;
+    };
+  }
+
+  if (mark == NULL) return;
+
+  require (RulePtr != NULL,"RulePtr not initialized");
+
+  q = (RuleEntry *) hash_get(Rname,mark->rname);
+  require (q != NULL,"RuleEntry not found");
+  set_orel(q->rulenum,&MR_CompromisedRules);
+}
+
+#ifdef __USE_PROTOS
+void MR_alphaBetaTraceReport(void)
+#else
+void MR_alphaBetaTraceReport()
+#endif
+{
+  int       i;
+
+  if (! AlphaBetaTrace) return;
+
+  MR_AlphaBetaMessageCount++;
+
+  fprintf(output,"\n");
+  fprintf(output,"#if 0\n");
+  fprintf(output,"\n");
+  fprintf(output,"Trace of references leading to attempt to compute the follow set of\n");
+  fprintf(output,"alpha in an \"(alpha)? beta\" block. It is not possible for antlr to\n");
+  fprintf(output,"compute this follow set because it is not known what part of beta has\n");
+  fprintf(output,"already been matched by alpha and what part remains to be matched.\n");
+  fprintf(output,"\n");
+  fprintf(output,"Rules which make use of the incorrect follow set will also be incorrect\n");
+  fprintf(output,"\n");
+
+  MR_backTraceDumpItemReset();
+
+  for (i=0; i < MR_BackTraceStack.count ; i++) {
+     MR_backTraceDumpItem(output,0,(Node *) MR_BackTraceStack.data[i]);
+     if (i < MR_BackTraceStack.count-1) {
+        MR_markCompromisedRule( (Node *) MR_BackTraceStack.data[i]);
+     };
+  };
+  fprintf(output,"\n");
+  fprintf(output,"#endif\n");
+}
+
+#ifdef __USE_PROTOS
+void MR_dumpRuleSet(set s)
+#else
+void MR_dumpRuleSet(s)
+  set   s;
+#endif
+{
+    unsigned    *cursor;
+    unsigned    *origin=set_pdq(s);
+
+    require(origin != NULL,"set_pdq failed");
+
+    if (RulePtr == NULL) {
+      fprintf(stderr,"RulePtr[] not yet initialized");
+    } else {
+      for (cursor=origin; *cursor != nil ; cursor++) {
+/****   if (cursor != origin) fprintf(stderr,","); ****/
+        fprintf(stderr,"    %s",RulePtr[*cursor]->rname);
+        fprintf(stderr,"\n");
+      };
+      free( (char *) origin);
+    };
+}
diff --git a/Tools/Source/TianoTools/Pccts/antlr/parser.dlg b/Tools/Source/TianoTools/Pccts/antlr/parser.dlg
new file mode 100644
index 0000000000..8c43dff300
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/parser.dlg
@@ -0,0 +1,1387 @@
+<<
+/* parser.dlg -- DLG Description of scanner
+ *
+ * Generated from: antlr.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include "pcctscfg.h"
+#include "set.h"
+#include <ctype.h>
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#define zzcr_attr(attr,tok,t)
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+LOOKAHEAD
+
+void
+#ifdef __USE_PROTOS
+zzerraction(void)
+#else
+zzerraction()
+#endif
+{
+	(*zzerr)("invalid token");
+	zzadvance();
+	zzskip();
+}
+>>
+
+<<%%lexaction
+
+/* maintained, but not used for now */
+set AST_nodes_refd_in_actions = set_init;
+int inAlt = 0;
+set attribsRefdFromAction = set_init; /* MR20 */
+int UsedOldStyleAttrib = 0;
+int UsedNewStyleLabel = 0;
+#ifdef __USE_PROTOS
+char *inline_set(char *);
+#else
+char *inline_set();
+#endif
+
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	    */
+/* MR1					in DLG action			                    */
+
+int tokenActionActive=0;                                            /* MR1 */
+
+  
+>>
+
+<<%%lexaction
+
+
+static char *
+#ifdef __USE_PROTOS
+getFileNameFromTheLineInfo(char *toStr, char *fromStr)
+#else
+getFileNameFromTheLineInfo(toStr, fromStr)
+char *toStr, *fromStr;
+#endif
+{
+  int i, j, k;
+  
+  if (!fromStr || !toStr) return toStr;
+  
+  /* find the first " */
+  
+  for (i=0;
+  (i<MaxFileName) &&
+  (fromStr[i] != '\n') &&
+  (fromStr[i] != '\r') &&
+  (fromStr[i] != '\"');
+  i++) /* nothing */ ;
+  
+  if ( (i == MaxFileName) ||
+  (fromStr[i] == '\n') ||
+  (fromStr[i] == '\r') ) {
+  return toStr;
+}
+
+  /* find the second " */
+
+  for (j=i+1;
+(j<MaxFileName) &&
+(fromStr[j] != '\n') &&
+(fromStr[j] != '\r') &&
+(fromStr[j] != '\"');
+j++) /* nothing */ ;
+
+  if ((j == MaxFileName) ||
+(fromStr[j] == '\n') ||
+(fromStr[j] == '\r') ) {
+  return toStr;
+}
+
+  /* go back until the last / or \ */
+
+  for (k=j-1;
+(fromStr[k] != '\"') &&
+(fromStr[k] != '/') &&
+(fromStr[k] != '\\');
+k--) /* nothing */ ;
+
+  /* copy the string after " / or \ into toStr */
+
+  for (i=k+1; fromStr[i] != '\"'; i++) {
+toStr[i-k-1] = fromStr[i];
+}
+
+  toStr[i-k-1] = '\0';
+
+  return toStr;
+}
+
+/* MR14 end of a block to support #line in antlr source code */
+
+  
+>>
+
+<<%%lexaction
+
+#ifdef __USE_PROTOS
+void mark_label_used_in_sem_pred(LabelEntry *le)              /* MR10 */
+#else
+void mark_label_used_in_sem_pred(le)                          /* MR10 */
+LabelEntry    *le;
+#endif
+{
+  TokNode   *tn;
+  require (le->elem->ntype == nToken,"mark_label_used... ntype != nToken");
+  tn=(TokNode *)le->elem;
+  require (tn->label != 0,"mark_label_used... TokNode has no label");
+  tn->label_used_in_semantic_pred=1;
+}
+>>
+
+
+%%START
+
+@
+	<<
+		NLA = Eof;
+    /* L o o k  F o r  A n o t h e r  F i l e */
+    {
+      FILE *new_input;
+      new_input = NextFile();
+      if ( new_input == NULL ) { NLA=Eof; return; }
+      fclose( input );
+      input = new_input;
+      zzrdstream( input );
+      zzskip();	/* Skip the Eof (@) char i.e continue */
+    }
+	>>
+
+[\t\ ]+
+	<<
+		NLA = 76;
+    zzskip();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 77;
+    zzline++; zzskip();   
+	>>
+
+\[
+	<<
+		NLA = 78;
+    zzmode(ACTIONS); zzmore();
+    istackreset();
+    pushint(']');   
+	>>
+
+\<\<
+	<<
+		NLA = 79;
+    action_file=CurFile; action_line=zzline;
+    zzmode(ACTIONS); zzmore();
+    list_free(&CurActionLabels,0);       /* MR10 */
+    numericActionLabel=0;                /* MR10 */
+    istackreset();
+    pushint('>');   
+	>>
+
+\"
+	<<
+		NLA = 80;
+    zzmode(STRINGS); zzmore();   
+	>>
+
+/\*
+	<<
+		NLA = 81;
+    zzmode(COMMENTS); zzskip();   
+	>>
+
+\*/
+	<<
+		NLA = 82;
+    warn("Missing /*; found dangling */"); zzskip();   
+	>>
+
+//
+	<<
+		NLA = 83;
+    zzmode(CPP_COMMENTS); zzskip();   
+	>>
+
+#line[\ \t]* [0-9]+ {[\ \t]* \"~[\"]+\" ([\ \t]* [0-9]*)* } (\n|\r|\r\n)
+	<<
+		NLA = 84;
+    
+    zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+    getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+	>>
+
+#line ~[\n\r]* (\n|\r|\r\n)
+	<<
+		NLA = 85;
+    
+    zzline++; zzmore();
+	>>
+
+\>\>
+	<<
+		NLA = 86;
+    warn("Missing <<; found dangling \>\>"); zzskip();   
+	>>
+
+.
+	<<
+		NLA = WildCard;
+	>>
+
+\@
+	<<
+		NLA = 88;
+    FoundException = 1;		/* MR6 */
+    FoundAtOperator = 1;  
+	>>
+
+{\\}#pragma
+	<<
+		NLA = Pragma;
+	>>
+
+{\\}#FirstSetSymbol
+	<<
+		NLA = FirstSetSymbol;
+	>>
+
+{\\}#header
+	<<
+		NLA = 94;
+	>>
+
+{\\}#first
+	<<
+		NLA = 95;
+	>>
+
+{\\}#parser
+	<<
+		NLA = 96;
+	>>
+
+{\\}#tokdefs
+	<<
+		NLA = 97;
+	>>
+
+\}
+	<<
+		NLA = 98;
+	>>
+
+class
+	<<
+		NLA = 99;
+	>>
+
+\{
+	<<
+		NLA = 102;
+	>>
+
+!
+	<<
+		NLA = 103;
+	>>
+
+\<
+	<<
+		NLA = 104;
+	>>
+
+\>
+	<<
+		NLA = 105;
+	>>
+
+:
+	<<
+		NLA = 106;
+	>>
+
+;
+	<<
+		NLA = 107;
+	>>
+
+{\\}#lexaction
+	<<
+		NLA = 108;
+	>>
+
+{\\}#lexmember
+	<<
+		NLA = 109;
+	>>
+
+{\\}#lexprefix
+	<<
+		NLA = 110;
+	>>
+
+{\\}#pred
+	<<
+		NLA = 111;
+	>>
+
+\|\|
+	<<
+		NLA = 112;
+	>>
+
+&&
+	<<
+		NLA = 113;
+	>>
+
+\(
+	<<
+		NLA = 114;
+	>>
+
+\)
+	<<
+		NLA = 115;
+	>>
+
+{\\}#lexclass
+	<<
+		NLA = 116;
+	>>
+
+{\\}#errclass
+	<<
+		NLA = 117;
+	>>
+
+{\\}#tokclass
+	<<
+		NLA = 118;
+	>>
+
+..
+	<<
+		NLA = 119;
+	>>
+
+{\\}#token
+	<<
+		NLA = 120;
+	>>
+
+=
+	<<
+		NLA = 121;
+	>>
+
+[0-9]+
+	<<
+		NLA = 122;
+	>>
+
+\|
+	<<
+		NLA = 123;
+	>>
+
+\~
+	<<
+		NLA = 124;
+	>>
+
+^
+	<<
+		NLA = 125;
+	>>
+
+approx
+	<<
+		NLA = 126;
+	>>
+
+LL\(1\)
+	<<
+		NLA = 127;
+	>>
+
+LL\(2\)
+	<<
+		NLA = 128;
+	>>
+
+\*
+	<<
+		NLA = 129;
+	>>
+
+\+
+	<<
+		NLA = 130;
+	>>
+
+?
+	<<
+		NLA = 131;
+	>>
+
+=>
+	<<
+		NLA = 132;
+	>>
+
+exception
+	<<
+		NLA = 133;
+	>>
+
+default
+	<<
+		NLA = 134;
+	>>
+
+catch
+	<<
+		NLA = 135;
+	>>
+
+[a-z] [A-Za-z0-9_]*
+	<<
+		NLA = NonTerminal;
+    
+    while ( zzchar==' ' || zzchar=='\t' ) {
+      zzadvance();
+    }
+    if ( zzchar == ':' && inAlt ) NLA = LABEL;
+	>>
+
+[A-Z] [A-Za-z0-9_]*
+	<<
+		NLA = TokenTerm;
+    
+    while ( zzchar==' ' || zzchar=='\t' ) {
+      zzadvance();
+    }
+    if ( zzchar == ':' && inAlt ) NLA = LABEL;
+	>>
+
+{\\}#[A-Za-z0-9_]*
+	<<
+		NLA = 136;
+    warn(eMsg1("unknown meta-op: %s",LATEXT(1))); zzskip();   
+	>>
+
+
+%%STRINGS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\"
+	<<
+		NLA = QuotedTerm;
+    zzmode(START);   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 3;
+    
+    zzline++;
+    warn("eoln found in string");
+    zzskip();
+	>>
+
+\\(\n|\r|\r\n)
+	<<
+		NLA = 4;
+    zzline++; zzmore();   
+	>>
+
+\\~[]
+	<<
+		NLA = 5;
+    zzmore();   
+	>>
+
+~[\n\r\"\\]+
+	<<
+		NLA = 6;
+    zzmore();   
+	>>
+
+
+%%ACTION_STRINGS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\"
+	<<
+		NLA = 7;
+    zzmode(ACTIONS); zzmore();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 8;
+    
+    zzline++;
+    warn("eoln found in string (in user action)");
+    zzskip();
+	>>
+
+\\(\n|\r|\r\n)
+	<<
+		NLA = 9;
+    zzline++; zzmore();   
+	>>
+
+\\~[]
+	<<
+		NLA = 10;
+    zzmore();   
+	>>
+
+~[\n\r\"\\]+
+	<<
+		NLA = 11;
+    zzmore();   
+	>>
+
+
+%%ACTION_CHARS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+'
+	<<
+		NLA = 12;
+    zzmode(ACTIONS); zzmore();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 13;
+    
+    zzline++;
+    warn("eoln found in char literal (in user action)");
+    zzskip();
+	>>
+
+\\~[]
+	<<
+		NLA = 14;
+    zzmore();   
+	>>
+
+~[\n\r'\\]+
+	<<
+		NLA = 15;
+    zzmore();   
+	>>
+
+
+%%ACTION_COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\*/
+	<<
+		NLA = 16;
+    zzmode(ACTIONS); zzmore();   
+	>>
+
+\*
+	<<
+		NLA = 17;
+    zzmore();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 18;
+    zzline++; zzmore(); DAWDLE;   
+	>>
+
+~[\n\r\*]+
+	<<
+		NLA = 19;
+    zzmore();   
+	>>
+
+
+%%TOK_DEF_COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\*/
+	<<
+		NLA = 20;
+    zzmode(PARSE_ENUM_FILE);
+    zzmore();   
+	>>
+
+\*
+	<<
+		NLA = 21;
+    zzmore();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 22;
+    zzline++; zzmore(); DAWDLE;   
+	>>
+
+~[\n\r\*]+
+	<<
+		NLA = 23;
+    zzmore();   
+	>>
+
+
+%%TOK_DEF_CPP_COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 24;
+    zzline++; zzmode(PARSE_ENUM_FILE); zzskip(); DAWDLE;   
+	>>
+
+~[\n\r]+
+	<<
+		NLA = 25;
+    zzskip();   
+	>>
+
+
+%%ACTION_CPP_COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 26;
+    zzline++; zzmode(ACTIONS); zzmore(); DAWDLE;   
+	>>
+
+~[\n\r]+
+	<<
+		NLA = 27;
+    zzmore();   
+	>>
+
+
+%%CPP_COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 28;
+    zzline++; zzmode(START); zzskip(); DAWDLE;   
+	>>
+
+~[\n\r]+
+	<<
+		NLA = 29;
+    zzskip();   
+	>>
+
+
+%%COMMENTS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\*/
+	<<
+		NLA = 30;
+    zzmode(START); zzskip();   
+	>>
+
+\*
+	<<
+		NLA = 31;
+    zzskip();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 32;
+    zzline++; zzskip(); DAWDLE;   
+	>>
+
+~[\n\r\*]+
+	<<
+		NLA = 33;
+    zzskip();   
+	>>
+
+
+%%ACTIONS
+
+@
+	<<
+		NLA = Eof;
+	>>
+
+\>\>
+	<<
+		NLA = Action;
+    /* these do not nest */
+    zzmode(START);
+    NLATEXT[0] = ' ';
+    NLATEXT[1] = ' ';
+    zzbegexpr[0] = ' ';
+    zzbegexpr[1] = ' ';
+    if ( zzbufovf ) {
+      err( eMsgd("action buffer overflow; size %d",ZZLEXBUFSIZE));
+    }
+    
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	*/
+    /* MR1					in DLG action			*/
+    /* MR1			Doesn't matter what kind of action it is - reset*/
+    
+			      tokenActionActive=0;		 /* MR1 */
+	>>
+
+\>\>?
+	<<
+		NLA = Pred;
+    /* these do not nest */
+    zzmode(START);
+    NLATEXT[0] = ' ';
+    NLATEXT[1] = ' ';
+    zzbegexpr[0] = '\0';
+    if ( zzbufovf ) {
+      err( eMsgd("predicate buffer overflow; size %d",ZZLEXBUFSIZE));
+    };
+#ifdef __cplusplus__
+    /* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __STDC__
+    /* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __USE_PROTOS
+    /* MRxx */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+    /* MR10 */                    list_apply(CurActionLabels,mark_label_used_in_sem_pred);
+#endif
+#endif
+#endif
+	>>
+
+\]
+	<<
+		NLA = PassAction;
+    if ( topint() == ']' ) {
+      popint();
+      if ( istackempty() )	/* terminate action */
+      {
+        zzmode(START);
+        NLATEXT[0] = ' ';
+        zzbegexpr[0] = ' ';
+        if ( zzbufovf ) {
+          err( eMsgd("parameter buffer overflow; size %d",ZZLEXBUFSIZE));
+        }
+      }
+      else {
+        /* terminate $[..] and #[..] */
+        if ( GenCC ) zzreplstr("))");
+        else zzreplstr(")");
+        zzmore();
+      }
+    }
+    else if ( topint() == '|' ) { /* end of simple [...] */
+      popint();
+      zzmore();
+    }
+    else zzmore();
+	>>
+
+consumeUntil\( [\ \t]* \{~[\}]+\} [\ \t]* \)
+	<<
+		NLA = 37;
+    
+    zzmore();
+    zzreplstr(inline_set(zzbegexpr+
+    strlen("consumeUntil(")));
+	>>
+
+consumeUntil\( ~[\)]+ \)
+	<<
+		NLA = 38;
+    zzmore();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 39;
+    zzline++; zzmore(); DAWDLE;   
+	>>
+
+\>
+	<<
+		NLA = 40;
+    zzmore();   
+	>>
+
+$
+	<<
+		NLA = 41;
+    zzmore();   
+	>>
+
+$$
+	<<
+		NLA = 42;
+    if ( !GenCC ) {zzreplstr("zzaRet"); zzmore();}
+    else err("$$ use invalid in C++ mode");   
+	>>
+
+$\[\]
+	<<
+		NLA = 43;
+    if ( !GenCC ) {zzreplstr("zzempty_attr"); zzmore();}
+    else err("$[] use invalid in C++ mode");   
+	>>
+
+$\[
+	<<
+		NLA = 44;
+    
+    pushint(']');
+    if ( !GenCC ) zzreplstr("zzconstr_attr(");
+    else err("$[..] use invalid in C++ mode");
+    zzmore();
+	>>
+
+$[0-9]+
+	<<
+		NLA = 45;
+    {
+      static char buf[100];
+      numericActionLabel=1;       /* MR10 */
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("$i attrib ref too big");
+      set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s)",
+      BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"_t%d%s",
+      BlkLevel-1,zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	>>
+
+$[0-9]+.
+	<<
+		NLA = 46;
+    {
+      static char buf[100];
+      numericActionLabel=1;       /* MR10 */
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("$i.field attrib ref too big");
+      zzbegexpr[strlen(zzbegexpr)-1] = ' ';
+      set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s).",
+      BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"_t%d%s.",
+      BlkLevel-1,zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	>>
+
+$[0-9]+.[0-9]+
+	<<
+		NLA = 47;
+    {
+      static char buf[100];
+      static char i[20], j[20];
+      char *p,*q;
+      numericActionLabel=1;       /* MR10 */
+      if (strlen(zzbegexpr)>(size_t)85) fatal("$i.j attrib ref too big");
+      for (p=zzbegexpr+1,q= &i[0]; *p!='.'; p++) {
+        if ( q == &i[20] )
+        fatalFL("i of $i.j attrib ref too big",
+        FileStr[CurFile], zzline );
+        *q++ = *p;
+      }
+      *q = '\0';
+      for (p++, q= &j[0]; *p!='\0'; p++) {
+        if ( q == &j[20] )
+        fatalFL("j of $i.j attrib ref too big",
+        FileStr[CurFile], zzline );
+        *q++ = *p;
+      }
+      *q = '\0';
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%s,%s)",i,j);
+      else sprintf(buf,"_t%s%s",i,j);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	>>
+
+$[_a-zA-Z][_a-zA-Z0-9]*
+	<<
+		NLA = 48;
+    { static char buf[300]; LabelEntry *el;
+      zzbegexpr[0] = ' ';
+      if ( CurRule != NULL &&
+      strcmp(CurRule, &zzbegexpr[1])==0 ) {
+        if ( !GenCC ) zzreplstr("zzaRet");
+      }
+      else if ( CurRetDef != NULL &&
+      strmember(CurRetDef, &zzbegexpr[1])) {
+        if ( hasMultipleOperands( CurRetDef ) ) {
+          require (strlen(zzbegexpr)<=(size_t)285,
+          "$retval attrib ref too big");
+          sprintf(buf,"_retv.%s",&zzbegexpr[1]);
+          zzreplstr(buf);
+        }
+        else zzreplstr("_retv");
+      }
+      else if ( CurParmDef != NULL &&
+      strmember(CurParmDef, &zzbegexpr[1])) {
+      ;
+    }
+    else if ( Elabel==NULL ) {
+    { err("$-variables in actions outside of rules are not allowed"); }
+  } else if ( (el=(LabelEntry *)hash_get(Elabel, &zzbegexpr[1]))!=NULL ) {
+  /* MR10 */
+  /* MR10 */                      /* element labels might exist without an elem when */
+  /* MR10 */                      /*  it is a forward reference (to a rule)          */
+  /* MR10 */
+  /* MR10 */						if ( GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) )
+  /* MR10 */							{ err(eMsg1("There are no token ptrs for rule references: '$%s'",&zzbegexpr[1])); }
+  /* MR10 */
+  /* MR10 */						if ( !GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) && GenAST) {
+  /* MR10 */                          err("You can no longer use attributes returned by rules when also using ASTs");
+  /* MR10 */                          err("   Use upward inheritance (\"rule >[Attrib a] : ... <<$a=...\>\>\")");
+  /* MR10 */                      };
+  /* MR10 */
+  /* MR10 */                      /* keep track of <<... $label ...>> for semantic predicates in guess mode */
+  /* MR10 */                      /* element labels contain pointer to the owners node                      */
+  /* MR10 */
+  /* MR10 */                      if (el->elem != NULL && el->elem->ntype == nToken) {
+  /* MR10 */                        list_add(&CurActionLabels,el);
+  /* MR10 */                      };
+}
+else
+warn(eMsg1("$%s not parameter, return value, (defined) element label",&zzbegexpr[1]));
+}
+zzmore();
+	>>
+
+#0
+	<<
+		NLA = 49;
+    zzreplstr("(*_root)"); zzmore(); chkGTFlag();   
+	>>
+
+#\[\]
+	<<
+		NLA = 50;
+    if ( GenCC ) {
+      if (NewAST) zzreplstr("(newAST)");
+      else zzreplstr("(new AST)");}
+    else {zzreplstr("zzastnew()");} zzmore();
+    chkGTFlag();
+	>>
+
+#\(\)
+	<<
+		NLA = 51;
+    zzreplstr("NULL"); zzmore(); chkGTFlag();   
+	>>
+
+#[0-9]+
+	<<
+		NLA = 52;
+    {
+      static char buf[100];
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("#i AST ref too big");
+      if ( GenCC ) sprintf(buf,"_ast%d%s",BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"zzastArg(%s)",zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      set_orel(atoi(zzbegexpr+1), &AST_nodes_refd_in_actions);
+      chkGTFlag();
+    }
+	>>
+
+#line[\ \t]* [0-9]+ {[\ \t]* \"~[\"]+\" ([\ \t]* [0-9]*)* } (\n|\r|\r\n)
+	<<
+		NLA = 53;
+    
+    zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+    getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+	>>
+
+#line ~[\n\r]* (\n|\r|\r\n)
+	<<
+		NLA = 54;
+    
+    zzline++; zzmore();
+	>>
+
+#[_a-zA-Z][_a-zA-Z0-9]*
+	<<
+		NLA = 55;
+    
+    if ( !(strcmp(zzbegexpr, "#ifdef")==0 ||
+    strcmp(zzbegexpr, "#if")==0 ||
+    strcmp(zzbegexpr, "#else")==0 ||
+    strcmp(zzbegexpr, "#endif")==0 ||
+    strcmp(zzbegexpr, "#ifndef")==0 ||
+    strcmp(zzbegexpr, "#define")==0 ||
+    strcmp(zzbegexpr, "#pragma")==0 ||
+    strcmp(zzbegexpr, "#undef")==0 ||
+    strcmp(zzbegexpr, "#import")==0 ||
+    strcmp(zzbegexpr, "#line")==0 ||
+    strcmp(zzbegexpr, "#include")==0 ||
+    strcmp(zzbegexpr, "#error")==0) )
+    {
+      static char buf[100];
+      sprintf(buf, "%s_ast", zzbegexpr+1);
+      /* MR27 */						list_add(&CurAstLabelsInActions, mystrdup(zzbegexpr+1));
+      zzreplstr(buf);
+      chkGTFlag();
+    }
+    zzmore();
+	>>
+
+#\[
+	<<
+		NLA = 56;
+    
+    pushint(']');
+    if ( GenCC ) {
+      if (NewAST) zzreplstr("(newAST(");
+      else zzreplstr("(new AST("); }
+    else zzreplstr("zzmk_ast(zzastnew(),");
+    zzmore();
+    chkGTFlag();
+	>>
+
+#\(
+	<<
+		NLA = 57;
+    
+    pushint('}');
+    if ( GenCC ) {
+      if (tmakeInParser) {
+        zzreplstr("tmake(");
+      }
+      else {
+        zzreplstr("ASTBase::tmake(");
+      }
+    }
+    else {
+      zzreplstr("zztmake(");
+    }
+    zzmore();
+    chkGTFlag();
+	>>
+
+#
+	<<
+		NLA = 58;
+    zzmore();   
+	>>
+
+\)
+	<<
+		NLA = 59;
+    
+    if ( istackempty() )
+    zzmore();
+    else if ( topint()==')' ) {
+      popint();
+    }
+    else if ( topint()=='}' ) {
+      popint();
+      /* terminate #(..) */
+      zzreplstr(", NULL)");
+    }
+    zzmore();
+	>>
+
+\[
+	<<
+		NLA = 60;
+    
+    pushint('|');	/* look for '|' to terminate simple [...] */
+    zzmore();
+	>>
+
+\(
+	<<
+		NLA = 61;
+    
+    pushint(')');
+    zzmore();
+	>>
+
+\\\]
+	<<
+		NLA = 62;
+    zzreplstr("]");  zzmore();   
+	>>
+
+\\\)
+	<<
+		NLA = 63;
+    zzreplstr(")");  zzmore();   
+	>>
+
+\\>
+	<<
+		NLA = 64;
+    if (! tokenActionActive) zzreplstr(">");	 /* MR1 */
+    zzmore();				         /* MR1 */
+	>>
+
+'
+	<<
+		NLA = 65;
+    zzmode(ACTION_CHARS); zzmore();  
+	>>
+
+\"
+	<<
+		NLA = 66;
+    zzmode(ACTION_STRINGS); zzmore();  
+	>>
+
+\\$
+	<<
+		NLA = 67;
+    zzreplstr("$");  zzmore();   
+	>>
+
+\\#
+	<<
+		NLA = 68;
+    zzreplstr("#");  zzmore();   
+	>>
+
+\\(\n|\r|\r\n)
+	<<
+		NLA = 69;
+    zzline++; zzmore();   
+	>>
+
+\\~[\]\)>$#]
+	<<
+		NLA = 70;
+    zzmore();   
+	>>
+
+/
+	<<
+		NLA = 71;
+    zzmore();   
+	>>
+
+/\*
+	<<
+		NLA = 72;
+    zzmode(ACTION_COMMENTS); zzmore();   
+	>>
+
+\*/
+	<<
+		NLA = 73;
+    warn("Missing /*; found dangling */ in action"); zzmore();   
+	>>
+
+//
+	<<
+		NLA = 74;
+    zzmode(ACTION_CPP_COMMENTS); zzmore();   
+	>>
+
+~[\n\r\)\(\\$#\>\]\[\"'/]+
+	<<
+		NLA = 75;
+    zzmore();   
+	>>
+
+
+%%PARSE_ENUM_FILE
+
+@
+	<<
+		NLA = Eof;
+    ;   
+	>>
+
+[\t\ ]+
+	<<
+		NLA = 137;
+    zzskip();   
+	>>
+
+\n|\r|\r\n
+	<<
+		NLA = 138;
+    zzline++; zzskip();   
+	>>
+
+//
+	<<
+		NLA = 139;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzmore();   
+	>>
+
+/\*
+	<<
+		NLA = 140;
+    zzmode(TOK_DEF_COMMENTS); zzskip();   
+	>>
+
+#ifdef
+	<<
+		NLA = 141;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#if
+	<<
+		NLA = 142;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#ifndef
+	<<
+		NLA = 143;
+    ;   
+	>>
+
+#else
+	<<
+		NLA = 144;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#endif
+	<<
+		NLA = 145;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#undef
+	<<
+		NLA = 146;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#import
+	<<
+		NLA = 147;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	>>
+
+#define
+	<<
+		NLA = 149;
+	>>
+
+enum
+	<<
+		NLA = 151;
+	>>
+
+\{
+	<<
+		NLA = 152;
+	>>
+
+=
+	<<
+		NLA = 153;
+	>>
+
+,
+	<<
+		NLA = 154;
+	>>
+
+\}
+	<<
+		NLA = 155;
+	>>
+
+;
+	<<
+		NLA = 156;
+	>>
+
+[0-9]+
+	<<
+		NLA = INT;
+	>>
+
+[a-zA-Z_][_a-zA-Z0-9]*
+	<<
+		NLA = ID;
+	>>
+
+%%
diff --git a/Tools/Source/TianoTools/Pccts/antlr/pred.c b/Tools/Source/TianoTools/Pccts/antlr/pred.c
new file mode 100644
index 0000000000..eb11c4d950
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/pred.c
@@ -0,0 +1,821 @@
+/*
+ * pred.c -- source for predicate detection, manipulation
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#include "set.h"
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#include "dlgdef.h"
+#include <ctype.h>
+
+#ifdef __USE_PROTOS
+static void complete_context_sets(RuleRefNode *, Predicate *);
+static void complete_context_trees(RuleRefNode *, Predicate *);
+#else
+static void complete_context_sets();
+static void complete_context_trees();
+#endif
+
+char *PRED_AND_LIST = "AND";
+char *PRED_OR_LIST = "OR";
+
+/*
+ * In C mode, return the largest constant integer found as the
+ * sole argument to LATEXT(i).
+ *
+ * In C++ mode, return the largest constant integer found as the
+ * sole argument to LT(i) given that the char before is nonalpha.
+ */
+
+int
+#ifdef __USE_PROTOS
+predicateLookaheadDepth(ActionNode *a)
+#else
+predicateLookaheadDepth(a)
+ActionNode *a;
+#endif
+{
+	int     max_k=0;
+
+    if (a->predEntry != NULL) {
+       MR_pred_depth(a->predEntry->pred,&max_k);
+       goto PREDENTRY_EXIT;
+    }
+
+	if ( GenCC )
+	{
+		/* scan for LT(i) */
+		int k = 0;
+		char *p = a->action;
+		while ( p!=NULL )
+		{
+			p = strstr(p, "LT(");
+			if ( p!=NULL )
+			{
+				if ( p>=a->action && !isalpha(*(p-1)) )
+				{
+					k = atoi(p+strlen("LT("));
+					if ( k>max_k ) max_k=k;
+				}
+				p += strlen("LT(");
+			}
+		}
+	}
+	else {
+		/* scan for LATEXT(i) */
+		int k = 0;
+		char *p = a->action;
+		while ( p!=NULL )
+		{
+			p = strstr(p, "LATEXT(");
+			if ( p!=NULL )
+			{
+				p += strlen("LATEXT(");
+				k = atoi(p);
+				if ( k>max_k ) max_k=k;
+			}
+		}
+	}
+
+	if (max_k==0) {
+		max_k = 1;	   /* MR33 Badly designed if didn't set max_k when CLL_k = 1 */
+		if (CLL_k > 1) /* MR27 Don't warn if max(k,ck) == 1 */
+		{
+			if ( !a->frmwarned )
+			{
+				a->frmwarned = 1;
+				warnFL(eMsg1("predicate: %s missing, bad, or with i=0; assuming i=1",
+							 GenCC?"LT(i)":"LATEXT(i)"),
+					   FileStr[a->file], a->line);
+			}
+		}
+	}
+
+/* MR10 */    if ( max_k > CLL_k) {
+/* MR10 */		if ( !a->frmwarned )
+/* MR10 */        {
+/* MR10 */			a->frmwarned = 1;
+/* MR11 */ errFL(eMsgd2("predicate refers to lookahead token %d. Semantic lookahead is limited to max(k,ck)==%d",
+/* MR10 */                        max_k,CLL_k),
+/* MR10 */                        FileStr[a->file],a->line);
+/* MR10 */          if (max_k >= OutputLL_k) {
+/* MR10 */            if (!GenCC) {
+/* MR10 */              errFL(eMsgd("    the lookahead buffer size in C mode is %d token(s) (including the one just recognized)",
+/* MR10 */                        OutputLL_k),
+/* MR10 */                        FileStr[a->file],a->line);
+/* MR10 */            };
+/* MR10 */          };
+/* MR10 */        };
+/* MR10 */        max_k= CLL_k;
+/* MR10 */    };
+
+PREDENTRY_EXIT:
+	return max_k;
+}
+
+/* Find all predicates in a block of alternatives.  DO NOT find predicates
+ * behind the block because that predicate could depend on things set in
+ * one of the nonoptional blocks
+ */
+
+Predicate *
+#ifdef __USE_PROTOS
+find_in_aSubBlk( Junction *alt )
+#else
+find_in_aSubBlk( alt )
+Junction *alt;
+#endif
+{
+	Predicate *a, *head=NULL, *tail=NULL, *root=NULL;
+	Junction *p = alt;
+
+    if (MRhoisting) {
+      return MR_find_in_aSubBlk(alt);
+    };
+	for (; p!=NULL; p=(Junction *)p->p2)
+	{
+		/* ignore empty alts */
+		if ( p->p1->ntype != nJunction ||
+			 ((Junction *)p->p1)->jtype != EndBlk )
+		{
+			a = find_predicates(p->p1);	/* get preds for this alt */
+			if ( a==NULL ) continue;
+
+			/* make an OR list of predicates */
+			if ( head==NULL )
+			{
+				root = new_pred();
+				root->expr = PRED_OR_LIST;
+				head = tail = a;
+				root->down = head;
+			}
+			else {
+				tail->right = a;
+				a->left = tail;
+				a->up = tail->up;
+				tail = a;
+			}
+		}
+	}
+
+	/* if just one pred, remove OR root */
+	if ( root!=NULL && root->down->right == NULL )
+	{
+		Predicate *d = root->down;
+		free( (char *) root);
+		return d;
+	}
+
+	return root;
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+find_in_aOptBlk( Junction *alt )
+#else
+find_in_aOptBlk( alt )
+Junction *alt;
+#endif
+{
+	return find_in_aSubBlk( alt );
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+find_in_aLoopBegin( Junction *alt )
+#else
+find_in_aLoopBegin( alt )
+Junction *alt;
+#endif
+{
+	return find_in_aSubBlk( (Junction *) alt->p1 );	/* get preds in alts */
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+find_in_aPlusBlk( Junction *alt )
+#else
+find_in_aPlusBlk( alt )
+Junction *alt;
+#endif
+{
+	require(alt!=NULL&&alt->p2!=NULL, "invalid aPlusBlk");
+	return find_in_aSubBlk( alt );
+}
+
+/* Look for a predicate;
+ *
+ * Do not pass anything but Junction nodes; no Actions, Tokens, RuleRefs.
+ * This means that a "hoisting distance" of zero is the only distance
+ * allowable.  Init actions are ignored.
+ *
+ * WARNING:
+ *		Assumes no (..)? block after predicate for the moment.
+ *		Does not check to see if pred is in production that can generate
+ *			a sequence contained in the set of ambiguous tuples.
+ *
+ * Return the predicate found if any.
+ */
+
+
+Predicate *
+#ifdef __USE_PROTOS
+find_predicates( Node *alt )
+#else
+find_predicates( alt )
+Node *alt;
+#endif
+{
+#ifdef DBG_PRED
+	Junction *j;
+	RuleRefNode *r;
+	TokNode *t;
+#endif
+	Predicate *pred;
+
+	if ( alt==NULL ) return NULL;
+
+#ifdef DBG_PRED
+	switch ( alt->ntype )
+	{
+		case nJunction :
+			j = (Junction *) alt;
+			fprintf(stderr, "Junction(in %s)", j->rname);
+			switch ( j->jtype )
+			{
+				case aSubBlk :
+					fprintf(stderr,"aSubBlk\n");
+					break;
+				case aOptBlk :
+					fprintf(stderr,"aOptBlk\n");
+					break;
+				case aLoopBegin :
+					fprintf(stderr,"aLoopBeginBlk\n");
+					break;
+				case aLoopBlk :
+					fprintf(stderr,"aLoopBlk\n");
+					break;
+				case aPlusBlk :
+					fprintf(stderr,"aPlusBlk\n");
+					break;
+				case EndBlk :
+					fprintf(stderr,"EndBlk\n");
+					break;
+				case RuleBlk :
+					fprintf(stderr,"RuleBlk\n");
+					break;
+				case Generic :
+					fprintf(stderr,"Generic\n");
+					break;
+				case EndRule :
+					fprintf(stderr,"EndRule\n");
+					break;
+			}
+			break;
+		case nRuleRef :
+			r = (RuleRefNode *) alt;
+			fprintf(stderr, "RuleRef(in %s)\n", r->rname);
+			break;
+		case nToken :
+			t = (TokNode *) alt;
+			fprintf(stderr, "TokenNode(in %s)%s\n", t->rname, TokenString(t->token));
+			break;
+		case nAction :
+			fprintf(stderr, "Action\n");
+			break;
+	}
+#endif
+
+	switch ( alt->ntype )
+	{
+		case nJunction :
+		{
+			Predicate *a, *b;
+			Junction *p = (Junction *) alt;	
+
+			/* lock nodes */
+			if ( p->jtype==aLoopBlk || p->jtype==RuleBlk ||
+				 p->jtype==aPlusBlk || p->jtype==EndRule )
+			{
+				require(p->pred_lock!=NULL, "rJunc: lock array is NULL");
+				if ( p->pred_lock[1] )
+				{
+					return NULL;
+				}
+				p->pred_lock[1] = TRUE;
+			}
+
+			switch ( p->jtype )
+			{
+				case aSubBlk :
+					a = find_in_aSubBlk(p);
+					return a;	/* nothing is visible past this guy */
+				case aOptBlk :
+					a = find_in_aOptBlk(p);
+					return a;
+				case aLoopBegin :
+					a = find_in_aLoopBegin(p);
+					return a;
+				case aLoopBlk :
+					a = find_in_aSubBlk(p);
+					p->pred_lock[1] = FALSE;
+					return a;
+				case aPlusBlk :
+					a = find_in_aPlusBlk(p);
+					p->pred_lock[1] = FALSE;
+					return a;	/* nothing is visible past this guy */
+				case RuleBlk :
+					a = find_predicates(p->p1);
+					p->pred_lock[1] = FALSE;
+					return a;
+				case Generic :
+					a = find_predicates(p->p1);
+					b = find_predicates(p->p2);
+					if ( p->pred_lock!=NULL ) p->pred_lock[1] = FALSE;
+					if ( a==NULL ) return b;
+					if ( b==NULL ) return a;
+					/* otherwise OR the two preds together */
+					{
+					fatal_internal("hit unknown situation during predicate hoisting");
+					}
+				case EndBlk :
+				case EndRule :	/* Find no predicates after a rule ref */
+					return NULL;
+				default:
+					fatal_internal("this cannot be printed\n");
+					break;
+			}
+		}
+		case nAction :
+		{
+			ActionNode *p = (ActionNode *) alt;
+            if ( p->noHoist) return NULL;                           /* MR12c */
+			if ( p->init_action ) return find_predicates(p->next);
+			if ( p->is_predicate )
+			{
+				Tree *t=NULL;
+#ifdef DBG_PRED
+				fprintf(stderr, "predicate: <<%s>>?\n", p->action);
+#endif
+				if ( p->guardpred!=NULL )
+				{
+					pred = predicate_dup(p->guardpred);
+                    MR_guardPred_plainSet(p,pred);                  /* MR12c */
+				}
+				else
+				{
+					pred = new_pred();
+					pred->k = predicateLookaheadDepth(p);
+					pred->source = p;
+					pred->expr = p->action;
+					if ( HoistPredicateContext && pred->k > 1 )
+					{
+						/* MR30 No need to use first_item_is_guess_block_extra
+						   since we know this is an action, not a (...)* or
+						   (...)+ block.
+						*/
+
+						if ( first_item_is_guess_block((Junction *)p->next) )
+						{
+                            warnFL("cannot compute context of predicate in front of (..)? block",
+                            FileStr[p->file], p->line);
+						}
+						else
+						{
+							ConstrainSearch = 0;
+/* MR11 */                  if (p->ampersandPred != NULL) {
+/* MR11 */  					TRAV(p,
+/* MR11 */							 pred->k,
+/* MR11 */  						 &(pred->completionTree), t);
+/* MR11 */                  } else {
+    							TRAV(p->next,
+    								 pred->k,
+    								 &(pred->completionTree), t);
+                            };
+							pred->tcontext = t;
+                            MR_check_pred_too_long(pred,pred->completionTree);
+#ifdef DBG_PRED
+							fprintf(stderr, "LL(%d) context:", pred->k);
+							preorder(t);
+							fprintf(stderr, "\n");
+#endif
+						}
+					}
+					else if ( HoistPredicateContext && pred->k == 1 )
+					{
+						pred->scontext[1] = empty;
+						/* MR30 No need to use first_item_is_guess_block_extra
+						   since we know this is an action.
+						*/
+						if ( first_item_is_guess_block((Junction *)p->next) )
+						{
+                        warnFL("cannot compute context of predicate in front of (..)? block",
+                                             FileStr[p->file], p->line);
+						}
+						else
+						{
+							REACH((Junction *)p->next,
+								  1,
+								  &(pred->completionSet),
+								  pred->scontext[1]);
+                            MR_check_pred_too_long(pred,pred->completionSet);
+#ifdef DBG_PRED
+							fprintf(stderr, "LL(1) context:");
+							s_fprT(stderr, pred->scontext[1]);
+							fprintf(stderr, "\n");
+#endif
+						}
+					}
+				}
+				{
+					Predicate  *d = find_predicates(p->next);
+                    Predicate  *root;
+
+/* Warning: Doesn't seem like the up pointers will all be set correctly;
+ * TJP: that's ok, we're not using them now.
+ */
+					if ( d!=NULL )
+					{
+						root = new_pred();
+						root->expr = PRED_AND_LIST;
+						root->down = pred;
+						pred->right = d;
+						pred->up = root;
+						d->left = pred;
+						d->up = pred->up;
+						return root;
+					}
+				}
+				return pred;
+			}
+			return NULL;
+		}
+		case nRuleRef :
+		{
+			Predicate   *a;
+			RuleRefNode *p = (RuleRefNode *) alt;
+			Junction    *r;
+            Junction    *save_MR_RuleBlkWithHalt;
+
+			RuleEntry *q = (RuleEntry *) hash_get(Rname, p->text);
+			if ( q == NULL )
+			{
+				warnFL( eMsg1("rule %s not defined",p->text), FileStr[p->file], p->line );
+				return NULL;
+			}
+			r = RulePtr[q->rulenum];
+			if ( r->pred_lock[1] )
+			{
+				/* infinite left-recursion; ignore 'cause LL sup 1 (k) analysis
+				 * must have seen it earlier.
+				 */
+				return NULL;
+			}
+
+            /* MR10 There should only be one halt set at a time.        */
+            /* MR10 Life would have been easier with a global variable  */
+            /* MR10    (at least for this particular need)              */
+            /* MR10 Unset the old one and set the new one, later undo.  */
+
+            require(r->end->halt == FALSE,"should only have one halt at a time");
+
+/* MR10 */  require(MR_RuleBlkWithHalt == NULL ||
+/* MR10 */          (MR_RuleBlkWithHalt->jtype == RuleBlk && MR_RuleBlkWithHalt->end->halt == TRUE),
+/* MR10 */             "RuleBlkWithHalt->end not RuleBlk or does not have halt set");
+/* MR10 */  if (MR_RuleBlkWithHalt != NULL) {
+/* MR10 */    MR_RuleBlkWithHalt->end->halt=FALSE;
+/* MR10 */  };
+
+/***        fprintf(stderr,"\nSetting halt on junction #%d\n",r->end->seq);     ***/
+
+            require(r->end->halt == FALSE,"rule->end->halt already set");
+
+            save_MR_RuleBlkWithHalt=MR_RuleBlkWithHalt;
+
+/* MR10 */  MR_pointerStackPush(&MR_RuleBlkWithHaltStack,MR_RuleBlkWithHalt);
+/* MR10 */  MR_pointerStackPush(&MR_PredRuleRefStack,p);
+
+			r->end->halt = TRUE;
+/* MR10 */  MR_RuleBlkWithHalt=r;
+
+			a = find_predicates((Node *)r);
+
+            require(r->end->halt == TRUE,"rule->end->halt not set");
+            r->end->halt = FALSE;
+
+/* MR10 */  MR_pointerStackPop(&MR_PredRuleRefStack);
+/* MR10 */  MR_RuleBlkWithHalt=(Junction *) MR_pointerStackPop(&MR_RuleBlkWithHaltStack);
+
+            require (MR_RuleBlkWithHalt==save_MR_RuleBlkWithHalt,
+                    "RuleBlkWithHaltStack not consistent");
+
+/* MR10 */  require(MR_RuleBlkWithHalt == NULL ||
+/* MR10 */          (MR_RuleBlkWithHalt->jtype == RuleBlk && MR_RuleBlkWithHalt->end->halt == FALSE),
+/* MR10 */             "RuleBlkWithHalt->end not RuleBlk or has no halt set");
+/* MR10 */  if (MR_RuleBlkWithHalt != NULL) {
+/* MR10 */    MR_RuleBlkWithHalt->end->halt=TRUE;
+/* MR10 */  };
+
+/***        fprintf(stderr,"\nRestoring halt on junction #%d\n",r->end->seq);   ***/
+
+			if ( a==NULL ) return NULL;
+
+			/* attempt to compute the "local" FOLLOW just like in normal lookahead
+			 * computation if needed
+			 */
+
+			complete_context_sets(p,a);
+			complete_context_trees(p,a);
+
+/* MR10 */  MR_cleanup_pred_trees(a);
+
+			return a;
+		}
+		case nToken :
+			break;
+	}
+
+	return NULL;
+}
+
+#ifdef __USE_PROTOS
+Predicate *MR_find_predicates_and_supp(Node *alt)
+#else
+Predicate *MR_find_predicates_and_supp(alt)
+  Node      *alt;
+#endif
+{
+    Predicate   *p;
+
+    p=find_predicates(alt);
+    p=MR_suppressK(alt,p);
+    return p;
+}
+
+Predicate *
+#ifdef __USE_PROTOS
+new_pred( void )
+#else
+new_pred( )
+#endif
+{
+	Predicate *p = (Predicate *) calloc(1,sizeof(Predicate)); /* MR10 */
+	require(p!=NULL, "new_pred: cannot alloc predicate");
+    p->scontext[0]=empty;
+    p->scontext[1]=empty;
+    p->completionTree=empty;
+    p->completionSet=empty;
+    p->plainSet=empty;
+	return p;
+}
+
+static void
+#ifdef __USE_PROTOS
+complete_context_sets( RuleRefNode *p, Predicate *a )
+#else
+complete_context_sets( p, a )
+RuleRefNode *p;
+Predicate *a;
+#endif
+{
+	set rk2, b;
+	int k2;
+
+#ifdef DBG_PRED
+	fprintf(stderr, "enter complete_context_sets\n");
+#endif
+	for (; a!=NULL; a=a->right)
+	{
+		if ( a->expr == PRED_AND_LIST || a->expr == PRED_OR_LIST )
+		{
+			complete_context_sets(p,a->down);
+			continue;
+		}
+		rk2 = b = empty;
+		while ( !set_nil(a->completionSet) )
+		{
+			k2 = set_int(a->completionSet);
+			set_rm(k2, a->completionSet);
+
+            REACH(p->next, k2, &rk2, b);
+			set_orin(&(a->scontext[1]), b);
+			set_free(b);
+		}
+
+		set_orin(&(a->completionSet), rk2);/* remember what we couldn't do */
+		set_free(rk2);
+#ifdef DBG_PRED
+		fprintf(stderr, "LL(1) context for %s(addr 0x%x) after ruleref:", a->expr, a);
+		s_fprT(stderr, a->scontext[1]);
+		fprintf(stderr, "\n");
+#endif
+/*		complete_context_sets(p, a->down);*/
+	}
+#ifdef DBG_PRED
+	fprintf(stderr, "exit complete_context_sets\n");
+#endif
+}
+
+static void
+#ifdef __USE_PROTOS
+complete_context_trees( RuleRefNode *p, Predicate *a )
+#else
+complete_context_trees( p, a )
+RuleRefNode *p;
+Predicate *a;
+#endif
+{
+	set rk2;
+	int k2;
+	Tree *u;
+
+#ifdef DBG_PRED
+	fprintf(stderr, "enter complete_context_trees\n");
+#endif
+	for (; a!=NULL; a=a->right)
+	{
+		if ( a->expr == PRED_AND_LIST || a->expr == PRED_OR_LIST )
+		{
+			complete_context_trees(p, a->down);
+			continue;
+		}
+		rk2 = empty;
+
+		/* any k left to do? if so, link onto tree */
+		while ( !set_nil(a->completionTree) )
+		{	
+			k2 = set_int(a->completionTree);
+			set_rm(k2, a->completionTree);
+			u = NULL;
+
+            TRAV(p->next, k2, &rk2, u);
+
+			/* any subtrees missing k2 tokens, add u onto end */
+			a->tcontext = tlink(a->tcontext, u, k2);
+            Tfree(u);   /* MR10 */
+		}
+		set_orin(&(a->completionTree), rk2);/* remember what we couldn't do */
+		set_free(rk2);
+#ifdef DBG_PRED
+		fprintf(stderr, "LL(i<%d) context after ruleref:", LL_k);
+		preorder(a->tcontext);
+		fprintf(stderr, "\n");
+#endif
+/*		complete_context_trees(p, a->down);*/
+	}
+#ifdef DBG_PRED
+	fprintf(stderr, "exit complete_context_trees\n");
+#endif
+}
+
+/* Walk a list of predicates and return the set of all tokens in scontext[1]'s */
+set
+#ifdef __USE_PROTOS
+covered_set( Predicate *p )
+#else
+covered_set( p )
+Predicate *p;
+#endif
+{
+	set a;
+
+	a = empty;
+	for (; p!=NULL; p=p->right)
+	{
+		if ( p->expr == PRED_AND_LIST || p->expr == PRED_OR_LIST )
+		{
+			set_orin(&a, covered_set(p->down));
+			continue;
+		}
+		set_orin(&a, p->scontext[1]);
+		set_orin(&a, covered_set(p->down));
+	}
+	return a;
+}
+
+/* MR10 predicate_free()
+   MR10 Don't free the leaf nodes since they are part of the action node
+*/
+
+#ifdef __USE_PROTOS
+void predicate_free(Predicate *p)
+#else
+void predicate_free(p)
+  Predicate     *p;
+#endif
+{
+  if (p == NULL) return;
+  predicate_free(p->right);
+  predicate_free(p->down);
+  if (p->cloned ||
+      p->source == NULL ||
+      p->source->guardpred == NULL ||
+      p->expr == PRED_AND_LIST ||
+      p->expr == PRED_OR_LIST) {
+    set_free(p->scontext[1]);
+    set_free(p->completionSet);
+    set_free(p->completionTree);
+    set_free(p->plainSet);
+    Tfree(p->tcontext);
+    free( (char *) p);
+  } else {
+    p->right=NULL;
+    p->down=NULL;  /* MR13 *** debug */
+  };
+}
+
+/* MR10 predicate_dup() */
+
+#ifdef __USE_PROTOS
+Predicate * predicate_dup_xxx(Predicate *p,int contextToo)
+#else
+Predicate * predicate_dup_xxx(p,contextToo)
+  Predicate     *p;
+  int           contextToo;
+#endif
+{
+  Predicate     *q;
+
+  if (p == NULL) return NULL;
+  q=new_pred();
+  q->down=predicate_dup(p->down);
+  q->right=predicate_dup(p->right);
+
+  /*
+     don't replicate expr - it is read-only
+     and address comparison is used to look
+     for identical predicates.
+  */
+
+  q->expr=p->expr;
+  q->k=p->k;
+  q->source=p->source;
+  q->cloned=1;
+  q->ampersandStyle=p->ampersandStyle;
+  q->inverted=p->inverted;
+  q->predEntry=p->predEntry;
+  q->plainSet=set_dup(p->plainSet);
+
+  if (contextToo) {
+    q->tcontext=tdup(p->tcontext);
+    q->scontext[0]=set_dup(p->scontext[0]);
+    q->scontext[1]=set_dup(p->scontext[1]);
+    q->completionTree=set_dup(p->completionTree);
+    q->completionSet=set_dup(p->completionSet);
+  };
+
+  /* don't need to dup "redundant" */
+
+  return q;
+
+}
+
+#ifdef __USE_PROTOS
+Predicate * predicate_dup_without_context(Predicate *p)
+#else
+Predicate * predicate_dup_without_context(p)
+  Predicate     *p;
+#endif
+{
+  return predicate_dup_xxx(p,0);
+}
+
+#ifdef __USE_PROTOS
+Predicate * predicate_dup(Predicate *p)
+#else
+Predicate * predicate_dup(p)
+  Predicate     *p;
+#endif
+{
+  return predicate_dup_xxx(p,1);
+}
+
diff --git a/Tools/Source/TianoTools/Pccts/antlr/proto.h b/Tools/Source/TianoTools/Pccts/antlr/proto.h
new file mode 100644
index 0000000000..53035e720e
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/proto.h
@@ -0,0 +1,852 @@
+/*
+ * proto.h -- function prototypes
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+                           /* V a r i a b l e s */
+
+extern int tp;
+extern Junction *SynDiag;
+extern char Version[];
+extern char VersionDef[];
+#ifdef __cplusplus
+extern void (*fpPrint[])(...);
+#else
+extern void (*fpPrint[])();
+#endif
+#ifdef __cplusplus
+extern struct _set (*fpReach[])(...);
+#else
+extern struct _set (*fpReach[])();
+#endif
+#ifdef __cplusplus
+extern struct _tree *(*fpTraverse[])(...);
+#else
+extern struct _tree *(*fpTraverse[])();
+#endif
+#ifdef __cplusplus
+extern void (**fpTrans)(...);
+#else
+extern void (**fpTrans)();
+#endif
+#ifdef __cplusplus
+extern void (**fpJTrans)(...);
+#else
+extern void (**fpJTrans)();
+#endif
+#ifdef __cplusplus
+extern void (*C_Trans[NumNodeTypes+1])(...);
+#else
+extern void (*C_Trans[])();
+#endif
+#ifdef __cplusplus
+extern void (*C_JTrans[NumJuncTypes+1])(...);
+#else
+extern void (*C_JTrans[])();
+#endif
+extern int BlkLevel;
+extern int CurFile;
+extern char *CurPredName;
+extern char *CurRule;
+extern int  CurRuleDebug;                       /* MR13 */
+extern Junction *CurRuleBlk;
+extern RuleEntry *CurRuleNode;
+extern ListNode *CurElementLabels;
+extern ListNode *CurAstLabelsInActions;         /* MR27 */
+extern ListNode *ContextGuardPredicateList;     /* MR13 */
+extern ListNode *CurActionLabels;
+extern int numericActionLabel;        /* MR10 << ... $1 ... >> or << ... $1 ... >>?   */
+extern ListNode *NumericPredLabels;   /* MR10 << ... $1 ... >>?  ONLY                 */
+extern char *FileStr[];
+extern int NumFiles;
+extern int EpToken;
+extern int WildCardToken;
+extern Entry	**Tname,
+				**Texpr,
+				**Rname,
+				**Fcache,
+				**Tcache,
+				**Elabel,
+				**Sname,
+                **Pname;    /* MR11 */
+extern ListNode *ExprOrder;
+extern ListNode **Cycles;
+extern int TokenNum;
+extern int LastTokenCounted;
+extern ListNode *BeforeActions, *AfterActions, *LexActions;
+
+/* MR1							                        		    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class     */
+/* MR1			  via #lexmember <<....>> & #lexprefix <<...>>              */
+/* MR1									    */
+
+extern ListNode *LexMemberActions;			 	             /* MR1 */
+extern ListNode *LexPrefixActions;				             /* MR1 */
+
+extern set *fset;   /* for constrained search */             /* MR11 */
+extern int maxk;    /* for constrained search */             /* MR11 */
+extern int Save_argc;                                        /* MR10 */
+extern char **Save_argv;                                     /* MR10 */
+extern ListNode *eclasses, *tclasses;
+extern char	*HdrAction;
+extern char *FirstAction;                                    /* MR11 */
+extern FILE	*ErrFile;
+extern char *RemapFileName;
+extern char *ErrFileName;
+extern char *DlgFileName;
+extern char *DefFileName;
+extern char *ModeFileName;
+extern char *StdMsgName;
+extern int NumRules;
+extern Junction **RulePtr;
+extern int LL_k;
+extern int CLL_k;
+extern char *decodeJType[];
+extern int PrintOut;
+extern int PrintAnnotate;
+extern int CodeGen;
+extern int LexGen;
+extern int esetnum;
+extern int setnum;
+extern int wordnum;
+extern int GenAST;
+extern int GenANSI;
+extern int **FoStack;
+extern int **FoTOS;
+extern int GenExprSetsOpt;
+extern FILE *DefFile;
+extern int CannotContinue;
+extern int GenCR;
+extern int GenLineInfo;
+extern int GenLineInfoMS;
+extern int action_file, action_line;
+extern int TraceGen;
+extern int CurAmbigAlt1, CurAmbigAlt2, CurAmbigline, CurAmbigfile;
+extern char *CurAmbigbtype;
+extern int elevel;
+extern int GenEClasseForRules;
+extern FILE *input, *output;
+extern char **TokenStr, **ExprStr;
+extern int CurrentLexClass, NumLexClasses;
+extern LClass lclass[];
+extern char LexStartSymbol[];
+extern char	*CurRetDef;
+extern char	*CurParmDef;
+extern int OutputLL_k;
+extern int TreeResourceLimit;
+extern int DemandLookahead;
+extern char *RulePrefix;
+extern int GenStdPccts;
+extern char *stdpccts;
+extern int ParseWithPredicates;
+extern int ConstrainSearch;
+extern int PURIFY;													/* MR23 */
+
+extern set MR_CompromisedRules;                                     /* MR14 */
+extern int MR_AmbSourceSearch;                                      /* MR11 */
+extern int MR_SuppressSearch;                                       /* MR13 */
+extern int MR_AmbSourceSearchGroup;                                 /* MR11 */
+extern int MR_AmbSourceSearchChoice;                                /* MR11 */
+extern int MR_AmbSourceSearchLimit;                                 /* MR11 */
+extern int MR_usingPredNames;                                       /* MR11 */
+extern int MR_ErrorSetComputationActive;                            /* MR14 */
+extern char *MR_AmbAidRule;                                         /* MR11 */
+extern int   MR_AmbAidLine;                                         /* MR11 */
+extern int   MR_AmbAidMultiple;                                     /* MR11 */
+extern int MR_AmbAidDepth;                                          /* MR11 */
+extern int MR_skipped_e3_report;                                    /* MR11 */
+extern int MR_matched_AmbAidRule;                                   /* MR11 */
+extern int MR_Inhibit_Tokens_h_Gen;                                 /* MR13 */
+extern int NewAST;                                                  /* MR13 */
+extern int tmakeInParser;                                           /* MR23 */
+extern int AlphaBetaTrace;                                          /* MR14 */
+extern int MR_BlkErr;                                               /* MR21 */
+extern int MR_AlphaBetaWarning;                                     /* MR14 */
+extern int MR_AlphaBetaMessageCount;                                /* MR14 */
+extern int MR_MaintainBackTrace;                                    /* MR14 */
+extern int MR_BadExprSets;                                          /* MR13 */
+extern int FoundGuessBlk;
+extern int FoundException;
+extern int FoundAtOperator;				                             /* MR6 */
+extern int FoundExceptionGroup;                                      /* MR6 */
+extern int WarningLevel;
+extern int UseStdout;					                             /* MR6 */
+extern int TabWidth;					                             /* MR6 */
+extern int pLevel;
+extern int pAlt1;
+extern int pAlt2;
+extern int AImode;
+extern int HoistPredicateContext;
+extern int MRhoisting;                                               /* MR9 */
+extern int MRhoistingk;                                              /* MR13 */
+extern int MR_debugGenRule;                                          /* MR11 */
+extern int GenCC;
+extern char *ParserName;
+extern char *StandardSymbols[];
+extern char *ASTSymbols[];
+extern set reserved_positions;
+extern set all_tokens;
+extern set imag_tokens;
+extern set tokclasses;
+extern ListNode *ForcedTokens;
+extern int *TokenInd;
+extern FILE *Parser_h, *Parser_c;
+extern char CurrentClassName[];
+extern int no_classes_found;
+extern char Parser_h_Name[];
+extern char Parser_c_Name[];
+extern char MRinfoFile_Name[];                                      /* MR10 */
+extern FILE *MRinfoFile;                                            /* MR10 */
+extern int MRinfo;                                                  /* MR10 */
+extern int MRinfoSeq;                                               /* MR10 */
+extern int InfoP;                                                   /* MR10 */
+extern int InfoT;                                                   /* MR10 */
+extern int InfoF;                                                   /* MR10 */
+extern int InfoM;                                                   /* MR10 */
+extern int InfoO;                                                   /* MR12 */
+extern int PotentialSuppression;                                    /* MR10 */
+extern int PotentialDummy;                                          /* MR10 */
+extern int TnodesInUse;                                             /* MR10 */
+extern int TnodesPeak;                                              /* MR10 */
+extern int TnodesReportThreshold;                                   /* MR11 */
+extern int TnodesAllocated;                                         /* MR10 */
+extern char *ClassDeclStuff;                                        /* MR10 */
+extern char *BaseClassName;                                         /* MR22 */
+extern ListNode *class_before_actions, *class_after_actions;
+extern char *UserTokenDefsFile;
+extern int UserDefdTokens;
+extern ListNode *MetaTokenNodes;
+extern char *OutputDirectory;
+extern int DontCopyTokens;
+extern int LTinTokenAction;                                         /* MR23 */
+extern set AST_nodes_refd_in_actions;
+extern ListNode *CurExGroups;
+extern int CurBlockID;
+extern int CurAltNum;
+extern Junction *CurAltStart;
+extern Junction *OuterAltStart;               /* chain exception groups MR7 */
+extern ExceptionGroup *DefaultExGroup;
+extern int NumSignals;
+extern int ContextGuardTRAV;
+extern Junction *MR_RuleBlkWithHalt;            /* MR10 */
+extern PointerStack MR_BackTraceStack;          /* MR10 */
+extern PointerStack MR_PredRuleRefStack;        /* MR10 */
+extern PointerStack MR_RuleBlkWithHaltStack;    /* MR10 */
+
+/*									*/
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	    */
+/* MR1					in DLG action			                    */
+/*								                                            */
+extern int tokenActionActive;	                                     /* MR1 */
+
+extern char *PRED_OR_LIST;                                          /* MR10 */
+extern char *PRED_AND_LIST;                                         /* MR10 */
+
+#ifdef __VMS
+#define STRICMP strcasecmp /* MR21 */
+#else
+#define STRICMP stricmp /* MR21 */
+#endif
+
+/* MR26 */
+#ifdef PCCTS_USE_STDARG
+extern Tree *tmake(Tree *root, ...);
+#else
+extern Tree *tmake();
+#endif
+
+#ifdef __USE_PROTOS
+extern int STRICMP(const char*, const char*);
+extern void istackreset(void);
+extern int istacksize(void);
+extern void pushint(int);
+extern int popint( void );
+extern int istackempty( void );
+extern int topint( void );
+extern void NewSetWd( void );
+extern void DumpSetWd( void );
+extern void DumpSetWdForC( void );
+extern void DumpSetWdForCC( void );
+extern void NewSet( void );
+extern void FillSet( set );
+extern void ComputeErrorSets( void );
+extern void ComputeTokSets( void );
+extern void SubstErrorClass( set * );
+extern int DefErrSet( set *, int, char * );
+extern int DefErrSetForC( set *, int, char * );
+extern int DefErrSetForCC( set *, int, char * );
+extern int DefErrSet1(int, set *, int, char *);                         /* MR21 */
+extern int DefErrSetForC1(int, set *, int, char *, const char* );       /* MR21 */
+extern int DefErrSetForCC1(int, set *, int, char *, const char* );      /* MR21 */
+extern int DefErrSetWithSuffix(int, set *, int, char *, const char *);  /* MR21 */
+extern void GenErrHdr( void );
+extern void dumpExpr( FILE *, char * );
+extern void addParm( Node *, char * );
+extern Graph buildAction( char *, int, int, int );
+extern Graph buildToken( char * );
+extern Graph buildWildCard( char * );
+extern Graph buildRuleRef( char * );
+extern Graph Or( Graph, Graph );
+extern Graph Cat( Graph, Graph );
+extern Graph makeOpt( Graph, int, char *);
+extern Graph makeBlk( Graph, int, char *);
+extern Graph makeLoop( Graph, int, char *);
+extern Graph makePlus( Graph, int, char *);
+extern Graph emptyAlt( void );
+extern Graph emptyAlt3( void );
+extern TokNode * newTokNode( void );
+extern RuleRefNode * newRNode( void );
+extern Junction * newJunction( void );
+extern ActionNode * newActionNode( void );
+extern char * makelocks( void );
+extern void preorder( Tree * );
+extern Tree * tnode( int );
+extern void _Tfree( Tree * );
+extern Tree * tdup( Tree * );
+extern int is_single_tuple( Tree * );
+extern Tree * tappend( Tree *, Tree * );
+extern void Tfree( Tree * );
+extern Tree * tlink( Tree *, Tree *, int );
+extern Tree * tshrink( Tree * );
+extern Tree * tflatten( Tree * );
+extern Tree * tJunc( Junction *, int, set * );
+extern Tree * tRuleRef( RuleRefNode *, int, set * );
+extern Tree * tToken( TokNode *, int, set * );
+extern Tree * tAction( ActionNode *, int, set * );
+extern int tmember( Tree *, Tree * );
+extern int tmember_constrained( Tree *, Tree * );
+extern Tree * tleft_factor( Tree * );
+extern Tree * trm_perm( Tree *, Tree * );
+extern void tcvt( set *, Tree * );
+extern Tree * permute( int, int );
+extern Tree * VerifyAmbig( Junction *, Junction *, unsigned **, set *, Tree **, Tree **, int * );
+extern set rJunc( Junction *, int, set * );
+extern set rRuleRef( RuleRefNode *, int, set * );
+extern set rToken( TokNode *, int, set * );
+extern set rAction( ActionNode *, int, set * );
+extern void HandleAmbiguity( Junction *, Junction *, Junction *, int );
+extern set First( Junction *, int, int, int * );
+extern void freeBlkFsets( Junction * );
+extern void genAction( ActionNode * );
+extern void genRuleRef( RuleRefNode * );
+extern void genToken( TokNode * );
+extern void genOptBlk( Junction * );
+extern void genLoopBlk( Junction *, Junction *, Junction *, int );
+extern void genLoopBegin( Junction * );
+extern void genPlusBlk( Junction * );
+extern void genSubBlk( Junction * );
+extern void genRule( Junction * );
+extern void genJunction( Junction * );
+extern void genEndBlk( Junction * );
+extern void genEndRule( Junction * );
+extern void genHdr( int );
+extern void genHdr1( int );
+extern void dumpAction( char *, FILE *, int, int, int, int );
+extern void dumpActionPlus(ActionNode*, char *, FILE *, int, int, int, int );   /* MR21 */
+extern Entry ** newHashTable( void );
+extern Entry * hash_add( Entry **, char *, Entry * );
+extern Entry * hash_get( Entry **, char * );
+extern void hashStat( Entry ** );
+extern char * mystrdup( char * );
+extern void genLexDescr( void );
+extern void dumpLexClasses( FILE * );
+extern void genDefFile( void );
+extern void DumpListOfParmNames( char *, FILE *, int );	/* MR5 janm 26-May-97 */
+extern int DumpNextNameInDef( char **, FILE * );
+extern void DumpOldStyleParms( char *, FILE * );
+extern void DumpType( char *, FILE * );
+extern int strmember( char *, char * );
+/* extern int HasComma( char * ); MR23 Replaced by hasMultipleOperands() */
+extern void DumpRetValStruct( FILE *, char *, int );
+extern char * StripQuotes( char * );
+extern int main( int, char *[] );
+extern void readDescr( void );
+extern FILE * NextFile( void );
+extern char * outnameX( char *, char *);
+extern char * outname( char * );
+extern void fatalFL( char *, char *, int );
+extern void fatal_intern( char *, char *, int );
+extern void cleanUp( void );
+extern char * eMsg3( char *, char *, char *, char * );
+extern char * eMsgd( char *, int );
+extern char * eMsgd2( char *, int, int );
+extern void s_fprT( FILE *, set );
+extern char * TerminalString( int );
+extern void lexclass( char * );
+extern void lexmode( int );
+extern int LexClassIndex( char * );
+extern int hasAction( char * );
+extern void setHasAction( char *, char * );
+extern int addTname( char * );
+extern int addTexpr( char * );
+extern int Tnum( char * );
+extern void Tklink( char *, char * );
+extern Entry * newEntry( char *, int );
+extern void list_add( ListNode **, void * );
+extern void list_free( ListNode **, int freeData );     /* MR10 */
+extern void list_apply( ListNode *, void (*)(void *) );
+extern int list_search_cstring (ListNode *, char *);    /* MR27 */
+extern char * Fkey( char *, int, int );
+extern void FoPush( char *, int );
+extern void FoPop( int );
+extern void RegisterCycle( char *, int );
+extern void ResolveFoCycles( int );
+extern void pJunc( Junction * );
+extern void pRuleRef( RuleRefNode * );
+extern void pToken( TokNode * );
+extern void pAction( ActionNode * );
+extern void FoLink( Node * );
+extern void addFoLink( Node *, char *, Junction * );
+extern void GenCrossRef( Junction * );
+extern void defErr( char *, long, long, long, long, long, long );
+extern void genStdPCCTSIncludeFile(FILE *,char *);                  /* MR10 */
+extern char * pcctsBaseName(char *);                                /* MR32 */
+extern Predicate *find_predicates(Node *);                          /* MR10 */
+extern Predicate *MR_find_predicates_and_supp(Node *);              /* MR13 */
+extern int predicateLookaheadDepth(ActionNode *);                   /* MR10 */
+extern void predicate_free(Predicate *);                            /* MR10 */
+extern Predicate * predicate_dup(Predicate *);                      /* MR10 */
+extern Predicate * predicate_dup_without_context(Predicate *);      /* MR11 */
+extern void GenRulePrototypes(FILE *, Junction *);
+extern Junction *first_item_is_guess_block(Junction *);
+extern Junction *first_item_is_guess_block_extra(Junction * q);		/* MR30 */
+extern Junction *analysis_point(Junction *);
+extern Tree *make_tree_from_sets(set *, set *);
+extern Tree *tdup_chain(Tree *);
+extern Tree *tdif(Tree *, Predicate *, set *, set *);
+extern set covered_set(Predicate *);
+extern void AmbiguityDialog(Junction *, int, Junction *, Junction *, int *, int *);
+extern void dumpAmbigMsg(set *, FILE *, int);
+extern void GenRuleFuncRedefs(FILE *, Junction *);
+extern void GenPredefinedSymbolRedefs(FILE *);
+extern void GenASTSymbolRedefs(FILE *);
+extern void GenRemapFile(void);
+extern void GenSetRedefs(FILE *);
+extern ForcedToken *newForcedToken(char *, int);
+extern void RemapForcedTokens(void);
+extern char *TokenOrExpr(int);
+extern void setUpperRange(TokNode *, char *);
+extern void GenParser_c_Hdr(void);
+extern void GenParser_h_Hdr(void);
+extern void GenRuleMemberDeclarationsForCC(FILE *, Junction *);
+extern int addForcedTname( char *, int );
+extern char *OutMetaName(char *);
+extern void OutFirstSetSymbol(Junction *q, char *);                 /* MR21 */
+extern void warnNoFL(char *err);
+extern void warnFL(char *err,char *f,int l);
+extern void warn(char *err);
+extern void warnNoCR( char *err );
+extern void errNoFL(char *err);
+extern void errFL(char *err,char *f,int l);
+extern void err(char *err);
+extern void errNoCR( char *err );
+extern void genPredTree( Predicate *p, Node *j, int ,int);
+extern UserAction *newUserAction(char *);
+extern char *gate_symbol(char *name);
+extern char *makeAltID(int blockid, int altnum);
+extern void DumpRemainingTokSets(void);
+extern void DumpANSIFunctionArgDef(FILE *f, Junction *q, int bInit);  /* MR23 */
+extern void DumpFormals(FILE *, char *, int bInit);                   /* MR23 */
+extern char* hideDefaultArgs(const char* pdecl);                      /* MR22 VHS */
+extern Predicate *computePredFromContextGuard(Graph,int *msgDone);    /* MR21 */
+extern void recomputeContextGuard(Predicate *);                       /* MR13 */
+extern Predicate *new_pred(void);
+extern void chkGTFlag(void);
+extern void leAdd(LabelEntry *);                                     /* MR7 */
+extern void leFixup(void);                                           /* MR7 */
+extern void egAdd(ExceptionGroup *);                                 /* MR7 */
+extern void egFixup(void);                                           /* MR7 */
+extern void altAdd(Junction *);                                      /* MR7 */
+extern void altFixup(void);                                          /* MR7 */
+extern Predicate * MR_find_in_aSubBlk(Junction *alt);                /* MR10 */
+extern Predicate * MR_predFlatten(Predicate *p);				     /* MR10 */
+extern Predicate * MR_predSimplifyALL(Predicate *p);	             /* MR10 */
+extern Predicate * MR_predSimplifyALLX(Predicate *p,int skipPass3);  /* MR10 */
+extern int MR_allPredLeaves(Predicate *p);                           /* MR10 */
+extern void MR_cleanup_pred_trees(Predicate *p);                     /* MR10 */
+extern int MR_predicate_context_completed(Predicate *p);             /* MR10 */
+extern void MR_check_pred_too_long(Predicate *p,set completion);     /* MR10 */
+extern Tree * MR_remove_epsilon_from_tree(Tree *t);                  /* MR10 */
+extern Tree * MR_computeTreeAND(Tree *l,Tree *r);					 /* MR10 */
+extern int MR_tree_equ(Tree *big, Tree *small);				         /* MR10 */
+extern set MR_First(int ck,Junction *j,set *incomplete);  		     /* MR10 */
+extern set MR_compute_pred_set(Predicate *p);                	     /* MR10 */
+extern Tree * MR_compute_pred_tree_context(Predicate *p);     	     /* MR10 */
+extern int MR_pointerStackPush(PointerStack *,void *);               /* MR10 */
+extern void * MR_pointerStackPop(PointerStack *);                    /* MR10 */
+extern void * MR_pointerStackTop(PointerStack *);                    /* MR10 */
+extern void MR_pointerStackReset(PointerStack *);                    /* MR10 */
+extern void MR_backTraceReport(void);                                /* MR10 */
+extern void MR_alphaBetaTraceReport(void);                           /* MR14 */
+extern void MR_dumpRuleSet(set);                                     /* MR14 */
+extern void MR_predContextPresent(Predicate *p,int *,int *);         /* MR10 */
+extern void MR_dumpPred(Predicate *p,int withContext);               /* MR10 */
+extern void MR_dumpPred1(int,Predicate *p,int withContext);          /* MR10 */
+extern void MR_xxxIndent(FILE *f,int depth);                         /* MR11 */
+extern void MR_outputIndent(int depth);                              /* MR11 */
+extern void MR_stderrIndent(int depth);                              /* MR11 */
+extern Junction * MR_ruleReferenced(RuleRefNode *rrn);               /* MR10 */
+extern Junction * MR_nameToRuleBlk(char *);                          /* MR10 */
+extern void MR_releaseResourcesUsedInRule(Node *);                   /* MR10 */
+extern void MR_dumpTreeX(int depth,Tree *t,int across);              /* MR10 */
+extern void MR_dumpTreeF(FILE *f,int depth,Tree *t,int across);      /* MR10 */
+extern void DumpFcache(void);                                        /* MR10 */
+extern void MR_dumpTokenSet(FILE *f,int depth,set s);                /* MR10 */
+extern void MR_traceAmbSource(set *,Junction *,Junction *);          /* MR11 */
+extern void MR_traceAmbSourceK(Tree *,Junction *a1,Junction *a2);    /* MR11 */
+extern void MR_traceAmbSourceKclient(void);                          /* MR20 */
+extern Node *MR_advance(Node *);                                     /* MR11 */
+extern int  MR_offsetFromRule(Node *);                               /* MR11 */
+extern char *MR_ruleNamePlusOffset(Node *);                          /* MR11 */
+extern int  MR_max_height_of_tree(Tree *);                           /* MR11 */
+extern int  MR_all_leaves_same_height(Tree *,int);                   /* MR11 */
+extern void MR_projectTreeOntoSet(Tree *t,int k,set *);              /* MR11 */
+extern Tree *MR_make_tree_from_set(set);                             /* MR11 */
+extern Predicate *MR_removeRedundantPredPass3(Predicate *);          /* MR11 */
+extern void MR_pred_depth(Predicate *,int *);                        /* MR11 */
+extern int  MR_comparePredicates(Predicate *,Predicate *);           /* MR11 */
+extern Predicate * MR_unfold(Predicate *);                           /* MR11 */
+extern void MR_simplifyInverted(Predicate *,int);                    /* MR11 */
+extern int  MR_secondPredicateUnreachable                            /* MR11 */
+            (Predicate *first,Predicate *second);                    /* MR11 */
+extern void MR_clearPredEntry(Predicate *);                          /* MR11 */
+extern void MR_orphanRules(FILE *);                                  /* MR12 */
+extern void MR_merge_contexts(Tree *);                               /* MR12 */
+extern int  ci_strequ(char *,char *);                                 /* MR12 */
+extern void MR_guardPred_plainSet(ActionNode *anode,Predicate *);    /* MR12c */
+extern void MR_suppressSearchReport(void);                           /* MR12c */
+extern Predicate * MR_suppressK(Node *,Predicate *);                 /* MR13 */
+extern void MR_backTraceDumpItem(FILE *,int skip,Node *n);           /* MR13 */
+extern void MR_backTraceDumpItemReset(void);                         /* MR13 */
+extern Junction * MR_junctionWithoutP2(Junction *);                  /* MR13 */
+extern void MR_setConstrainPointer(set *);							 /* MR18 */
+extern void BlockPreambleOption(Junction *q, char * pSymbol);        /* MR23 */
+extern char* getInitializer(char *);                                 /* MR23 */
+extern char *endFormal(char *pStart,                                 /* MR23 */
+					   char **ppDataType,                            /* MR23 */
+					   char **ppSymbol,                              /* MR23 */
+					   char **ppEqualSign,                           /* MR23 */
+					   char **ppValue,                               /* MR23 */
+					   char **ppSeparator,                           /* MR23 */
+					   int *pNext);                                  /* MR23 */
+extern char *strBetween(char *pStart,                                /* MR23 */
+						char *pNext,                                 /* MR23 */
+						char *pStop);                                /* MR23 */
+extern int hasMultipleOperands(char *);                              /* MR23 */
+extern void DumpInitializers(FILE*, RuleEntry*, char*);              /* MR23 */
+extern int isTermEntryTokClass(TermEntry *);						 /* MR23 */
+extern int isEmptyAlt(Node *, Node *);                               /* MR23 */
+#else
+extern int STRICMP();
+extern void istackreset();
+extern int istacksize();
+extern void pushint();
+extern int popint();
+extern int istackempty();
+extern int topint();
+extern void NewSetWd();
+extern void DumpSetWd();
+extern void DumpSetWdForC();
+extern void DumpSetWdForCC();
+extern void NewSet();
+extern void FillSet();
+extern void ComputeErrorSets();
+extern void ComputeTokSets();
+extern void SubstErrorClass();
+extern int DefErrSet();
+extern int DefErrSetForC();
+extern int DefErrSetForCC();
+extern int DefErrSet1();
+extern int DefErrSetForC1();
+extern int DefErrSetForCC1();
+extern int DefErrSetWithSuffix();                                   /* MR21 */
+extern void GenErrHdr();
+extern void dumpExpr();
+extern void addParm();
+extern Graph buildAction();
+extern Graph buildToken();
+extern Graph buildWildCard();
+extern Graph buildRuleRef();
+extern Graph Or();
+extern Graph Cat();
+extern Graph makeOpt();
+extern Graph makeBlk();
+extern Graph makeLoop();
+extern Graph makePlus();
+extern Graph emptyAlt();
+extern Graph emptyAlt3();
+extern TokNode * newTokNode();
+extern RuleRefNode * newRNode();
+extern Junction * newJunction();
+extern ActionNode * newActionNode();
+extern char * makelocks();
+extern void preorder();
+extern Tree * tnode();
+extern void _Tfree();
+extern Tree * tdup();
+extern int is_single_tuple();
+extern Tree * tappend();
+extern void Tfree();
+extern Tree * tlink();
+extern Tree * tshrink();
+extern Tree * tflatten();
+extern Tree * tJunc();
+extern Tree * tRuleRef();
+extern Tree * tToken();
+extern Tree * tAction();
+extern int tmember();
+extern int tmember_constrained();
+extern Tree * tleft_factor();
+extern Tree * trm_perm();
+extern void tcvt();
+extern Tree * permute();
+extern Tree * VerifyAmbig();
+extern set rJunc();
+extern set rRuleRef();
+extern set rToken();
+extern set rAction();
+extern void HandleAmbiguity();
+extern set First();
+extern void freeBlkFsets();
+extern void genAction();
+extern void genRuleRef();
+extern void genToken();
+extern void genOptBlk();
+extern void genLoopBlk();
+extern void genLoopBegin();
+extern void genPlusBlk();
+extern void genSubBlk();
+extern void genRule();
+extern void genJunction();
+extern void genEndBlk();
+extern void genEndRule();
+extern void genHdr();
+extern void genHdr1();
+extern void dumpAction();
+extern void dumpActionPlus();                           /* MR21 */
+extern Entry ** newHashTable();
+extern Entry * hash_add();
+extern Entry * hash_get();
+extern void hashStat();
+extern char * mystrdup();
+extern void genLexDescr();
+extern void dumpLexClasses();
+extern void genDefFile();
+extern void DumpListOfParmNames();                    /* MR5 janm 26-May-97 */
+extern int DumpNextNameInDef();
+extern void DumpOldStyleParms();
+extern void DumpType();
+extern int strmember();
+/* extern int HasComma(); MR23 Replaced by hasMultipleOperands() */
+extern void DumpRetValStruct();
+extern char * StripQuotes();
+extern int main();
+extern void readDescr();
+extern FILE * NextFile();
+extern char * outnameX();
+extern char * outname();
+extern void fatalFL();
+extern void fatal_intern();
+extern void cleanUp();
+extern char * eMsg3();
+extern char * eMsgd();
+extern char * eMsgd2();
+extern void s_fprT();
+extern char * TerminalString();
+extern void lexclass();
+extern void lexmode();
+extern int LexClassIndex();
+extern int hasAction();
+extern void setHasAction();
+extern int addTname();
+extern int addTexpr();
+extern int Tnum();
+extern void Tklink();
+extern Entry * newEntry();
+extern void list_add();
+extern void list_free();                /* MR10 */
+extern void list_apply();
+extern int list_search_cstring ();      /* MR27 */
+extern char * Fkey();
+extern void FoPush();
+extern void FoPop();
+extern void RegisterCycle();
+extern void ResolveFoCycles();
+extern void pJunc();
+extern void pRuleRef();
+extern void pToken();
+extern void pAction();
+extern void FoLink();
+extern void addFoLink();
+extern void GenCrossRef();
+extern void defErr();
+extern void genStdPCCTSIncludeFile();
+extern char * pcctsBaseName();                                /* MR32 */
+extern Predicate *find_predicates();
+extern Predicate *MR_find_predicates_and_supp();              /* MR13 */
+extern int predicateLookaheadDepth();                         /* MR10 */
+extern void predicate_free();                                 /* MR10 */
+extern Predicate * predicate_dup();                           /* MR10 */
+extern Predicate * predicate_dup_without_context();           /* MR11 */
+extern void GenRulePrototypes();
+extern Junction *first_item_is_guess_block();
+extern Junction *first_item_is_guess_block_extra();			  /* MR30 */
+extern Junction *analysis_point();
+extern Tree *make_tree_from_sets();
+extern Tree *tdup_chain();
+extern Tree *tdif();
+extern set covered_set();
+extern void AmbiguityDialog();
+extern void dumpAmbigMsg();
+extern void GenRuleFuncRedefs();
+extern void GenPredefinedSymbolRedefs();
+extern void GenASTSymbolRedefs();
+extern void GenRemapFile();
+extern void GenSetRedefs();
+extern ForcedToken *newForcedToken();
+extern void RemapForcedTokens();
+extern char *TokenOrExpr();
+extern void setUpperRange();
+extern void GenParser_c_Hdr();
+extern void GenParser_h_Hdr();
+extern void GenRuleMemberDeclarationsForCC();
+extern int addForcedTname();
+extern char *OutMetaName();
+extern void OutFirstSetSymbol();                            /* MR21 */
+extern void warnNoFL();
+extern void warnFL();
+extern void warn();
+extern void warnNoCR();
+extern void errNoFL();
+extern void errFL();
+extern void err();
+extern void errNoCR();
+extern void genPredTree();
+extern UserAction *newUserAction();
+extern char *gate_symbol();
+extern char *makeAltID();
+extern void DumpRemainingTokSets();
+extern void DumpANSIFunctionArgDef();
+extern void DumpFormals();                                           /* MR23 */
+extern char* hideDefaultArgs();                                      /* MR22 VHS */
+extern Predicate *computePredFromContextGuard();
+extern void recomputeContextGuard();                                 /* MR13 */
+extern Predicate *new_pred();
+extern void chkGTFlag();
+extern void leAdd();                                                 /* MR7 */
+extern void leFixup();                                               /* MR7 */
+extern void egAdd();                                                 /* MR7 */
+extern void egFixup();                                               /* MR7 */
+extern void altAdd();                                                /* MR7 */
+extern void altFixup();                                              /* MR7 */
+extern Predicate * MR_find_in_aSubBlk();       		                /* MR10 */
+extern Predicate * MR_predFlatten();						        /* MR10 */
+extern Predicate * MR_predSimplifyALL();                            /* MR10 */
+extern Predicate * MR_predSimplifyALLX();                           /* MR10 */
+extern void MR_cleanup_pred_trees();                                /* MR10 */
+extern int MR_allPredLeaves();                                      /* MR10 */
+extern int MR_predicate_context_completed();                        /* MR10 */
+extern void MR_check_pred_too_long();                               /* MR10 */
+extern Tree * MR_remove_epsilon_from_tree();				        /* MR10 */
+extern Tree * MR_computeTreeAND();					                /* MR10 */
+extern int MR_tree_equ();                   				        /* MR10 */
+extern set MR_First();				                                /* MR10 */
+extern set MR_compute_pred_set();				                    /* MR10 */
+extern Tree * MR_compute_pred_tree_context();				        /* MR10 */
+extern int MR_pointerStackPush();                                   /* MR10 */
+extern void * MR_pointerStackPop();                                 /* MR10 */
+extern void * MR_pointerStackTop();                                 /* MR10 */
+extern void MR_pointerStackReset();                                 /* MR10 */
+extern void MR_backTraceReport();                                   /* MR10 */
+extern void MR_alphaBetaTraceReport();                              /* MR14 */
+extern void MR_dumpRuleSet();                                       /* MR14 */
+extern void MR_predContextPresent();                                /* MR10 */
+extern void MR_dumpPred();                                          /* MR10 */
+extern void MR_dumpPred1();                                         /* MR10 */
+extern void MR_xxxIndent();                                         /* MR11 */
+extern void MR_stderrIndent();                                      /* MR11 */
+extern void MR_outputIndent();                                      /* MR11 */
+extern Junction * MR_ruleReferenced();                              /* MR10 */
+extern void MR_releaseResourcesUsedInRule();                        /* MR10 */
+extern void MR_dumpTreeX();                                         /* MR10 */
+extern void MR_dumpTreeF();                                         /* MR10 */
+extern void DumpFcache();                                           /* MR10 */
+extern void MR_dumpTokenSet();                                      /* MR10 */
+extern void MR_traceAmbSource();                                    /* MR11 */
+extern Node *MR_advance();                                          /* MR11 */
+extern int  MR_offsetFromRule();                                    /* MR11 */
+extern char *MR_ruleNamePlusOffset();                               /* MR11 */
+extern void MR_traceAmbSourceK();                                   /* MR11 */
+extern void MR_traceAmbSourceKclient();                             /* [i_a] added */
+extern int  MR_max_height_of_tree();                                /* MR11 */
+extern int  MR_all_leaves_same_height();                            /* MR11 */
+extern void MR_projectTreeOntoSet();                                /* MR11 */
+extern Tree *MR_make_tree_from_set();                               /* MR11 */
+extern Predicate *MR_removeRedundantPredPass3();                    /* MR11 */
+extern void MR_pred_depth();                                        /* MR11 */
+extern int  MR_comparePredicates();                                 /* MR11 */
+extern Predicate * MR_unfold();                                     /* MR11 */
+extern void MR_simplifyInverted();                                  /* MR11 */
+extern int  MR_secondPredicateUnreachable();                        /* MR11 */
+extern Junction * MR_nameToRuleBlk();                               /* MR10 */
+extern void MR_clearPredEntry();                                    /* MR11 */
+extern void MR_orphanRules();                                       /* MR12 */
+extern void MR_merge_contexts();                                    /* MR12 */
+extern int ci_strequ();                                             /* MR12 */
+extern void MR_guardPred_plainSet();                                /* MR12c */
+extern void MR_suppressSearchReport();                              /* MR12c */
+extern Predicate * MR_suppressK();                                  /* MR13 */
+extern void MR_backTraceDumpItem();                                 /* MR13 */
+extern void MR_backTraceDumpItemReset();                            /* MR13 */
+extern Junction * MR_junctionWithoutP2();                           /* MR13 */
+extern void MR_setConstrainPointer();					  		    /* MR18 */
+extern void BlockPreambleOption();                                  /* MR23 */
+extern char* getInitializer();                                      /* MR23 */
+extern int hasMultipleOperands();                                   /* MR23 */
+extern char *endFormal();                                           /* MR23 */
+extern char *strBetween();                                          /* MR23 */
+extern void DumpInitializers();                                     /* MR23 */
+extern int isTermEntryTokClass();							 	    /* MR23 */
+extern int isEmptyAlt();
+
+#endif
+
+#ifdef __USE_PROTOS
+#include <stdlib.h>
+#endif
+
+/* MR20 G. Hobbelt  Create proper externs for dlg variables */
+
+extern set attribsRefdFromAction;
+extern int inAlt;
+extern int UsedOldStyleAttrib;
+extern int UsedNewStyleLabel;
+
+#define MAX_BLK_LEVEL 100                       /* MR23 */
+extern int     CurBlockID_array[MAX_BLK_LEVEL]; /* MR23 */
+extern int     CurAltNum_array[MAX_BLK_LEVEL];  /* MR23 */
diff --git a/Tools/Source/TianoTools/Pccts/antlr/scan.c b/Tools/Source/TianoTools/Pccts/antlr/scan.c
new file mode 100644
index 0000000000..9b4bde08e6
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/scan.c
@@ -0,0 +1,5735 @@
+
+/* parser.dlg -- DLG Description of scanner
+ *
+ * Generated from: antlr.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include "pcctscfg.h"
+#include "set.h"
+#include <ctype.h>
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#define zzcr_attr(attr,tok,t)
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+LOOKAHEAD
+
+void
+#ifdef __USE_PROTOS
+zzerraction(void)
+#else
+zzerraction()
+#endif
+{
+	(*zzerr)("invalid token");
+	zzadvance();
+	zzskip();
+}
+/*
+ * D L G tables
+ *
+ * Generated from: parser.dlg
+ *
+ * 1989-2001 by  Will Cohen, Terence Parr, and Hank Dietz
+ * Purdue University Electrical Engineering
+ * DLG Version 1.33MR33
+ */
+
+#include "mode.h"
+
+
+
+
+/* maintained, but not used for now */
+set AST_nodes_refd_in_actions = set_init;
+int inAlt = 0;
+set attribsRefdFromAction = set_init; /* MR20 */
+int UsedOldStyleAttrib = 0;
+int UsedNewStyleLabel = 0;
+#ifdef __USE_PROTOS
+char *inline_set(char *);
+#else
+char *inline_set();
+#endif
+
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	    */
+/* MR1					in DLG action			                    */
+
+int tokenActionActive=0;                                            /* MR1 */
+
+  
+
+
+
+static char *
+#ifdef __USE_PROTOS
+getFileNameFromTheLineInfo(char *toStr, char *fromStr)
+#else
+getFileNameFromTheLineInfo(toStr, fromStr)
+char *toStr, *fromStr;
+#endif
+{
+  int i, j, k;
+  
+  if (!fromStr || !toStr) return toStr;
+  
+  /* find the first " */
+  
+  for (i=0;
+  (i<MaxFileName) &&
+  (fromStr[i] != '\n') &&
+  (fromStr[i] != '\r') &&
+  (fromStr[i] != '\"');
+  i++) /* nothing */ ;
+  
+  if ( (i == MaxFileName) ||
+  (fromStr[i] == '\n') ||
+  (fromStr[i] == '\r') ) {
+  return toStr;
+}
+
+  /* find the second " */
+
+  for (j=i+1;
+(j<MaxFileName) &&
+(fromStr[j] != '\n') &&
+(fromStr[j] != '\r') &&
+(fromStr[j] != '\"');
+j++) /* nothing */ ;
+
+  if ((j == MaxFileName) ||
+(fromStr[j] == '\n') ||
+(fromStr[j] == '\r') ) {
+  return toStr;
+}
+
+  /* go back until the last / or \ */
+
+  for (k=j-1;
+(fromStr[k] != '\"') &&
+(fromStr[k] != '/') &&
+(fromStr[k] != '\\');
+k--) /* nothing */ ;
+
+  /* copy the string after " / or \ into toStr */
+
+  for (i=k+1; fromStr[i] != '\"'; i++) {
+toStr[i-k-1] = fromStr[i];
+}
+
+  toStr[i-k-1] = '\0';
+
+  return toStr;
+}
+
+/* MR14 end of a block to support #line in antlr source code */
+
+  
+
+
+#ifdef __USE_PROTOS
+void mark_label_used_in_sem_pred(LabelEntry *le)              /* MR10 */
+#else
+void mark_label_used_in_sem_pred(le)                          /* MR10 */
+LabelEntry    *le;
+#endif
+{
+  TokNode   *tn;
+  require (le->elem->ntype == nToken,"mark_label_used... ntype != nToken");
+  tn=(TokNode *)le->elem;
+  require (tn->label != 0,"mark_label_used... TokNode has no label");
+  tn->label_used_in_semantic_pred=1;
+}
+
+static void act1()
+{ 
+		NLA = Eof;
+    /* L o o k  F o r  A n o t h e r  F i l e */
+    {
+      FILE *new_input;
+      new_input = NextFile();
+      if ( new_input == NULL ) { NLA=Eof; return; }
+      fclose( input );
+      input = new_input;
+      zzrdstream( input );
+      zzskip();	/* Skip the Eof (@) char i.e continue */
+    }
+	}
+
+
+static void act2()
+{ 
+		NLA = 76;
+    zzskip();   
+	}
+
+
+static void act3()
+{ 
+		NLA = 77;
+    zzline++; zzskip();   
+	}
+
+
+static void act4()
+{ 
+		NLA = 78;
+    zzmode(ACTIONS); zzmore();
+    istackreset();
+    pushint(']');   
+	}
+
+
+static void act5()
+{ 
+		NLA = 79;
+    action_file=CurFile; action_line=zzline;
+    zzmode(ACTIONS); zzmore();
+    list_free(&CurActionLabels,0);       /* MR10 */
+    numericActionLabel=0;                /* MR10 */
+    istackreset();
+    pushint('>');   
+	}
+
+
+static void act6()
+{ 
+		NLA = 80;
+    zzmode(STRINGS); zzmore();   
+	}
+
+
+static void act7()
+{ 
+		NLA = 81;
+    zzmode(COMMENTS); zzskip();   
+	}
+
+
+static void act8()
+{ 
+		NLA = 82;
+    warn("Missing /*; found dangling */"); zzskip();   
+	}
+
+
+static void act9()
+{ 
+		NLA = 83;
+    zzmode(CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act10()
+{ 
+		NLA = 84;
+    
+    zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+    getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+	}
+
+
+static void act11()
+{ 
+		NLA = 85;
+    
+    zzline++; zzmore();
+	}
+
+
+static void act12()
+{ 
+		NLA = 86;
+    warn("Missing <<; found dangling >>"); zzskip();   
+	}
+
+
+static void act13()
+{ 
+		NLA = WildCard;
+	}
+
+
+static void act14()
+{ 
+		NLA = 88;
+    FoundException = 1;		/* MR6 */
+    FoundAtOperator = 1;  
+	}
+
+
+static void act15()
+{ 
+		NLA = Pragma;
+	}
+
+
+static void act16()
+{ 
+		NLA = FirstSetSymbol;
+	}
+
+
+static void act17()
+{ 
+		NLA = 94;
+	}
+
+
+static void act18()
+{ 
+		NLA = 95;
+	}
+
+
+static void act19()
+{ 
+		NLA = 96;
+	}
+
+
+static void act20()
+{ 
+		NLA = 97;
+	}
+
+
+static void act21()
+{ 
+		NLA = 98;
+	}
+
+
+static void act22()
+{ 
+		NLA = 99;
+	}
+
+
+static void act23()
+{ 
+		NLA = 102;
+	}
+
+
+static void act24()
+{ 
+		NLA = 103;
+	}
+
+
+static void act25()
+{ 
+		NLA = 104;
+	}
+
+
+static void act26()
+{ 
+		NLA = 105;
+	}
+
+
+static void act27()
+{ 
+		NLA = 106;
+	}
+
+
+static void act28()
+{ 
+		NLA = 107;
+	}
+
+
+static void act29()
+{ 
+		NLA = 108;
+	}
+
+
+static void act30()
+{ 
+		NLA = 109;
+	}
+
+
+static void act31()
+{ 
+		NLA = 110;
+	}
+
+
+static void act32()
+{ 
+		NLA = 111;
+	}
+
+
+static void act33()
+{ 
+		NLA = 112;
+	}
+
+
+static void act34()
+{ 
+		NLA = 113;
+	}
+
+
+static void act35()
+{ 
+		NLA = 114;
+	}
+
+
+static void act36()
+{ 
+		NLA = 115;
+	}
+
+
+static void act37()
+{ 
+		NLA = 116;
+	}
+
+
+static void act38()
+{ 
+		NLA = 117;
+	}
+
+
+static void act39()
+{ 
+		NLA = 118;
+	}
+
+
+static void act40()
+{ 
+		NLA = 119;
+	}
+
+
+static void act41()
+{ 
+		NLA = 120;
+	}
+
+
+static void act42()
+{ 
+		NLA = 121;
+	}
+
+
+static void act43()
+{ 
+		NLA = 122;
+	}
+
+
+static void act44()
+{ 
+		NLA = 123;
+	}
+
+
+static void act45()
+{ 
+		NLA = 124;
+	}
+
+
+static void act46()
+{ 
+		NLA = 125;
+	}
+
+
+static void act47()
+{ 
+		NLA = 126;
+	}
+
+
+static void act48()
+{ 
+		NLA = 127;
+	}
+
+
+static void act49()
+{ 
+		NLA = 128;
+	}
+
+
+static void act50()
+{ 
+		NLA = 129;
+	}
+
+
+static void act51()
+{ 
+		NLA = 130;
+	}
+
+
+static void act52()
+{ 
+		NLA = 131;
+	}
+
+
+static void act53()
+{ 
+		NLA = 132;
+	}
+
+
+static void act54()
+{ 
+		NLA = 133;
+	}
+
+
+static void act55()
+{ 
+		NLA = 134;
+	}
+
+
+static void act56()
+{ 
+		NLA = 135;
+	}
+
+
+static void act57()
+{ 
+		NLA = NonTerminal;
+    
+    while ( zzchar==' ' || zzchar=='\t' ) {
+      zzadvance();
+    }
+    if ( zzchar == ':' && inAlt ) NLA = LABEL;
+	}
+
+
+static void act58()
+{ 
+		NLA = TokenTerm;
+    
+    while ( zzchar==' ' || zzchar=='\t' ) {
+      zzadvance();
+    }
+    if ( zzchar == ':' && inAlt ) NLA = LABEL;
+	}
+
+
+static void act59()
+{ 
+		NLA = 136;
+    warn(eMsg1("unknown meta-op: %s",LATEXT(1))); zzskip();   
+	}
+
+static unsigned char shift0[257] = {
+  0, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  1, 2, 58, 58, 3, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 1, 40, 6, 9, 58, 58, 45, 
+  58, 46, 47, 8, 52, 58, 58, 18, 7, 16, 
+  14, 15, 16, 16, 16, 16, 16, 16, 16, 41, 
+  42, 5, 48, 17, 53, 19, 56, 56, 56, 56, 
+  56, 26, 56, 56, 56, 56, 56, 51, 56, 56, 
+  56, 56, 56, 56, 29, 56, 56, 56, 56, 56, 
+  56, 56, 4, 20, 58, 50, 57, 58, 23, 31, 
+  38, 34, 13, 35, 24, 33, 11, 55, 36, 10, 
+  25, 12, 32, 21, 55, 22, 27, 28, 54, 55, 
+  55, 43, 30, 55, 39, 44, 37, 49, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 
+  58, 58, 58, 58, 58, 58, 58
+};
+
+
+static void act60()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act61()
+{ 
+		NLA = QuotedTerm;
+    zzmode(START);   
+	}
+
+
+static void act62()
+{ 
+		NLA = 3;
+    
+    zzline++;
+    warn("eoln found in string");
+    zzskip();
+	}
+
+
+static void act63()
+{ 
+		NLA = 4;
+    zzline++; zzmore();   
+	}
+
+
+static void act64()
+{ 
+		NLA = 5;
+    zzmore();   
+	}
+
+
+static void act65()
+{ 
+		NLA = 6;
+    zzmore();   
+	}
+
+static unsigned char shift1[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 2, 5, 5, 3, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 1, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act66()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act67()
+{ 
+		NLA = 7;
+    zzmode(ACTIONS); zzmore();   
+	}
+
+
+static void act68()
+{ 
+		NLA = 8;
+    
+    zzline++;
+    warn("eoln found in string (in user action)");
+    zzskip();
+	}
+
+
+static void act69()
+{ 
+		NLA = 9;
+    zzline++; zzmore();   
+	}
+
+
+static void act70()
+{ 
+		NLA = 10;
+    zzmore();   
+	}
+
+
+static void act71()
+{ 
+		NLA = 11;
+    zzmore();   
+	}
+
+static unsigned char shift2[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 2, 5, 5, 3, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 1, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act72()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act73()
+{ 
+		NLA = 12;
+    zzmode(ACTIONS); zzmore();   
+	}
+
+
+static void act74()
+{ 
+		NLA = 13;
+    
+    zzline++;
+    warn("eoln found in char literal (in user action)");
+    zzskip();
+	}
+
+
+static void act75()
+{ 
+		NLA = 14;
+    zzmore();   
+	}
+
+
+static void act76()
+{ 
+		NLA = 15;
+    zzmore();   
+	}
+
+static unsigned char shift3[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 2, 5, 5, 3, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act77()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act78()
+{ 
+		NLA = 16;
+    zzmode(ACTIONS); zzmore();   
+	}
+
+
+static void act79()
+{ 
+		NLA = 17;
+    zzmore();   
+	}
+
+
+static void act80()
+{ 
+		NLA = 18;
+    zzline++; zzmore(); DAWDLE;   
+	}
+
+
+static void act81()
+{ 
+		NLA = 19;
+    zzmore();   
+	}
+
+static unsigned char shift4[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 3, 5, 5, 4, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 1, 5, 5, 5, 5, 2, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act82()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act83()
+{ 
+		NLA = 20;
+    zzmode(PARSE_ENUM_FILE);
+    zzmore();   
+	}
+
+
+static void act84()
+{ 
+		NLA = 21;
+    zzmore();   
+	}
+
+
+static void act85()
+{ 
+		NLA = 22;
+    zzline++; zzmore(); DAWDLE;   
+	}
+
+
+static void act86()
+{ 
+		NLA = 23;
+    zzmore();   
+	}
+
+static unsigned char shift5[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 3, 5, 5, 4, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 1, 5, 5, 5, 5, 2, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act87()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act88()
+{ 
+		NLA = 24;
+    zzline++; zzmode(PARSE_ENUM_FILE); zzskip(); DAWDLE;   
+	}
+
+
+static void act89()
+{ 
+		NLA = 25;
+    zzskip();   
+	}
+
+static unsigned char shift6[257] = {
+  0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3
+};
+
+
+static void act90()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act91()
+{ 
+		NLA = 26;
+    zzline++; zzmode(ACTIONS); zzmore(); DAWDLE;   
+	}
+
+
+static void act92()
+{ 
+		NLA = 27;
+    zzmore();   
+	}
+
+static unsigned char shift7[257] = {
+  0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3
+};
+
+
+static void act93()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act94()
+{ 
+		NLA = 28;
+    zzline++; zzmode(START); zzskip(); DAWDLE;   
+	}
+
+
+static void act95()
+{ 
+		NLA = 29;
+    zzskip();   
+	}
+
+static unsigned char shift8[257] = {
+  0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 1, 3, 3, 2, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  3, 3, 3, 3, 3, 3, 3
+};
+
+
+static void act96()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act97()
+{ 
+		NLA = 30;
+    zzmode(START); zzskip();   
+	}
+
+
+static void act98()
+{ 
+		NLA = 31;
+    zzskip();   
+	}
+
+
+static void act99()
+{ 
+		NLA = 32;
+    zzline++; zzskip(); DAWDLE;   
+	}
+
+
+static void act100()
+{ 
+		NLA = 33;
+    zzskip();   
+	}
+
+static unsigned char shift9[257] = {
+  0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 3, 5, 5, 4, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 1, 5, 5, 5, 5, 2, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 
+  5, 5, 5, 5, 5, 5, 5
+};
+
+
+static void act101()
+{ 
+		NLA = Eof;
+	}
+
+
+static void act102()
+{ 
+		NLA = Action;
+    /* these do not nest */
+    zzmode(START);
+    NLATEXT[0] = ' ';
+    NLATEXT[1] = ' ';
+    zzbegexpr[0] = ' ';
+    zzbegexpr[1] = ' ';
+    if ( zzbufovf ) {
+      err( eMsgd("action buffer overflow; size %d",ZZLEXBUFSIZE));
+    }
+    
+/* MR1	10-Apr-97  MR1  Previously unable to put right shift operator	*/
+    /* MR1					in DLG action			*/
+    /* MR1			Doesn't matter what kind of action it is - reset*/
+    
+			      tokenActionActive=0;		 /* MR1 */
+	}
+
+
+static void act103()
+{ 
+		NLA = Pred;
+    /* these do not nest */
+    zzmode(START);
+    NLATEXT[0] = ' ';
+    NLATEXT[1] = ' ';
+    zzbegexpr[0] = '\0';
+    if ( zzbufovf ) {
+      err( eMsgd("predicate buffer overflow; size %d",ZZLEXBUFSIZE));
+    };
+#ifdef __cplusplus__
+    /* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __STDC__
+    /* MR10 */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+#ifdef __USE_PROTOS
+    /* MRxx */                    list_apply(CurActionLabels, (void (*)(void *))mark_label_used_in_sem_pred);
+#else
+    /* MR10 */                    list_apply(CurActionLabels,mark_label_used_in_sem_pred);
+#endif
+#endif
+#endif
+	}
+
+
+static void act104()
+{ 
+		NLA = PassAction;
+    if ( topint() == ']' ) {
+      popint();
+      if ( istackempty() )	/* terminate action */
+      {
+        zzmode(START);
+        NLATEXT[0] = ' ';
+        zzbegexpr[0] = ' ';
+        if ( zzbufovf ) {
+          err( eMsgd("parameter buffer overflow; size %d",ZZLEXBUFSIZE));
+        }
+      }
+      else {
+        /* terminate $[..] and #[..] */
+        if ( GenCC ) zzreplstr("))");
+        else zzreplstr(")");
+        zzmore();
+      }
+    }
+    else if ( topint() == '|' ) { /* end of simple [...] */
+      popint();
+      zzmore();
+    }
+    else zzmore();
+	}
+
+
+static void act105()
+{ 
+		NLA = 37;
+    
+    zzmore();
+    zzreplstr(inline_set(zzbegexpr+
+    strlen("consumeUntil(")));
+	}
+
+
+static void act106()
+{ 
+		NLA = 38;
+    zzmore();   
+	}
+
+
+static void act107()
+{ 
+		NLA = 39;
+    zzline++; zzmore(); DAWDLE;   
+	}
+
+
+static void act108()
+{ 
+		NLA = 40;
+    zzmore();   
+	}
+
+
+static void act109()
+{ 
+		NLA = 41;
+    zzmore();   
+	}
+
+
+static void act110()
+{ 
+		NLA = 42;
+    if ( !GenCC ) {zzreplstr("zzaRet"); zzmore();}
+    else err("$$ use invalid in C++ mode");   
+	}
+
+
+static void act111()
+{ 
+		NLA = 43;
+    if ( !GenCC ) {zzreplstr("zzempty_attr"); zzmore();}
+    else err("$[] use invalid in C++ mode");   
+	}
+
+
+static void act112()
+{ 
+		NLA = 44;
+    
+    pushint(']');
+    if ( !GenCC ) zzreplstr("zzconstr_attr(");
+    else err("$[..] use invalid in C++ mode");
+    zzmore();
+	}
+
+
+static void act113()
+{ 
+		NLA = 45;
+    {
+      static char buf[100];
+      numericActionLabel=1;       /* MR10 */
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("$i attrib ref too big");
+      set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s)",
+      BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"_t%d%s",
+      BlkLevel-1,zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	}
+
+
+static void act114()
+{ 
+		NLA = 46;
+    {
+      static char buf[100];
+      numericActionLabel=1;       /* MR10 */
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("$i.field attrib ref too big");
+      zzbegexpr[strlen(zzbegexpr)-1] = ' ';
+      set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s).",
+      BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"_t%d%s.",
+      BlkLevel-1,zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	}
+
+
+static void act115()
+{ 
+		NLA = 47;
+    {
+      static char buf[100];
+      static char i[20], j[20];
+      char *p,*q;
+      numericActionLabel=1;       /* MR10 */
+      if (strlen(zzbegexpr)>(size_t)85) fatal("$i.j attrib ref too big");
+      for (p=zzbegexpr+1,q= &i[0]; *p!='.'; p++) {
+        if ( q == &i[20] )
+        fatalFL("i of $i.j attrib ref too big",
+        FileStr[CurFile], zzline );
+        *q++ = *p;
+      }
+      *q = '\0';
+      for (p++, q= &j[0]; *p!='\0'; p++) {
+        if ( q == &j[20] )
+        fatalFL("j of $i.j attrib ref too big",
+        FileStr[CurFile], zzline );
+        *q++ = *p;
+      }
+      *q = '\0';
+      if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%s,%s)",i,j);
+      else sprintf(buf,"_t%s%s",i,j);
+      zzreplstr(buf);
+      zzmore();
+      UsedOldStyleAttrib = 1;
+      if ( UsedNewStyleLabel )
+      err("cannot mix old-style $i with new-style labels");
+    }
+	}
+
+
+static void act116()
+{ 
+		NLA = 48;
+    { static char buf[300]; LabelEntry *el;
+      zzbegexpr[0] = ' ';
+      if ( CurRule != NULL &&
+      strcmp(CurRule, &zzbegexpr[1])==0 ) {
+        if ( !GenCC ) zzreplstr("zzaRet");
+      }
+      else if ( CurRetDef != NULL &&
+      strmember(CurRetDef, &zzbegexpr[1])) {
+        if ( hasMultipleOperands( CurRetDef ) ) {
+          require (strlen(zzbegexpr)<=(size_t)285,
+          "$retval attrib ref too big");
+          sprintf(buf,"_retv.%s",&zzbegexpr[1]);
+          zzreplstr(buf);
+        }
+        else zzreplstr("_retv");
+      }
+      else if ( CurParmDef != NULL &&
+      strmember(CurParmDef, &zzbegexpr[1])) {
+      ;
+    }
+    else if ( Elabel==NULL ) {
+    { err("$-variables in actions outside of rules are not allowed"); }
+  } else if ( (el=(LabelEntry *)hash_get(Elabel, &zzbegexpr[1]))!=NULL ) {
+  /* MR10 */
+  /* MR10 */                      /* element labels might exist without an elem when */
+  /* MR10 */                      /*  it is a forward reference (to a rule)          */
+  /* MR10 */
+  /* MR10 */						if ( GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) )
+  /* MR10 */							{ err(eMsg1("There are no token ptrs for rule references: '$%s'",&zzbegexpr[1])); }
+  /* MR10 */
+  /* MR10 */						if ( !GenCC && (el->elem == NULL || el->elem->ntype==nRuleRef) && GenAST) {
+  /* MR10 */                          err("You can no longer use attributes returned by rules when also using ASTs");
+  /* MR10 */                          err("   Use upward inheritance (\"rule >[Attrib a] : ... <<$a=...>>\")");
+  /* MR10 */                      };
+  /* MR10 */
+  /* MR10 */                      /* keep track of <<... $label ...>> for semantic predicates in guess mode */
+  /* MR10 */                      /* element labels contain pointer to the owners node                      */
+  /* MR10 */
+  /* MR10 */                      if (el->elem != NULL && el->elem->ntype == nToken) {
+  /* MR10 */                        list_add(&CurActionLabels,el);
+  /* MR10 */                      };
+}
+else
+warn(eMsg1("$%s not parameter, return value, (defined) element label",&zzbegexpr[1]));
+}
+zzmore();
+	}
+
+
+static void act117()
+{ 
+		NLA = 49;
+    zzreplstr("(*_root)"); zzmore(); chkGTFlag();   
+	}
+
+
+static void act118()
+{ 
+		NLA = 50;
+    if ( GenCC ) {
+      if (NewAST) zzreplstr("(newAST)");
+      else zzreplstr("(new AST)");}
+    else {zzreplstr("zzastnew()");} zzmore();
+    chkGTFlag();
+	}
+
+
+static void act119()
+{ 
+		NLA = 51;
+    zzreplstr("NULL"); zzmore(); chkGTFlag();   
+	}
+
+
+static void act120()
+{ 
+		NLA = 52;
+    {
+      static char buf[100];
+      if ( strlen(zzbegexpr)>(size_t)85 )
+      fatal("#i AST ref too big");
+      if ( GenCC ) sprintf(buf,"_ast%d%s",BlkLevel-1,zzbegexpr+1);
+      else sprintf(buf,"zzastArg(%s)",zzbegexpr+1);
+      zzreplstr(buf);
+      zzmore();
+      set_orel(atoi(zzbegexpr+1), &AST_nodes_refd_in_actions);
+      chkGTFlag();
+    }
+	}
+
+
+static void act121()
+{ 
+		NLA = 53;
+    
+    zzline = atoi(zzbegexpr+5) - 1; zzline++; zzmore();
+    getFileNameFromTheLineInfo(FileStr[CurFile], zzbegexpr);
+	}
+
+
+static void act122()
+{ 
+		NLA = 54;
+    
+    zzline++; zzmore();
+	}
+
+
+static void act123()
+{ 
+		NLA = 55;
+    
+    if ( !(strcmp(zzbegexpr, "#ifdef")==0 ||
+    strcmp(zzbegexpr, "#if")==0 ||
+    strcmp(zzbegexpr, "#else")==0 ||
+    strcmp(zzbegexpr, "#endif")==0 ||
+    strcmp(zzbegexpr, "#ifndef")==0 ||
+    strcmp(zzbegexpr, "#define")==0 ||
+    strcmp(zzbegexpr, "#pragma")==0 ||
+    strcmp(zzbegexpr, "#undef")==0 ||
+    strcmp(zzbegexpr, "#import")==0 ||
+    strcmp(zzbegexpr, "#line")==0 ||
+    strcmp(zzbegexpr, "#include")==0 ||
+    strcmp(zzbegexpr, "#error")==0) )
+    {
+      static char buf[100];
+      sprintf(buf, "%s_ast", zzbegexpr+1);
+      /* MR27 */						list_add(&CurAstLabelsInActions, mystrdup(zzbegexpr+1));
+      zzreplstr(buf);
+      chkGTFlag();
+    }
+    zzmore();
+	}
+
+
+static void act124()
+{ 
+		NLA = 56;
+    
+    pushint(']');
+    if ( GenCC ) {
+      if (NewAST) zzreplstr("(newAST(");
+      else zzreplstr("(new AST("); }
+    else zzreplstr("zzmk_ast(zzastnew(),");
+    zzmore();
+    chkGTFlag();
+	}
+
+
+static void act125()
+{ 
+		NLA = 57;
+    
+    pushint('}');
+    if ( GenCC ) {
+      if (tmakeInParser) {
+        zzreplstr("tmake(");
+      }
+      else {
+        zzreplstr("ASTBase::tmake(");
+      }
+    }
+    else {
+      zzreplstr("zztmake(");
+    }
+    zzmore();
+    chkGTFlag();
+	}
+
+
+static void act126()
+{ 
+		NLA = 58;
+    zzmore();   
+	}
+
+
+static void act127()
+{ 
+		NLA = 59;
+    
+    if ( istackempty() )
+    zzmore();
+    else if ( topint()==')' ) {
+      popint();
+    }
+    else if ( topint()=='}' ) {
+      popint();
+      /* terminate #(..) */
+      zzreplstr(", NULL)");
+    }
+    zzmore();
+	}
+
+
+static void act128()
+{ 
+		NLA = 60;
+    
+    pushint('|');	/* look for '|' to terminate simple [...] */
+    zzmore();
+	}
+
+
+static void act129()
+{ 
+		NLA = 61;
+    
+    pushint(')');
+    zzmore();
+	}
+
+
+static void act130()
+{ 
+		NLA = 62;
+    zzreplstr("]");  zzmore();   
+	}
+
+
+static void act131()
+{ 
+		NLA = 63;
+    zzreplstr(")");  zzmore();   
+	}
+
+
+static void act132()
+{ 
+		NLA = 64;
+    if (! tokenActionActive) zzreplstr(">");	 /* MR1 */
+    zzmore();				         /* MR1 */
+	}
+
+
+static void act133()
+{ 
+		NLA = 65;
+    zzmode(ACTION_CHARS); zzmore();  
+	}
+
+
+static void act134()
+{ 
+		NLA = 66;
+    zzmode(ACTION_STRINGS); zzmore();  
+	}
+
+
+static void act135()
+{ 
+		NLA = 67;
+    zzreplstr("$");  zzmore();   
+	}
+
+
+static void act136()
+{ 
+		NLA = 68;
+    zzreplstr("#");  zzmore();   
+	}
+
+
+static void act137()
+{ 
+		NLA = 69;
+    zzline++; zzmore();   
+	}
+
+
+static void act138()
+{ 
+		NLA = 70;
+    zzmore();   
+	}
+
+
+static void act139()
+{ 
+		NLA = 71;
+    zzmore();   
+	}
+
+
+static void act140()
+{ 
+		NLA = 72;
+    zzmode(ACTION_COMMENTS); zzmore();   
+	}
+
+
+static void act141()
+{ 
+		NLA = 73;
+    warn("Missing /*; found dangling */ in action"); zzmore();   
+	}
+
+
+static void act142()
+{ 
+		NLA = 74;
+    zzmode(ACTION_CPP_COMMENTS); zzmore();   
+	}
+
+
+static void act143()
+{ 
+		NLA = 75;
+    zzmore();   
+	}
+
+static unsigned char shift10[257] = {
+  0, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  16, 19, 33, 33, 20, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 16, 33, 28, 27, 21, 33, 33, 
+  30, 15, 18, 32, 33, 33, 33, 25, 31, 23, 
+  24, 24, 24, 24, 24, 24, 24, 24, 24, 33, 
+  33, 33, 33, 1, 2, 33, 26, 26, 26, 26, 
+  26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+  26, 26, 26, 26, 26, 26, 11, 26, 26, 26, 
+  26, 26, 22, 29, 3, 33, 26, 33, 26, 26, 
+  4, 26, 10, 26, 26, 26, 13, 26, 26, 14, 
+  9, 6, 5, 26, 26, 26, 7, 12, 8, 26, 
+  26, 26, 26, 26, 17, 33, 34, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33
+};
+
+
+static void act144()
+{ 
+		NLA = Eof;
+    ;   
+	}
+
+
+static void act145()
+{ 
+		NLA = 137;
+    zzskip();   
+	}
+
+
+static void act146()
+{ 
+		NLA = 138;
+    zzline++; zzskip();   
+	}
+
+
+static void act147()
+{ 
+		NLA = 139;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzmore();   
+	}
+
+
+static void act148()
+{ 
+		NLA = 140;
+    zzmode(TOK_DEF_COMMENTS); zzskip();   
+	}
+
+
+static void act149()
+{ 
+		NLA = 141;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act150()
+{ 
+		NLA = 142;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act151()
+{ 
+		NLA = 143;
+    ;   
+	}
+
+
+static void act152()
+{ 
+		NLA = 144;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act153()
+{ 
+		NLA = 145;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act154()
+{ 
+		NLA = 146;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act155()
+{ 
+		NLA = 147;
+    zzmode(TOK_DEF_CPP_COMMENTS); zzskip();   
+	}
+
+
+static void act156()
+{ 
+		NLA = 149;
+	}
+
+
+static void act157()
+{ 
+		NLA = 151;
+	}
+
+
+static void act158()
+{ 
+		NLA = 152;
+	}
+
+
+static void act159()
+{ 
+		NLA = 153;
+	}
+
+
+static void act160()
+{ 
+		NLA = 154;
+	}
+
+
+static void act161()
+{ 
+		NLA = 155;
+	}
+
+
+static void act162()
+{ 
+		NLA = 156;
+	}
+
+
+static void act163()
+{ 
+		NLA = INT;
+	}
+
+
+static void act164()
+{ 
+		NLA = ID;
+	}
+
+static unsigned char shift11[257] = {
+  0, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  1, 2, 27, 27, 3, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 1, 27, 27, 6, 27, 27, 27, 
+  27, 27, 27, 5, 27, 22, 27, 27, 4, 25, 
+  25, 25, 25, 25, 25, 25, 25, 25, 25, 27, 
+  24, 27, 21, 27, 27, 27, 26, 26, 26, 26, 
+  26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+  26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 
+  26, 26, 27, 27, 27, 27, 26, 27, 26, 26, 
+  26, 9, 10, 8, 26, 26, 7, 26, 26, 12, 
+  15, 11, 17, 16, 26, 18, 13, 19, 14, 26, 
+  26, 26, 26, 26, 20, 27, 23, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 
+  27, 27, 27, 27, 27, 27, 27
+};
+
+#define DfaStates	436
+typedef unsigned short DfaState;
+
+static DfaState st0[60] = {
+  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
+  11, 11, 11, 12, 13, 13, 13, 14, 15, 16, 
+  17, 11, 11, 18, 11, 11, 19, 11, 11, 19, 
+  11, 11, 11, 11, 20, 11, 11, 21, 22, 23, 
+  24, 25, 26, 11, 27, 28, 29, 30, 31, 32, 
+  33, 34, 35, 36, 11, 11, 19, 436, 436, 436
+};
+
+static DfaState st1[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st2[60] = {
+  436, 2, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st3[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st4[60] = {
+  436, 436, 37, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st5[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st6[60] = {
+  436, 436, 436, 436, 436, 38, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st7[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st8[60] = {
+  436, 436, 436, 436, 436, 436, 436, 39, 40, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st9[60] = {
+  436, 436, 436, 436, 436, 436, 436, 41, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st10[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  42, 43, 43, 44, 43, 43, 43, 436, 436, 436, 
+  436, 45, 43, 43, 43, 43, 46, 43, 47, 43, 
+  43, 43, 43, 48, 43, 49, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st11[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st12[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 51, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st13[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 13, 13, 13, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st14[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 52, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st15[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 53, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st16[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st17[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 54, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st18[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 55, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st19[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  56, 56, 56, 56, 56, 56, 56, 436, 436, 436, 
+  436, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
+  56, 56, 56, 56, 56, 56, 56, 436, 56, 436, 
+  436, 436, 436, 56, 436, 436, 436, 436, 436, 436, 
+  436, 56, 436, 436, 56, 56, 56, 56, 436, 436
+};
+
+static DfaState st20[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 57, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st21[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st22[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  58, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 59, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st23[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st24[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st25[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st26[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st27[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 60, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st28[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 61, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st29[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st30[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st31[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 62, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st32[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st33[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st34[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  56, 56, 56, 56, 56, 56, 56, 436, 436, 436, 
+  436, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
+  56, 56, 56, 56, 56, 56, 56, 436, 56, 436, 
+  436, 436, 436, 56, 436, 436, 436, 436, 436, 436, 
+  436, 63, 436, 436, 56, 56, 56, 56, 436, 436
+};
+
+static DfaState st35[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st36[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st37[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st38[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st39[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st40[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st41[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st42[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 64, 43, 65, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st43[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st44[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 66, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st45[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 67, 68, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st46[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 69, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st47[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 70, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st48[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 71, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st49[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 72, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st50[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st51[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 73, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st52[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st53[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st54[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  74, 43, 43, 44, 43, 43, 43, 436, 436, 436, 
+  436, 45, 43, 43, 43, 43, 46, 43, 47, 43, 
+  43, 43, 43, 48, 43, 49, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st55[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 75, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st56[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  56, 56, 56, 56, 56, 56, 56, 436, 436, 436, 
+  436, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
+  56, 56, 56, 56, 56, 56, 56, 436, 56, 436, 
+  436, 436, 436, 56, 436, 436, 436, 436, 436, 436, 
+  436, 56, 436, 436, 56, 56, 56, 56, 436, 436
+};
+
+static DfaState st57[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 76, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st58[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 77, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st59[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 78, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st60[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st61[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st62[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st63[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  56, 56, 56, 56, 56, 56, 56, 436, 436, 436, 
+  436, 56, 56, 56, 56, 56, 56, 56, 56, 56, 
+  56, 56, 56, 56, 56, 56, 56, 436, 56, 436, 
+  436, 436, 436, 56, 436, 436, 79, 436, 436, 436, 
+  436, 56, 436, 436, 56, 56, 56, 56, 436, 436
+};
+
+static DfaState st64[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 80, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st65[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 81, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st66[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 82, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st67[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 83, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 84, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st68[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 85, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st69[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 86, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st70[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 87, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st71[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 88, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st72[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 89, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st73[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 90, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st74[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 65, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st75[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 91, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st76[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 92, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st77[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 93, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st78[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 94, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st79[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 95, 96, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st80[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 97, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st81[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 98, 43, 99, 43, 100, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 101, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st82[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 102, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st83[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 103, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st84[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 104, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st85[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 105, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st86[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 106, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st87[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 107, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 108, 43, 43, 436, 109, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st88[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 110, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st89[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 111, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st90[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 112, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st91[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 113, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st92[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 114, 50, 50, 50, 436, 436
+};
+
+static DfaState st93[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 115, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st94[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 116, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st95[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 117, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st96[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 118, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st97[60] = {
+  436, 119, 120, 121, 122, 122, 122, 122, 122, 122, 
+  123, 123, 123, 123, 124, 124, 124, 122, 122, 122, 
+  122, 123, 123, 123, 123, 123, 123, 123, 123, 123, 
+  123, 123, 123, 123, 123, 123, 123, 122, 123, 122, 
+  122, 122, 122, 123, 122, 122, 122, 122, 122, 122, 
+  122, 123, 122, 122, 123, 123, 123, 123, 122, 436
+};
+
+static DfaState st98[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 125, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st99[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 126, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st100[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 127, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st101[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  128, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st102[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  129, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st103[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st104[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 130, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st105[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 131, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st106[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 132, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st107[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 133, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st108[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 134, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st109[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  135, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st110[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 136, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st111[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 137, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st112[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 138, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st113[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 139, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st114[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  140, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st115[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st116[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st117[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st118[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st119[60] = {
+  436, 119, 120, 121, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 141, 141, 141, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st120[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st121[60] = {
+  436, 436, 142, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st122[60] = {
+  436, 122, 120, 121, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st123[60] = {
+  436, 122, 120, 121, 122, 122, 122, 122, 122, 122, 
+  123, 123, 123, 123, 123, 123, 123, 122, 122, 122, 
+  122, 123, 123, 123, 123, 123, 123, 123, 123, 123, 
+  123, 123, 123, 123, 123, 123, 123, 122, 123, 122, 
+  122, 122, 122, 123, 122, 122, 122, 122, 122, 122, 
+  122, 123, 122, 122, 123, 123, 123, 123, 122, 436
+};
+
+static DfaState st124[60] = {
+  436, 143, 144, 145, 122, 122, 146, 122, 122, 122, 
+  123, 123, 123, 123, 124, 124, 124, 122, 122, 122, 
+  122, 123, 123, 123, 123, 123, 123, 123, 123, 123, 
+  123, 123, 123, 123, 123, 123, 123, 122, 123, 122, 
+  122, 122, 122, 123, 122, 122, 122, 122, 122, 122, 
+  122, 123, 122, 122, 123, 123, 123, 123, 122, 436
+};
+
+static DfaState st125[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 147, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st126[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 148, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st127[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 149, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st128[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 150, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st129[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 151, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st130[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 152, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st131[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 153, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st132[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 154, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st133[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st134[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 155, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st135[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 156, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st136[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 157, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st137[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st138[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 158, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st139[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st140[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 159, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st141[60] = {
+  436, 143, 144, 145, 122, 122, 146, 122, 122, 122, 
+  122, 122, 122, 122, 141, 141, 141, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st142[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st143[60] = {
+  436, 143, 120, 121, 122, 122, 146, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st144[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st145[60] = {
+  436, 436, 160, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st146[60] = {
+  436, 161, 162, 163, 161, 161, 122, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 436
+};
+
+static DfaState st147[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 164, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st148[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 165, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st149[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 166, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st150[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 167, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st151[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 168, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st152[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st153[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st154[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 169, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st155[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 170, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st156[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 171, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st157[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st158[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 172, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st159[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st160[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st161[60] = {
+  436, 161, 162, 163, 161, 161, 173, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 
+  161, 161, 161, 161, 161, 161, 161, 161, 161, 436
+};
+
+static DfaState st162[60] = {
+  436, 174, 174, 174, 174, 174, 175, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 436
+};
+
+static DfaState st163[60] = {
+  436, 174, 176, 174, 174, 174, 175, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 436
+};
+
+static DfaState st164[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 177, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st165[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 178, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st166[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 179, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st167[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 180, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st168[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 181, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st169[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 182, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st170[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st171[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 183, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st172[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 184, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st173[60] = {
+  436, 185, 144, 145, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 186, 186, 186, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st174[60] = {
+  436, 174, 174, 174, 174, 174, 175, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 436
+};
+
+static DfaState st175[60] = {
+  436, 187, 188, 189, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 190, 190, 190, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st176[60] = {
+  436, 174, 174, 174, 174, 174, 175, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 174, 
+  174, 174, 174, 174, 174, 174, 174, 174, 174, 436
+};
+
+static DfaState st177[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 191, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st178[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 192, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st179[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 193, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st180[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st181[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st182[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 194, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st183[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st184[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  50, 50, 50, 50, 50, 50, 50, 436, 436, 436, 
+  436, 50, 50, 50, 50, 50, 50, 50, 50, 50, 
+  50, 50, 50, 50, 50, 50, 50, 436, 50, 436, 
+  436, 436, 436, 50, 436, 436, 436, 436, 436, 436, 
+  436, 50, 436, 436, 50, 50, 50, 50, 436, 436
+};
+
+static DfaState st185[60] = {
+  436, 185, 144, 145, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 186, 186, 186, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st186[60] = {
+  436, 185, 144, 145, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 186, 186, 186, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
+  122, 122, 122, 122, 122, 122, 122, 122, 122, 436
+};
+
+static DfaState st187[60] = {
+  436, 187, 188, 189, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 190, 190, 190, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st188[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st189[60] = {
+  436, 436, 195, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st190[60] = {
+  436, 187, 188, 189, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 190, 190, 190, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st191[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st192[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st193[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st194[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  196, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st195[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st196[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 197, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st197[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 198, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st198[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 199, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st199[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  200, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st200[60] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  43, 43, 43, 43, 43, 43, 43, 436, 436, 436, 
+  436, 43, 43, 43, 43, 43, 43, 43, 43, 43, 
+  43, 43, 43, 43, 43, 43, 43, 436, 43, 436, 
+  436, 436, 436, 43, 436, 436, 436, 436, 436, 436, 
+  436, 43, 436, 436, 43, 43, 43, 43, 436, 436
+};
+
+static DfaState st201[7] = {
+  202, 203, 204, 205, 206, 207, 436
+};
+
+static DfaState st202[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st203[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st204[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st205[7] = {
+  436, 436, 208, 436, 436, 436, 436
+};
+
+static DfaState st206[7] = {
+  436, 209, 210, 211, 209, 209, 436
+};
+
+static DfaState st207[7] = {
+  436, 436, 436, 436, 436, 207, 436
+};
+
+static DfaState st208[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st209[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st210[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st211[7] = {
+  436, 436, 212, 436, 436, 436, 436
+};
+
+static DfaState st212[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st213[7] = {
+  214, 215, 216, 217, 218, 219, 436
+};
+
+static DfaState st214[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st215[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st216[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st217[7] = {
+  436, 436, 220, 436, 436, 436, 436
+};
+
+static DfaState st218[7] = {
+  436, 221, 222, 223, 221, 221, 436
+};
+
+static DfaState st219[7] = {
+  436, 436, 436, 436, 436, 219, 436
+};
+
+static DfaState st220[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st221[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st222[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st223[7] = {
+  436, 436, 224, 436, 436, 436, 436
+};
+
+static DfaState st224[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st225[7] = {
+  226, 227, 228, 229, 230, 231, 436
+};
+
+static DfaState st226[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st227[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st228[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st229[7] = {
+  436, 436, 232, 436, 436, 436, 436
+};
+
+static DfaState st230[7] = {
+  436, 233, 233, 233, 233, 233, 436
+};
+
+static DfaState st231[7] = {
+  436, 436, 436, 436, 436, 231, 436
+};
+
+static DfaState st232[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st233[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st234[7] = {
+  235, 236, 237, 238, 239, 237, 436
+};
+
+static DfaState st235[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st236[7] = {
+  436, 436, 240, 436, 436, 436, 436
+};
+
+static DfaState st237[7] = {
+  436, 436, 237, 436, 436, 237, 436
+};
+
+static DfaState st238[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st239[7] = {
+  436, 436, 436, 241, 436, 436, 436
+};
+
+static DfaState st240[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st241[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st242[7] = {
+  243, 244, 245, 246, 247, 245, 436
+};
+
+static DfaState st243[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st244[7] = {
+  436, 436, 248, 436, 436, 436, 436
+};
+
+static DfaState st245[7] = {
+  436, 436, 245, 436, 436, 245, 436
+};
+
+static DfaState st246[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st247[7] = {
+  436, 436, 436, 249, 436, 436, 436
+};
+
+static DfaState st248[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st249[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st250[5] = {
+  251, 252, 253, 254, 436
+};
+
+static DfaState st251[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st252[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st253[5] = {
+  436, 255, 436, 436, 436
+};
+
+static DfaState st254[5] = {
+  436, 436, 436, 254, 436
+};
+
+static DfaState st255[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st256[5] = {
+  257, 258, 259, 260, 436
+};
+
+static DfaState st257[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st258[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st259[5] = {
+  436, 261, 436, 436, 436
+};
+
+static DfaState st260[5] = {
+  436, 436, 436, 260, 436
+};
+
+static DfaState st261[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st262[5] = {
+  263, 264, 265, 266, 436
+};
+
+static DfaState st263[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st264[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st265[5] = {
+  436, 267, 436, 436, 436
+};
+
+static DfaState st266[5] = {
+  436, 436, 436, 266, 436
+};
+
+static DfaState st267[5] = {
+  436, 436, 436, 436, 436
+};
+
+static DfaState st268[7] = {
+  269, 270, 271, 272, 273, 271, 436
+};
+
+static DfaState st269[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st270[7] = {
+  436, 436, 274, 436, 436, 436, 436
+};
+
+static DfaState st271[7] = {
+  436, 436, 271, 436, 436, 271, 436
+};
+
+static DfaState st272[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st273[7] = {
+  436, 436, 436, 275, 436, 436, 436
+};
+
+static DfaState st274[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st275[7] = {
+  436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st276[36] = {
+  277, 278, 279, 280, 281, 279, 279, 279, 279, 279, 
+  279, 279, 279, 279, 279, 282, 279, 279, 283, 284, 
+  285, 286, 287, 279, 279, 279, 279, 288, 289, 290, 
+  291, 292, 293, 279, 279, 436
+};
+
+static DfaState st277[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st278[36] = {
+  436, 294, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st279[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st280[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st281[36] = {
+  436, 436, 279, 436, 279, 295, 279, 279, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st282[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st283[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st284[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st285[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 296, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st286[36] = {
+  436, 436, 436, 436, 297, 297, 297, 297, 297, 297, 
+  297, 297, 297, 297, 297, 436, 436, 436, 436, 436, 
+  436, 298, 299, 300, 300, 436, 297, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st287[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st288[36] = {
+  436, 436, 436, 436, 301, 301, 301, 301, 301, 301, 
+  301, 301, 301, 301, 302, 303, 436, 436, 436, 436, 
+  436, 436, 304, 305, 306, 436, 301, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st289[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st290[36] = {
+  436, 307, 308, 309, 308, 308, 308, 308, 308, 308, 
+  308, 308, 308, 308, 308, 308, 308, 308, 310, 311, 
+  312, 313, 308, 308, 308, 308, 308, 314, 308, 308, 
+  308, 308, 308, 308, 308, 436
+};
+
+static DfaState st291[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st292[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 315, 316, 436, 436, 436
+};
+
+static DfaState st293[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 317, 279, 279, 279, 436
+};
+
+static DfaState st294[36] = {
+  436, 436, 318, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st295[36] = {
+  436, 436, 279, 436, 279, 279, 319, 279, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st296[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st297[36] = {
+  436, 436, 436, 436, 320, 320, 320, 320, 320, 320, 
+  320, 320, 320, 320, 320, 436, 436, 436, 436, 436, 
+  436, 436, 436, 320, 320, 436, 320, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st298[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st299[36] = {
+  436, 436, 436, 321, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st300[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 300, 300, 322, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st301[36] = {
+  436, 436, 436, 436, 323, 323, 323, 323, 323, 323, 
+  323, 323, 323, 323, 323, 436, 436, 436, 436, 436, 
+  436, 436, 436, 323, 323, 436, 323, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st302[36] = {
+  436, 436, 436, 436, 323, 323, 323, 323, 323, 323, 
+  323, 323, 323, 324, 323, 436, 436, 436, 436, 436, 
+  436, 436, 436, 323, 323, 436, 323, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st303[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 325, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st304[36] = {
+  436, 436, 436, 326, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st305[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 306, 306, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st306[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 306, 306, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st307[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st308[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st309[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st310[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st311[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st312[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 327, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st313[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st314[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st315[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st316[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st317[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st318[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st319[36] = {
+  436, 436, 279, 436, 279, 279, 279, 328, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st320[36] = {
+  436, 436, 436, 436, 320, 320, 320, 320, 320, 320, 
+  320, 320, 320, 320, 320, 436, 436, 436, 436, 436, 
+  436, 436, 436, 320, 320, 436, 320, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st321[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st322[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 329, 329, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st323[36] = {
+  436, 436, 436, 436, 323, 323, 323, 323, 323, 323, 
+  323, 323, 323, 323, 323, 436, 436, 436, 436, 436, 
+  436, 436, 436, 323, 323, 436, 323, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st324[36] = {
+  436, 436, 436, 436, 323, 323, 330, 323, 323, 323, 
+  323, 323, 323, 323, 323, 436, 436, 436, 436, 436, 
+  436, 436, 436, 323, 323, 436, 323, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st325[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st326[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st327[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st328[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 331, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st329[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 329, 329, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st330[36] = {
+  436, 436, 436, 436, 323, 323, 323, 323, 323, 323, 
+  332, 323, 323, 323, 323, 436, 436, 436, 436, 436, 
+  436, 436, 436, 323, 323, 436, 323, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st331[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 333, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st332[36] = {
+  436, 334, 334, 334, 335, 335, 335, 335, 335, 335, 
+  335, 335, 335, 335, 335, 334, 336, 334, 334, 337, 
+  338, 334, 334, 339, 339, 334, 335, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st333[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  340, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st334[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 334, 334, 334, 337, 
+  338, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st335[36] = {
+  436, 334, 334, 334, 335, 335, 335, 335, 335, 335, 
+  335, 335, 335, 335, 335, 334, 334, 334, 334, 337, 
+  338, 334, 334, 335, 335, 334, 335, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st336[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 336, 334, 334, 337, 
+  338, 334, 334, 341, 341, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st337[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st338[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 342, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st339[36] = {
+  436, 334, 334, 334, 335, 335, 335, 335, 335, 335, 
+  335, 335, 335, 335, 335, 334, 343, 334, 334, 344, 
+  345, 334, 334, 339, 339, 334, 335, 334, 346, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st340[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 347, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st341[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 343, 334, 334, 344, 
+  345, 334, 334, 341, 341, 334, 334, 334, 346, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st342[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st343[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 343, 334, 334, 337, 
+  338, 334, 334, 334, 334, 334, 334, 334, 346, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st344[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st345[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 348, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st346[36] = {
+  436, 349, 349, 349, 349, 349, 349, 349, 349, 349, 
+  349, 349, 349, 349, 349, 349, 349, 349, 349, 350, 
+  351, 349, 349, 349, 349, 349, 349, 349, 334, 349, 
+  349, 349, 349, 349, 349, 436
+};
+
+static DfaState st347[36] = {
+  436, 436, 279, 436, 279, 279, 352, 279, 279, 279, 
+  279, 279, 279, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st348[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st349[36] = {
+  436, 349, 349, 349, 349, 349, 349, 349, 349, 349, 
+  349, 349, 349, 349, 349, 349, 349, 349, 349, 350, 
+  351, 349, 349, 349, 349, 349, 349, 349, 353, 349, 
+  349, 349, 349, 349, 349, 436
+};
+
+static DfaState st350[36] = {
+  436, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 355, 354, 
+  354, 354, 354, 354, 354, 436
+};
+
+static DfaState st351[36] = {
+  436, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 354, 356, 
+  354, 354, 354, 354, 354, 354, 354, 354, 355, 354, 
+  354, 354, 354, 354, 354, 436
+};
+
+static DfaState st352[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 357, 279, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st353[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 358, 334, 334, 344, 
+  345, 334, 334, 359, 359, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st354[36] = {
+  436, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 355, 354, 
+  354, 354, 354, 354, 354, 436
+};
+
+static DfaState st355[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 360, 436, 436, 361, 
+  362, 436, 436, 363, 363, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st356[36] = {
+  436, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 354, 354, 
+  354, 354, 354, 354, 354, 354, 354, 354, 355, 354, 
+  354, 354, 354, 354, 354, 436
+};
+
+static DfaState st357[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 279, 364, 279, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st358[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 358, 334, 334, 344, 
+  345, 334, 334, 359, 359, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st359[36] = {
+  436, 334, 334, 334, 334, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 334, 358, 334, 334, 344, 
+  345, 334, 334, 359, 359, 334, 334, 334, 334, 334, 
+  334, 334, 334, 334, 334, 436
+};
+
+static DfaState st360[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 360, 436, 436, 361, 
+  362, 436, 436, 363, 363, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st361[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st362[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 365, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st363[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 360, 436, 436, 361, 
+  362, 436, 436, 363, 363, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st364[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 279, 279, 366, 436, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st365[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st366[36] = {
+  436, 436, 279, 436, 279, 279, 279, 279, 279, 279, 
+  279, 279, 279, 279, 279, 367, 279, 279, 436, 436, 
+  436, 436, 436, 279, 279, 279, 279, 436, 436, 436, 
+  436, 436, 279, 279, 279, 436
+};
+
+static DfaState st367[36] = {
+  436, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 368, 369, 370, 436, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 436
+};
+
+static DfaState st368[36] = {
+  436, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 371, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 436
+};
+
+static DfaState st369[36] = {
+  436, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 368, 369, 370, 371, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 436
+};
+
+static DfaState st370[36] = {
+  436, 372, 372, 372, 372, 372, 372, 372, 372, 372, 
+  372, 372, 372, 372, 372, 372, 372, 372, 373, 372, 
+  372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 
+  372, 372, 372, 372, 368, 436
+};
+
+static DfaState st371[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st372[36] = {
+  436, 372, 372, 372, 372, 372, 372, 372, 372, 372, 
+  372, 372, 372, 372, 372, 372, 372, 372, 373, 372, 
+  372, 372, 372, 372, 372, 372, 372, 372, 372, 372, 
+  372, 372, 372, 372, 374, 436
+};
+
+static DfaState st373[36] = {
+  436, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 376, 436
+};
+
+static DfaState st374[36] = {
+  436, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 368, 377, 368, 378, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 436
+};
+
+static DfaState st375[36] = {
+  436, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 375, 375, 375, 375, 375, 375, 
+  375, 375, 375, 375, 376, 436
+};
+
+static DfaState st376[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 379, 436, 380, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st377[36] = {
+  436, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 368, 377, 368, 378, 368, 
+  368, 368, 368, 368, 368, 368, 368, 368, 368, 368, 
+  368, 368, 368, 368, 368, 436
+};
+
+static DfaState st378[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st379[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 379, 436, 380, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st380[36] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436
+};
+
+static DfaState st381[28] = {
+  382, 383, 384, 385, 386, 436, 387, 388, 388, 388, 
+  389, 388, 388, 388, 388, 388, 388, 388, 388, 388, 
+  390, 391, 392, 393, 394, 395, 388, 436
+};
+
+static DfaState st382[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st383[28] = {
+  436, 383, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st384[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st385[28] = {
+  436, 436, 396, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st386[28] = {
+  436, 436, 436, 436, 397, 398, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st387[28] = {
+  436, 436, 436, 436, 436, 436, 436, 399, 436, 400, 
+  401, 436, 436, 436, 402, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st388[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st389[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 404, 403, 403, 403, 403, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st390[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st391[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st392[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st393[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st394[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st395[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 395, 436, 436
+};
+
+static DfaState st396[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st397[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st398[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st399[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 405, 436, 
+  436, 436, 436, 436, 436, 406, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st400[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  407, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st401[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 408, 409, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st402[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 410, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st403[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st404[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 403, 403, 403, 411, 403, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st405[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 412, 
+  436, 413, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st406[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 414, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st407[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 415, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st408[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 416, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st409[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 417, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st410[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 418, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st411[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 403, 403, 403, 403, 419, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st412[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  420, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st413[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 421, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st414[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 422, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st415[28] = {
+  436, 436, 436, 436, 436, 436, 436, 423, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st416[28] = {
+  436, 436, 436, 436, 436, 436, 436, 424, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st417[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  425, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st418[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  426, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st419[28] = {
+  436, 436, 436, 436, 436, 436, 436, 403, 403, 403, 
+  403, 403, 403, 403, 403, 403, 403, 403, 403, 403, 
+  436, 436, 436, 436, 436, 403, 403, 436
+};
+
+static DfaState st420[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 427, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st421[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  428, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st422[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 429, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st423[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 430, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st424[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 431, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st425[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st426[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 432, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st427[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st428[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 433, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st429[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 434, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st430[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  435, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st431[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st432[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st433[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st434[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+static DfaState st435[28] = {
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436, 436, 436, 
+  436, 436, 436, 436, 436, 436, 436, 436
+};
+
+
+DfaState *dfa[436] = {
+	st0,
+	st1,
+	st2,
+	st3,
+	st4,
+	st5,
+	st6,
+	st7,
+	st8,
+	st9,
+	st10,
+	st11,
+	st12,
+	st13,
+	st14,
+	st15,
+	st16,
+	st17,
+	st18,
+	st19,
+	st20,
+	st21,
+	st22,
+	st23,
+	st24,
+	st25,
+	st26,
+	st27,
+	st28,
+	st29,
+	st30,
+	st31,
+	st32,
+	st33,
+	st34,
+	st35,
+	st36,
+	st37,
+	st38,
+	st39,
+	st40,
+	st41,
+	st42,
+	st43,
+	st44,
+	st45,
+	st46,
+	st47,
+	st48,
+	st49,
+	st50,
+	st51,
+	st52,
+	st53,
+	st54,
+	st55,
+	st56,
+	st57,
+	st58,
+	st59,
+	st60,
+	st61,
+	st62,
+	st63,
+	st64,
+	st65,
+	st66,
+	st67,
+	st68,
+	st69,
+	st70,
+	st71,
+	st72,
+	st73,
+	st74,
+	st75,
+	st76,
+	st77,
+	st78,
+	st79,
+	st80,
+	st81,
+	st82,
+	st83,
+	st84,
+	st85,
+	st86,
+	st87,
+	st88,
+	st89,
+	st90,
+	st91,
+	st92,
+	st93,
+	st94,
+	st95,
+	st96,
+	st97,
+	st98,
+	st99,
+	st100,
+	st101,
+	st102,
+	st103,
+	st104,
+	st105,
+	st106,
+	st107,
+	st108,
+	st109,
+	st110,
+	st111,
+	st112,
+	st113,
+	st114,
+	st115,
+	st116,
+	st117,
+	st118,
+	st119,
+	st120,
+	st121,
+	st122,
+	st123,
+	st124,
+	st125,
+	st126,
+	st127,
+	st128,
+	st129,
+	st130,
+	st131,
+	st132,
+	st133,
+	st134,
+	st135,
+	st136,
+	st137,
+	st138,
+	st139,
+	st140,
+	st141,
+	st142,
+	st143,
+	st144,
+	st145,
+	st146,
+	st147,
+	st148,
+	st149,
+	st150,
+	st151,
+	st152,
+	st153,
+	st154,
+	st155,
+	st156,
+	st157,
+	st158,
+	st159,
+	st160,
+	st161,
+	st162,
+	st163,
+	st164,
+	st165,
+	st166,
+	st167,
+	st168,
+	st169,
+	st170,
+	st171,
+	st172,
+	st173,
+	st174,
+	st175,
+	st176,
+	st177,
+	st178,
+	st179,
+	st180,
+	st181,
+	st182,
+	st183,
+	st184,
+	st185,
+	st186,
+	st187,
+	st188,
+	st189,
+	st190,
+	st191,
+	st192,
+	st193,
+	st194,
+	st195,
+	st196,
+	st197,
+	st198,
+	st199,
+	st200,
+	st201,
+	st202,
+	st203,
+	st204,
+	st205,
+	st206,
+	st207,
+	st208,
+	st209,
+	st210,
+	st211,
+	st212,
+	st213,
+	st214,
+	st215,
+	st216,
+	st217,
+	st218,
+	st219,
+	st220,
+	st221,
+	st222,
+	st223,
+	st224,
+	st225,
+	st226,
+	st227,
+	st228,
+	st229,
+	st230,
+	st231,
+	st232,
+	st233,
+	st234,
+	st235,
+	st236,
+	st237,
+	st238,
+	st239,
+	st240,
+	st241,
+	st242,
+	st243,
+	st244,
+	st245,
+	st246,
+	st247,
+	st248,
+	st249,
+	st250,
+	st251,
+	st252,
+	st253,
+	st254,
+	st255,
+	st256,
+	st257,
+	st258,
+	st259,
+	st260,
+	st261,
+	st262,
+	st263,
+	st264,
+	st265,
+	st266,
+	st267,
+	st268,
+	st269,
+	st270,
+	st271,
+	st272,
+	st273,
+	st274,
+	st275,
+	st276,
+	st277,
+	st278,
+	st279,
+	st280,
+	st281,
+	st282,
+	st283,
+	st284,
+	st285,
+	st286,
+	st287,
+	st288,
+	st289,
+	st290,
+	st291,
+	st292,
+	st293,
+	st294,
+	st295,
+	st296,
+	st297,
+	st298,
+	st299,
+	st300,
+	st301,
+	st302,
+	st303,
+	st304,
+	st305,
+	st306,
+	st307,
+	st308,
+	st309,
+	st310,
+	st311,
+	st312,
+	st313,
+	st314,
+	st315,
+	st316,
+	st317,
+	st318,
+	st319,
+	st320,
+	st321,
+	st322,
+	st323,
+	st324,
+	st325,
+	st326,
+	st327,
+	st328,
+	st329,
+	st330,
+	st331,
+	st332,
+	st333,
+	st334,
+	st335,
+	st336,
+	st337,
+	st338,
+	st339,
+	st340,
+	st341,
+	st342,
+	st343,
+	st344,
+	st345,
+	st346,
+	st347,
+	st348,
+	st349,
+	st350,
+	st351,
+	st352,
+	st353,
+	st354,
+	st355,
+	st356,
+	st357,
+	st358,
+	st359,
+	st360,
+	st361,
+	st362,
+	st363,
+	st364,
+	st365,
+	st366,
+	st367,
+	st368,
+	st369,
+	st370,
+	st371,
+	st372,
+	st373,
+	st374,
+	st375,
+	st376,
+	st377,
+	st378,
+	st379,
+	st380,
+	st381,
+	st382,
+	st383,
+	st384,
+	st385,
+	st386,
+	st387,
+	st388,
+	st389,
+	st390,
+	st391,
+	st392,
+	st393,
+	st394,
+	st395,
+	st396,
+	st397,
+	st398,
+	st399,
+	st400,
+	st401,
+	st402,
+	st403,
+	st404,
+	st405,
+	st406,
+	st407,
+	st408,
+	st409,
+	st410,
+	st411,
+	st412,
+	st413,
+	st414,
+	st415,
+	st416,
+	st417,
+	st418,
+	st419,
+	st420,
+	st421,
+	st422,
+	st423,
+	st424,
+	st425,
+	st426,
+	st427,
+	st428,
+	st429,
+	st430,
+	st431,
+	st432,
+	st433,
+	st434,
+	st435
+};
+
+
+DfaState accepts[437] = {
+  0, 1, 2, 3, 3, 4, 25, 6, 0, 50, 
+  59, 57, 57, 43, 26, 13, 14, 0, 57, 58, 
+  57, 21, 57, 23, 24, 27, 28, 44, 0, 35, 
+  36, 42, 45, 46, 58, 51, 52, 3, 5, 9, 
+  7, 8, 59, 59, 59, 59, 59, 59, 59, 59, 
+  57, 57, 12, 40, 59, 57, 58, 57, 57, 57, 
+  33, 34, 53, 58, 59, 59, 59, 59, 59, 59, 
+  59, 59, 59, 57, 59, 57, 57, 57, 57, 0, 
+  59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 
+  57, 57, 57, 57, 57, 0, 0, 59, 59, 59, 
+  59, 59, 59, 32, 59, 59, 59, 59, 59, 59, 
+  59, 59, 57, 57, 57, 22, 56, 48, 49, 0, 
+  11, 11, 0, 59, 59, 59, 59, 59, 59, 59, 
+  59, 59, 59, 41, 59, 59, 59, 18, 57, 47, 
+  57, 0, 11, 0, 10, 10, 0, 59, 59, 59, 
+  59, 59, 15, 19, 59, 59, 59, 17, 57, 55, 
+  10, 0, 11, 11, 59, 59, 59, 59, 59, 59, 
+  20, 59, 57, 0, 0, 0, 11, 59, 59, 59, 
+  37, 38, 59, 39, 54, 0, 0, 0, 10, 10, 
+  0, 31, 29, 30, 59, 10, 59, 59, 59, 59, 
+  16, 0, 60, 61, 62, 62, 0, 65, 62, 64, 
+  63, 63, 63, 0, 66, 67, 68, 68, 0, 71, 
+  68, 70, 69, 69, 69, 0, 72, 73, 74, 74, 
+  0, 76, 74, 75, 0, 77, 79, 81, 80, 80, 
+  78, 80, 0, 82, 84, 86, 85, 85, 83, 85, 
+  0, 87, 88, 88, 89, 88, 0, 90, 91, 91, 
+  92, 91, 0, 93, 94, 94, 95, 94, 0, 96, 
+  98, 100, 99, 99, 97, 99, 0, 101, 108, 143, 
+  104, 143, 129, 127, 107, 107, 109, 128, 126, 134, 
+  0, 133, 139, 143, 102, 143, 107, 116, 110, 112, 
+  113, 123, 123, 125, 124, 117, 120, 132, 138, 130, 
+  131, 137, 137, 135, 136, 142, 140, 141, 103, 143, 
+  116, 111, 114, 123, 123, 119, 118, 137, 143, 115, 
+  123, 143, 123, 143, 0, 123, 0, 122, 122, 123, 
+  143, 0, 122, 0, 121, 121, 0, 143, 121, 0, 
+  122, 122, 143, 0, 0, 0, 122, 143, 0, 0, 
+  0, 121, 121, 0, 143, 121, 143, 0, 0, 0, 
+  0, 106, 0, 106, 0, 0, 0, 0, 105, 0, 
+  105, 0, 144, 145, 146, 146, 0, 0, 164, 164, 
+  158, 159, 160, 161, 162, 163, 146, 147, 148, 0, 
+  0, 0, 0, 164, 164, 150, 0, 0, 0, 0, 
+  0, 164, 0, 0, 0, 0, 0, 0, 0, 157, 
+  0, 0, 0, 0, 0, 152, 0, 149, 0, 0, 
+  0, 153, 154, 151, 155, 156, 0
+};
+
+void (*actions[165])() = {
+	zzerraction,
+	act1,
+	act2,
+	act3,
+	act4,
+	act5,
+	act6,
+	act7,
+	act8,
+	act9,
+	act10,
+	act11,
+	act12,
+	act13,
+	act14,
+	act15,
+	act16,
+	act17,
+	act18,
+	act19,
+	act20,
+	act21,
+	act22,
+	act23,
+	act24,
+	act25,
+	act26,
+	act27,
+	act28,
+	act29,
+	act30,
+	act31,
+	act32,
+	act33,
+	act34,
+	act35,
+	act36,
+	act37,
+	act38,
+	act39,
+	act40,
+	act41,
+	act42,
+	act43,
+	act44,
+	act45,
+	act46,
+	act47,
+	act48,
+	act49,
+	act50,
+	act51,
+	act52,
+	act53,
+	act54,
+	act55,
+	act56,
+	act57,
+	act58,
+	act59,
+	act60,
+	act61,
+	act62,
+	act63,
+	act64,
+	act65,
+	act66,
+	act67,
+	act68,
+	act69,
+	act70,
+	act71,
+	act72,
+	act73,
+	act74,
+	act75,
+	act76,
+	act77,
+	act78,
+	act79,
+	act80,
+	act81,
+	act82,
+	act83,
+	act84,
+	act85,
+	act86,
+	act87,
+	act88,
+	act89,
+	act90,
+	act91,
+	act92,
+	act93,
+	act94,
+	act95,
+	act96,
+	act97,
+	act98,
+	act99,
+	act100,
+	act101,
+	act102,
+	act103,
+	act104,
+	act105,
+	act106,
+	act107,
+	act108,
+	act109,
+	act110,
+	act111,
+	act112,
+	act113,
+	act114,
+	act115,
+	act116,
+	act117,
+	act118,
+	act119,
+	act120,
+	act121,
+	act122,
+	act123,
+	act124,
+	act125,
+	act126,
+	act127,
+	act128,
+	act129,
+	act130,
+	act131,
+	act132,
+	act133,
+	act134,
+	act135,
+	act136,
+	act137,
+	act138,
+	act139,
+	act140,
+	act141,
+	act142,
+	act143,
+	act144,
+	act145,
+	act146,
+	act147,
+	act148,
+	act149,
+	act150,
+	act151,
+	act152,
+	act153,
+	act154,
+	act155,
+	act156,
+	act157,
+	act158,
+	act159,
+	act160,
+	act161,
+	act162,
+	act163,
+	act164
+};
+
+static DfaState dfa_base[] = {
+	0,
+	201,
+	213,
+	225,
+	234,
+	242,
+	250,
+	256,
+	262,
+	268,
+	276,
+	381
+};
+
+static unsigned char *b_class_no[] = {
+	shift0,
+	shift1,
+	shift2,
+	shift3,
+	shift4,
+	shift5,
+	shift6,
+	shift7,
+	shift8,
+	shift9,
+	shift10,
+	shift11
+};
+
+
+
+#define ZZSHIFT(c) (b_class_no[zzauto][1+c])
+#define MAX_MODE 12
+#include "dlgauto.h"
diff --git a/Tools/Source/TianoTools/Pccts/antlr/stdpccts.h b/Tools/Source/TianoTools/Pccts/antlr/stdpccts.h
new file mode 100644
index 0000000000..ccdc21c3c9
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/stdpccts.h
@@ -0,0 +1,31 @@
+#ifndef STDPCCTS_H
+#define STDPCCTS_H
+/*
+ * stdpccts.h -- P C C T S  I n c l u d e
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#ifndef ANTLR_VERSION
+#define ANTLR_VERSION	13333
+#endif
+
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include "pcctscfg.h"
+#include "set.h"
+#include <ctype.h>
+#include "syn.h"
+#include "hash.h"
+#include "generic.h"
+#define zzcr_attr(attr,tok,t)
+#define zzSET_SIZE 20
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "mode.h"
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/antlr/syn.h b/Tools/Source/TianoTools/Pccts/antlr/syn.h
new file mode 100644
index 0000000000..a23d196d77
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/syn.h
@@ -0,0 +1,390 @@
+/*
+ * syn.h
+ *
+ * This file includes definitions and macros associated with syntax diagrams
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include "set.h"
+
+#define NumNodeTypes	4
+#define NumJuncTypes	9
+
+/* List the different node types */
+#define nJunction		1
+#define nRuleRef		2
+#define nToken			3
+#define nAction			4
+
+/* Different types of junctions */
+#define aSubBlk			1
+#define aOptBlk			2
+#define aLoopBlk		3
+#define EndBlk			4
+#define RuleBlk			5
+#define Generic			6	/* just a junction--no unusual characteristics */
+#define EndRule			7
+#define aPlusBlk		8
+#define aLoopBegin		9
+
+typedef int NodeType;
+
+#define TreeBlockAllocSize		500
+#define JunctionBlockAllocSize	200
+#define ActionBlockAllocSize	50
+#define RRefBlockAllocSize		100
+#define TokenBlockAllocSize		100
+
+#ifdef __cplusplus
+class ActionNode;
+class Junction;
+#endif
+
+/* note that 'right' is used by the tree node allocator as a ptr for linked list */
+typedef struct _tree {
+			struct _tree *down, *right;
+			int token;
+			union {
+				int rk;	/* if token==EpToken, => how many more tokens req'd */
+				struct _tree *tref;	/* if token==TREE_REF */
+				set sref;			/* if token==SET */
+			} v;
+#ifdef TREE_DEBUG
+			int in_use;
+            int seq;
+#endif
+		} Tree;
+
+
+/* a predicate is defined to be a predicate action and a token tree with
+ * context info (if used); later, this struct may include the
+ * "hoisting distance" when we hoist past tokens.
+ *
+ * A tree is used to indicate && vs ||
+ *
+ *    p
+ *    |
+ *    q--r
+ *
+ * indicates p && (q||r).
+ *
+ * If expr is PRED_AND_LIST or PRED_OR_LIST, then it's an operation node
+ * and indicates the start of an && or || list.
+ */
+
+typedef struct _Predicate {
+	struct _Predicate *down, *right;	/* these have to be first */
+	struct _Predicate *up, *left;		/* doubly-link me */
+	char *expr;
+	Tree *tcontext;	/* used if lookahead depth of > one is needed (tree) */
+	int k;			/* lookahead depth for this tcontext */
+	set scontext[2];/* used if lookahead depth of one is needed (set) */
+					/* scontext[0] is not used; only needed so genExprSets()
+					   routine works (it expects an array)
+					 */
+	set completionTree;	/* which lookahead depths are required to complete tcontext? */
+    set completionSet;  /* MR10 separate completion set for sets and trees           */
+    struct _PredEntry *predEntry;         /* MR11 */
+
+#ifdef __cplusplus
+	ActionNode *source;	/* where did this predicate come from? */
+#else
+	struct _anode *source;	/* where did this predicate come from? */
+#endif
+
+    char             cloned;               /* MR10 don't want to free original guard pred */
+    char             redundant;            /* MR10 predicate tree simplification          */
+    char             ampersandStyle;       /* MR10  (g)? && <<p>>?                        */
+    char             inverted;             /* MR11 ! predName */
+    char             isConst;              /* MR11 */
+    char             constValue;           /* MR11 */
+    char             conflictReported;     /* MR11 */
+
+    set              plainSet;             /* MR12b */
+
+    /*** remember to change new_predicate() and predicate_dup() when changing this ***/
+
+} Predicate;
+
+typedef struct _ExceptionHandler {
+			char *signalname;
+			char *action;
+		} ExceptionHandler;
+
+typedef struct _ExceptionGroup {
+			struct _ListNode *handlers; /* list of ExceptionHandler's */
+			char *label;		/* label==""; implies not attached to any
+								 * particular rule ref.
+								 */
+			char *altID;		/* which alt did it come from (blk#:alt#) */
+
+            struct _ExceptionGroup  *pendingLink; /* for alternative EG MR7 */
+            struct _ExceptionGroup  *outerEG;     /* for alternative EG MR7 */
+            struct _LabelEntry      *labelEntry;  /* for alternative EG MR7 */
+            int                     forRule;                         /* MR7 */
+            int                     used;                            /* MR7 */
+		} ExceptionGroup ;
+
+
+#define TokenString(_i)			((TokenInd!=NULL)?TokenStr[TokenInd[_i]]:TokenStr[_i])
+#define ExprString(_i)			((TokenInd!=NULL)?ExprStr[TokenInd[_i]]:ExprStr[_i])
+
+
+				/* M e s s a g e  P a s s i n g  T o  N o d e s */
+
+/*
+ * assumes a 'Junction *r' exists.  This macro calls a function with
+ * the pointer to the node to operate on and a pointer to the rule
+ * in which it is enclosed.
+ */
+#define TRANS(p)	{if ( (p)==NULL ) fatal("TRANS: NULL object");		\
+					if ( (p)->ntype == nJunction ) (*(fpJTrans[((Junction *)(p))->jtype]))( p );\
+					else (*(fpTrans[(p)->ntype]))( p );}
+
+#define PRINT(p)	{if ( (p)==NULL ) fatal("PRINT: NULL object");\
+					(*(fpPrint[(p)->ntype]))( p );}
+
+#define REACH(p,k,rk,a) {if ( (p)==NULL ) fatal("REACH: NULL object");\
+					(a) = (*(fpReach[(p)->ntype]))( p, k, rk );}
+
+#define TRAV(p,k,rk,a) {if ( (p)==NULL ) {\
+					  if ( ContextGuardTRAV ) (a)=NULL; \
+					  else fatal("TRAV: NULL object");\
+				    } \
+					else (a) = (*(fpTraverse[(p)->ntype]))( p, k, rk );}
+
+/**
+*** #define TRAV(p,k,rk,a) {if ( (p)==NULL ) fatal("TRAV: NULL object");\
+***					(a) = (*(fpTraverse[(p)->ntype]))( p, k, rk );}
+**/
+
+/* All syntax diagram nodes derive from Node -- superclass
+ */
+#ifdef __cplusplus
+class Node {
+public:
+			NodeType ntype;
+			char *rname;		/* what rule does this element live in? */
+			int file;			/* index in FileStr */
+			int line;			/* line number that element occurs on */
+		};
+#else
+typedef struct _node {
+			NodeType ntype;
+			char *rname;		/* what rule does this element live in? */
+			int file;			/* index in FileStr */
+			int line;			/* line number that element occurs on */
+		} Node;
+#endif
+
+#ifdef __cplusplus
+class ActionNode : public Node {
+public:
+#else
+typedef struct _anode {
+			NodeType ntype;
+			char *rname;		/* what rule does this action live in? */
+			int file;			/* index in FileStr (name of file with action) */
+			int line;			/* line number that action occurs on */
+#endif
+			Node *next;
+			char *action;
+			int is_predicate;	/* true if action is a <<...>>? predicate action */
+			int done;			/* don't dump if action dumped (used for predicates) */
+			int init_action;	/* is this the 1st action of 1st prod of block? */
+			char *pred_fail;	/* what to do/print when predicate fails */
+			Predicate  *guardpred;	/* if '(context)? =>' was present, already done */
+			unsigned char frmwarned;/* have we dumped a warning for pred yet? */
+			unsigned char ctxwarned;/* have we dumped a warning for pred yet? */
+            unsigned char predTooLong;     /* MR10 have we dumped warning for pred yet */
+            unsigned char noHoist;         /* MR12 literally "noHoist" */
+            Predicate         *ampersandPred;     /* MR10   (g)? && <<p>>? expr   */
+#ifdef __cplusplus
+            Junction          *guardNodes;        /* MR11 */
+#else
+            struct _junct     *guardNodes;        /* MR11 */
+#endif
+            struct _PredEntry *predEntry;         /* MR11 */
+            int               inverted;           /* MR11 <<!predSymbol>>? */
+#ifdef __cplusplus
+		};
+#else
+		} ActionNode;
+#endif
+
+#ifdef __cplusplus
+class TokNode : public Node {
+public:
+#else
+typedef struct _toknode {
+			NodeType ntype;
+			char *rname;		/* name of rule it's in */
+			int file;			/* index in FileStr (name of file with rule) */
+			int line;			/* line number that token occurs on */
+#endif
+			Node *next;
+			int token;
+			int astnode;		/* leaf/root/excluded (used to build AST's) */
+			unsigned char label;/* token label or expression ? */
+			unsigned char remapped;
+								/* used if token id's are forced to certain positions;
+								 * a function walks the tree reassigning token numbers */
+			int upper_range;    /* MR13 - was char */
+								/* used only if Token is of type T1..T2; in this case,
+								 * use token..upper_range as the range; else
+								 * upper_range must be 0 */
+			unsigned char wild_card;
+								/* indicates that the token is the "." wild-card;
+								 * field token is ignored if wild_card is set
+								 */
+			unsigned int elnum; /* element number within the alternative */
+#ifdef __cplusplus
+			Junction *altstart;	/* pointer to node that starts alt */
+#else
+			struct _junct *altstart;	/* pointer to node that starts alt */
+#endif
+			struct _TCnode *tclass;		/* token class if tokclass ref */
+			set tset;			/* set of tokens represented by meta token */
+			char *el_label;		/* el_label:toknode */
+			unsigned char complement;	/* complement the set? */
+			ExceptionGroup *ex_group;	/* any exception[el_label] attached? */
+            unsigned char use_def_MT_handler;
+            unsigned char label_used_in_semantic_pred;  /* MR10 */
+#ifdef __cplusplus
+		};
+#else
+		} TokNode;
+#endif
+
+#ifdef __cplusplus
+class RuleRefNode : public Node {
+public:
+#else
+typedef struct _rrnode {
+			NodeType ntype;
+			char *rname;		/* name of rule it's in */
+			int file;			/* index in FileStr (name of file with rule)
+								   it's in */
+			int line;			/* line number that rule ref occurs on */
+#endif
+			Node *next;
+			char *text;			/* reference to which rule */
+			char *parms;		/* point to parameters of rule invocation
+								   (if present) */
+			char *assign;		/* point to left-hand-side of assignment
+								   (if any) */
+			int linked;			/* Has a FoLink already been established? */
+			int astnode;		/* excluded? (used to build AST's) */
+			unsigned int elnum; /* element number within the alternative */
+#ifdef __cplusplus
+			Junction *altstart;
+#else
+			struct _junct *altstart;
+#endif
+			char *el_label;		/* el_label:rrnode */
+			ExceptionGroup *ex_group;	/* any exception[el_label] attached? */
+#ifdef __cplusplus
+		};
+#else
+		} RuleRefNode;
+#endif
+
+#ifdef __cplusplus
+class Junction : public Node {
+public:
+#else
+typedef struct _junct {
+			NodeType ntype;
+			char *rname;		/* name of rule junction is in */
+			int file;			/* index in FileStr (name of file with rule)
+								   if blk == RuleBlk */
+			int line;			/* line number that rule occurs on */
+#endif
+            int seq;            /* MR10 sequence number */
+			char ignore;		/* used by FIRST computation to ignore
+								   empty alt added for the (...)+ blks */
+			char visited;		/* used by recursive routines to avoid
+								   infinite recursion */
+			char pvisited;		/* used by print routines to avoid
+								   infinite recursion */
+			char fvisited;		/* used by FoLink() to avoid
+								   infinite recursion */
+			char *lock;			/* used by REACH to track infinite recursion */
+			char *pred_lock;	/* used by find_predicates to track infinite recursion */
+			int altnum;			/* used in subblocks. altnum==0 means not an
+								   alt of subrule */
+			int jtype;			/* annotation for code-gen/FIRST/FOLLOW.
+								   Junction type */
+#ifdef __cplusplus
+			Junction *end;		/* pointer to node with EndBlk in it
+								   if blk == a block type */
+#else
+			struct _junct *end;	/* pointer to node with EndBlk in it
+								   if blk == a block type */
+#endif
+			Node *p1, *p2;
+			char  halt;			/* never move past a junction with halt==TRUE */ /* MR10 was int */
+			char *pdecl;		/* point to declaration of parameters on rule
+								   (if present) */
+			char *parm;			/* point to parameter of block invocation
+								   (if present) */
+			char predparm;		/* indicates that the 'parm' is a predicate
+								 * to be used in the while loop generated
+								 * for blocks */ /* MR10 was int */
+			char *ret;			/* point to return type of rule (if present) */
+			char *erraction;	/* point to error action (if present) */
+			int blockid;		/* this is a unique ID */
+			char *exception_label;	/* goto label for this alt */
+			set *fset;			/* used for code generation */
+			Tree *ftree;		/* used for code generation */
+			Predicate *predicate;/* predicate that can be used to disambiguate */
+			char guess;			/* true if (...)? block */
+            char alpha_beta_guess_end;      /* MR14 1 => end block of guess sub block  */
+            Node *guess_analysis_point;     /* MR14 */
+			char approx;		/* limit block to use linear approx lookahead? */
+			set tokrefs;		/* if ith element of alt is tokref then i is member */
+			set rulerefs;		/* if ith element of alt is rule ref then i is member */
+			struct _ListNode *exceptions; /* list of exceptions groups for rule */
+			struct _ListNode *el_labels;  /* list of element labels for rule */
+            ExceptionGroup   *outerEG;                               /* MR7 */
+            int              curAltNum;                              /* MR7 */
+            char* pFirstSetSymbol;   /* #pragma FirstSetSymbol(Foo)     MR21 */
+#ifdef __cplusplus
+            Junction         *pendingLink;                           /* MR7 */
+#else
+            struct _junct    *pendingLink;                           /* MR7 */
+#endif
+            char             overlap_warning;                        /* MR10 */
+#ifdef __cplusplus
+		};
+#else
+		} Junction;
+#endif
+
+typedef struct { Node *left, *right;} Graph;
+
diff --git a/Tools/Source/TianoTools/Pccts/antlr/tokens.h b/Tools/Source/TianoTools/Pccts/antlr/tokens.h
new file mode 100644
index 0000000000..91a53a8471
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/antlr/tokens.h
@@ -0,0 +1,246 @@
+#ifndef tokens_h
+#define tokens_h
+/* tokens.h -- List of labelled tokens and stuff
+ *
+ * Generated from: antlr.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * ANTLR Version 1.33MR33
+ */
+#define zzEOF_TOKEN 1
+#define Eof 1
+#define QuotedTerm 2
+#define Action 34
+#define Pred 35
+#define PassAction 36
+#define WildCard 87
+#define LABEL 89
+#define Pragma 92
+#define FirstSetSymbol 93
+#define NonTerminal 100
+#define TokenTerm 101
+#define ID 148
+#define INT 150
+
+#ifdef __USE_PROTOS
+void grammar(void);
+#else
+extern void grammar();
+#endif
+
+#ifdef __USE_PROTOS
+void class_def(void);
+#else
+extern void class_def();
+#endif
+
+#ifdef __USE_PROTOS
+void rule(void);
+#else
+extern void rule();
+#endif
+
+#ifdef __USE_PROTOS
+void laction(void);
+#else
+extern void laction();
+#endif
+
+#ifdef __USE_PROTOS
+void lmember(void);
+#else
+extern void lmember();
+#endif
+
+#ifdef __USE_PROTOS
+void lprefix(void);
+#else
+extern void lprefix();
+#endif
+
+#ifdef __USE_PROTOS
+void aPred(void);
+#else
+extern void aPred();
+#endif
+
+#ifdef __USE_PROTOS
+extern Predicate * predOrExpr(void);
+#else
+extern Predicate * predOrExpr();
+#endif
+
+#ifdef __USE_PROTOS
+extern Predicate * predAndExpr(void);
+#else
+extern Predicate * predAndExpr();
+#endif
+
+#ifdef __USE_PROTOS
+extern Predicate * predPrimary(void);
+#else
+extern Predicate * predPrimary();
+#endif
+
+#ifdef __USE_PROTOS
+void aLexclass(void);
+#else
+extern void aLexclass();
+#endif
+
+#ifdef __USE_PROTOS
+void error(void);
+#else
+extern void error();
+#endif
+
+#ifdef __USE_PROTOS
+void tclass(void);
+#else
+extern void tclass();
+#endif
+
+#ifdef __USE_PROTOS
+void token(void);
+#else
+extern void token();
+#endif
+
+#ifdef __USE_PROTOS
+void block(set * toksrefd,set * rulesrefd);
+#else
+extern void block();
+#endif
+
+#ifdef __USE_PROTOS
+void alt(set * toksrefd,set * rulesrefd);
+#else
+extern void alt();
+#endif
+
+#ifdef __USE_PROTOS
+extern LabelEntry * element_label(void);
+#else
+extern LabelEntry * element_label();
+#endif
+
+#ifdef __USE_PROTOS
+extern Node * element(int old_not,int first_on_line,int use_def_MT_handler);
+#else
+extern Node * element();
+#endif
+
+#ifdef __USE_PROTOS
+void default_exception_handler(void);
+#else
+extern void default_exception_handler();
+#endif
+
+#ifdef __USE_PROTOS
+extern ExceptionGroup * exception_group(void);
+#else
+extern ExceptionGroup * exception_group();
+#endif
+
+#ifdef __USE_PROTOS
+extern ExceptionHandler * exception_handler(void);
+#else
+extern ExceptionHandler * exception_handler();
+#endif
+
+#ifdef __USE_PROTOS
+void enum_file(char * fname);
+#else
+extern void enum_file();
+#endif
+
+#ifdef __USE_PROTOS
+void defines(char * fname);
+#else
+extern void defines();
+#endif
+
+#ifdef __USE_PROTOS
+void enum_def(char * fname);
+#else
+extern void enum_def();
+#endif
+
+#endif
+extern SetWordType zzerr1[];
+extern SetWordType zzerr2[];
+extern SetWordType zzerr3[];
+extern SetWordType zzerr4[];
+extern SetWordType setwd1[];
+extern SetWordType zzerr5[];
+extern SetWordType zzerr6[];
+extern SetWordType zzerr7[];
+extern SetWordType zzerr8[];
+extern SetWordType zzerr9[];
+extern SetWordType setwd2[];
+extern SetWordType zzerr10[];
+extern SetWordType zzerr11[];
+extern SetWordType zzerr12[];
+extern SetWordType zzerr13[];
+extern SetWordType setwd3[];
+extern SetWordType zzerr14[];
+extern SetWordType zzerr15[];
+extern SetWordType zzerr16[];
+extern SetWordType zzerr17[];
+extern SetWordType zzerr18[];
+extern SetWordType zzerr19[];
+extern SetWordType zzerr20[];
+extern SetWordType zzerr21[];
+extern SetWordType setwd4[];
+extern SetWordType zzerr22[];
+extern SetWordType zzerr23[];
+extern SetWordType zzerr24[];
+extern SetWordType zzerr25[];
+extern SetWordType zzerr26[];
+extern SetWordType setwd5[];
+extern SetWordType zzerr27[];
+extern SetWordType zzerr28[];
+extern SetWordType zzerr29[];
+extern SetWordType zzerr30[];
+extern SetWordType zzerr31[];
+extern SetWordType zzerr32[];
+extern SetWordType zzerr33[];
+extern SetWordType setwd6[];
+extern SetWordType zzerr34[];
+extern SetWordType zzerr35[];
+extern SetWordType zzerr36[];
+extern SetWordType zzerr37[];
+extern SetWordType zzerr38[];
+extern SetWordType zzerr39[];
+extern SetWordType zzerr40[];
+extern SetWordType zzerr41[];
+extern SetWordType zzerr42[];
+extern SetWordType setwd7[];
+extern SetWordType zzerr43[];
+extern SetWordType zzerr44[];
+extern SetWordType zzerr45[];
+extern SetWordType zzerr46[];
+extern SetWordType zzerr47[];
+extern SetWordType zzerr48[];
+extern SetWordType zzerr49[];
+extern SetWordType zzerr50[];
+extern SetWordType zzerr51[];
+extern SetWordType zzerr52[];
+extern SetWordType zzerr53[];
+extern SetWordType setwd8[];
+extern SetWordType zzerr54[];
+extern SetWordType zzerr55[];
+extern SetWordType zzerr56[];
+extern SetWordType zzerr57[];
+extern SetWordType setwd9[];
+extern SetWordType zzerr58[];
+extern SetWordType zzerr59[];
+extern SetWordType zzerr60[];
+extern SetWordType zzerr61[];
+extern SetWordType zzerr62[];
+extern SetWordType zzerr63[];
+extern SetWordType zzerr64[];
+extern SetWordType zzerr65[];
+extern SetWordType setwd10[];
+extern SetWordType setwd11[];
diff --git a/Tools/Source/TianoTools/Pccts/build.gcc b/Tools/Source/TianoTools/Pccts/build.gcc
new file mode 100644
index 0000000000..06d4800269
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/build.gcc
@@ -0,0 +1,2 @@
+(cd antlr/; make -f makefile)
+(cd dlg/; make -f makefile)
diff --git a/Tools/Source/TianoTools/Pccts/build.xml b/Tools/Source/TianoTools/Pccts/build.xml
new file mode 100644
index 0000000000..12a3afadac
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/build.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK Pccts Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="Pccts"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+        </then>
+      </elseif>
+    </if>
+  </target>
+
+  <target name="GenTool" depends="init">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <ant dir="${PACKAGE_DIR}/Pccts/antlr" inheritAll="true"/>
+    <ant dir="${PACKAGE_DIR}/Pccts/dlg" inheritAll="true"/>
+  </target>
+
+  <target name="clean" depends="init">
+    <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="clean" inheritAll="true"/>
+    <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="clean" inheritAll="true"/>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="cleanall" inheritAll="true"/>
+    <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="cleanall" inheritAll="true"/>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/Pccts/dlg/DlgMS.mak b/Tools/Source/TianoTools/Pccts/dlg/DlgMS.mak
new file mode 100644
index 0000000000..4a9019b1c6
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/DlgMS.mak
@@ -0,0 +1,121 @@
+# PCCTS directory
+
+# You will need to set the LIB variable similar to this.
+# LIB="C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/lib;c:/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK/Lib"
+
+# PCCTS_HOME=<your PCCTS_HOME>
+PCCTS_HOME=$(WORKSPACE)\Tools\Source\TianoTools\Pccts
+DLG_SRC=$(PCCTS_HOME)\dlg
+PCCTS_H=$(PCCTS_HOME)\h
+
+
+# Support directories
+SET=$(PCCTS_HOME)\support\set
+
+
+# Compiler stuff
+CC = cl
+CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
+        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /W3 /Zi
+
+DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
+           output.obj relabel.obj automata.obj
+
+SUPPORT_OBJS = set.obj
+
+# Dependencies
+
+dlg.exe: $(DLG_OBJS) $(SUPPORT_OBJS)
+    $(CC) $(CFLAGS) -o dlg.exe $(DLG_OBJS) $(SUPPORT_OBJS)
+    del *.obj
+    del *.ilk
+    del *.pdb
+		move dlg.exe $(WORKSPACE)\Tools\bin\.
+
+dlg_p.obj: $(DLG_SRC)\dlg_p.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+                	$(DLG_SRC)\mode.h \
+                	$(DLG_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\dlg_p.c
+
+dlg_a.obj: $(DLG_SRC)\dlg_a.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgauto.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+                	$(DLG_SRC)\mode.h \
+                	$(DLG_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\dlg_a.c
+
+main.obj: $(DLG_SRC)\main.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+                	$(DLG_SRC)\mode.h \
+                	$(DLG_SRC)\stdpccts.h \
+                	$(DLG_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\main.c
+
+err.obj: $(DLG_SRC)\err.c \
+					$(PCCTS_H)\antlr.h \
+					$(PCCTS_H)\config.h \
+					$(PCCTS_H)\dlgdef.h \
+					$(PCCTS_H)\err.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+                	$(DLG_SRC)\tokens.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\err.c
+
+support.obj: $(DLG_SRC)\support.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\support.c
+
+output.obj: $(DLG_SRC)\output.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\output.c
+
+relabel.obj: $(DLG_SRC)\relabel.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\relabel.c
+
+automata.obj: $(DLG_SRC)\automata.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+                	$(DLG_SRC)\dlg.h \
+
+    $(CC) -c $(CFLAGS) $(DLG_SRC)\automata.c
+
+
+set.obj: $(SET)\set.c \
+					$(PCCTS_H)\config.h \
+					$(SET)\set.h \
+
+    $(CC) -c $(CFLAGS) $(SET)\set.c
+
+clean:	
+    del *.obj
+
+distclean:
+    del *.obj
+    del $(WORKSPACE)\Tools\bin\dlg.exe
diff --git a/Tools/Source/TianoTools/Pccts/dlg/DlgPPC.mak b/Tools/Source/TianoTools/Pccts/dlg/DlgPPC.mak
new file mode 100644
index 0000000000..55b643ad88
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/DlgPPC.mak
@@ -0,0 +1,84 @@
+#   File:       dlgPPC.make
+#   Target:     dlgPPC
+#   Sources:    automata.c
+#               dlg_a.c
+#               dlg_p.c
+#               err.c
+#               main.c
+#               output.c
+#               relabel.c
+#               support.c
+#               ::support:set:set.c
+#   Created:    Sunday, May 17, 1998 11:34:20 PM
+#	Author:		Kenji Tanaka
+
+
+MAKEFILE     = dlgPPC.make
+�MondoBuild� = {MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
+Includes     = �
+		-i "::h:" �
+		-i "::support:set:"
+Sym�PPC      = 
+ObjDir�PPC   = ":Obj:"
+
+PPCCOptions  = {Includes} {Sym�PPC}  -w off -d MPW -d __STDC__=1 -d USER_ZZSYN
+
+Objects�PPC  = �
+		"{ObjDir�PPC}automata.c.x" �
+		"{ObjDir�PPC}dlg_a.c.x" �
+		"{ObjDir�PPC}dlg_p.c.x" �
+		"{ObjDir�PPC}err.c.x" �
+		"{ObjDir�PPC}main.c.x" �
+		"{ObjDir�PPC}output.c.x" �
+		"{ObjDir�PPC}relabel.c.x" �
+		"{ObjDir�PPC}support.c.x" �
+		"{ObjDir�PPC}set.c.x"
+
+
+dlgPPC �� {�MondoBuild�} {Objects�PPC}
+	PPCLink �
+		-o {Targ} {Sym�PPC} �
+		{Objects�PPC} �
+		-t 'MPST' �
+		-c 'MPS ' �
+		"{SharedLibraries}InterfaceLib" �
+		"{SharedLibraries}StdCLib" �
+		"{SharedLibraries}MathLib" �
+		"{PPCLibraries}StdCRuntime.o" �
+		"{PPCLibraries}PPCCRuntime.o" �
+		"{PPCLibraries}PPCToolLibs.o"
+
+
+"{ObjDir�PPC}automata.c.x" � {�MondoBuild�} automata.c
+	{PPCC} automata.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}dlg_a.c.x" � {�MondoBuild�} dlg_a.c
+	{PPCC} dlg_a.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}dlg_p.c.x" � {�MondoBuild�} dlg_p.c
+	{PPCC} dlg_p.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}err.c.x" � {�MondoBuild�} err.c
+	{PPCC} err.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}main.c.x" � {�MondoBuild�} main.c
+	{PPCC} main.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}output.c.x" � {�MondoBuild�} output.c
+	{PPCC} output.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}relabel.c.x" � {�MondoBuild�} relabel.c
+	{PPCC} relabel.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}support.c.x" � {�MondoBuild�} support.c
+	{PPCC} support.c -o {Targ} {PPCCOptions}
+
+"{ObjDir�PPC}set.c.x" � {�MondoBuild�} "::support:set:set.c"
+	{PPCC} "::support:set:set.c" -o {Targ} {PPCCOptions}
+
+
+dlgPPC �� dlg.r
+	Rez dlg.r -o dlgPPC -a
+
+Install  � dlgPPC
+	Duplicate -y dlgPPC "{MPW}"Tools:dlg
diff --git a/Tools/Source/TianoTools/Pccts/dlg/automata.c b/Tools/Source/TianoTools/Pccts/dlg/automata.c
new file mode 100644
index 0000000000..d6d5d7809d
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/automata.c
@@ -0,0 +1,353 @@
+/* Automata conversion functions for DLG
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#include "dlg.h"
+#ifdef MEMCHK
+#include "trax.h"
+#else
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif /* __STDC__ */
+#endif
+
+#define hash_list struct _hash_list_
+hash_list{
+	hash_list *next;	/* next thing in list */
+	dfa_node *node;
+ };
+
+int	dfa_allocated = 0;	/* keeps track of number of dfa nodes */
+dfa_node	**dfa_array;	/* root of binary tree that stores dfa array */
+dfa_node	*dfa_model_node;
+hash_list 	*dfa_hash[HASH_SIZE];	/* used to quickly find */
+					/* desired dfa node */
+
+void 
+#ifdef __USE_PROTOS
+make_dfa_model_node(int width)
+#else
+make_dfa_model_node(width)
+int width;
+#endif
+{
+	register int i;
+	dfa_model_node = (dfa_node*) malloc(sizeof(dfa_node)
+			 + sizeof(int)*width);
+	dfa_model_node->node_no = -1; /* impossible value for real dfa node */
+	dfa_model_node->dfa_set = 0;
+	dfa_model_node->alternatives = FALSE;
+	dfa_model_node->done = FALSE;
+	dfa_model_node->nfa_states = empty;
+	for(i = 0; i<width; i++){
+		dfa_model_node->trans[i] = NIL_INDEX;
+	}
+}
+
+
+/* adds a new nfa to the binary tree and returns a pointer to it */
+dfa_node *
+#ifdef __USE_PROTOS
+new_dfa_node(set nfa_states)
+#else
+new_dfa_node(nfa_states)
+set nfa_states;
+#endif
+{
+	register int j;
+	register dfa_node *t;
+	static int dfa_size=0;	/* elements dfa_array[] can hold */
+
+	++dfa_allocated;
+	if (dfa_size<=dfa_allocated){
+		/* need to redo array */
+		if (!dfa_array){
+			/* need some to do inital allocation */
+			dfa_size=dfa_allocated+DFA_MIN;
+			dfa_array=(dfa_node **) malloc(sizeof(dfa_node*)*
+				dfa_size);
+		}else{
+			/* need more space */
+			dfa_size=2*(dfa_allocated+1);
+			dfa_array=(dfa_node **) realloc(dfa_array,
+				sizeof(dfa_node*)*dfa_size);
+		}
+	}
+	/* fill out entry in array */
+	t = (dfa_node*) malloc(sizeof(nfa_node)+sizeof(int)*class_no);
+	*t = *dfa_model_node;
+	for (j=0; j<class_no; ++j)
+		t->trans[j] = NIL_INDEX;
+	t->node_no = dfa_allocated;
+	t->nfa_states = set_dup(nfa_states);
+	dfa_array[dfa_allocated] = t;
+	return t;
+}
+
+
+/* past a pointer to the start start of the nfa graph
+ * nfa_to_dfa convers this graph to dfa.  The function returns
+ * a pointer to the first dfa state.
+ * NOTE:  The function that prints out the table will have to figure out how
+ * to find the other dfa states given the first dfa_state and the number of dfa
+ * nodes allocated
+ */
+dfa_node **
+#ifdef __USE_PROTOS
+nfa_to_dfa(nfa_node *start)
+#else
+nfa_to_dfa(start)
+nfa_node *start;
+#endif
+{
+	register dfa_node *d_state, *trans_d_state;
+	register int a;
+	set t;
+	int last_done;
+	unsigned *nfa_list;
+	unsigned *reach_list;
+
+	reach_list = (unsigned *) malloc((2+nfa_allocated)*sizeof(unsigned));
+	if (!start) return NULL;
+	t = set_of(NFA_NO(start));
+	_set_pdq(t,reach_list);
+	closure(&t,reach_list);
+	/* Make t a dfa state */
+	d_state = dfastate(t);
+	last_done = DFA_NO(d_state);
+	
+	do {
+		/* Mark dfa state x as "done" */
+		d_state->done = TRUE;
+		nfa_list = set_pdq(d_state->nfa_states);
+		for (a = 0; a<class_no; ++a) {
+			/* Add NFA states reached by a from d_state */
+			reach(nfa_list,a,reach_list);
+			/* Were any states found? */
+			if ((*reach_list)!=nil) {
+				/* was t=empty; */
+				set_free(t);
+				/* yes, compute closure */
+				closure(&t,reach_list);
+				/* Make DFA state of it ... */
+				trans_d_state = dfastate(t);
+				/* And make transition x->t, labeled with a */
+				d_state->trans[a] = DFA_NO(trans_d_state);
+				d_state->alternatives = TRUE;
+			}
+		}
+		free(nfa_list);
+		++last_done; /* move forward in queue */
+		/* And so forth until nothing isn't done */
+		d_state = DFA(last_done);
+	} while (last_done<=dfa_allocated);
+
+	free(reach_list);
+	set_free(t);
+
+	/* returns pointer to the array that holds the automaton */
+	return dfa_array;
+}
+
+void 
+#ifdef __USE_PROTOS
+clear_hash(void)
+#else
+clear_hash()
+#endif
+{
+	register int i;
+
+	for(i=0; i<HASH_SIZE; ++i)
+		dfa_hash[i] = 0;
+}
+
+#if HASH_STAT
+void
+#ifdef __USE_PROTOS
+fprint_hash_stats(FILE *f)
+#else
+fprint_hash_stats(f)
+FILE *f;
+#endif
+{
+	register hash_list *p;
+	register int i,j;
+	register total;
+
+	total=0;
+	for(i=0; i<HASH_SIZE; ++i){
+		j=0;
+		p = dfa_hash[i];
+		while(p){
+			++j;
+			p = p->next;
+		}
+		total+=j;
+		fprintf(f,"bin[%d] has %d\n",i,j);
+	}
+	fprintf(f,"total = %d\n",total);
+}
+#endif
+
+/* Returns a pointer to a dfa node that has the same nfa nodes in it.
+ * This may or maynot be a newly created node.
+ */
+dfa_node *
+#ifdef __USE_PROTOS
+dfastate(set nfa_states)
+#else
+dfastate(nfa_states)
+set nfa_states;
+#endif
+{
+	register hash_list *p;
+	int bin;
+
+	/* hash using set and see if it exists */
+	bin = set_hash(nfa_states,HASH_SIZE);
+	p = dfa_hash[bin];
+	while(p && !set_equ(nfa_states,(p->node)->nfa_states)){
+		p = p->next;
+	}
+	if(!p){
+		/* next state to add to hash table */
+		p = (hash_list*)malloc(sizeof(hash_list));
+		p->node = new_dfa_node(nfa_states);
+		p->next = dfa_hash[bin];
+		dfa_hash[bin] = p;
+	}
+	return (p->node);
+}
+
+
+/* this reach assumes the closure has been done already on set */
+int 
+#ifdef __USE_PROTOS
+reach(unsigned *nfa_list, register int a, unsigned *reach_list)
+#else
+reach(nfa_list, a, reach_list)
+unsigned *nfa_list;
+register int a;
+unsigned *reach_list;
+#endif
+{
+	register unsigned *e;
+	register nfa_node *node;
+	int t=0;
+
+	e = nfa_list;
+	if (e){
+		while (*e != nil){
+			node = NFA(*e);
+			if (set_el(a,node->label)){
+				t=1;
+				*reach_list=NFA_NO(node->trans[0]);
+				++reach_list;
+			}
+			++e;
+		}
+	}
+	*reach_list=nil;
+	return t;
+}
+
+/* finds all the nodes that can be reached by epsilon transitions
+   from the set of a nodes and returns puts them back in set b */
+set 
+#ifdef __USE_PROTOS
+closure(set *b, unsigned *reach_list)
+#else
+closure(b, reach_list)
+set *b;
+unsigned *reach_list;
+#endif
+{
+	register nfa_node *node,*n;	/* current node being examined */
+	register unsigned *e;
+
+	++operation_no;
+#if 0
+	t = e = set_pdq(*b);
+#else
+	e=reach_list;
+#endif
+	while (*e != nil){
+		node = NFA(*e);
+		set_orel(NFA_NO(node),b);
+		/* mark it done */
+		node->nfa_set = operation_no;
+		if ((n=node->trans[0]) != NIL_INDEX && set_nil(node->label) &&
+		  (n->nfa_set != operation_no)){
+			/* put in b */
+			set_orel(NFA_NO(n),b);
+			close1(n,operation_no,b);
+		}
+		if ((n=node->trans[1]) != NIL_INDEX &&
+		  (n->nfa_set != operation_no)){
+			/* put in b */
+			set_orel(NFA_NO(node->trans[1]),b);
+			close1(n,operation_no,b);
+		}
+		++e;
+	}
+#if 0
+	free(t);
+#endif
+	return *b;
+}
+
+#ifdef __USE_PROTOS
+void close1(nfa_node *node, int o, set *b)
+#else
+void close1(node,o,b)
+nfa_node *node;
+int o;	/* marker to avoid cycles */
+set *b;
+#endif
+{
+	register nfa_node *n;	/* current node being examined */
+
+	/* mark it done */
+	node->nfa_set = o;
+	if ((n=node->trans[0]) != NIL_INDEX && set_nil(node->label) &&
+	  (n->nfa_set != o)){
+		/* put in b */
+		set_orel(NFA_NO(n),b);
+		close1(n,o,b);
+	}
+	if ((n=node->trans[1]) != NIL_INDEX &&
+	  (n->nfa_set != o)){
+		/* put in b */
+		set_orel(NFA_NO(node->trans[1]),b);
+		close1(n,o,b);
+	}
+}
diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/Source/TianoTools/Pccts/dlg/build.xml
new file mode 100644
index 0000000000..74f31b01b4
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/build.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK dlg Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="dlg"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+  <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+		<condition property="CheckDepends">
+		  <uptodate targetfile="${WORKSPACE}/Tools/bin/dlg.exe">
+			  <srcfiles dir="." includes="*.c *.h *.g"/>
+			</uptodate>
+		</condition>
+		<if>
+		  <equals arg1="${CheckDepends}" arg2="true"/>
+			<then>
+				<echo message="Executable, dlg.exe, is up to date."/>
+			</then>
+		</if>
+  </target>
+
+  <target name="GenTool" depends="init" unless="CheckDepends">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f DlgMS.mak"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+	</target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f DlgMS.mak clean"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile clean"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+	    	  <arg line="-f DlgMS.mak distclean"/>
+    		</exec>
+		  </then>
+		<elseif>
+      <equals arg1="${ToolChain}" arg2="gcc"/>
+			<then>
+    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile distclean"/>
+    		</exec>
+		  </then>
+		</elseif>
+		</if>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.1 b/Tools/Source/TianoTools/Pccts/dlg/dlg.1
new file mode 100644
index 0000000000..f68e3ae8a7
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg.1
@@ -0,0 +1,79 @@
+.TH dlg 1 "April 1994" "DLG" "PCCTS Manual Pages"
+.SH NAME
+dlg \- DFA Lexical Analyzer Generator
+.SH SYNTAX
+.LP
+\fBdlg\fR [\fIoptions\fR] \fIlexical_spec\fR [\fIoutput_file\fR]
+.SH DESCRIPTION
+.B dlg
+is a tool that produces fast deterministic finite automata for recognizing
+regular expressions in input.
+.SH OPTIONS
+.IP "\fB-CC\fR"
+Generate C++ output.  The \fIoutput_file\fP is not specified in this
+case.
+.IP "\fB-C\fR[\fP level\fR]
+Where \fPlevel\fR is the compression level used.  0 indications no
+compression, 1 removes all unused characters from the transition from table,
+and 2 maps equivalent characters into the same character classes.  It is
+suggested that level -C2 is used, since it will significantly reduce the size
+of the dfa produced for lexical analyzer.
+.IP "\fB-m\fP
+Produces the header file for the lexical mode with a name other than
+the default name of "mode.h".
+.IP \fB-i\fP
+An interactive, or as interactive as possible, parser is produced.  A character
+is only obtained when required to decide which state to go to.  Some care
+must be taken to obtain accept states that do not require look ahead at the
+next character to determine if that is the stop state.  Any regular expression
+with a Kleene closure at the end is guaranteed to require another character
+of look ahead.
+.IP "\fB-cl\fP class
+Specify a class name for DLG to generate.  The default is DLGLexer.
+'class' will be a subclass of DLGLexerBase; only used for -CC.
+.IP \fB-ci\fP
+The automaton will treat upper and lower case characters identically.
+This is accomplished in the automaton; the characters in the lexical
+buffer are unmodified.
+.IP \fB-cs\fP
+Upper and lower case characters are treated as distinct.  This is the
+default.
+.IP "\fB-o\fP dir
+Directory where output files should go (default=".").  This is very
+nice for keeping the source directory clear of ANTLR and DLG spawn.
+.IP \fB-Wambiguity\fP
+Warns if more than one regular expression could match the same character
+sequence.  The warnings give the numbers of the expressions in the dlg
+lexical specification file.  The numbering of the expressions starts at one.
+Multiple warnings may be print for the same expressions.
+.IP \-
+Used in place of file names to get input from standard in or send output
+to standard out.
+.SH "SPECIAL CONSIDERATIONS"
+.PP
+\fIDlg\fP works...  we think.  There is no implicit guarantee of
+anything.  We reserve no \fBlegal\fP rights to the software known as
+the Purdue Compiler Construction Tool Set (PCCTS) \(em PCCTS is in the
+public domain.  An individual or company may do whatever they wish
+with source code distributed with PCCTS or the code generated by
+PCCTS, including the incorporation of PCCTS, or its output, into
+commercial software.  We encourage users to develop software with
+PCCTS.  However, we do ask that credit is given to us for developing
+PCCTS.  By "credit", we mean that if you incorporate our source code
+into one of your programs (commercial product, research project, or
+otherwise) that you acknowledge this fact somewhere in the
+documentation, research report, etc...  If you like PCCTS and have
+developed a nice tool with the output, please mention that you
+developed it using PCCTS.  As long as these guidelines are followed, we
+expect to continue enhancing this system and expect to make other
+tools available as they are completed.
+.SH FILES
+.B mode.h
+,
+.B dlgauto.h
+,
+.B dlgdef.h
+.SH SEE ALSO
+.BR antlr (1),
+.BR pccts (1)
+.SH BUGS
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.h b/Tools/Source/TianoTools/Pccts/dlg/dlg.h
new file mode 100644
index 0000000000..9f387c0a1c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg.h
@@ -0,0 +1,250 @@
+/* dlg header file
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+/* MR1 Move pcctscfg.h to top of file 					*/
+
+#include "pcctscfg.h"						
+
+/* turn off warnings for unreferenced labels */
+
+#ifdef _MSC_VER
+#pragma warning(disable:4102)
+#endif
+
+#include "set.h"
+
+#define TRUE	1
+#define FALSE	0
+
+/***** output related stuff *******************/
+#define IN	input_stream
+#define OUT	output_stream
+
+#define MAX_MODES	50	/* number of %%names allowed */
+#define MAX_ON_LINE	10
+
+#define NFA_MIN		64	/* minimum nfa_array size */
+#define DFA_MIN		64	/* minimum dfa_array size */
+
+#define DEFAULT_CLASSNAME "DLGLexer"
+
+/* these macros allow the size of the character set to be easily changed */
+/* NOTE: do NOT change MIN_CHAR since EOF is the lowest char, -1 */
+#define MIN_CHAR (-1)	/* lowest possible character possible on input */
+#define MAX_CHAR 255	/* highest possible character possible on input */
+#define CHAR_RANGE (1+(MAX_CHAR) - (MIN_CHAR))
+
+/* indicates that the not an "array" reference */
+#define NIL_INDEX 0
+
+/* size of hash table used to find dfa_states quickly */
+#define HASH_SIZE 211
+
+#define nfa_node struct _nfa_node
+nfa_node {
+	int		node_no;
+	int		nfa_set;
+	int		accept;	/* what case to use */
+	nfa_node	*trans[2];
+	set		label;	/* one arc always labelled with epsilon */
+};
+
+#define dfa_node struct _dfa_node
+dfa_node {
+	int		node_no;
+	int		dfa_set;
+	int		alternatives;	/* used for interactive mode */
+					/* are more characters needed */
+	int		done;
+	set		nfa_states;
+	int		trans[1];/* size of transition table depends on
+				  * number of classes required for automata.
+				  */
+
+
+};
+
+/******** macros for accessing the NFA and DFA nodes ****/
+#define NFA(x)	(nfa_array[x])
+#define DFA(x)	(dfa_array[x])
+#define DFA_NO(x) ( (x) ? (x)->node_no : NIL_INDEX)
+#define NFA_NO(x) ( (x) ? (x)->node_no : NIL_INDEX)
+
+/******** wrapper for memory checking ***/
+/*#define malloc(x)	dlg_malloc((x),__FILE__,__LINE__)*/
+
+/*#define calloc(x,y)	dlg_calloc((x),(y),__FILE__,__LINE__)*/
+
+/******** antlr attributes *************/
+typedef struct {
+	unsigned char letter;
+	nfa_node *l,*r;
+	set label;
+	} Attrib;
+
+#define zzcr_attr(attr, token, text) {					\
+	(attr)->letter = text[0]; (attr)->l = NULL;			\
+	(attr)->r = NULL; (attr)->label = empty;			\
+}
+#define zzd_attr(a)	set_free((a)->label);
+
+/******************** Variable ******************************/
+extern char	program[];	/* tells what program this is */
+extern char	version[];	/* tells what version this is */
+extern char	*file_str[];	/* file names being used */
+extern int	err_found;	/* flag to indicate error occured */
+extern int	action_no;	/* last action function printed */
+extern int	func_action;	/* should actions be turned into functions?*/
+extern set	used_chars;	/* used to label trans. arcs */
+extern set	used_classes;	/* classes or chars used to label trans. arcs */
+extern int	class_no;	/* number of classes used */
+extern set	class_sets[];	/* shows char. in each class */
+extern set	normal_chars;	/* mask off unused portion of set */
+extern int	comp_level;	/* what compression level to use */
+extern int	interactive;	/* interactive scanner (avoid lookahead)*/
+extern int	mode_counter;	/* keeps track of the number of %%name */
+extern int	dfa_basep[];	/* start of each group of dfa */
+extern int	dfa_class_nop[];/* number of transistion arcs in */
+				/* each dfa in each mode */
+extern int	nfa_allocated;
+extern int	dfa_allocated;
+extern nfa_node	**nfa_array;	/* start of nfa "array" */
+extern dfa_node	**dfa_array;	/* start of dfa "array" */
+extern int	operation_no;	/* unique number for each operation */
+extern FILE	*input_stream;	/* where description read from */
+extern FILE	*output_stream; /* where to put the output */
+extern FILE	*mode_stream;	/* where to put the mode output */
+extern FILE	*class_stream;
+extern char	*mode_file;	/* name of file for mode output */
+extern int	gen_ansi;	/* produce ansi compatible code */
+extern int	case_insensitive;/* ignore case of input spec. */
+extern int	warn_ambig;	/* show if regular expressions ambiguous */
+extern int	gen_cpp;
+extern char *cl_file_str;
+extern int	firstLexMember;	/* MR1 */
+extern char *OutputDirectory;
+extern char	*class_name;
+
+/******************** Functions ******************************/
+#ifdef __USE_PROTOS
+extern char 	*dlg_malloc(int, char *, int); /* wrapper malloc */
+extern char 	*dlg_calloc(int, int, char *, int); /* wrapper calloc */
+extern int	reach(unsigned *, register int, unsigned *);
+extern set	closure(set *, unsigned *);
+extern dfa_node *new_dfa_node(set);
+extern nfa_node *new_nfa_node(void);
+extern dfa_node *dfastate(set);
+extern dfa_node **nfa_to_dfa(nfa_node *);
+extern void	internal_error(char *, char *, int);    /* MR9 23-Sep-97 */
+extern FILE	*read_stream(char *);	/* opens file for reading */
+extern FILE	*write_stream(char *);	/* opens file for writing */
+extern void	make_nfa_model_node(void);
+extern void	make_dfa_model_node(int);
+extern char *ClassName(char *);
+extern char *OutMetaName(char *);
+extern void error(char*, int);
+extern void warning(char*, int);
+extern void p_head(void);
+extern void p_class_hdr(void);
+extern void p_includes(void);
+extern void p_tables(void);
+extern void p_tail(void);					/* MR1 */
+extern void p_class_def1(void);				/* MR1 */
+extern void new_automaton_mode(void);			/* MR1 */
+extern int  relabel(nfa_node *,int);			/* MR1 */
+extern void p_shift_table(int);				/* MR1 */
+extern void p_bshift_table(void);				/* MR1 */
+extern void p_class_table(void);				/* MR1 */
+extern void p_mode_def(char *,int);			/* MR1 */
+extern void init(void);					/* MR1 */
+extern void p_class_def2(void);				/* MR1 */
+extern void clear_hash(void);				/* MR1 */
+extern void p_alternative_table(void);			/* MR1 */
+extern void p_node_table(void);				/* MR1 */
+extern void p_dfa_table(void);				/* MR1 */
+extern void p_accept_table(void);				/* MR1 */
+extern void p_action_table(void);				/* MR1 */
+extern void p_base_table(void);				/* MR1 */
+extern void p_single_node(int,int);			/* MR1 */
+extern char * minsize(int);				/* MR1 */
+extern void close1(nfa_node *,int,set *);		/* MR1 */
+extern void partition(nfa_node *,int);			/* MR1 */
+extern void intersect_nfa_labels(nfa_node *,set *);	/* MR1 */
+extern void r_intersect(nfa_node *,set *);		/* MR1 */
+extern void label_node(nfa_node *);			/* MR1 */
+extern void label_with_classes(nfa_node *);		/* MR1 */
+
+#else
+extern char *dlg_malloc();	/* wrapper malloc */
+extern char *dlg_calloc();	/* wrapper calloc */
+extern int	reach();
+extern set	closure();
+extern dfa_node *new_dfa_node();
+extern nfa_node *new_nfa_node();
+extern dfa_node *dfastate();
+extern dfa_node **nfa_to_dfa();
+extern void	internal_error();   /* MR9 23-Sep-97 */
+extern FILE	*read_stream();		/* opens file for reading */
+extern FILE	*write_stream();	/* opens file for writing */
+extern void	make_nfa_model_node();
+extern void	make_dfa_model_node();
+extern char *ClassName();
+extern char *OutMetaName();
+extern void error();
+extern void warning();
+extern void p_head();                   /* MR9 */
+extern void p_class_hdr();              /* MR9 */
+extern void p_includes();               /* MR9 */
+extern void p_tables();                 /* MR9 */
+extern void p_tail();					/* MR1 */
+extern void p_class_def1();				/* MR1 */
+extern void new_automaton_mode();			/* MR1 */
+extern int  relabel();					/* MR1 */
+extern void p_shift_table();				/* MR1 */
+extern void p_bshift_table();				/* MR1 */
+extern void p_class_table();				/* MR1 */
+extern void p_mode_def();				/* MR1 */
+extern void init();					/* MR1 */
+extern void p_class_def2();				/* MR1 */
+extern void clear_hash();				/* MR1 */
+extern void p_alternative_table();			/* MR1 */
+extern void p_node_table();				/* MR1 */
+extern void p_dfa_table();				/* MR1 */
+extern void p_accept_table();				/* MR1 */
+extern void p_action_table();				/* MR1 */
+extern void p_base_table();				/* MR1 */
+extern void p_single_node();				/* MR1 */
+extern char * minsize();				/* MR1 */
+extern void close1();					/* MR1 */
+extern void partition();				/* MR1 */
+extern void intersect_nfa_labels();			/* MR1 */
+extern void r_intersect();				/* MR1 */
+extern void label_node();				/* MR1 */
+extern void label_with_classes();			/* MR1 */
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg.r b/Tools/Source/TianoTools/Pccts/dlg/dlg.r
new file mode 100644
index 0000000000..c5311fa1b8
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg.r
@@ -0,0 +1,275 @@
+/*
+	File:		dlgMPW.r
+	Target:		dlg 133MR
+	Created:    Monday, June 15, 1998 4:44:11 AM
+	Author:		Kenji Tanaka (kentar@osa.att.ne.jp)
+*/
+
+#include "cmdo.r"
+
+resource 'cmdo' (128, "Dlg") {
+	{	/* array dialogs: 1 elements */
+		/* [1] */
+		295,
+		"DLG -- Purdue Compiler Construction Tool"
+		" Set (PCCTS) lexical analyzer generator.",
+		{	/* array itemArray: 18 elements */
+			/* [1] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{35, 175, 50, 225},
+				"On",
+				"-CC",
+				"When this control is checked, DLG genera"
+				"tes a scanner using C++ classes rather t"
+				"han C functions."
+			},
+			/* [2] */
+			Or {
+				{	/* array OrArray: 1 elements */
+					/* [1] */
+					1
+				}
+			},
+			RegularEntry {
+				"Lexer Class Name:",
+				{35, 225, 50, 355},
+				{35, 355, 51, 450},
+				"DLGLexer",
+				keepCase,
+				"-cl",
+				"This entry specifies the name DLG uses f"
+				"or the C++ lexer class."
+			},
+			/* [3] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{25, 165, 60, 460},
+				"C++ Code Generation"
+			},
+			/* [4] */
+			NotDependent {
+
+			},
+			Files {
+				InputFile,
+				RequiredFile {
+					{37, 25, 56, 135},
+					"Input File",
+					"",
+					"Choose the lexical description file for "
+					"DLG to process."
+				},
+				Additional {
+					"",
+					"",
+					"",
+					"",
+					{	/* array TypesArray: 1 elements */
+						/* [1] */
+						text
+					}
+				}
+			},
+			/* [5] */
+			Or {
+				{	/* array OrArray: 1 elements */
+					/* [1] */
+					-1
+				}
+			},
+			Files {
+				OutputFile,
+				RequiredFile {
+					{66, 25, 85, 135},
+					"Output File",
+					"",
+					"Choose the name of the file that will ho"
+					"ld the DLG-produced scanner."
+				},
+				NoMore {
+
+				}
+			},
+			/* [6] */
+			Or {
+				{	/* array OrArray: 2 elements */
+					/* [1] */
+					1,
+					/* [2] */
+					5
+				}
+			},
+			Dummy {
+
+			},
+			/* [7] */
+			NotDependent {
+
+			},
+			Redirection {
+				DiagnosticOutput,
+				{90, 25}
+			},
+			/* [8] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{25, 20, 132, 145},
+				"Files"
+			},
+			/* [9] */
+			NotDependent {
+
+			},
+			Files {
+				DirOnly,
+				OptionalFile {
+					{68, 175, 84, 305},
+					{88, 175, 107, 305},
+					"Output Directory",
+					":",
+					"-o",
+					"",
+					"Choose the directory where DLG will put "
+					"its output.",
+					dim,
+					"Output DirectoryI",
+					"",
+					""
+				},
+				NoMore {
+
+				}
+			},
+			/* [10] */
+			NotDependent {
+
+			},
+			RegularEntry {
+				"Mode File Name:",
+				{68, 315, 83, 450},
+				{88, 315, 104, 450},
+				"mode.h",
+				keepCase,
+				"-m",
+				"This entry specifies the name DLG uses f"
+				"or its lexical mode output file."
+			},
+			/* [11] */
+			NotDependent {
+
+			},
+			RadioButtons {
+				{	/* array radioArray: 3 elements */
+					/* [1] */
+					{134, 175, 149, 255}, "None", "", Set, "When this option is selected, DLG will n"
+					"ot compress its tables.",
+					/* [2] */
+					{134, 265, 149, 345}, "Level 1", "-C1", NotSet, "When this option is selected, DLG will r"
+					"emove all unused characters from the tra"
+					"nsition-from table.",
+					/* [3] */
+					{134, 360, 149, 450}, "Level 2", "-C2", NotSet, "When this option is selected, DLG will p"
+					"erform level 1 compression plus it will "
+					"map equivalent characters into the same "
+					"character classes."
+				}
+			},
+			/* [12] */
+			NotDependent {
+
+			},
+			TextBox {
+				gray,
+				{124, 165, 156, 460},
+				"Table Compression"
+			},
+			/* [13] */
+			NotDependent {
+
+			},
+			CheckOption {
+				Set,
+				{165, 20, 180, 145},
+				"Case Sensitive",
+				"-ci",
+				"When this control is checked, the DLG au"
+				"tomaton will treat upper and lower case "
+				"characters identically."
+			},
+			/* [14] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{165, 150, 180, 300},
+				"Interactive Scanner",
+				"-i",
+				"When this control is checked, DLG will g"
+				"enerate as interactive a scanner as poss"
+				"ible."
+			},
+			/* [15] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{165, 310, 180, 460},
+				"Ambiguity Warnings",
+				"-Wambiguity",
+				"When this control is checked, DLG warns "
+				"if more than one regular expression coul"
+				"d match the same character sequence."
+			},
+			/* [16] */
+			NotDependent {
+
+			},
+			VersionDialog {
+				VersionString {
+					"1.33MR"
+				},
+				"PCCTS was written by Terence Parr, Russe"
+				"ll Quong, Will Cohen, and Hank Dietz: 19"
+				"89-1998. MPW port by Scott Haney.",
+				noDialog
+			},
+			/* [17] */
+			And {
+				{	/* array AndArray: 2 elements */
+					/* [1] */
+					4,
+					/* [2] */
+					6
+				}
+			},
+			DoItButton {
+
+			},
+			/* [18] */
+			NotDependent {
+
+			},
+			CheckOption {
+				NotSet,
+				{142, 20, 157, 148},
+				"Generate ANSI C",
+				"-ga",
+				"When this control is checked, DLG genera"
+				"tes ANSI C compatible code."
+			}
+		}
+	}
+};
+
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg1.txt b/Tools/Source/TianoTools/Pccts/dlg/dlg1.txt
new file mode 100644
index 0000000000..06b320de2a
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg1.txt
@@ -0,0 +1,132 @@
+
+
+
+dlg(1)                 PCCTS Manual Pages                  dlg(1)
+
+
+
+NAME
+     dlg - DFA Lexical Analyzer Generator
+
+SYNTAX
+     dlg [_o_p_t_i_o_n_s] _l_e_x_i_c_a_l__s_p_e_c [_o_u_t_p_u_t__f_i_l_e]
+
+DESCRIPTION
+     dlg is a tool that produces fast deterministic finite auto-
+     mata for recognizing regular expressions in input.
+
+OPTIONS
+     -CC  Generate C++ output.  The _o_u_t_p_u_t__f_i_l_e is not specified
+          in this case.
+
+     -C[ level]
+          Where level is the compression level used.  0 indica-
+          tions no compression, 1 removes all unused characters
+          from the transition from table, and 2 maps equivalent
+          characters into the same character classes.  It is sug-
+          gested that level -C2 is used, since it will signifi-
+          cantly reduce the size of the dfa produced for lexical
+          analyzer.
+
+     -m   Produces the header file for the lexical mode with a
+          name other than the default name of "mode.h".
+
+     -i   An interactive, or as interactive as possible, parser
+          is produced.  A character is only obtained when
+          required to decide which state to go to.  Some care
+          must be taken to obtain accept states that do not
+          require look ahead at the next character to determine
+          if that is the stop state.  Any regular expression with
+          a Kleene closure at the end is guaranteed to require
+          another character of look ahead.
+
+     -cl class
+          Specify a class name for DLG to generate.  The default
+          is DLGLexer.
+
+     -ci  The automaton will treat upper and lower case charac-
+          ters identically.  This is accomplished in the automa-
+          ton; the characters in the lexical buffer are unmodi-
+          fied.
+
+     -cs  Upper and lower case characters are treated as dis-
+          tinct.  This is the default.
+
+     -o dir
+          Directory where output files should go (default=".").
+          This is very nice for keeping the source directory
+          clear of ANTLR and DLG spawn.
+
+     -Wambiguity
+          Warns if more than one regular expression could match
+          the same character sequence.  The warnings give the
+          numbers of the expressions in the dlg lexical specifi-
+          cation file.  The numbering of the expressions starts
+          at one.  Multiple warnings may be print for the same
+          expressions.
+
+     -    Used in place of file names to get input from standard
+          in or send output to standard out.
+
+SPECIAL CONSIDERATIONS
+     _D_l_g works...  we think.  There is no implicit guarantee of
+     anything.  We reserve no legal rights to the software known
+     as the Purdue Compiler Construction Tool Set (PCCTS) - PCCTS
+     is in the public domain.  An individual or company may do
+     whatever they wish with source code distributed with PCCTS
+     or the code generated by PCCTS, including the incorporation
+     of PCCTS, or its output, into commercial software.  We
+     encourage users to develop software with PCCTS.  However, we
+     do ask that credit is given to us for developing PCCTS.  By
+     "credit", we mean that if you incorporate our source code
+     into one of your programs (commercial product, research pro-
+     ject, or otherwise) that you acknowledge this fact somewhere
+     in the documentation, research report, etc...  If you like
+     PCCTS and have developed a nice tool with the output, please
+     mention that you developed it using PCCTS.  As long as these
+     guidelines are followed, we expect to continue enhancing
+     this system and expect to make other tools available as they
+     are completed.
+
+FILES
+     mode.h , dlgauto.h , dlgdef.h
+
+SEE ALSO
+     antlr(1), pccts(1)
+
+BUGS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_a.c b/Tools/Source/TianoTools/Pccts/dlg/dlg_a.c
new file mode 100644
index 0000000000..0b8982cf2a
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg_a.c
@@ -0,0 +1,1414 @@
+
+/* parser.dlg -- DLG Description of scanner
+ *
+ * Generated from: dlg_p.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include <ctype.h>
+#include "dlg.h"
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+LOOKAHEAD
+
+void
+#ifdef __USE_PROTOS
+zzerraction(void)
+#else
+zzerraction()
+#endif
+{
+	(*zzerr)("invalid token");
+	zzadvance();
+	zzskip();
+}
+/*
+ * D L G tables
+ *
+ * Generated from: parser.dlg
+ *
+ * 1989-2001 by  Will Cohen, Terence Parr, and Hank Dietz
+ * Purdue University Electrical Engineering
+ * DLG Version 1.33MR33
+ */
+
+#include "mode.h"
+
+
+
+
+int	func_action;		/* should actions be turned into functions?*/
+int	lex_mode_counter = 0;	/* keeps track of the number of %%names */
+/* MR1									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+/* MR1				via <<%%lexmember...>>			    */
+/* MR1									    */
+int	lexMember = 0;		/* <<%%lexmemeber ...>>	   		MR1 */
+int	lexAction = 0;		/* <<%%lexaction ...>>			MR1 */
+int	parserClass = 0;	/* <<%%parserclass ...>>        MR1 */
+int	lexPrefix = 0;		/* <<%%lexprefix ...>>			MR1 */
+char	theClassName[100];						     /* MR11 */
+char	*pClassName=theClassName;					 /* MR11 */
+int	firstLexMember=1;					             /* MR1 */
+
+#ifdef __USE_PROTOS
+void  xxputc(int c) {						/* MR1 */
+#else
+  void xxputc(c)							/* MR1 */
+  int	c;							/* MR1 */
+  {								/* MR1 */
+#endif
+    if (parserClass) {						/* MR1 */
+      *pClassName++=c;						/* MR1 */
+      *pClassName=0;						/* MR1 */
+    } else if (lexMember || lexPrefix) {				/* MR1 */
+      if (class_stream != NULL) fputc(c,class_stream);		/* MR1 */
+    } else {							/* MR1 */
+      fputc(c,OUT);						/* MR1 */
+    };								/* MR1 */
+  }  								/* MR1 */
+  
+#ifdef __USE_PROTOS
+  void xxprintf(char *format,char *string) {			/* MR1 */
+#else
+    void xxprintf(format,string) 					/* MR1 */
+    char *format;							/* MR1 */
+    char *string;							/* MR1 */
+    {								/* MR1 */
+#endif
+      if (lexMember || lexPrefix || parserClass) {			/* MR1 */
+        if (class_stream != NULL)					/* MR1 */
+        fprintf(class_stream,format,string);			/* MR1 */
+      } else {							/* MR1 */
+        fprintf(OUT,format,string);					/* MR1 */
+      };								/* MR1 */
+    }  								/* MR1 */
+
+static void act1()
+{ 
+		NLA = 1;
+	}
+
+
+static void act2()
+{ 
+		NLA = 2;
+    zzskip();   
+	}
+
+
+static void act3()
+{ 
+		NLA = 3;
+    zzline++; zzskip(); DAWDLE;   
+	}
+
+
+static void act4()
+{ 
+		NLA = L_EOF;
+	}
+
+
+static void act5()
+{ 
+		NLA = PER_PER;
+	}
+
+
+static void act6()
+{ 
+		NLA = NAME_PER_PER;
+    p_mode_def(&zzlextext[2],lex_mode_counter++);   
+	}
+
+
+static void act7()
+{ 
+		NLA = LEXMEMBER;
+    lexMember=1;					/* MR1 */
+    if (firstLexMember != 0) {			/* MR1 */
+      firstLexMember=0;				/* MR1 */
+      p_class_def1();				/* MR1 */
+    };						/* MR1 */
+    zzmode(ACT);					/* MR1 */
+	}
+
+
+static void act8()
+{ 
+		NLA = LEXACTION;
+    lexAction=1;zzmode(ACT);  
+	}
+
+
+static void act9()
+{ 
+		NLA = PARSERCLASS;
+    parserClass=1;				/* MR1 */
+    zzmode(ACT);					/* MR1 */
+	}
+
+
+static void act10()
+{ 
+		NLA = LEXPREFIX;
+    lexPrefix=1;zzmode(ACT);  
+	}
+
+
+static void act11()
+{ 
+		NLA = ACTION;
+    if (func_action)
+    fprintf(OUT,"\n%s %sact%d()\n{ ",
+    gen_cpp?"ANTLRTokenType":"static void",
+    gen_cpp?ClassName("::"):"", ++action_no);
+    zzmode(ACT); zzskip();
+	}
+
+
+static void act12()
+{ 
+		NLA = GREAT_GREAT;
+	}
+
+
+static void act13()
+{ 
+		NLA = L_BRACE;
+	}
+
+
+static void act14()
+{ 
+		NLA = R_BRACE;
+	}
+
+
+static void act15()
+{ 
+		NLA = L_PAR;
+	}
+
+
+static void act16()
+{ 
+		NLA = R_PAR;
+	}
+
+
+static void act17()
+{ 
+		NLA = L_BRACK;
+	}
+
+
+static void act18()
+{ 
+		NLA = R_BRACK;
+	}
+
+
+static void act19()
+{ 
+		NLA = ZERO_MORE;
+	}
+
+
+static void act20()
+{ 
+		NLA = ONE_MORE;
+	}
+
+
+static void act21()
+{ 
+		NLA = OR;
+	}
+
+
+static void act22()
+{ 
+		NLA = RANGE;
+	}
+
+
+static void act23()
+{ 
+		NLA = NOT;
+	}
+
+
+static void act24()
+{ 
+		NLA = OCTAL_VALUE;
+    {int t; sscanf(&zzlextext[1],"%o",&t); zzlextext[0] = t;}  
+	}
+
+
+static void act25()
+{ 
+		NLA = HEX_VALUE;
+    {int t; sscanf(&zzlextext[3],"%x",&t); zzlextext[0] = t;}  
+	}
+
+
+static void act26()
+{ 
+		NLA = DEC_VALUE;
+    {int t; sscanf(&zzlextext[1],"%d",&t); zzlextext[0] = t;}  
+	}
+
+
+static void act27()
+{ 
+		NLA = TAB;
+    zzlextext[0] = '\t';  
+	}
+
+
+static void act28()
+{ 
+		NLA = NL;
+    zzlextext[0] = '\n';  
+	}
+
+
+static void act29()
+{ 
+		NLA = CR;
+    zzlextext[0] = '\r';  
+	}
+
+
+static void act30()
+{ 
+		NLA = BS;
+    zzlextext[0] = '\b';  
+	}
+
+
+static void act31()
+{ 
+		NLA = CONTINUATION;
+    zzline++; zzskip();  
+	}
+
+
+static void act32()
+{ 
+		NLA = LIT;
+    zzlextext[0] = zzlextext[1];  
+	}
+
+
+static void act33()
+{ 
+		NLA = REGCHAR;
+	}
+
+static unsigned char shift0[257] = {
+  0, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  1, 2, 40, 40, 1, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 1, 40, 40, 40, 40, 4, 40, 
+  40, 30, 31, 34, 35, 40, 37, 40, 40, 23, 
+  24, 24, 24, 24, 24, 24, 24, 25, 25, 40, 
+  40, 26, 40, 27, 40, 3, 21, 21, 21, 21, 
+  21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 
+  22, 22, 22, 22, 22, 22, 22, 22, 22, 20, 
+  22, 22, 32, 39, 33, 40, 22, 40, 11, 9, 
+  12, 21, 6, 19, 22, 22, 14, 22, 22, 5, 
+  8, 16, 15, 17, 22, 10, 18, 13, 22, 22, 
+  22, 7, 22, 22, 28, 36, 29, 38, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 
+  40, 40, 40, 40, 40, 40, 40
+};
+
+
+static void act34()
+{ 
+		NLA = 1;
+    error("unterminated action", zzline); zzmode(START);   
+	}
+
+
+static void act35()
+{ 
+		NLA = ACTION;
+    if (func_action) fprintf(OUT,"}\n\n");
+    zzmode(START);
+    /* MR1									    */
+    /* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+    /* MR1				via <<%%lexmember ...>>			    */
+    /* MR1			This is a consequence of not saving actions         */
+    /* MR1									    */
+    /* MR1 */	   parserClass=0;		
+    /* MR1 */	   lexPrefix=0;
+    /* MR1 */	   lexAction=0;
+    /* MR1 */	   lexMember=0;
+	}
+
+
+static void act36()
+{ 
+		NLA = 34;
+    xxputc(zzlextext[0]); zzskip();   
+	}
+
+
+static void act37()
+{ 
+		NLA = 35;
+    xxputc('>'); zzskip();   
+	}
+
+
+static void act38()
+{ 
+		NLA = 36;
+    xxputc('\\'); zzskip();   
+	}
+
+
+static void act39()
+{ 
+		NLA = 37;
+    xxputc(zzlextext[0]); ++zzline; zzskip();   
+	}
+
+
+static void act40()
+{ 
+		NLA = 38;
+    zzmode(ACTION_COMMENTS);			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	}
+
+
+static void act41()
+{ 
+		NLA = 39;
+    zzmode(ACTION_CPP_COMMENTS);			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	}
+
+
+static void act42()
+{ 
+		NLA = 40;
+    xxputc(zzlextext[0]); zzskip();   
+	}
+
+static unsigned char shift1[257] = {
+  0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 3, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 5, 6, 6, 6, 6, 4, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 1, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 2, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6
+};
+
+
+static void act43()
+{ 
+		NLA = 1;
+	}
+
+
+static void act44()
+{ 
+		NLA = 41;
+    zzmode(ACT);					/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	}
+
+
+static void act45()
+{ 
+		NLA = 42;
+    zzline++; xxputc(zzlextext[0]); zzskip();  
+	}
+
+
+static void act46()
+{ 
+		NLA = 43;
+    xxputc(zzlextext[0]); zzskip();  
+	}
+
+static unsigned char shift2[257] = {
+  0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 3, 4, 4, 3, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 1, 4, 4, 4, 4, 2, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4
+};
+
+
+static void act47()
+{ 
+		NLA = 1;
+	}
+
+
+static void act48()
+{ 
+		NLA = 44;
+    zzmode(ACT); zzline++;			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	}
+
+
+static void act49()
+{ 
+		NLA = 45;
+    xxputc(zzlextext[0]); zzskip();  
+	}
+
+static unsigned char shift3[257] = {
+  0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 1, 2, 2, 1, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
+  2, 2, 2, 2, 2, 2, 2
+};
+
+#define DfaStates	94
+typedef unsigned char DfaState;
+
+static DfaState st0[42] = {
+  1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  6, 6, 6, 6, 6, 6, 7, 8, 9, 10, 
+  11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 
+  6, 94
+};
+
+static DfaState st1[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st2[42] = {
+  94, 21, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st3[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st4[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st5[42] = {
+  94, 94, 94, 94, 22, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st6[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st7[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 23, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st8[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 24, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st9[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st10[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st11[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st12[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st13[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st14[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st15[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st16[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st17[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st18[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st19[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st20[42] = {
+  94, 25, 26, 25, 25, 25, 25, 25, 25, 27, 
+  28, 25, 25, 29, 25, 25, 30, 25, 25, 25, 
+  25, 25, 25, 31, 32, 32, 25, 25, 25, 25, 
+  25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 
+  25, 94
+};
+
+static DfaState st21[42] = {
+  94, 21, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st22[42] = {
+  94, 94, 94, 94, 94, 33, 33, 33, 33, 33, 
+  33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 
+  33, 33, 33, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st23[42] = {
+  94, 94, 94, 94, 34, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st24[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st25[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st26[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st27[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st28[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st29[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st30[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st31[42] = {
+  94, 94, 94, 94, 94, 94, 94, 35, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  35, 94, 94, 36, 36, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st32[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 37, 37, 37, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st33[42] = {
+  94, 94, 94, 94, 94, 38, 38, 38, 38, 38, 
+  38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 
+  38, 38, 38, 38, 38, 38, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st34[42] = {
+  94, 94, 94, 94, 39, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st35[42] = {
+  94, 94, 94, 94, 94, 94, 40, 94, 94, 40, 
+  94, 40, 40, 94, 94, 94, 94, 94, 94, 40, 
+  94, 40, 94, 40, 40, 40, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st36[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 36, 36, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st37[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 37, 37, 37, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st38[42] = {
+  94, 94, 94, 94, 94, 38, 38, 38, 38, 38, 
+  38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 
+  38, 38, 38, 38, 38, 38, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st39[42] = {
+  94, 94, 94, 94, 94, 41, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 42, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st40[42] = {
+  94, 94, 94, 94, 94, 94, 40, 94, 94, 40, 
+  94, 40, 40, 94, 94, 94, 94, 94, 94, 40, 
+  94, 40, 94, 40, 40, 40, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st41[42] = {
+  94, 94, 94, 94, 94, 94, 43, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st42[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 44, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st43[42] = {
+  94, 94, 94, 94, 94, 94, 94, 45, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st44[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  46, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st45[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 47, 94, 
+  94, 48, 94, 94, 94, 94, 94, 49, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st46[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 50, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st47[42] = {
+  94, 94, 94, 94, 94, 94, 51, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st48[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 52, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st49[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  53, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st50[42] = {
+  94, 94, 94, 94, 94, 94, 54, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st51[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 55, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st52[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 56, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st53[42] = {
+  94, 94, 94, 94, 94, 94, 57, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st54[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  58, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st55[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 59, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st56[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 60, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st57[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 61, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st58[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 62, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st59[42] = {
+  94, 94, 94, 94, 94, 94, 63, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st60[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 64, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st61[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 65, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st62[42] = {
+  94, 94, 94, 94, 94, 66, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st63[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  67, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st64[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 68, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st65[42] = {
+  94, 94, 94, 94, 94, 94, 94, 69, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st66[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 70, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st67[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st68[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st69[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st70[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 71, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st71[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 72, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st72[42] = {
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94, 94, 94, 94, 94, 94, 94, 94, 94, 
+  94, 94
+};
+
+static DfaState st73[8] = {
+  74, 75, 76, 77, 78, 79, 79, 94
+};
+
+static DfaState st74[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st75[8] = {
+  94, 80, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st76[8] = {
+  94, 81, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st77[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st78[8] = {
+  94, 94, 94, 94, 82, 83, 94, 94
+};
+
+static DfaState st79[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st80[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st81[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st82[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st83[8] = {
+  94, 94, 94, 94, 94, 94, 94, 94
+};
+
+static DfaState st84[6] = {
+  85, 86, 87, 88, 87, 94
+};
+
+static DfaState st85[6] = {
+  94, 94, 94, 94, 94, 94
+};
+
+static DfaState st86[6] = {
+  94, 94, 89, 94, 94, 94
+};
+
+static DfaState st87[6] = {
+  94, 94, 94, 94, 94, 94
+};
+
+static DfaState st88[6] = {
+  94, 94, 94, 94, 94, 94
+};
+
+static DfaState st89[6] = {
+  94, 94, 94, 94, 94, 94
+};
+
+static DfaState st90[4] = {
+  91, 92, 93, 94
+};
+
+static DfaState st91[4] = {
+  94, 94, 94, 94
+};
+
+static DfaState st92[4] = {
+  94, 94, 94, 94
+};
+
+static DfaState st93[4] = {
+  94, 94, 94, 94
+};
+
+
+DfaState *dfa[94] = {
+	st0,
+	st1,
+	st2,
+	st3,
+	st4,
+	st5,
+	st6,
+	st7,
+	st8,
+	st9,
+	st10,
+	st11,
+	st12,
+	st13,
+	st14,
+	st15,
+	st16,
+	st17,
+	st18,
+	st19,
+	st20,
+	st21,
+	st22,
+	st23,
+	st24,
+	st25,
+	st26,
+	st27,
+	st28,
+	st29,
+	st30,
+	st31,
+	st32,
+	st33,
+	st34,
+	st35,
+	st36,
+	st37,
+	st38,
+	st39,
+	st40,
+	st41,
+	st42,
+	st43,
+	st44,
+	st45,
+	st46,
+	st47,
+	st48,
+	st49,
+	st50,
+	st51,
+	st52,
+	st53,
+	st54,
+	st55,
+	st56,
+	st57,
+	st58,
+	st59,
+	st60,
+	st61,
+	st62,
+	st63,
+	st64,
+	st65,
+	st66,
+	st67,
+	st68,
+	st69,
+	st70,
+	st71,
+	st72,
+	st73,
+	st74,
+	st75,
+	st76,
+	st77,
+	st78,
+	st79,
+	st80,
+	st81,
+	st82,
+	st83,
+	st84,
+	st85,
+	st86,
+	st87,
+	st88,
+	st89,
+	st90,
+	st91,
+	st92,
+	st93
+};
+
+
+DfaState accepts[95] = {
+  0, 1, 2, 3, 4, 33, 33, 33, 33, 13, 
+  14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 
+  0, 2, 5, 11, 12, 32, 31, 30, 29, 27, 
+  28, 24, 26, 6, 0, 0, 24, 26, 6, 0, 
+  25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 0, 0, 7, 8, 10, 
+  0, 0, 9, 0, 34, 36, 38, 39, 42, 42, 
+  35, 37, 41, 40, 0, 43, 46, 46, 45, 44, 
+  0, 47, 48, 49, 0
+};
+
+void (*actions[50])() = {
+	zzerraction,
+	act1,
+	act2,
+	act3,
+	act4,
+	act5,
+	act6,
+	act7,
+	act8,
+	act9,
+	act10,
+	act11,
+	act12,
+	act13,
+	act14,
+	act15,
+	act16,
+	act17,
+	act18,
+	act19,
+	act20,
+	act21,
+	act22,
+	act23,
+	act24,
+	act25,
+	act26,
+	act27,
+	act28,
+	act29,
+	act30,
+	act31,
+	act32,
+	act33,
+	act34,
+	act35,
+	act36,
+	act37,
+	act38,
+	act39,
+	act40,
+	act41,
+	act42,
+	act43,
+	act44,
+	act45,
+	act46,
+	act47,
+	act48,
+	act49
+};
+
+static DfaState dfa_base[] = {
+	0,
+	73,
+	84,
+	90
+};
+
+static unsigned char *b_class_no[] = {
+	shift0,
+	shift1,
+	shift2,
+	shift3
+};
+
+
+
+#define ZZSHIFT(c) (b_class_no[zzauto][1+c])
+#define MAX_MODE 4
+#include "dlgauto.h"
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_p.c b/Tools/Source/TianoTools/Pccts/dlg/dlg_p.c
new file mode 100644
index 0000000000..e726ae3983
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg_p.c
@@ -0,0 +1,959 @@
+/*
+ * A n t l r  T r a n s l a t i o n  H e a d e r
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ *
+ *   ..\bin\antlr dlg_p.g -gh
+ *
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include <ctype.h>
+#include "dlg.h"
+#define zzSET_SIZE 8
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "mode.h"
+
+/* MR23 In order to remove calls to PURIFY use the antlr -nopurify option */
+
+#ifndef PCCTS_PURIFY
+#define PCCTS_PURIFY(r,s) memset((char *) &(r),'\0',(s));
+#endif
+
+ANTLR_INFO
+
+
+/* MR20 G. Hobbelt 
+Fix for Borland C++ 4.x & 5.x compiling with ALL warnings enabled
+*/
+
+#ifdef __TURBOC__
+#pragma warn -aus  /* unused assignment of 'xxx' */
+#endif
+
+int	action_no = 0;	   /* keep track of actions outputed */
+int	nfa_allocated = 0; /* keeps track of number of nfa nodes */
+nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */
+nfa_node nfa_model_node;   /* model to initialize new nodes */
+set	used_chars;	   /* used to label trans. arcs */
+set	used_classes;	   /* classes or chars used to label trans. arcs */
+set	normal_chars;	   /* mask to get rid elements that aren't used
+in set */
+int	flag_paren = FALSE;
+int	flag_brace = FALSE;
+int	mode_counter = 0;  /* keep track of number of %%names */
+
+  
+
+void
+#ifdef __USE_PROTOS
+grammar(void)
+#else
+grammar()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  p_head(); p_class_hdr(); func_action = FALSE;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (setwd1[LA(1)]&0x1) ) {
+      {
+        zzBLOCK(zztasp3);
+        zzMake0;
+        {
+        if ( (LA(1)==LEXACTION) ) {
+          zzmatch(LEXACTION); zzCONSUME;
+        }
+        else {
+          if ( (LA(1)==LEXMEMBER) ) {
+            zzmatch(LEXMEMBER); zzCONSUME;
+          }
+          else {
+            if ( (LA(1)==LEXPREFIX) ) {
+              zzmatch(LEXPREFIX); zzCONSUME;
+            }
+            else {
+              if ( (LA(1)==PARSERCLASS) ) {
+                zzmatch(PARSERCLASS); zzCONSUME;
+              }
+              else {
+                if ( (LA(1)==ACTION) ) {
+                }
+                else {zzFAIL(1,zzerr1,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+              }
+            }
+          }
+        }
+        zzEXIT(zztasp3);
+        }
+      }
+      zzmatch(ACTION); zzCONSUME;
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  if ( gen_cpp ) p_includes();
+  start_states();
+  func_action = FALSE; p_tables(); p_tail();
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==ACTION) ) {
+      zzmatch(ACTION); zzCONSUME;
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(1);
+  if (firstLexMember != 0) p_class_def1();
+ zzCONSUME;
+
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x2);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+start_states(void)
+#else
+start_states()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==PER_PER) ) {
+      zzmatch(PER_PER); zzCONSUME;
+      do_conversion();
+    }
+    else {
+      if ( (LA(1)==NAME_PER_PER) ) {
+        zzmatch(NAME_PER_PER); zzCONSUME;
+        do_conversion();
+        {
+          zzBLOCK(zztasp3);
+          zzMake0;
+          {
+          while ( (LA(1)==NAME_PER_PER) ) {
+            zzmatch(NAME_PER_PER); zzCONSUME;
+            do_conversion();
+            zzLOOP(zztasp3);
+          }
+          zzEXIT(zztasp3);
+          }
+        }
+      }
+      else {zzFAIL(1,zzerr2,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzmatch(PER_PER); zzCONSUME;
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x4);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+do_conversion(void)
+#else
+do_conversion()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  new_automaton_mode(); func_action = TRUE;
+  rule_list();
+  
+  dfa_class_nop[mode_counter] =
+  relabel(zzaArg(zztasp1,1 ).l,comp_level);
+  if (comp_level)
+  p_shift_table(mode_counter);
+  dfa_basep[mode_counter] = dfa_allocated+1;
+  make_dfa_model_node(dfa_class_nop[mode_counter]);
+  nfa_to_dfa(zzaArg(zztasp1,1 ).l);
+  ++mode_counter;
+  func_action = FALSE;
+#ifdef HASH_STAT
+  fprint_hash_stats(stderr);
+#endif
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x8);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+rule_list(void)
+#else
+rule_list()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  if ( (setwd1[LA(1)]&0x10) ) {
+    rule();
+    zzaRet.l=zzaArg(zztasp1,1 ).l; zzaRet.r=zzaArg(zztasp1,1 ).r;
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      while ( (setwd1[LA(1)]&0x20) ) {
+        rule();
+        {nfa_node *t1;
+          t1 = new_nfa_node();
+          (t1)->trans[0]=zzaRet.l;
+          (t1)->trans[1]=zzaArg(zztasp2,1 ).l;
+          /* all accept nodes "dead ends" */
+          zzaRet.l=t1; zzaRet.r=NULL;
+        }
+        zzLOOP(zztasp2);
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+  }
+  else {
+    if ( (setwd1[LA(1)]&0x40) ) {
+      zzaRet.l = new_nfa_node(); zzaRet.r = NULL;
+      warning("no regular expressions", zzline);
+    }
+    else {zzFAIL(1,zzerr3,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd1, 0x80);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+rule(void)
+#else
+rule()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  if ( (setwd2[LA(1)]&0x1) ) {
+    reg_expr();
+    zzmatch(ACTION);
+    if (zzaArg(zztasp1,1 ).r != NULL) {
+      zzaRet.l=zzaArg(zztasp1,1 ).l; zzaRet.r=zzaArg(zztasp1,1 ).r; (zzaArg(zztasp1,1 ).r)->accept=action_no;
+    }
+ zzCONSUME;
+
+  }
+  else {
+    if ( (LA(1)==ACTION) ) {
+      zzmatch(ACTION);
+      zzaRet.l = NULL; zzaRet.r = NULL;
+      error("no expression for action  ", zzline);
+ zzCONSUME;
+
+    }
+    else {zzFAIL(1,zzerr4,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x2);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+reg_expr(void)
+#else
+reg_expr()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  and_expr();
+  zzaRet.l=zzaArg(zztasp1,1 ).l; zzaRet.r=zzaArg(zztasp1,1 ).r;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (LA(1)==OR) ) {
+      zzmatch(OR); zzCONSUME;
+      and_expr();
+      {nfa_node *t1, *t2;
+        t1 = new_nfa_node(); t2 = new_nfa_node();
+        (t1)->trans[0]=zzaRet.l;
+        (t1)->trans[1]=zzaArg(zztasp2,2 ).l;
+        /* MR23 */		   if (zzaRet.r != NULL) (zzaRet.r)->trans[1]=t2;
+        if (zzaArg(zztasp2,2 ).r) {
+          (zzaArg(zztasp2,2 ).r)->trans[1]=t2;     /* MR20 */
+        }
+        zzaRet.l=t1; zzaRet.r=t2;
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x4);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+and_expr(void)
+#else
+and_expr()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  repeat_expr();
+  
+  zzaRet.l=zzaArg(zztasp1,1 ).l; zzaRet.r=zzaArg(zztasp1,1 ).r;
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (setwd2[LA(1)]&0x8) ) {
+      repeat_expr();
+      if (zzaRet.r != NULL) {
+        (zzaRet.r)->trans[1]=zzaArg(zztasp2,1 ).l;
+        zzaRet.r=zzaArg(zztasp2,1 ).r;
+      }
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x10);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+repeat_expr(void)
+#else
+repeat_expr()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  if ( (setwd2[LA(1)]&0x20) ) {
+    expr();
+    zzaRet.l=zzaArg(zztasp1,1 ).l; zzaRet.r=zzaArg(zztasp1,1 ).r;
+    {
+      zzBLOCK(zztasp2);
+      zzMake0;
+      {
+      if ( (LA(1)==ZERO_MORE) ) {
+        zzmatch(ZERO_MORE);
+        {	nfa_node *t1,*t2;
+          /* MR23 */		if (zzaRet.r != NULL) (zzaRet.r)->trans[0] = zzaRet.l;
+          t1 = new_nfa_node(); t2 = new_nfa_node();
+          t1->trans[0]=zzaRet.l;
+          t1->trans[1]=t2;
+          /* MR23 */		if (zzaRet.r != NULL) (zzaRet.r)->trans[1]=t2;
+          zzaRet.l=t1;zzaRet.r=t2;
+        }
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==ONE_MORE) ) {
+          zzmatch(ONE_MORE);
+          if (zzaRet.r != NULL) (zzaRet.r)->trans[0] = zzaRet.l;
+ zzCONSUME;
+
+        }
+        else {
+          if ( (setwd2[LA(1)]&0x40) ) {
+          }
+          else {zzFAIL(1,zzerr5,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+      }
+      zzEXIT(zztasp2);
+      }
+    }
+  }
+  else {
+    if ( (LA(1)==ZERO_MORE) ) {
+      zzmatch(ZERO_MORE);
+      error("no expression for *", zzline);
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==ONE_MORE) ) {
+        zzmatch(ONE_MORE);
+        error("no expression for +", zzline);
+ zzCONSUME;
+
+      }
+      else {zzFAIL(1,zzerr6,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd2, 0x80);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+expr(void)
+#else
+expr()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  zzaRet.l = new_nfa_node();
+  zzaRet.r = new_nfa_node();
+  if ( (LA(1)==L_BRACK) ) {
+    zzmatch(L_BRACK); zzCONSUME;
+    atom_list();
+    zzmatch(R_BRACK);
+    
+    /* MR23 */		if (zzaRet.l != NULL) {
+      (zzaRet.l)->trans[0] = zzaRet.r;
+      (zzaRet.l)->label = set_dup(zzaArg(zztasp1,2 ).label);
+      set_orin(&used_chars,(zzaRet.l)->label);
+    }
+ zzCONSUME;
+
+  }
+  else {
+    if ( (LA(1)==NOT) ) {
+      zzmatch(NOT); zzCONSUME;
+      zzmatch(L_BRACK); zzCONSUME;
+      atom_list();
+      zzmatch(R_BRACK);
+      
+      /* MR23 */		if (zzaRet.l != NULL) {
+        (zzaRet.l)->trans[0] = zzaRet.r;
+        (zzaRet.l)->label = set_dif(normal_chars,zzaArg(zztasp1,3 ).label);
+        set_orin(&used_chars,(zzaRet.l)->label);
+      }
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==L_PAR) ) {
+        zzmatch(L_PAR); zzCONSUME;
+        reg_expr();
+        zzmatch(R_PAR);
+        
+        /* MR23 */		if (zzaRet.l != NULL) {				
+          (zzaRet.l)->trans[0] = zzaArg(zztasp1,2 ).l;
+          if (zzaArg(zztasp1,2 ).r) {
+            (zzaArg(zztasp1,2 ).r)->trans[1] = zzaRet.r;    /* MR20 */
+          }
+        }
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==L_BRACE) ) {
+          zzmatch(L_BRACE); zzCONSUME;
+          reg_expr();
+          zzmatch(R_BRACE);
+          
+          /* MR23 */		if (zzaRet.l != NULL) {
+            (zzaRet.l)->trans[0] = zzaArg(zztasp1,2 ).l;
+            (zzaRet.l)->trans[1] = zzaRet.r;
+            if (zzaArg(zztasp1,2 ).r) {
+              (zzaArg(zztasp1,2 ).r)->trans[1] = zzaRet.r;    /* MR20 */
+            }
+          }
+ zzCONSUME;
+
+        }
+        else {
+          if ( (setwd3[LA(1)]&0x1) ) {
+            atom();
+            
+            /* MR23 */		if (zzaRet.l != NULL) {
+              (zzaRet.l)->trans[0] = zzaRet.r;
+              (zzaRet.l)->label = set_dup(zzaArg(zztasp1,1 ).label);
+              set_orin(&used_chars,(zzaRet.l)->label);
+            }
+          }
+          else {zzFAIL(1,zzerr7,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+        }
+      }
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x2);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+atom_list(void)
+#else
+atom_list()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  set_free(zzaRet.label);
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    while ( (setwd3[LA(1)]&0x4) ) {
+      near_atom();
+      set_orin(&(zzaRet.label),zzaArg(zztasp2,1 ).label);
+      zzLOOP(zztasp2);
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x8);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+near_atom(void)
+#else
+near_atom()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  register int i;
+  register int i_prime;
+  anychar();
+  zzaRet.letter=zzaArg(zztasp1,1 ).letter; zzaRet.label=set_of(zzaArg(zztasp1,1 ).letter);
+  i_prime = zzaArg(zztasp1,1 ).letter + MIN_CHAR;
+  if (case_insensitive && islower(i_prime))
+  set_orel(toupper(i_prime)-MIN_CHAR,
+  &(zzaRet.label));
+  if (case_insensitive && isupper(i_prime))
+  set_orel(tolower(i_prime)-MIN_CHAR,
+  &(zzaRet.label));
+  {
+    zzBLOCK(zztasp2);
+    zzMake0;
+    {
+    if ( (LA(1)==RANGE) ) {
+      zzmatch(RANGE); zzCONSUME;
+      anychar();
+      if (case_insensitive){
+        i_prime = zzaRet.letter+MIN_CHAR;
+        zzaRet.letter = (islower(i_prime) ?
+        toupper(i_prime) : i_prime)-MIN_CHAR;
+        i_prime = zzaArg(zztasp2,2 ).letter+MIN_CHAR;
+        zzaArg(zztasp2,2 ).letter = (islower(i_prime) ?
+        toupper(i_prime) : i_prime)-MIN_CHAR;
+      }
+      /* check to see if range okay */
+      {
+        int debugLetter1 = zzaRet.letter;
+        int debugLetter2 = zzaArg(zztasp2,2 ).letter;
+      }
+      if (zzaRet.letter > zzaArg(zztasp2,2 ).letter 
+      && zzaArg(zztasp2,2 ).letter != 0xff){       /* MR16 */
+        error("invalid range  ", zzline);
+      }
+      for (i=zzaRet.letter; i<= (int)zzaArg(zztasp2,2 ).letter; ++i){
+        set_orel(i,&(zzaRet.label));
+        i_prime = i+MIN_CHAR;
+        if (case_insensitive && islower(i_prime))
+        set_orel(toupper(i_prime)-MIN_CHAR,
+        &(zzaRet.label));
+        if (case_insensitive && isupper(i_prime))
+        set_orel(tolower(i_prime)-MIN_CHAR,
+        &(zzaRet.label));
+      }
+    }
+    else {
+      if ( (setwd3[LA(1)]&0x10) ) {
+      }
+      else {zzFAIL(1,zzerr8,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+    }
+    zzEXIT(zztasp2);
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x20);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+atom(void)
+#else
+atom()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  register int i_prime;
+  anychar();
+  zzaRet.label = set_of(zzaArg(zztasp1,1 ).letter);
+  i_prime = zzaArg(zztasp1,1 ).letter + MIN_CHAR;
+  if (case_insensitive && islower(i_prime))
+  set_orel(toupper(i_prime)-MIN_CHAR,
+  &(zzaRet.label));
+  if (case_insensitive && isupper(i_prime))
+  set_orel(tolower(i_prime)-MIN_CHAR,
+  &(zzaRet.label));
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x40);
+  }
+}
+
+void
+#ifdef __USE_PROTOS
+anychar(void)
+#else
+anychar()
+#endif
+{
+  zzRULE;
+  zzBLOCK(zztasp1);
+  zzMake0;
+  {
+  if ( (LA(1)==REGCHAR) ) {
+    zzmatch(REGCHAR);
+    zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+  }
+  else {
+    if ( (LA(1)==OCTAL_VALUE) ) {
+      zzmatch(OCTAL_VALUE);
+      zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+    }
+    else {
+      if ( (LA(1)==HEX_VALUE) ) {
+        zzmatch(HEX_VALUE);
+        zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+      }
+      else {
+        if ( (LA(1)==DEC_VALUE) ) {
+          zzmatch(DEC_VALUE);
+          zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+        }
+        else {
+          if ( (LA(1)==TAB) ) {
+            zzmatch(TAB);
+            zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+          }
+          else {
+            if ( (LA(1)==NL) ) {
+              zzmatch(NL);
+              zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+            }
+            else {
+              if ( (LA(1)==CR) ) {
+                zzmatch(CR);
+                zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+              }
+              else {
+                if ( (LA(1)==BS) ) {
+                  zzmatch(BS);
+                  zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+                }
+                else {
+                  if ( (LA(1)==LIT) ) {
+                    zzmatch(LIT);
+                    zzaRet.letter = zzaArg(zztasp1,1 ).letter - MIN_CHAR;
+ zzCONSUME;
+
+                  }
+                  else {
+                    if ( (LA(1)==L_EOF) ) {
+                      zzmatch(L_EOF);
+                      zzaRet.letter = 0;
+ zzCONSUME;
+
+                    }
+                    else {zzFAIL(1,zzerr9,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk); goto fail;}
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  zzEXIT(zztasp1);
+  return;
+fail:
+  zzEXIT(zztasp1);
+  /* empty action */  
+  zzsyn(zzMissText, zzBadTok, (ANTLRChar *)"", zzMissSet, zzMissTok, zzErrk, zzBadText);
+  zzresynch(setwd3, 0x80);
+  }
+}
+
+/* adds a new nfa to the binary tree and returns a pointer to it */
+nfa_node *
+#ifdef __USE_PROTOS
+new_nfa_node(void)
+#else
+new_nfa_node()
+#endif
+{
+  register nfa_node *t;
+  static int nfa_size=0;	/* elements nfa_array[] can hold */
+  
+	++nfa_allocated;
+  if (nfa_size<=nfa_allocated){
+    /* need to redo array */
+    if (!nfa_array){
+      /* need some to do inital allocation */
+      nfa_size=nfa_allocated+NFA_MIN;
+      nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
+      nfa_size);
+    }else{
+      /* need more space */
+      nfa_size=2*(nfa_allocated+1);
+      nfa_array=(nfa_node **) realloc(nfa_array,
+      sizeof(nfa_node*)*nfa_size);
+    }
+  }
+  /* fill out entry in array */
+  t = (nfa_node*) malloc(sizeof(nfa_node));
+  nfa_array[nfa_allocated] = t;
+  *t = nfa_model_node;
+  t->node_no = nfa_allocated;
+  return t;
+}
+
+
+/* initialize the model node used to fill in newly made nfa_nodes */
+void
+#ifdef __USE_PROTOS
+make_nfa_model_node(void)
+#else
+make_nfa_model_node()
+#endif
+{
+  nfa_model_node.node_no = -1; /* impossible value for real nfa node */
+  nfa_model_node.nfa_set = 0;
+  nfa_model_node.accept = 0;   /* error state default*/
+  nfa_model_node.trans[0] = NULL;
+  nfa_model_node.trans[1] = NULL;
+  nfa_model_node.label = empty;
+}
+
+#if defined(DEBUG) || defined(_DEBUG)
+
+/* print out the pointer value and the node_number */
+void
+#ifdef __USE_PROTOS
+fprint_dfa_pair(FILE *f, nfa_node *p)
+#else
+fprint_dfa_pair(f, p)
+FILE *f;
+nfa_node *p;
+#endif
+{
+  if (p){
+    fprintf(f, "%x (%d)", p, p->node_no);
+  }else{
+    fprintf(f, "(nil)");
+  }
+}
+
+/* print out interest information on a set */
+void
+#ifdef __USE_PROTOS
+fprint_set(FILE *f, set s)
+#else
+fprint_set(f,s)
+FILE *f;
+set s;
+#endif
+{
+  unsigned int *x;
+  
+	fprintf(f, "n = %d,", s.n);
+  if (s.setword){
+    fprintf(f, "setword = %x,   ", s.setword);
+    /* print out all the elements in the set */
+    x = set_pdq(s);
+    while (*x!=nil){
+      fprintf(f, "%d ", *x);
+      ++x;
+    }
+  }else{
+    fprintf(f, "setword = (nil)");
+  }
+}
+
+/* code to be able to dump out the nfas
+return 0 if okay dump
+return 1 if screwed up
+*/
+int
+#ifdef __USE_PROTOS
+dump_nfas(int first_node, int last_node)
+#else
+dump_nfas(first_node, last_node)
+int first_node;
+int last_node;
+#endif
+{
+  register int i;
+  nfa_node *t;
+  
+	for (i=first_node; i<=last_node; ++i){
+    t = NFA(i);
+    if (!t) break;
+    fprintf(stderr, "nfa_node %d {\n", t->node_no);
+    fprintf(stderr, "\n\tnfa_set = %d\n", t->nfa_set);
+    fprintf(stderr, "\taccept\t=\t%d\n", t->accept);
+    fprintf(stderr, "\ttrans\t=\t(");
+    fprint_dfa_pair(stderr, t->trans[0]);
+    fprintf(stderr, ",");
+    fprint_dfa_pair(stderr, t->trans[1]);
+    fprintf(stderr, ")\n");
+    fprintf(stderr, "\tlabel\t=\t{ ");
+    fprint_set(stderr, t->label);
+    fprintf(stderr, "\t}\n");
+    fprintf(stderr, "}\n\n");
+  }
+  return 0;
+}
+#endif
+
+/* DLG-specific syntax error message generator
+* (define USER_ZZSYN when compiling so don't get 2 definitions)
+*/
+void
+#ifdef __USE_PROTOS
+zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, char *bad_text)
+#else
+zzsyn(text, tok, egroup, eset, etok, k, bad_text)
+char *text, *egroup, *bad_text;
+int tok;
+int etok;
+int k;
+SetWordType *eset;
+#endif
+{
+fprintf(stderr, ErrHdr, file_str[0]!=NULL?file_str[0]:"stdin", zzline);
+fprintf(stderr, " syntax error at \"%s\"", (tok==zzEOF_TOKEN)?"EOF":text);
+if ( !etok && !eset ) {fprintf(stderr, "\n"); return;}
+if ( k==1 ) fprintf(stderr, " missing");
+else
+{
+fprintf(stderr, "; \"%s\" not", bad_text);
+if ( zzset_deg(eset)>1 ) fprintf(stderr, " in");
+}
+if ( zzset_deg(eset)>0 ) zzedecode(eset);
+else fprintf(stderr, " %s", zztokens[etok]);
+if ( strlen(egroup) > (size_t)0 ) fprintf(stderr, " in %s", egroup);
+fprintf(stderr, "\n");
+}
diff --git a/Tools/Source/TianoTools/Pccts/dlg/dlg_p.g b/Tools/Source/TianoTools/Pccts/dlg/dlg_p.g
new file mode 100644
index 0000000000..58ca110693
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/dlg_p.g
@@ -0,0 +1,614 @@
+/*  This is the parser for the dlg
+ *  This is a part of the Purdue Compiler Construction Tool Set
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-1995
+ */
+
+#header	<<
+#include <ctype.h>
+#include "dlg.h"
+>>
+
+<<
+
+/* MR20 G. Hobbelt 
+   Fix for Borland C++ 4.x & 5.x compiling with ALL warnings enabled
+*/
+
+#ifdef __TURBOC__
+#pragma warn -aus  /* unused assignment of 'xxx' */
+#endif
+
+int	action_no = 0;	   /* keep track of actions outputed */
+int	nfa_allocated = 0; /* keeps track of number of nfa nodes */
+nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */
+nfa_node nfa_model_node;   /* model to initialize new nodes */
+set	used_chars;	   /* used to label trans. arcs */
+set	used_classes;	   /* classes or chars used to label trans. arcs */
+set	normal_chars;	   /* mask to get rid elements that aren't used
+			      in set */
+int	flag_paren = FALSE;
+int	flag_brace = FALSE;
+int	mode_counter = 0;  /* keep track of number of %%names */
+
+>>
+
+#lexaction <<
+int	func_action;		/* should actions be turned into functions?*/
+int	lex_mode_counter = 0;	/* keeps track of the number of %%names */
+/* MR1									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+/* MR1				via <<%%lexmember...>>			    */
+/* MR1									    */
+int	lexMember = 0;		/* <<%%lexmemeber ...>>	   		MR1 */
+int	lexAction = 0;		/* <<%%lexaction ...>>			MR1 */
+int	parserClass = 0;	/* <<%%parserclass ...>>        MR1 */
+int	lexPrefix = 0;		/* <<%%lexprefix ...>>			MR1 */
+char	theClassName[100];						     /* MR11 */
+char	*pClassName=theClassName;					 /* MR11 */
+int	firstLexMember=1;					             /* MR1 */
+
+#ifdef __USE_PROTOS
+void  xxputc(int c) {						/* MR1 */
+#else
+void xxputc(c)							/* MR1 */
+  int	c;							/* MR1 */
+{								/* MR1 */
+#endif
+  if (parserClass) {						/* MR1 */
+    *pClassName++=c;						/* MR1 */
+    *pClassName=0;						/* MR1 */
+  } else if (lexMember || lexPrefix) {				/* MR1 */
+    if (class_stream != NULL) fputc(c,class_stream);		/* MR1 */
+  } else {							/* MR1 */
+    fputc(c,OUT);						/* MR1 */
+  };								/* MR1 */
+}  								/* MR1 */
+
+#ifdef __USE_PROTOS
+void xxprintf(char *format,char *string) {			/* MR1 */
+#else
+void xxprintf(format,string) 					/* MR1 */
+  char *format;							/* MR1 */
+  char *string;							/* MR1 */
+{								/* MR1 */
+#endif
+  if (lexMember || lexPrefix || parserClass) {			/* MR1 */
+    if (class_stream != NULL)					/* MR1 */
+	 fprintf(class_stream,format,string);			/* MR1 */
+  } else {							/* MR1 */
+    fprintf(OUT,format,string);					/* MR1 */
+  };								/* MR1 */
+}  								/* MR1 */
+>>
+
+#token "[\r\t\ ]+"	<< zzskip(); >>						/* Ignore white */
+#token "\n"			<< zzline++; zzskip(); DAWDLE; >>	/* Track Line # */
+#token L_EOF		"\@"
+#token PER_PER		"\%\%"
+#token NAME_PER_PER	"\%\%[a-zA-Z_][a-zA-Z0-9_]*"
+		<< p_mode_def(&zzlextext[2],lex_mode_counter++); >>
+
+#token LEXMEMBER	"\<\<\%\%lexmember"			/* MR1 */
+		<<lexMember=1;					/* MR1 */
+	          if (firstLexMember != 0) {			/* MR1 */
+	            firstLexMember=0;				/* MR1 */
+	            p_class_def1();				/* MR1 */
+		  };						/* MR1 */
+	          zzmode(ACT);					/* MR1 */
+                >>						/* MR1 */
+#token LEXACTION	"\<\<\%\%lexaction"			/* MR1 */
+		<<lexAction=1;zzmode(ACT);>>			/* MR1 */
+#token PARSERCLASS	"\<\<\%\%parserclass"			/* MR1 */
+		<<parserClass=1;				/* MR1 */
+		  zzmode(ACT);					/* MR1 */
+		>>						/* MR1 */
+#token LEXPREFIX	"\<\<\%\%lexprefix"			/* MR1 */
+		<<lexPrefix=1;zzmode(ACT);>>			/* MR1 */
+
+#token ACTION		"\<\<"
+		<< if (func_action)
+			fprintf(OUT,"\n%s %sact%d()\n{ ",
+					gen_cpp?"ANTLRTokenType":"static void",
+					gen_cpp?ClassName("::"):"", ++action_no);
+		   zzmode(ACT); zzskip();
+		>>
+#token GREAT_GREAT	"\>\>"
+#token L_BRACE		"\{"
+#token R_BRACE		"\}"
+#token L_PAR		"\("
+#token R_PAR		"\)"
+#token L_BRACK		"\["
+#token R_BRACK		"\]"
+#token ZERO_MORE	"\*"
+#token ONE_MORE		"\+"
+#token OR		"\|"
+#token RANGE		"\-"
+#token NOT		"\~"
+#token OCTAL_VALUE "\\0[0-7]*"		
+	<< {int t; sscanf(&zzlextext[1],"%o",&t); zzlextext[0] = t;}>>
+#token HEX_VALUE   "\\0[Xx][0-9a-fA-F]+"
+	<< {int t; sscanf(&zzlextext[3],"%x",&t); zzlextext[0] = t;}>>
+#token DEC_VALUE   "\\[1-9][0-9]*"
+	<< {int t; sscanf(&zzlextext[1],"%d",&t); zzlextext[0] = t;}>>
+#token TAB		"\\t"		<< zzlextext[0] = '\t';>>
+#token NL		"\\n"		<< zzlextext[0] = '\n';>>
+#token CR		"\\r"		<< zzlextext[0] = '\r';>>
+#token BS		"\\b"		<< zzlextext[0] = '\b';>>
+
+/* MR1									*/
+/* MR1 10-Apr-97 MR1	Allow #token regular expressions to cross lines	*/
+/* MR1									*/
+#token CONTINUATION	"\\ \n"		<< zzline++; zzskip();>> /* MR1 */
+
+/* NOTE: this takes ANYTHING after the \ */
+#token LIT		"\\~[tnrb]"	<< zzlextext[0] = zzlextext[1];>>
+
+/* NOTE: this takes ANYTHING that doesn't match the other tokens */
+#token REGCHAR		"~[\\]"
+
+
+grammar		:   << p_head(); p_class_hdr(); func_action = FALSE;>>
+		 ( {LEXACTION | LEXMEMBER | LEXPREFIX | PARSERCLASS } ACTION)* /* MR1 */
+		    <<if ( gen_cpp ) p_includes();>>
+		    start_states
+		    << func_action = FALSE; p_tables(); p_tail(); >>
+		    (ACTION)* "@"
+			<< if (firstLexMember != 0) p_class_def1(); >> 		/* MR1 */
+		;
+
+start_states	: ( PER_PER do_conversion
+		  | NAME_PER_PER do_conversion (NAME_PER_PER do_conversion)*)
+		    PER_PER
+		;
+
+do_conversion	: <<new_automaton_mode(); func_action = TRUE;>>
+			rule_list
+			<<
+				dfa_class_nop[mode_counter] =
+					relabel($1.l,comp_level);
+				if (comp_level)
+					p_shift_table(mode_counter);
+				dfa_basep[mode_counter] = dfa_allocated+1;
+				make_dfa_model_node(dfa_class_nop[mode_counter]);
+				nfa_to_dfa($1.l);
+				++mode_counter;
+		    		func_action = FALSE;
+#ifdef HASH_STAT
+				fprint_hash_stats(stderr);
+#endif
+			>>
+		;
+
+rule_list	: rule <<$$.l=$1.l; $$.r=$1.r;>>
+			(rule
+				<<{nfa_node *t1;
+				   t1 = new_nfa_node();
+				   (t1)->trans[0]=$$.l;
+				   (t1)->trans[1]=$1.l;
+				   /* all accept nodes "dead ends" */
+				   $$.l=t1; $$.r=NULL;
+				   }
+				>>
+			)*
+		| /* empty */
+			<<$$.l = new_nfa_node(); $$.r = NULL;
+			   warning("no regular expressions", zzline);
+			>>
+		;
+
+rule	: reg_expr ACTION
+/* MR23 */		<< if ($1.r != NULL) {
+					$$.l=$1.l; $$.r=$1.r; ($1.r)->accept=action_no;
+				   }
+				>>
+		| ACTION
+			<<$$.l = NULL; $$.r = NULL;
+			  error("no expression for action  ", zzline);
+			>>
+		;
+
+reg_expr	: and_expr <<$$.l=$1.l; $$.r=$1.r;>>
+			(OR and_expr
+				<<{nfa_node *t1, *t2;
+				   t1 = new_nfa_node(); t2 = new_nfa_node();
+				   (t1)->trans[0]=$$.l;
+				   (t1)->trans[1]=$2.l;
+/* MR23 */		   if ($$.r != NULL) ($$.r)->trans[1]=t2;
+                   if ($2.r) {
+    				   ($2.r)->trans[1]=t2;     /* MR20 */
+                   }
+				   $$.l=t1; $$.r=t2;
+				  }
+				>>
+			)*
+		;
+
+and_expr	: repeat_expr
+					<<
+						$$.l=$1.l; $$.r=$1.r;
+				    >>
+			(repeat_expr 
+/* MR23 */				<< if ($$.r != NULL) {
+							($$.r)->trans[1]=$1.l;
+							$$.r=$1.r;
+						   }
+						>>
+			)*
+		;
+
+repeat_expr	: expr <<$$.l=$1.l; $$.r=$1.r;>>
+			{ ZERO_MORE
+			<<{	nfa_node *t1,*t2;
+/* MR23 */		if ($$.r != NULL) ($$.r)->trans[0] = $$.l;
+				t1 = new_nfa_node(); t2 = new_nfa_node();
+				t1->trans[0]=$$.l;
+				t1->trans[1]=t2;
+/* MR23 */		if ($$.r != NULL) ($$.r)->trans[1]=t2;
+				$$.l=t1;$$.r=t2;
+			  }
+			>>
+			| ONE_MORE
+/* MR23 */		<<if ($$.r != NULL) ($$.r)->trans[0] = $$.l;>>
+			}
+		| ZERO_MORE
+			<< error("no expression for *", zzline);>>
+		| ONE_MORE
+			<< error("no expression for +", zzline);>>
+		;
+
+expr	: << $$.l = new_nfa_node();
+			 $$.r = new_nfa_node();
+		  >>
+		  L_BRACK atom_list R_BRACK
+			<<
+/* MR23 */		if ($$.l != NULL) {
+					($$.l)->trans[0] = $$.r;
+					($$.l)->label = set_dup($2.label);
+					set_orin(&used_chars,($$.l)->label);
+				}
+			>>
+		| NOT L_BRACK atom_list R_BRACK
+			<<
+/* MR23 */		if ($$.l != NULL) {
+					($$.l)->trans[0] = $$.r;
+					($$.l)->label = set_dif(normal_chars,$3.label);
+					set_orin(&used_chars,($$.l)->label);
+				}
+			>>
+		| L_PAR reg_expr R_PAR
+			<<
+/* MR23 */		if ($$.l != NULL) {				
+					($$.l)->trans[0] = $2.l;
+					if ($2.r) {
+    					($2.r)->trans[1] = $$.r;    /* MR20 */
+					}
+				}
+			>>
+		| L_BRACE reg_expr R_BRACE
+			<<
+/* MR23 */		if ($$.l != NULL) {
+					($$.l)->trans[0] = $2.l;
+					($$.l)->trans[1] = $$.r;
+			        if ($2.r) {
+    					($2.r)->trans[1] = $$.r;    /* MR20 */
+					}
+				}
+			>>
+		| atom
+			<<
+/* MR23 */		if ($$.l != NULL) {
+					($$.l)->trans[0] = $$.r;
+					($$.l)->label = set_dup($1.label);
+					set_orin(&used_chars,($$.l)->label);
+				}
+			>>
+		;
+
+atom_list	: << set_free($$.label); >>
+				(near_atom <<set_orin(&($$.label),$1.label);>>)*
+		;
+
+near_atom	: << register int i;
+		     register int i_prime;
+		  >>
+		  anychar
+			<<$$.letter=$1.letter; $$.label=set_of($1.letter);
+			i_prime = $1.letter + MIN_CHAR;
+			if (case_insensitive && islower(i_prime))
+				set_orel(toupper(i_prime)-MIN_CHAR,
+					&($$.label));
+			if (case_insensitive && isupper(i_prime))
+	 			set_orel(tolower(i_prime)-MIN_CHAR,
+					&($$.label));
+			>>
+			{ RANGE anychar
+				<< if (case_insensitive){
+					i_prime = $$.letter+MIN_CHAR;
+					$$.letter = (islower(i_prime) ?
+						toupper(i_prime) : i_prime)-MIN_CHAR;
+					i_prime = $2.letter+MIN_CHAR;
+					$2.letter = (islower(i_prime) ?
+						toupper(i_prime) : i_prime)-MIN_CHAR;
+				   }
+				   /* check to see if range okay */
+					{
+					    int debugLetter1 = $$.letter;
+						int debugLetter2 = $2.letter;
+					}
+				   if ($$.letter > $2.letter 
+                                       && $2.letter != 0xff){       /* MR16 */
+					  error("invalid range  ", zzline);
+				   }
+				   for (i=$$.letter; i<= (int)$2.letter; ++i){
+					set_orel(i,&($$.label));
+					i_prime = i+MIN_CHAR;
+					if (case_insensitive && islower(i_prime))
+						set_orel(toupper(i_prime)-MIN_CHAR,
+							&($$.label));
+					if (case_insensitive && isupper(i_prime))
+		 				set_orel(tolower(i_prime)-MIN_CHAR,
+							&($$.label));
+					}
+				>>
+			}
+		;
+
+atom		: << register int i_prime;>>
+		  anychar
+		  <<$$.label = set_of($1.letter);
+		    i_prime = $1.letter + MIN_CHAR;
+		    if (case_insensitive && islower(i_prime))
+			set_orel(toupper(i_prime)-MIN_CHAR,
+				&($$.label));
+		    if (case_insensitive && isupper(i_prime))
+	 		set_orel(tolower(i_prime)-MIN_CHAR,
+				&($$.label));
+		  >>
+		;
+
+anychar		: REGCHAR	<<$$.letter = $1.letter - MIN_CHAR;>>
+		| OCTAL_VALUE	<<$$.letter = $1.letter - MIN_CHAR;>>
+		| HEX_VALUE	<<$$.letter = $1.letter - MIN_CHAR;>>
+		| DEC_VALUE	<<$$.letter = $1.letter - MIN_CHAR;>>
+		| TAB		<<$$.letter = $1.letter - MIN_CHAR;>>
+		| NL		<<$$.letter = $1.letter - MIN_CHAR;>>
+		| CR		<<$$.letter = $1.letter - MIN_CHAR;>>
+		| BS		<<$$.letter = $1.letter - MIN_CHAR;>>
+		| LIT		<<$$.letter = $1.letter - MIN_CHAR;>>
+		/* NOTE: LEX_EOF is ALWAYS shifted to 0 = MIN_CHAR - MIN_CHAR*/
+		| L_EOF		<<$$.letter = 0;>>
+		;
+
+<</* empty action */>>
+
+#lexclass ACT
+#token "@"	<< error("unterminated action", zzline); zzmode(START); >>
+#token ACTION "\>\>"
+		<< if (func_action) fprintf(OUT,"}\n\n");
+		   zzmode(START);
+/* MR1									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+/* MR1				via <<%%lexmember ...>>			    */
+/* MR1			This is a consequence of not saving actions         */
+/* MR1									    */
+/* MR1 */	   parserClass=0;		
+/* MR1 */	   lexPrefix=0;
+/* MR1 */	   lexAction=0;
+/* MR1 */	   lexMember=0;
+		>>
+#token "\>"		<< xxputc(zzlextext[0]); zzskip(); >>		/* MR1 */
+#token "\\\>"		<< xxputc('>'); zzskip(); >>			/* MR1 */
+#token "\\"		<< xxputc('\\'); zzskip(); >>			/* MR1 */
+#token "\n"		<< xxputc(zzlextext[0]); ++zzline; zzskip(); >>	/* MR1 */
+#token "/\*"		<< zzmode(ACTION_COMMENTS);			/* MR1 */
+			   xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+			>>						/* MR1 */
+#token "//"		<< zzmode(ACTION_CPP_COMMENTS);			/* MR1 */
+			   xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+			>>						/* MR1 */
+#token "~[]"		<< xxputc(zzlextext[0]); zzskip(); >>		/* MR1 */
+									/* MR1 */
+#lexclass ACTION_COMMENTS						/* MR1 */
+#token "\*/"		<< zzmode(ACT);					/* MR1 */
+			   xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+			>>						/* MR1 */
+#token "[\n\r]"		<< zzline++; xxputc(zzlextext[0]); zzskip();>>	/* MR1 */
+#token "~[]"		<< xxputc(zzlextext[0]); zzskip();>>		/* MR1 */
+									/* MR1 */
+#lexclass ACTION_CPP_COMMENTS						/* MR1 */
+#token "[\n\r]"		<< zzmode(ACT); zzline++;			/* MR1 */
+			   xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+			>>						/* MR1 */
+#token "~[]"		<< xxputc(zzlextext[0]); zzskip();>>		/* MR1 */
+
+<<
+/* adds a new nfa to the binary tree and returns a pointer to it */
+nfa_node *
+#ifdef __USE_PROTOS
+new_nfa_node(void)
+#else
+new_nfa_node()
+#endif
+{
+	register nfa_node *t;
+	static int nfa_size=0;	/* elements nfa_array[] can hold */
+
+	++nfa_allocated;
+	if (nfa_size<=nfa_allocated){
+		/* need to redo array */
+		if (!nfa_array){
+			/* need some to do inital allocation */
+			nfa_size=nfa_allocated+NFA_MIN;
+			nfa_array=(nfa_node **) malloc(sizeof(nfa_node*)*
+				nfa_size);
+		}else{
+			/* need more space */
+			nfa_size=2*(nfa_allocated+1);
+			nfa_array=(nfa_node **) realloc(nfa_array,
+				sizeof(nfa_node*)*nfa_size);
+		}
+	}
+	/* fill out entry in array */
+	t = (nfa_node*) malloc(sizeof(nfa_node));
+	nfa_array[nfa_allocated] = t;
+	*t = nfa_model_node;
+	t->node_no = nfa_allocated;
+	return t;
+}
+
+
+/* initialize the model node used to fill in newly made nfa_nodes */
+void
+#ifdef __USE_PROTOS
+make_nfa_model_node(void)
+#else
+make_nfa_model_node()
+#endif
+{
+	nfa_model_node.node_no = -1; /* impossible value for real nfa node */
+	nfa_model_node.nfa_set = 0;
+	nfa_model_node.accept = 0;   /* error state default*/
+	nfa_model_node.trans[0] = NULL;
+	nfa_model_node.trans[1] = NULL;
+	nfa_model_node.label = empty;
+}
+>>
+
+<<
+#if defined(DEBUG) || defined(_DEBUG)
+
+/* print out the pointer value and the node_number */
+void
+#ifdef __USE_PROTOS
+fprint_dfa_pair(FILE *f, nfa_node *p)
+#else
+fprint_dfa_pair(f, p)
+FILE *f;
+nfa_node *p;
+#endif
+{
+	if (p){
+		fprintf(f, "%x (%d)", p, p->node_no);
+	}else{
+		fprintf(f, "(nil)");
+	}
+}
+
+/* print out interest information on a set */
+void
+#ifdef __USE_PROTOS
+fprint_set(FILE *f, set s)
+#else
+fprint_set(f,s)
+FILE *f;
+set s;
+#endif
+{
+	unsigned int *x;
+
+	fprintf(f, "n = %d,", s.n);
+	if (s.setword){
+		fprintf(f, "setword = %x,   ", s.setword);
+		/* print out all the elements in the set */
+		x = set_pdq(s);
+		while (*x!=nil){
+			fprintf(f, "%d ", *x);
+			++x;
+		}
+	}else{
+		fprintf(f, "setword = (nil)");
+	}
+}
+
+/* code to be able to dump out the nfas
+	return 0 if okay dump
+	return 1 if screwed up
+ */
+int
+#ifdef __USE_PROTOS
+dump_nfas(int first_node, int last_node)
+#else
+dump_nfas(first_node, last_node)
+int first_node;
+int last_node;
+#endif
+{
+	register int i;
+	nfa_node *t;
+
+	for (i=first_node; i<=last_node; ++i){
+		t = NFA(i);
+		if (!t) break;
+		fprintf(stderr, "nfa_node %d {\n", t->node_no);
+		fprintf(stderr, "\n\tnfa_set = %d\n", t->nfa_set);
+		fprintf(stderr, "\taccept\t=\t%d\n", t->accept);
+		fprintf(stderr, "\ttrans\t=\t(");
+		fprint_dfa_pair(stderr, t->trans[0]);
+		fprintf(stderr, ",");
+		fprint_dfa_pair(stderr, t->trans[1]);
+		fprintf(stderr, ")\n");
+		fprintf(stderr, "\tlabel\t=\t{ ");
+		fprint_set(stderr, t->label);
+		fprintf(stderr, "\t}\n");
+		fprintf(stderr, "}\n\n");
+	}
+	return 0;
+}
+#endif
+>>
+
+<<
+/* DLG-specific syntax error message generator
+ * (define USER_ZZSYN when compiling so don't get 2 definitions)
+ */
+void
+#ifdef __USE_PROTOS
+zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, char *bad_text)
+#else
+zzsyn(text, tok, egroup, eset, etok, k, bad_text)
+char *text, *egroup, *bad_text;
+int tok;
+int etok;
+int k;
+SetWordType *eset;
+#endif
+{
+	fprintf(stderr, ErrHdr, file_str[0]!=NULL?file_str[0]:"stdin", zzline);
+	fprintf(stderr, " syntax error at \"%s\"", (tok==zzEOF_TOKEN)?"EOF":text);
+	if ( !etok && !eset ) {fprintf(stderr, "\n"); return;}
+	if ( k==1 ) fprintf(stderr, " missing");
+	else
+	{
+		fprintf(stderr, "; \"%s\" not", bad_text);
+		if ( zzset_deg(eset)>1 ) fprintf(stderr, " in");
+	}
+	if ( zzset_deg(eset)>0 ) zzedecode(eset);
+	else fprintf(stderr, " %s", zztokens[etok]);
+	if ( strlen(egroup) > (size_t)0 ) fprintf(stderr, " in %s", egroup);
+	fprintf(stderr, "\n");
+}
+>>
diff --git a/Tools/Source/TianoTools/Pccts/dlg/err.c b/Tools/Source/TianoTools/Pccts/dlg/err.c
new file mode 100644
index 0000000000..c3eaeae6d1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/err.c
@@ -0,0 +1,99 @@
+/*
+ * A n t l r  S e t s / E r r o r  F i l e  H e a d e r
+ *
+ * Generated from: dlg_p.g
+ *
+ * Terence Parr, Russell Quong, Will Cohen, and Hank Dietz: 1989-2001
+ * Parr Research Corporation
+ * with Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include <ctype.h>
+#include "dlg.h"
+#define zzSET_SIZE 8
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "err.h"
+
+ANTLRChar *zztokens[46]={
+	/* 00 */	"Invalid",
+	/* 01 */	"@",
+	/* 02 */	"[\\r\\t\\ ]+",
+	/* 03 */	"\\n",
+	/* 04 */	"L_EOF",
+	/* 05 */	"PER_PER",
+	/* 06 */	"NAME_PER_PER",
+	/* 07 */	"LEXMEMBER",
+	/* 08 */	"LEXACTION",
+	/* 09 */	"PARSERCLASS",
+	/* 10 */	"LEXPREFIX",
+	/* 11 */	"ACTION",
+	/* 12 */	"GREAT_GREAT",
+	/* 13 */	"L_BRACE",
+	/* 14 */	"R_BRACE",
+	/* 15 */	"L_PAR",
+	/* 16 */	"R_PAR",
+	/* 17 */	"L_BRACK",
+	/* 18 */	"R_BRACK",
+	/* 19 */	"ZERO_MORE",
+	/* 20 */	"ONE_MORE",
+	/* 21 */	"OR",
+	/* 22 */	"RANGE",
+	/* 23 */	"NOT",
+	/* 24 */	"OCTAL_VALUE",
+	/* 25 */	"HEX_VALUE",
+	/* 26 */	"DEC_VALUE",
+	/* 27 */	"TAB",
+	/* 28 */	"NL",
+	/* 29 */	"CR",
+	/* 30 */	"BS",
+	/* 31 */	"CONTINUATION",
+	/* 32 */	"LIT",
+	/* 33 */	"REGCHAR",
+	/* 34 */	"\\>",
+	/* 35 */	"\\\\>",
+	/* 36 */	"\\",
+	/* 37 */	"\\n",
+	/* 38 */	"/\\*",
+	/* 39 */	"//",
+	/* 40 */	"~[]",
+	/* 41 */	"\\*/",
+	/* 42 */	"[\\n\\r]",
+	/* 43 */	"~[]",
+	/* 44 */	"[\\n\\r]",
+	/* 45 */	"~[]"
+};
+SetWordType zzerr1[8] = {0x80,0xf,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr2[8] = {0x60,0x0,0x0,0x0, 0x0,0x0,0x0,0x0};
+SetWordType zzerr3[8] = {0x70,0xa8,0x9a,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType setwd1[46] = {0x0,0x6,0x0,0x0,0x30,0xc8,0xc8,
+	0x1,0x1,0x1,0x1,0x35,0x0,0x30,0x0,
+	0x30,0x0,0x30,0x0,0x30,0x30,0x0,0x0,
+	0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,
+	0x0,0x30,0x30,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr4[8] = {0x10,0xa8,0x9a,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType zzerr5[8] = {0x10,0xe8,0xbb,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType zzerr6[8] = {0x10,0xa0,0x9a,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType setwd2[46] = {0x0,0x0,0x0,0x0,0xeb,0x2,0x2,
+	0x0,0x0,0x0,0x0,0xd6,0x0,0xeb,0xd4,
+	0xeb,0xd4,0xeb,0x0,0xcb,0xcb,0xd0,0x0,
+	0xeb,0xeb,0xeb,0xeb,0xeb,0xeb,0xeb,0xeb,
+	0x0,0xeb,0xeb,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0};
+SetWordType zzerr7[8] = {0x10,0xa0,0x82,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType zzerr8[8] = {0x10,0x0,0x44,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType zzerr9[8] = {0x10,0x0,0x0,0x7f, 0x3,0x0,0x0,0x0};
+SetWordType setwd3[46] = {0x0,0x0,0x0,0x0,0xf7,0x0,0x0,
+	0x0,0x0,0x0,0x0,0xc2,0x0,0xc2,0xc2,
+	0xc2,0xc2,0xc2,0xb8,0xc2,0xc2,0xc2,0x80,
+	0xc2,0xf7,0xf7,0xf7,0xf7,0xf7,0xf7,0xf7,
+	0x0,0xf7,0xf7,0x0,0x0,0x0,0x0,0x0,
+	0x0,0x0,0x0,0x0,0x0,0x0,0x0};
diff --git a/Tools/Source/TianoTools/Pccts/dlg/main.c b/Tools/Source/TianoTools/Pccts/dlg/main.c
new file mode 100644
index 0000000000..35bd827f8c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/main.c
@@ -0,0 +1,281 @@
+/* Main function for dlg version
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "stdpccts.h"
+
+char	program[] = "dlg";
+char	version[] = "1.33MR33";					/* MRXXX */
+int	numfiles = 0;
+char	*file_str[2] = {NULL, NULL};
+char	*mode_file = "mode.h";
+char	*class_name = DEFAULT_CLASSNAME;
+char	*OutputDirectory = TopDirectory;
+
+/* Option variables */
+int comp_level = 0;
+int interactive = FALSE;
+int case_insensitive = FALSE;
+int warn_ambig = FALSE;
+int gen_cpp = FALSE;
+
+#ifdef __USE_PROTOS
+static int ci_strequ(char *a,char *b)
+#else
+static int ci_strequ(a,b)
+  char  *a;
+  char  *b;
+#endif
+{
+  for ( ;*a != 0 && *b != 0; a++, b++) {
+    if (toupper(*a) != toupper(*b)) return 0;
+  }
+  return (*a == *b);
+}
+
+/* Option List Stuff */
+#ifdef __USE_PROTOS
+void p_comp0(void)		{comp_level = 0;}
+void p_comp1(void)		{comp_level = 1;}
+void p_comp2(void)		{comp_level = 2;}
+void p_stdio(void)		{ file_str[numfiles++] = NULL;}
+void p_file(char *s) 	{ file_str[numfiles++] = s;}
+void p_cl_name(char *s, char *t)
+	{
+		if ( gen_cpp ) {
+			class_name = t;
+		}
+		else {
+			warning("-cl only valid in C++ mode; -cl ignored...",0);
+		}
+	}
+void p_mode_file(char *s, char *t){mode_file=t;}
+void p_outdir(char *s,char *t) {OutputDirectory=t;}
+void p_ansi(void)		{gen_ansi = TRUE;}
+void p_interactive(void)	{interactive = TRUE;}
+void p_case_s(void)		{ case_insensitive = FALSE; }
+void p_case_i(void)		{ case_insensitive = TRUE; }
+void p_warn_ambig(void)	{ warn_ambig = TRUE; }
+void p_cpp(void)		{ gen_cpp = TRUE; }
+#else
+void p_comp0()		{comp_level = 0;}
+void p_comp1()		{comp_level = 1;}
+void p_comp2()		{comp_level = 2;}
+void p_stdio()		{ file_str[numfiles++] = NULL;}
+void p_file(s) char *s;	{ file_str[numfiles++] = s;}
+void p_cl_name(s,t)
+	char *s, *t;
+	{
+		if ( gen_cpp ) {
+			class_name = t;
+		}
+		else {
+			warning("-cl only valid in C++ mode; -cl ignored...",0);
+		}
+	}
+void p_mode_file(s,t) char *s,*t;{mode_file=t;}
+void p_outdir(s,t) char *s,*t;{OutputDirectory=t;}
+void p_ansi()		{gen_ansi = TRUE;}
+void p_interactive()	{interactive = TRUE;}
+void p_case_s()		{ case_insensitive = FALSE; }
+void p_case_i()		{ case_insensitive = TRUE; }
+void p_warn_ambig()	{ warn_ambig = TRUE; }
+void p_cpp()		{ gen_cpp = TRUE; }
+#endif
+
+#ifdef __cplusplus
+typedef void (*WildFunc)(...);
+#else
+typedef void (*WildFunc)();
+#endif
+
+typedef struct {
+			char *option;
+			int  arg;
+			WildFunc process;
+			char *descr;
+		} Opt;
+
+Opt options[] = {
+	{ "-CC", 0, (WildFunc)p_cpp, "Generate C++ output" },
+	{ "-C0", 0, (WildFunc)p_comp0, "No compression (default)" },
+	{ "-C1", 0, (WildFunc)p_comp1, "Compression level 1" },
+	{ "-C2", 0, (WildFunc)p_comp2, "Compression level 2" },
+	{ "-ga", 0, (WildFunc)p_ansi, "Generate ansi C"},
+	{ "-Wambiguity", 0, (WildFunc)p_warn_ambig, "Warn if expressions ambiguous"},
+	{ "-m", 1, (WildFunc)p_mode_file, "Rename lexical mode output file"},
+	{ "-i", 0, (WildFunc)p_interactive, "Build interactive scanner (not valid for C++ mode)"},
+	{ "-ci", 0, (WildFunc)p_case_i, "Make lexical analyzer case insensitive"},
+	{ "-cl", 1, (WildFunc)p_cl_name, "Rename lexer class (DLGLexer); only used for -CC"},
+	{ "-cs", 0, (WildFunc)p_case_s, "Make lexical analyzer case sensitive (default)"},
+	{ "-o",  1, (WildFunc)p_outdir, OutputDirectoryOption},
+	{ "-", 0, (WildFunc)p_stdio, "Use standard i/o rather than file"},
+	{ "*", 0, (WildFunc)p_file, ""}, /* anything else is a file */
+	{ NULL, 0, NULL }	
+ };
+
+#ifdef __USE_PROTOS
+void ProcessArgs(int argc, char **argv, Opt *options)
+#else
+void ProcessArgs(argc, argv, options)
+int argc;
+char **argv;
+Opt *options;
+#endif
+{
+	Opt *p;
+	
+	while ( argc-- > 0 )
+	{
+		p = options;
+		while ( p->option != NULL )
+		{
+			if ( strcmp(p->option, "*") == 0 ||
+				 ci_strequ(p->option,*argv) )
+			{
+				if ( p->arg )
+				{
+					(*p->process)( *argv, *(argv+1) );
+					argv++;
+					argc--;
+				}
+				else
+					(*p->process)( *argv );
+				break;
+			}
+			p++;
+		}
+		argv++;
+	}
+}
+
+#ifdef __USE_PROTOS
+int main(int argc, char *argv[])
+#else
+int main(argc, argv)
+int argc;
+char *argv[];
+#endif
+{
+	init();
+	fprintf(stderr, "%s  Version %s   1989-2001\n", &(program[0]),
+		&(version[0]));
+	if ( argc == 1 )
+	{
+		Opt *p = options;
+		fprintf(stderr, "%s [options] f1 f2 ... fn\n",argv[0]);
+		while ( *(p->option) != '*' )
+		{
+			fprintf(stderr, "\t%s %s\t%s\n",
+							p->option,
+							(p->arg)?"___":"   ",
+							p->descr);
+			p++;
+		}
+	}else{
+		ProcessArgs(argc-1, &(argv[1]), options);
+		if (interactive && gen_cpp) {
+			fprintf(stderr,"\n");
+/***  MR21a This statement is wrong ! ***/
+#if 0
+***			fprintf(stderr,"Interactive lexer option (\"-i\") has no effect when in C++ mode\n");
+***			fprintf(stderr,"because of extra buffering provided by ANTLRTokenBuffer class.\n");
+***			fprintf(stderr,"\n");
+#endif
+		}
+		input_stream = read_stream(file_str[0]);
+		if (input_stream) {
+			/* don't overwrite unless input okay */
+			if ( gen_cpp ) {
+				output_stream = write_stream(ClassName(CPP_FILE_SUFFIX));
+				if ( file_str[1]!=NULL ) {
+					warning("output file implicit in C++ mode; ignored...",0);
+				}
+				class_stream = write_stream(ClassName(".h"));
+				mode_stream = class_stream;
+			}
+			else {
+				output_stream = write_stream(file_str[1]);
+				mode_stream = write_stream(mode_file);
+			}
+		}
+		/* make sure that error reporting routines in grammar
+		   know what the file really is */
+		/* make sure that reading and writing somewhere */
+		if (input_stream && output_stream && mode_stream){
+			ANTLR(grammar(), input_stream);
+		}
+		p_class_def2();			/* MR1 */
+	}
+	if ( output_stream!=NULL ) fclose(output_stream);
+	if ( !gen_cpp && mode_stream!=NULL ) fclose(mode_stream);
+	if ( class_stream!=NULL ) fclose(class_stream);
+	exit(PCCTS_EXIT_SUCCESS);
+	return 0;		/* get rid of warning message MR1 */
+}
+
+/* initialize all the variables */
+void 
+#ifdef __USE_PROTOS
+init(void)
+#else
+init()
+#endif
+{
+	register int i;
+
+#ifdef SPECIAL_INITS
+	special_inits();					/* MR1 */
+#endif
+	used_chars = empty;
+	used_classes = empty;
+	/* make the valid character set */
+	normal_chars = empty;
+	/* NOTE: MIN_CHAR is EOF */
+	/* NOTE: EOF is not quite a valid char, it is special. Skip it*/
+	for (i = 1; i<CHAR_RANGE; ++i){
+		set_orel(i,&normal_chars);
+	}
+	make_nfa_model_node();
+	clear_hash();
+	/* NOTE: need to set this flag before the lexer starts getting */
+	/* tokens */
+   	func_action = FALSE;	
+}
+
+/* stuff that needs to be reset when a new automaton is being built */
+void 
+#ifdef __USE_PROTOS
+new_automaton_mode(void)					/* MR1 */
+#else
+new_automaton_mode()					/* MR1 */
+#endif
+{
+	set_free(used_chars);
+	clear_hash();
+}
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile b/Tools/Source/TianoTools/Pccts/dlg/makefile
new file mode 100644
index 0000000000..1658394130
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile
@@ -0,0 +1,156 @@
+#
+# Makefile for DLG 1.33
+# Terence Parr
+# Purdue University, U of MN, Parr Research Corporation
+# 1989-1994
+#
+# Ported to IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+##
+
+#
+#   OS/2 & DOS 16 bit using MSC 6.0
+#
+#CC=cl
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=/NOD:LLIBCE LLIBCEP
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link @<<
+#$** /NOI
+#$@ /STACK:16384
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        bind $@ c:\os2\doscalls.lib
+#        copy *.exe ..\bin
+#
+
+#
+#   Borland C++ for DOS
+#
+#CC=bcc
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= emu mathl cl
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#       tlink @&&|
+#C0L $**
+#$@ /Tde /c
+#
+#$(LIBS)
+#$(DEF_FILE) $(LFLAGS) ;
+#|
+#        copy *.exe ..\bin
+#
+
+#
+# C-Set/2 for OS/2
+#
+#CC=icc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 /DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT=obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link386 @<<
+#$** /NOI
+#$@ /STACK:32768
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        copy *.exe ..\bin
+#
+
+#
+# Borland C++ for OS/2
+#
+#CC=bcc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= c2 os2
+#
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        tlink @&&|
+#c02 $** -c
+#dlg.exe
+#
+#C2 os2
+#
+#|
+#        copy *.exe ..\bin
+#
+
+#
+#   UNIX
+#
+CC=cc
+COPT=-O
+ANTLR=../bin/antlr
+DLG=../bin/dlg
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+OBJ_EXT=o
+OUT_OBJ = -o
+OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
+        relabel.o automata.o
+
+dlg : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/dlg $(OBJ)
+
+SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
+        relabel.c automata.c
+
+#dlg_p.c parser.dlg err.c tokens.h : dlg_p.g
+#	$(ANTLR) dlg_p.g
+
+#dlg_a.c mode.h : parser.dlg
+#	$(DLG) -C2 parser.dlg dlg_a.c
+
+dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_p.c
+
+dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_a.c
+
+main.$(OBJ_EXT) : main.c dlg.h
+	$(CC) $(CFLAGS) -c main.c
+
+set.$(OBJ_EXT) : $(SET)/set.c
+	$(CC) -c $(CFLAGS) $(SET)/set.c
+
+lint:
+	lint *.c
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile1 b/Tools/Source/TianoTools/Pccts/dlg/makefile1
new file mode 100644
index 0000000000..4d00f7966e
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile1
@@ -0,0 +1,63 @@
+#
+# Makefile for DLG 1.33
+# Terence Parr
+# Purdue University, U of MN, Parr Research Corporation
+# 1989-1994
+#
+# Ported to IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+##
+
+
+#
+#   UNIX
+#
+CC=cc
+ANTLR=../bin/antlr
+DLG=../bin/dlg
+ANSI=-ansi
+CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) $(ANSI) -DZZLEXBUFSIZE=32000
+OBJ_EXT=o
+OUT_OBJ = -o
+OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
+        relabel.o automata.o
+
+dlg : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o dlg $(OBJ)
+		mv dlg ../bin
+
+SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
+        relabel.c automata.c
+
+dlg_p.c parser.dlg err.c tokens.h : dlg_p.g
+	$(ANTLR) dlg_p.g
+
+dlg_a.c mode.h : parser.dlg
+	$(DLG) -C2 parser.dlg dlg_a.c
+
+dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_p.c
+
+dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_a.c
+
+main.$(OBJ_EXT) : main.c dlg.h
+	$(CC) $(CFLAGS) -c main.c
+
+set.$(OBJ_EXT) : $(SET)/set.c
+	$(CC) -c $(CFLAGS) $(SET)/set.c
+
+lint:
+	lint *.c
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core
diff --git a/Tools/Source/TianoTools/Pccts/dlg/mode.h b/Tools/Source/TianoTools/Pccts/dlg/mode.h
new file mode 100644
index 0000000000..3f3279e52a
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/mode.h
@@ -0,0 +1,4 @@
+#define START 0
+#define ACT 1
+#define ACTION_COMMENTS 2
+#define ACTION_CPP_COMMENTS 3
diff --git a/Tools/Source/TianoTools/Pccts/dlg/output.c b/Tools/Source/TianoTools/Pccts/dlg/output.c
new file mode 100644
index 0000000000..2e56a6d8c1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/output.c
@@ -0,0 +1,850 @@
+/* output.c, output generator for dlg
+ *
+ * Output Notes:
+ *
+ * DfaStates == number of dfa nodes in automaton (just a #define)
+ * DfaState == type large enough to index every node in automaton
+ *         <256 unsigned char, <65536 unsigned short, etc.
+ *
+ * Thus, the elements in each of the automaton states (st%d) are type DfaState
+ * and are size appropriately, since they must be able to index the next
+ * automaton state.
+ *
+ * dfa[] == a linear array that points to all the automaton states (st%d)
+ *         (dfa_base[] should be the same, but isn't right now)
+ *
+ * accepts[] == Taking a closer look at this one, it probably shouldn't be type
+ *         DfaState because there is no real requirement that the number of
+ *         accepts states is less than the number of dfa state.  However, if
+ *         the number of accept states was more than the number of DFA states
+ *         then the lexical specification would be really ambiguous.
+ *
+ *         Another note. Is that is should be possible to fold accepts[] and
+ *         actions[] together.  If this is done, I would suggest get rid of
+ *         accept[] and make actions[] have an entry for each state (st%d) in
+ *         the automaton.
+ *
+ * dfa_base[] == starting location for each lexical mode.  This should be
+ *         Dfastate type (but isn't right now), since it points to the states
+ *         in the automaton.
+ *
+ * dfa_class_no[] == indicates the number of columns each lexical mode has.
+ *
+ * b_class_no[] == pointer to the start of the translation array used to
+ *         convert from input character to character class.  This could cause
+ *         problems if there are more than 256 classes
+ *
+ * shift%d[] == the actual translation arrays that convert the input character
+ *         into the character class.  These will have to change if there are
+ *         more than 256 character classes.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "dlg.h"
+#ifdef MEMCHK
+#include "trax.h"
+#else
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif /* __STDC__ */
+#endif
+
+static char *mode_name[MAX_MODES];
+static int mode_number[MAX_MODES];
+static int cur_mode=0;
+
+int operation_no = 0; /* used to mark nodes so that infinite loops avoided */
+int dfa_basep[MAX_MODES]; 	/* start of each group of states */
+int dfa_class_nop[MAX_MODES];	/* number of elements in each group of states*/
+
+int gen_ansi = FALSE;		/* allows ansi code to be generated */
+
+FILE *input_stream;	/* where to read description from */
+FILE *output_stream;	/* where to put the output	  */
+FILE *mode_stream;	/* where to put the mode.h stuff */
+FILE *class_stream;	/* where to put the scan.h stuff (if gen_cpp) */
+
+/* NOTE: This section is MACHINE DEPENDENT */
+#define DIF_SIZE 4
+#if defined(PC) && !defined(PC32)
+unsigned long typesize[DIF_SIZE]  = { 0x7f, 0x7fff, 0x7ffful, 0x7ffffffful }; /* MR20 */
+char t0[] = "unsigned char";
+char t1[] = "unsigned short";
+char t2[] = "unsigned int";
+char t3[] = "unsigned long";
+char *typevar[DIF_SIZE] = { t0, t1, t2, t3};
+#else
+unsigned long typesize[DIF_SIZE]  = { 0x7f, 0x7fff, 0x7ffffffful, 0x7ffffffful }; /* MR20 */
+char t0[] = "unsigned char";
+char t1[] = "unsigned short";
+char t2[] = "unsigned int";
+char t3[] = "unsigned long";
+char *typevar[DIF_SIZE] = { t0, t1, t2, t3};
+#endif
+
+/* Added by TJP August 1994 */
+/* Take in MyLexer and return MyLexer_h */
+
+static char *
+#ifdef __USE_PROTOS
+gate_symbol(char *name)
+#else
+gate_symbol(name)
+char *name;
+#endif
+{
+	static char buf[100];
+	sprintf(buf, "%s_h", name);
+	return buf;
+}
+
+/* Added by TJP August 1994 */
+static char *
+#ifdef __USE_PROTOS
+mystrdup(char *s)
+#else
+mystrdup(s)
+char *s;
+#endif
+{
+	char *p = (char *)malloc(strlen(s)+1);
+	strcpy(p, s);
+	return p;
+}
+
+#ifdef __USE_PROTOS
+void p_class_hdr(void)
+#else
+void p_class_hdr()						
+#endif
+{
+	if ( class_stream == NULL ) return;
+	fprintf(class_stream, "#ifndef %s\n", gate_symbol(ClassName("")));
+	fprintf(class_stream, "#define %s\n", gate_symbol(ClassName("")));
+	fprintf(class_stream, "/*\n");
+	fprintf(class_stream, " * D L G L e x e r  C l a s s  D e f i n i t i o n\n");
+	fprintf(class_stream, " *\n");
+	fprintf(class_stream, " * Generated from:");
+	fprintf(class_stream, " %s", file_str[0]);
+	fprintf(class_stream, "\n");
+	fprintf(class_stream, " *\n");
+	fprintf(class_stream, " * 1989-2001 by  Will Cohen, Terence Parr, and Hank Dietz\n");
+	fprintf(class_stream, " * Purdue University Electrical Engineering\n");
+	fprintf(class_stream, " * DLG Version %s\n", version);
+	fprintf(class_stream, " */\n\n");
+	fprintf(class_stream, "\n");
+	fprintf(class_stream, "#include \"%s\"\n", DLEXERBASE_H);
+}
+
+/* MR1									*/
+/* MR1 16-Apr-97  Split printing of class header up into several parts  */
+/* MR1		    so that #lexprefix <<...>>and #lexmember <<...>>	*/
+/* MR1		    can be inserted in the appropriate spots		*/
+/* MR1									*/
+
+#ifdef __USE_PROTOS
+void p_class_def1(void)
+#else
+void p_class_def1()
+#endif
+{
+	if ( class_stream == NULL ) return;
+	fprintf(class_stream, "\nclass %s : public DLGLexerBase {\n", ClassName(""));
+	fprintf(class_stream, "public:\n");
+}
+
+#ifdef __USE_PROTOS
+void p_class_def2(void)
+#else
+void p_class_def2()
+#endif
+{
+	int i, m;
+	if ( class_stream == NULL ) return;
+	fprintf(class_stream, "public:\n");
+	fprintf(class_stream, "\tstatic const int MAX_MODE;\n");
+	fprintf(class_stream, "\tstatic const int DfaStates;\n");
+	for (i=0; i<cur_mode; i++) {
+		fprintf(class_stream, "\tstatic const int %s;\n", mode_name[i]);
+	}
+
+	fprintf(class_stream, "\ttypedef %s DfaState;\n\n", minsize(dfa_allocated));
+	fprintf(class_stream, "\t%s(DLGInputStream *in,\n",ClassName(""));
+	fprintf(class_stream, "\t\tunsigned bufsize=2000)\n");
+	fprintf(class_stream, "\t\t: DLGLexerBase(in, bufsize, %d)\n", interactive);
+	fprintf(class_stream, "\t{\n");
+	fprintf(class_stream, "\t;\n");
+	fprintf(class_stream, "\t}\n");
+	fprintf(class_stream, "\tvoid	  mode(int);\n");
+	fprintf(class_stream, "\tANTLRTokenType nextTokenType(void);\n");
+	fprintf(class_stream, "\tvoid     advance(void);\n");
+	fprintf(class_stream, "protected:\n");
+	for (i=1; i<=action_no; ++i) {
+		fprintf(class_stream, "\tANTLRTokenType act%d();\n", i);
+	}
+
+	for(m=0; m<(mode_counter-1); ++m){
+		for(i=dfa_basep[m]; i<dfa_basep[m+1]; ++i)
+			fprintf(class_stream, "\tstatic DfaState st%d[%d];\n", i-1, dfa_class_nop[m]+1);
+	}
+	for(i=dfa_basep[m]; i<=dfa_allocated; ++i)
+		fprintf(class_stream, "\tstatic DfaState st%d[%d];\n", i-1, dfa_class_nop[m]+1);
+
+	fprintf(class_stream, "\tstatic DfaState *dfa[%d];\n", dfa_allocated);
+	fprintf(class_stream, "\tstatic DfaState dfa_base[];\n");
+/*	fprintf(class_stream, "\tstatic int dfa_base_no[];\n"); */
+	fprintf(class_stream, "\tstatic unsigned char *b_class_no[];\n");
+	fprintf(class_stream, "\tstatic DfaState accepts[%d];\n",dfa_allocated+1);
+	fprintf(class_stream, "\tstatic DLGChar alternatives[%d];\n",dfa_allocated+1);
+	/* WARNING: should be ANTLRTokenType for action table, but g++ 2.5.6 is hosed */
+	fprintf(class_stream, "\tstatic ANTLRTokenType (%s::*actions[%d])();\n", ClassName(""), action_no+1);
+	for(m=0; m<mode_counter; ++m) {
+		fprintf(class_stream, "\tstatic unsigned char shift%d[%d];\n",
+			m, CHAR_RANGE);
+	}
+	if (comp_level)
+		fprintf(class_stream, "\tint ZZSHIFT(int c) { return b_class_no[automaton][1+c]; }\n");
+	else
+		fprintf(class_stream, "\tint ZZSHIFT(int c) { return 1+c; }\n");
+
+/* MR1									  */
+/* MR1 11-APr-97   Kludge to allow inclusion of user-defined code in	  */
+/* MR1			 DLGLexer class header				  */
+/* MR1		   Deprecated in favor of 133MR1 addition #lexmember <<>> */
+/* MR1									  */
+/* MR1 */	fprintf(class_stream,"//\n");
+/* MR1 */	fprintf(class_stream,
+/* MR1 */	   "// 133MR1 Deprecated feature to allow inclusion of ");
+/* MR1 */	fprintf(class_stream,
+/* MR1 */	   "user-defined code in DLG class header\n");
+/* MR1 */	fprintf(class_stream,"//\n");
+/* MR1 */
+/* MR1 */	fprintf(class_stream,"#ifdef DLGLexerIncludeFile\n");
+/* MR1 */	fprintf(class_stream,"#include DLGLexerIncludeFile\n");
+/* MR1 */	fprintf(class_stream,"#endif\n");
+
+	fprintf(class_stream, "};\n");
+
+	fprintf(class_stream, "typedef ANTLRTokenType (%s::*Ptr%sMemberFunc)();\n",
+			ClassName(""), ClassName(""));
+
+	fprintf(class_stream, "#endif\n");
+}
+
+/* generate required header on output */
+
+#ifdef __USE_PROTOS
+void p_head(void)
+#else
+void p_head()
+#endif
+{
+	fprintf(OUT, "/*\n");
+	fprintf(OUT, " * D L G tables\n");
+	fprintf(OUT, " *\n");
+	fprintf(OUT, " * Generated from:");
+	fprintf(OUT, " %s", file_str[0]);
+	fprintf(OUT, "\n");
+	fprintf(OUT, " *\n");
+	fprintf(OUT, " * 1989-2001 by  Will Cohen, Terence Parr, and Hank Dietz\n");
+	fprintf(OUT, " * Purdue University Electrical Engineering\n");
+	fprintf(OUT, " * DLG Version %s\n", version);
+	fprintf(OUT, " */\n\n");
+	if ( gen_cpp)  fprintf(OUT, "#include \"pcctscfg.h\"\n");
+	if ( gen_cpp ) fprintf(OUT, "#include \"pccts_stdio.h\"\n");
+	if ( !gen_cpp ) fprintf(OUT, "#include \"%s\"\n\n", mode_file);
+	fprintf(OUT,"\n");
+}
+
+#ifdef __USE_PROTOS
+void p_includes(void)
+#else
+void p_includes()
+#endif
+{
+	fprintf(OUT, "#include \"%s\"\n", APARSER_H);
+	fprintf(OUT, "#include \"%s\"\n", DLEXERBASE_H);
+	fprintf(OUT, "#include \"%s\"\n", ClassName(".h"));
+}
+
+/* generate code to tie up any loose ends */
+
+#ifdef __USE_PROTOS
+void p_tail(void)   				/* MR1 */
+#else
+void p_tail()						/* MR1 */
+#endif
+{
+	if ( gen_cpp ) {
+		if ( strcmp(ClassName(""), DEFAULT_CLASSNAME)!=0 )
+			fprintf(OUT, "#define DLGLexer %s\n", ClassName(""));
+		fprintf(OUT, "#include \"%s\"\n", DLEXER_H);  /* MR23 Rename DLexer.cpp to DLexer.h */
+		return;
+	}
+	fprintf(OUT, "\n");
+	fprintf(OUT, "\n");
+	if (comp_level)
+		fprintf(OUT, "#define ZZSHIFT(c) (b_class_no[zzauto][1+c])\n");
+	else
+		fprintf(OUT, "#define ZZSHIFT(c) (1+c)\n");
+	if ( !gen_cpp ) fprintf(OUT, "#define MAX_MODE %d\n",mode_counter);
+	fprintf(OUT, "#include \"dlgauto.h\"\n");
+}
+
+
+/* output the table of DFA for general use */
+
+#ifdef __USE_PROTOS
+void p_tables()
+#else
+void p_tables()
+#endif
+{
+	if ( !gen_cpp ) {
+		fprintf(OUT, "#define DfaStates\t%d\n", dfa_allocated);
+		fprintf(OUT, "typedef %s DfaState;\n\n", minsize(dfa_allocated));
+	}
+
+	if ( gen_cpp ) {
+		int i;
+		fprintf(OUT, "\n");
+		fprintf(OUT, "const int %s::MAX_MODE=%d;\n",
+				ClassName(""),
+				mode_counter);
+		fprintf(OUT, "const int %s::DfaStates=%d;\n",
+				ClassName(""),
+				dfa_allocated);
+		for (i=0; i<cur_mode; i++) {
+			fprintf(OUT, "const int %s::%s=%d;\n",
+					ClassName(""), mode_name[i], mode_number[i]);
+		}
+		fprintf(OUT, "\n");
+	}
+
+	p_node_table();
+	p_dfa_table();
+	p_accept_table();
+	p_action_table();
+	p_base_table();
+	p_class_table();
+	if (comp_level)
+		p_bshift_table();
+	if (interactive || gen_cpp )
+		p_alternative_table();
+}
+
+
+/* figures out the smallest variable type that will hold the transitions
+ */
+
+#ifdef __USE_PROTOS
+char *minsize(int elements)
+#else
+char *minsize(elements)
+int elements;
+#endif
+{
+	int i = 0;
+
+	while ((unsigned long) elements > typesize[i]) /* MR20 */
+		++i;
+	return typevar[i];
+}
+
+
+#ifdef __USE_PROTOS
+void p_node_table(void)
+#else
+void p_node_table()
+#endif
+{
+	register int	i;
+	register int	m = 0;
+
+	for(m=0; m<(mode_counter-1); ++m){
+		for(i=dfa_basep[m]; i<dfa_basep[m+1]; ++i)
+			p_single_node(i,dfa_class_nop[m]);
+	}
+	for(i=dfa_basep[m]; i<=dfa_allocated; ++i)
+		p_single_node(i,dfa_class_nop[m]);
+}
+
+
+#ifdef __USE_PROTOS
+void p_single_node(int i,int classes)
+#else
+void p_single_node(i,classes)
+int i,classes;
+#endif
+{
+	register int	j;
+	register int	trans, items_on_line;
+
+#if 1
+	/* extra state (classes+1) for invalid characters */
+	fprintf(OUT, "%sDfaState %sst%d[%d] = {\n  ",
+		gen_cpp?ClassName("::"):"static ",
+		gen_cpp?ClassName("::"):"",(i-1), (classes+1));
+#else
+	fprintf(OUT, "static DfaState st%d[%d] = {\n  ", (i-1), classes);
+#endif
+	items_on_line = MAX_ON_LINE;
+	for(j=0; j<classes; ++j){
+		DAWDLE;
+		trans = DFA(i)->trans[j];
+		if (trans == NIL_INDEX)
+			trans = dfa_allocated+1;
+		/* all of DFA moved down one in array */
+		fprintf(OUT, "%d", trans-1);
+		fprintf(OUT, ", ");
+		if (!(--items_on_line)){
+			fprintf(OUT, "\n  ");
+			items_on_line = MAX_ON_LINE;
+		}
+	}
+#if 1
+	/* put in jump to error state */
+	fprintf(OUT, "%d\n};\n\n", dfa_allocated);
+#else
+	fprintf(OUT, "\n};\n\n");
+#endif
+}
+
+
+#ifdef __USE_PROTOS
+void p_dfa_table(void)
+#else
+void p_dfa_table()
+#endif
+{
+	register int	i;
+
+	fprintf(OUT, "\n%sDfaState *%sdfa[%d] = {\n",
+		gen_cpp?ClassName("::"):"",gen_cpp?ClassName("::"):"", dfa_allocated);
+	for (i=0; i<(dfa_allocated-1); ++i){
+		fprintf(OUT, "\tst%d,\n", i);
+	}
+	fprintf(OUT, "\tst%d\n", i);
+	fprintf(OUT, "};\n\n");
+}
+
+
+#ifdef __USE_PROTOS
+void p_accept_table(void)
+#else
+void p_accept_table()
+#endif
+{
+	register int	i = 1;
+	register int	items_on_line = 0;
+	int		true_interactive = TRUE;
+
+	/* make sure element for one past (zzerraction) -WEC 12/16/92 */
+	fprintf(OUT,"\n%sDfaState %saccepts[%d] = {\n  ",
+			gen_cpp?ClassName("::"):"",
+			gen_cpp?ClassName("::"):"",
+			dfa_allocated+1);
+	/* don't do anything if no dfa nodes */
+	if (i>dfa_allocated) goto skip_accepts;
+	for (;;) {
+		int accept=0;   /* MR14a - Manuel Kessler (mlkessle@cip.physik.uni-wuerzburg.de) */
+		set accept_set;
+		set nfa_states;
+		unsigned int *t, *nfa_i;
+		unsigned int *q, *regular_expr;
+
+		accept_set = empty;
+		nfa_states = DFA(i)->nfa_states;
+		t = nfa_i = set_pdq(nfa_states);
+		/* NOTE: picks lowest accept because accepts monotonic	*/
+		/*	with respect to nfa node numbers and set_pdq	*/
+		/*	returns in that order				*/
+		while((*nfa_i != nil) && (!(accept = NFA(*nfa_i)->accept))){
+			nfa_i++;
+		}
+
+		/* figure out if more than one accept state there */
+		if (warn_ambig ){
+			set_orel(accept, &accept_set);
+			while(*nfa_i != nil){
+				set_orel(NFA(*nfa_i)->accept, &accept_set);
+				nfa_i++;
+			}
+			/* remove error action from consideration */
+			set_rm(0, accept_set);
+
+			if( set_deg(accept_set)>1){
+				fprintf(stderr, "dlg warning: ambiguous regular expression ");
+				q = regular_expr = set_pdq(accept_set);
+				while(*regular_expr != nil){
+					fprintf(stderr," %d ", *regular_expr);
+					++regular_expr;
+				}
+				fprintf(stderr, "\n");
+				free(q);
+			}
+		}
+
+		if ((DFA(i)->alternatives) && (accept != 0)){
+			true_interactive = FALSE;
+		}
+		fprintf(OUT, "%d, ", accept);
+
+		/* free up memory before we "break" below -ATG 4/6/95 */
+		free(t);
+		set_free(accept_set);
+
+		if ((++i)>dfa_allocated)
+			break;
+		if ((++items_on_line)>=MAX_ON_LINE){
+			fprintf(OUT,"\n  ");
+			items_on_line = 0;
+		}
+/*
+		free(t);
+		set_free(accept_set);
+*/
+	}
+	/* make sure element for one past (zzerraction) -WEC 12/16/92 */
+skip_accepts:
+	fprintf(OUT, "0\n};\n\n");
+}
+
+
+#ifdef __USE_PROTOS
+void p_action_table(void)
+#else
+void p_action_table()
+#endif
+{
+	register int	i;
+	char* theClassName = ClassName("");
+
+	if ( gen_cpp )
+		fprintf(OUT, "Ptr%sMemberFunc %s::actions[%d] = {\n", theClassName,
+					theClassName, action_no+1);
+	else
+		fprintf(OUT, "void (*actions[%d])() = {\n", action_no+1);
+	if ( gen_cpp )
+/*		fprintf(OUT, "\t(Ptr%sMemberFunc)&%s::erraction,\n", theClassName, theClassName);*/
+		fprintf(OUT, "\t&%s::erraction,\n", theClassName);
+	else
+		fprintf(OUT, "\tzzerraction,\n");
+	for (i=1; i<action_no; ++i) {
+		if ( gen_cpp )
+/*			fprintf(OUT,"\t(Ptr%sMemberFunc)&%s::act%d,\n", theClassName, theClassName, i);*/
+			fprintf(OUT,"\t&%s::act%d,\n", theClassName, i);
+		else
+			fprintf(OUT,"\tact%d,\n", i);
+		DAWDLE;
+	}
+	if ( gen_cpp )
+/*		fprintf(OUT,"\t(Ptr%sMemberFunc)&%s::act%d\n", theClassName, theClassName, i);*/
+		fprintf(OUT,"\t&%s::act%d\n", theClassName, i);
+	else
+		fprintf(OUT,"\tact%d\n", i);
+	fprintf(OUT, "};\n\n");
+}
+
+
+#ifdef __USE_PROTOS
+void p_shift_table(int m)  				    /* MR1 */
+#else
+void p_shift_table(m)						/* MR1 */
+int m;
+#endif
+{
+	register int	i = 0, j;
+	register int	items_on_line = 0;
+
+	fprintf(OUT, "%s unsigned char %sshift%d[%d] = {\n  ",
+		gen_cpp?"":"static",
+		gen_cpp?ClassName("::"):"", m, CHAR_RANGE);
+	for (;;) {
+		/* find which partition character i is in */
+		for (j=0; j<dfa_class_nop[mode_counter]; ++j){
+			if (set_el(i,class_sets[j]))
+				break;
+			}
+		fprintf(OUT,"%d",j);
+		if ((++i)>=CHAR_RANGE)
+			break;
+		fprintf(OUT,", ");
+		if ((++items_on_line)>=MAX_ON_LINE){
+			fprintf(OUT,"\n  ");
+			items_on_line = 0;
+			}
+		}
+	fprintf(OUT, "\n};\n\n");
+}
+
+
+#ifdef __USE_PROTOS
+void p_base_table(void)
+#else
+void p_base_table()
+#endif
+{
+	register int m;
+
+	fprintf(OUT, "%sDfaState %sdfa_base[] = {\n",
+			gen_cpp?ClassName("::"):"static ",
+			gen_cpp?ClassName("::"):"");
+	for(m=0; m<(mode_counter-1); ++m)
+		fprintf(OUT, "\t%d,\n", dfa_basep[m]-1);
+	fprintf(OUT, "\t%d\n};\n\n", dfa_basep[m]-1);
+}
+
+
+#ifdef __USE_PROTOS
+void p_class_table(void)    				/* MR1 */
+#else
+void p_class_table()						/* MR1 */
+#endif
+{
+#if 0
+	register int m;
+
+	fprintf(OUT,"%s int %sdfa_class_no[] = {\n",
+			gen_cpp?"":"static",
+			gen_cpp?ClassName("::"):"");
+	for(m=0; m<(mode_counter-1); ++m)
+		fprintf(OUT,"\t%d,\n", dfa_class_nop[m]);
+	fprintf(OUT,"\t%d\n};\n\n", dfa_class_nop[m]);
+#endif
+}
+
+
+#ifdef __USE_PROTOS
+void p_bshift_table(void)					/* MR1 */
+#else
+void p_bshift_table()						/* MR1 */
+#endif
+{
+	register int m;
+
+	fprintf(OUT,"%s unsigned char *%sb_class_no[] = {\n",
+		gen_cpp?"":"static",
+		gen_cpp?ClassName("::"):"");
+	for(m=0; m<(mode_counter-1); ++m)
+		fprintf(OUT, "\tshift%d,\n", m);
+	fprintf(OUT, "\tshift%d\n};\n\n", m);
+}
+
+
+#ifdef __USE_PROTOS
+void p_alternative_table(void)				/* MR1 */
+#else
+void p_alternative_table()					/* MR1 */
+#endif
+{
+	register int i;
+
+	if ( !gen_cpp ) fprintf(OUT, "#define ZZINTERACTIVE\n\n");
+	if ( gen_cpp )
+		fprintf(OUT, "DLGChar %salternatives[%d] = {\n",  /* mr23 vhs %sDfaStates+1 */
+				ClassName("::"),
+				dfa_allocated+1); /* vhs ClassName("::")); */
+	else
+		fprintf(OUT, "static %s zzalternatives[DfaStates+1] = {\n",
+				minsize(dfa_allocated));
+
+	for(i=1; i<=dfa_allocated; ++i)
+		fprintf(OUT, "\t%d,\n", DFA(i)->alternatives);
+	fprintf(OUT, "/* must have 0 for zzalternatives[DfaStates] */\n");
+	fprintf(OUT, "\t0\n};\n\n");
+}
+
+
+#ifdef __USE_PROTOS
+void p_mode_def(char *s,int m)			/* MR1 */
+#else
+void p_mode_def(s,m)					/* MR1 */
+char *s;
+int m;
+#endif
+{
+	if ( gen_cpp )
+	{
+		mode_name[cur_mode] = mystrdup(s);
+		mode_number[cur_mode] = m;
+		cur_mode++;
+	}
+	else
+		fprintf(mode_stream, "#define %s %d\n", s, m);
+}
+
+#ifdef __USE_PROTOS
+char * ClassName(char *suffix)
+#else
+char * ClassName(suffix)
+char *suffix;
+#endif
+{
+	static char buf[200];
+	extern char *class_name;
+
+	sprintf(buf, "%s%s", class_name, suffix);
+	return buf;
+}
+
+#ifdef DEBUG
+
+/* print out a particular nfa node that is pointed to by p */
+
+#ifdef __USE_PROTOS
+void p_nfa_node(nfa_node *p)
+#else
+void p_nfa_node(p)
+nfa_node *p;
+#endif
+{
+	 register nfa_node *t;
+
+	if (p != NIL_INDEX){
+		printf("NFA state : %d\naccept state : %d\n",
+			NFA_NO(p),p->accept);
+		if (p->trans[0] != NIL_INDEX){
+			printf("trans[0] => %d on ", NFA_NO(p->trans[0]));
+			p_set(p->label);
+			printf("\n");
+			}
+		else
+			printf("trans[0] => nil\n");
+		if (p->trans[1] != NIL_INDEX)
+			printf("trans[1] => %d on epsilon\n",
+				NFA_NO(p->trans[1]));
+		else
+			printf("trans[1] => nil\n");
+		printf("\n");
+		}
+}
+#endif
+
+#ifdef  DEBUG
+
+/* code to print out special structures when using a debugger */
+
+#ifdef __USE_PROTOS
+void p_nfa(p)
+#else
+void p_nfa(nfa_node *p)
+nfa_node *p;	/* state number also index into array */
+#endif
+{
+/* each node has a marker on it so it only gets printed once */
+
+	operation_no++; /* get new number */
+	s_p_nfa(p);
+}
+
+#ifdef __USE_PROTOS
+void s_p_nfa(nfa_node *p)
+#else
+void s_p_nfa(p)
+nfa_node *p;	/* state number also index into array */
+#endif
+{
+	if ((p != NIL_INDEX) && (p->nfa_set != operation_no)){
+		/* so it is only printed once */
+		p->nfa_set = operation_no;
+		p_nfa_node(p);
+		s_p_nfa(p->trans[0]);
+		s_p_nfa(p->trans[1]);
+		}
+}
+
+#ifdef __USE_PROTOS
+void p_dfa_node(dfa_node *p)
+#else
+void p_dfa_node(p)
+dfa_node *p;
+#endif
+{
+	int i;
+
+	if (p != NIL_INDEX){
+		printf("DFA state :%d\n",NFA_NO(p));
+		if (p->done)
+			printf("done\n");
+		else
+			printf("undone\n");
+		printf("from nfa states : ");
+		p_set(p->nfa_states);
+		printf("\n");
+		/* NOTE: trans arcs stored as ints rather than pointer*/
+		for (i=0; i<class_no; i++){
+			printf("%d ",p->trans[i]);
+			}
+		printf("\n\n");
+		}
+}
+
+#ifdef __USE_PROTOS
+void p_dfa(void)
+#else
+void p_dfa()
+#endif
+{
+/* prints out all the dfa nodes actually allocated */
+
+	int i;
+
+	for (i = 1; i<=dfa_allocated; i++)
+		p_dfa_node(NFA(i));
+}
+
+
+/* print out numbers in the set label */
+
+#ifdef __USE_PROTOS
+void p_set(set label)
+#else
+void p_set(label)
+set label;
+#endif
+{
+	unsigned *t, *e;
+
+	if (set_nil(label)){
+		printf("epsilon\n");
+	}else{
+		t = e = set_pdq(label);
+		while(*e != nil){
+			printf("%d ", (*e+MIN_CHAR));
+			e++;
+		}
+		printf("\n");
+		free(t);
+	}
+	
+}
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/dlg/parser.dlg b/Tools/Source/TianoTools/Pccts/dlg/parser.dlg
new file mode 100644
index 0000000000..df9a637f9e
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/parser.dlg
@@ -0,0 +1,398 @@
+<<
+/* parser.dlg -- DLG Description of scanner
+ *
+ * Generated from: dlg_p.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#define ANTLR_VERSION	13333
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include <ctype.h>
+#include "dlg.h"
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+LOOKAHEAD
+
+void
+#ifdef __USE_PROTOS
+zzerraction(void)
+#else
+zzerraction()
+#endif
+{
+	(*zzerr)("invalid token");
+	zzadvance();
+	zzskip();
+}
+>>
+
+<<%%lexaction
+
+int	func_action;		/* should actions be turned into functions?*/
+int	lex_mode_counter = 0;	/* keeps track of the number of %%names */
+/* MR1									    */
+/* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+/* MR1				via <<%%lexmember...>>			    */
+/* MR1									    */
+int	lexMember = 0;		/* <<%%lexmemeber ...>>	   		MR1 */
+int	lexAction = 0;		/* <<%%lexaction ...>>			MR1 */
+int	parserClass = 0;	/* <<%%parserclass ...>>        MR1 */
+int	lexPrefix = 0;		/* <<%%lexprefix ...>>			MR1 */
+char	theClassName[100];						     /* MR11 */
+char	*pClassName=theClassName;					 /* MR11 */
+int	firstLexMember=1;					             /* MR1 */
+
+#ifdef __USE_PROTOS
+void  xxputc(int c) {						/* MR1 */
+#else
+  void xxputc(c)							/* MR1 */
+  int	c;							/* MR1 */
+  {								/* MR1 */
+#endif
+    if (parserClass) {						/* MR1 */
+      *pClassName++=c;						/* MR1 */
+      *pClassName=0;						/* MR1 */
+    } else if (lexMember || lexPrefix) {				/* MR1 */
+      if (class_stream != NULL) fputc(c,class_stream);		/* MR1 */
+    } else {							/* MR1 */
+      fputc(c,OUT);						/* MR1 */
+    };								/* MR1 */
+  }  								/* MR1 */
+  
+#ifdef __USE_PROTOS
+  void xxprintf(char *format,char *string) {			/* MR1 */
+#else
+    void xxprintf(format,string) 					/* MR1 */
+    char *format;							/* MR1 */
+    char *string;							/* MR1 */
+    {								/* MR1 */
+#endif
+      if (lexMember || lexPrefix || parserClass) {			/* MR1 */
+        if (class_stream != NULL)					/* MR1 */
+        fprintf(class_stream,format,string);			/* MR1 */
+      } else {							/* MR1 */
+        fprintf(OUT,format,string);					/* MR1 */
+      };								/* MR1 */
+    }  								/* MR1 */
+>>
+
+
+%%START
+
+@
+	<<
+		NLA = 1;
+	>>
+
+[\r\t\ ]+
+	<<
+		NLA = 2;
+    zzskip();   
+	>>
+
+\n
+	<<
+		NLA = 3;
+    zzline++; zzskip(); DAWDLE;   
+	>>
+
+\@
+	<<
+		NLA = L_EOF;
+	>>
+
+\%\%
+	<<
+		NLA = PER_PER;
+	>>
+
+\%\%[a-zA-Z_][a-zA-Z0-9_]*
+	<<
+		NLA = NAME_PER_PER;
+    p_mode_def(&zzlextext[2],lex_mode_counter++);   
+	>>
+
+\<\<\%\%lexmember
+	<<
+		NLA = LEXMEMBER;
+    lexMember=1;					/* MR1 */
+    if (firstLexMember != 0) {			/* MR1 */
+      firstLexMember=0;				/* MR1 */
+      p_class_def1();				/* MR1 */
+    };						/* MR1 */
+    zzmode(ACT);					/* MR1 */
+	>>
+
+\<\<\%\%lexaction
+	<<
+		NLA = LEXACTION;
+    lexAction=1;zzmode(ACT);  
+	>>
+
+\<\<\%\%parserclass
+	<<
+		NLA = PARSERCLASS;
+    parserClass=1;				/* MR1 */
+    zzmode(ACT);					/* MR1 */
+	>>
+
+\<\<\%\%lexprefix
+	<<
+		NLA = LEXPREFIX;
+    lexPrefix=1;zzmode(ACT);  
+	>>
+
+\<\<
+	<<
+		NLA = ACTION;
+    if (func_action)
+    fprintf(OUT,"\n%s %sact%d()\n{ ",
+    gen_cpp?"ANTLRTokenType":"static void",
+    gen_cpp?ClassName("::"):"", ++action_no);
+    zzmode(ACT); zzskip();
+	>>
+
+\>\>
+	<<
+		NLA = GREAT_GREAT;
+	>>
+
+\{
+	<<
+		NLA = L_BRACE;
+	>>
+
+\}
+	<<
+		NLA = R_BRACE;
+	>>
+
+\(
+	<<
+		NLA = L_PAR;
+	>>
+
+\)
+	<<
+		NLA = R_PAR;
+	>>
+
+\[
+	<<
+		NLA = L_BRACK;
+	>>
+
+\]
+	<<
+		NLA = R_BRACK;
+	>>
+
+\*
+	<<
+		NLA = ZERO_MORE;
+	>>
+
+\+
+	<<
+		NLA = ONE_MORE;
+	>>
+
+\|
+	<<
+		NLA = OR;
+	>>
+
+\-
+	<<
+		NLA = RANGE;
+	>>
+
+\~
+	<<
+		NLA = NOT;
+	>>
+
+\\0[0-7]*
+	<<
+		NLA = OCTAL_VALUE;
+    {int t; sscanf(&zzlextext[1],"%o",&t); zzlextext[0] = t;}  
+	>>
+
+\\0[Xx][0-9a-fA-F]+
+	<<
+		NLA = HEX_VALUE;
+    {int t; sscanf(&zzlextext[3],"%x",&t); zzlextext[0] = t;}  
+	>>
+
+\\[1-9][0-9]*
+	<<
+		NLA = DEC_VALUE;
+    {int t; sscanf(&zzlextext[1],"%d",&t); zzlextext[0] = t;}  
+	>>
+
+\\t
+	<<
+		NLA = TAB;
+    zzlextext[0] = '\t';  
+	>>
+
+\\n
+	<<
+		NLA = NL;
+    zzlextext[0] = '\n';  
+	>>
+
+\\r
+	<<
+		NLA = CR;
+    zzlextext[0] = '\r';  
+	>>
+
+\\b
+	<<
+		NLA = BS;
+    zzlextext[0] = '\b';  
+	>>
+
+\\ \n
+	<<
+		NLA = CONTINUATION;
+    zzline++; zzskip();  
+	>>
+
+\\~[tnrb]
+	<<
+		NLA = LIT;
+    zzlextext[0] = zzlextext[1];  
+	>>
+
+~[\\]
+	<<
+		NLA = REGCHAR;
+	>>
+
+
+%%ACT
+
+@
+	<<
+		NLA = 1;
+    error("unterminated action", zzline); zzmode(START);   
+	>>
+
+\>\>
+	<<
+		NLA = ACTION;
+    if (func_action) fprintf(OUT,"}\n\n");
+    zzmode(START);
+    /* MR1									    */
+    /* MR1  11-Apr-97	Provide mechanism for inserting code into DLG class */
+    /* MR1				via <<%%lexmember ...>>			    */
+    /* MR1			This is a consequence of not saving actions         */
+    /* MR1									    */
+    /* MR1 */	   parserClass=0;		
+    /* MR1 */	   lexPrefix=0;
+    /* MR1 */	   lexAction=0;
+    /* MR1 */	   lexMember=0;
+	>>
+
+\>
+	<<
+		NLA = 34;
+    xxputc(zzlextext[0]); zzskip();   
+	>>
+
+\\\>
+	<<
+		NLA = 35;
+    xxputc('>'); zzskip();   
+	>>
+
+\\
+	<<
+		NLA = 36;
+    xxputc('\\'); zzskip();   
+	>>
+
+\n
+	<<
+		NLA = 37;
+    xxputc(zzlextext[0]); ++zzline; zzskip();   
+	>>
+
+/\*
+	<<
+		NLA = 38;
+    zzmode(ACTION_COMMENTS);			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	>>
+
+//
+	<<
+		NLA = 39;
+    zzmode(ACTION_CPP_COMMENTS);			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	>>
+
+~[]
+	<<
+		NLA = 40;
+    xxputc(zzlextext[0]); zzskip();   
+	>>
+
+
+%%ACTION_COMMENTS
+
+@
+	<<
+		NLA = 1;
+	>>
+
+\*/
+	<<
+		NLA = 41;
+    zzmode(ACT);					/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	>>
+
+[\n\r]
+	<<
+		NLA = 42;
+    zzline++; xxputc(zzlextext[0]); zzskip();  
+	>>
+
+~[]
+	<<
+		NLA = 43;
+    xxputc(zzlextext[0]); zzskip();  
+	>>
+
+
+%%ACTION_CPP_COMMENTS
+
+@
+	<<
+		NLA = 1;
+	>>
+
+[\n\r]
+	<<
+		NLA = 44;
+    zzmode(ACT); zzline++;			/* MR1 */
+    xxprintf("%s", &(zzlextext[0])); zzskip();	/* MR1 */
+	>>
+
+~[]
+	<<
+		NLA = 45;
+    xxputc(zzlextext[0]); zzskip();  
+	>>
+
+%%
diff --git a/Tools/Source/TianoTools/Pccts/dlg/relabel.c b/Tools/Source/TianoTools/Pccts/dlg/relabel.c
new file mode 100644
index 0000000000..0b8bc163d1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/relabel.c
@@ -0,0 +1,217 @@
+/* This group of functions does the character class compression.
+   It goes over the dfa and relabels the arcs with the partitions
+   of characters in the NFA.  The partitions are stored in the
+   array class.
+
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include "dlg.h"
+#ifdef MEMCHK
+#include "trax.h"
+#else
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif /* __STDC__ */
+#endif
+
+int	class_no = CHAR_RANGE;	/* number of classes for labels */
+int	first_el[CHAR_RANGE];	/* first element in each class partition */
+set	class_sets[CHAR_RANGE];	/* array holds partitions from class */
+				/* compression */
+
+/* goes through labels on NFA graph and partitions the characters into
+ * character classes.  This reduces the amount of space required for each
+ * dfa node, since only one arc is required each class instead of one arc
+ * for each character
+ * level:
+ * 0 no compression done
+ * 1 remove unused characters from classes
+ * 2 compress equivalent characters into same class
+ *
+ * returns the number of character classes required
+ */
+#ifdef __USE_PROTOS
+int relabel(nfa_node* start,int level)
+#else
+int relabel(start,level)
+int level;
+nfa_node *start;
+#endif
+{
+	if (level){
+		set_free(used_classes);	
+		partition(start,level);
+		label_with_classes(start);
+	}else{
+		/* classes equivalent to all characters in alphabet */
+		class_no = CHAR_RANGE;
+	}
+	return class_no;
+}
+
+/* makes character class sets for new labels */
+#ifdef __USE_PROTOS
+void partition(nfa_node* start,int level)
+#else
+void partition(start,level)
+nfa_node	*start;	/* beginning of nfa graph */
+int		level;	/* compression level to uses */
+#endif
+{
+	set current_class;
+	set unpart_chars;
+	set temp;
+
+	unpart_chars = set_dup(used_chars);
+#if 0
+	/* EOF (-1+1) alway in class 0 */
+	class_sets[0] = set_of(0);
+	first_el[0] = 0;
+	used_classes = set_of(0);
+	temp = set_dif(unpart_chars, class_sets[0]);
+	set_free(unpart_chars);
+	unpart_chars = temp;
+	class_no = 1;
+#else
+	class_no = 0;
+#endif
+	while (!set_nil(unpart_chars)){
+		/* don't look for equivalent labels if c <= 1 */
+		if (level <= 1){
+			current_class = set_of(set_int(unpart_chars));
+		}else{
+			current_class = set_dup(unpart_chars);
+			intersect_nfa_labels(start,&current_class);
+		}
+		set_orel(class_no,&used_classes);
+		first_el[class_no] = set_int(current_class);
+		class_sets[class_no] = current_class;
+		temp = set_dif(unpart_chars,current_class);
+		set_free(unpart_chars);
+		unpart_chars = temp;
+		++class_no;
+	}
+
+	/* free unpart_chars -ATG 5/6/95 */
+	set_free(unpart_chars);
+
+#if 0
+	/* group all the other unused characters into a class */
+	set_orel(class_no,&used_classes);
+	first_el[class_no] = set_int(current_class);
+	class_sets[class_no] = set_dif(normal_chars,used_chars);
+	++class_no;
+#endif
+}
+
+
+/* given pointer to beginning of graph and recursively walks it trying
+ * to find a maximal partition.  This partion in returned in maximal_class
+ */
+#ifdef __USE_PROTOS
+void intersect_nfa_labels(nfa_node* start,set* maximal_class)
+#else
+void intersect_nfa_labels(start,maximal_class)
+nfa_node *start;
+set *maximal_class;
+#endif
+{
+	/* pick a new operation number */
+	++operation_no;
+	r_intersect(start,maximal_class);	
+}
+
+#ifdef __USE_PROTOS
+void r_intersect(nfa_node* start,set* maximal_class)
+#else
+void r_intersect(start,maximal_class)
+nfa_node *start;
+set * maximal_class;
+#endif
+{
+	set temp;
+
+	if(start && start->nfa_set != operation_no)
+	{
+		start->nfa_set = operation_no;
+		temp = set_and(*maximal_class,start->label);
+		if (!set_nil(temp))
+		{
+			set_free(*maximal_class);
+			*maximal_class = temp;
+		}else{
+			set_free(temp);
+		}
+		r_intersect(start->trans[0],maximal_class);
+		r_intersect(start->trans[1],maximal_class);
+	}
+}
+
+
+/* puts class labels in place of old character labels */
+#ifdef __USE_PROTOS
+void label_with_classes(nfa_node* start)
+#else
+void label_with_classes(start)
+nfa_node *start;
+#endif
+{
+	++operation_no;
+	label_node(start);
+}
+
+#ifdef __USE_PROTOS
+void label_node(nfa_node *start)
+#else
+void label_node(start)
+nfa_node *start;
+#endif
+{
+	set new_label;
+	register int i;
+
+	/* only do node if it hasn't been done before */
+	if (start && start->nfa_set != operation_no){
+		start->nfa_set = operation_no;
+		new_label = empty;
+		for (i = 0; i<class_no; ++i){
+			/* if one element of class in old_label,
+			   all elements are. */
+			if (set_el(first_el[i],start->label))
+				set_orel(i,&new_label);
+		}
+		set_free(start->label);
+		start->label = new_label;
+		/* do any nodes that can be reached from this one */
+		label_node(start->trans[0]);
+		label_node(start->trans[1]);
+	}
+}
diff --git a/Tools/Source/TianoTools/Pccts/dlg/stdpccts.h b/Tools/Source/TianoTools/Pccts/dlg/stdpccts.h
new file mode 100644
index 0000000000..06ec67e44d
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/stdpccts.h
@@ -0,0 +1,26 @@
+#ifndef STDPCCTS_H
+#define STDPCCTS_H
+/*
+ * stdpccts.h -- P C C T S  I n c l u d e
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * With AHPCRC, University of Minnesota
+ * ANTLR Version 1.33MR33
+ */
+
+#ifndef ANTLR_VERSION
+#define ANTLR_VERSION	13333
+#endif
+
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+#include <ctype.h>
+#include "dlg.h"
+#define zzSET_SIZE 8
+#include "antlr.h"
+#include "tokens.h"
+#include "dlgdef.h"
+#include "mode.h"
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/dlg/support.c b/Tools/Source/TianoTools/Pccts/dlg/support.c
new file mode 100644
index 0000000000..84fe99d69c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/support.c
@@ -0,0 +1,240 @@
+/*
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * DLG 1.33
+ * Will Cohen
+ * With mods by Terence Parr; AHPCRC, University of Minnesota
+ * 1989-2001
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "dlg.h"
+#ifdef MEMCHK
+#include "trax.h"
+#else
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif /* __STDC__ */
+#endif
+
+int	err_found = 0;			/* indicates whether problem found */
+
+#ifdef __USE_PROTOS
+void internal_error(char *s, char *file,int line)    /* MR9 23-Sep-97 */
+#else
+void internal_error(s,file,line)    /* MR9 23-Sep-97 */
+char *s,*file;
+int line;
+#endif
+{
+	fprintf(stderr,s,file,line);
+	exit(PCCTS_EXIT_FAILURE);
+}
+
+#ifdef __USE_PROTOS
+char *dlg_malloc(int bytes,char *file,int line)
+#else
+char *dlg_malloc(bytes,file,line)
+int bytes;
+char *file;
+int line;
+#endif
+{
+	char *t;
+
+	t = (char *) malloc(bytes);
+	if (!t){
+		/* error */
+		internal_error("%s(%d): unable to allocate memory\n",
+			file,line);
+	}
+	return t;
+}
+
+
+#ifdef __USE_PROTOS
+char *dlg_calloc(int n,int bytes,char *file,int line)
+#else
+char *dlg_calloc(n,bytes,file,line)
+int n,bytes;
+char *file;
+int line;
+#endif
+{
+	char *t;
+
+	t = (char *) calloc(n,bytes);
+	if (!t){
+		/* error */
+		internal_error("%s(%d): unable to allocate memory\n",
+			file,line);
+	}
+	return t;
+}
+
+
+#ifdef __USE_PROTOS
+FILE *read_stream(char *name)
+#else
+FILE *read_stream(name)
+char *name;
+#endif
+{
+	FILE *f;
+
+	if (name){
+		if (name[0] == '-') {
+			fprintf(stderr, "dlg: invalid option: '%s'\n", name);
+			f = NULL;
+		}else{
+			f = fopen(name, "r");
+			if (f == NULL){
+				/* couldn't open file */
+				fprintf(stderr,
+					"dlg: Warning: Can't read file %s.\n",
+					name);
+			}
+		}
+	}else{
+		/* open stdin if nothing there */
+		f = stdin;
+	}
+	return f;
+}
+
+#ifdef __USE_PROTOS
+FILE *write_stream(char *name)
+#else
+FILE *write_stream(name)
+char *name;
+#endif
+{
+	FILE *f;
+
+	if (name){
+		if (name[0] == '-') {
+			fprintf(stderr, "dlg: invalid option: '%s'\n", name);
+			f = NULL;
+		}else{
+			f = fopen(OutMetaName(name), "w");
+			if (f == NULL){
+				/* couldn't open file */
+				fprintf(stderr,
+					"dlg: Warning: Can't write to file %s.\n",
+					name);
+			}
+			else
+#ifdef SPECIAL_FOPEN
+                special_fopen_actions(OutMetaName(name));	/* MR1 */
+#else
+		;						/* MR1 */
+#endif
+		}
+	}else{
+		/* open stdout if nothing there */
+		f = stdout;
+	}
+	return f;
+}
+
+
+#ifdef __USE_PROTOS
+void fatal(char *message,int line_no)
+#else
+void fatal(message,line_no)
+char *message;
+int line_no;
+#endif
+{
+	fprintf(stderr,ErrHdr,
+		(file_str[0] ? file_str[0] : "stdin"), line_no);
+	fprintf(stderr, " Fatal: %s\n", message);
+	exit(PCCTS_EXIT_FAILURE);
+}
+
+#ifdef __USE_PROTOS
+void error(char *message,int line_no)
+#else
+void error(message,line_no)
+char *message;
+int line_no;
+#endif
+{
+	fprintf(stderr,ErrHdr,
+		(file_str[0] ? file_str[0] : "stdin"), line_no);
+	fprintf(stderr, " Error: %s\n", message);
+	err_found = 1;
+}
+
+#ifdef __USE_PROTOS
+void warning(char *message,int line_no)
+#else
+void warning(message,line_no)
+char *message;
+int line_no;
+#endif
+{
+	fprintf(stderr,ErrHdr,
+		(file_str[0] ? file_str[0] : "stdin"), line_no);
+	fprintf(stderr, " Warning: %s\n", message);
+}
+
+/* MR10: Jeff Vincent
+   MR10: Changed to remove directory information from n only if
+   MR10: if OutputDirectory was changed by user (-o option)
+*/
+
+#ifdef __USE_PROTOS
+char *OutMetaName(char *n)
+#else
+char *OutMetaName(n)
+char *n;
+#endif
+{	
+    static char *dir_sym = DirectorySymbol;
+    static char newname[MaxFileName+1];
+    char *p;
+
+	/* If OutputDirectory is same as TopDirectory (platform default) then leave n alone. */
+    if (strcmp(OutputDirectory, TopDirectory) == 0)
+		return n;
+
+	/* p will point to filename without path information */
+	if ((p = strrchr(n, *dir_sym)) != NULL)
+		p++;
+	else
+		p = n;
+
+	/* Copy new output directory into newname[] */
+	strcpy(newname, OutputDirectory);
+
+	/* if new output directory does not have trailing dir_sym, add it! */
+	if (newname[strlen(newname)-1] != *dir_sym)
+		strcat(newname, dir_sym);
+
+	/* contatenate FILE NAME ONLY to new output directory */
+	strcat(newname, p);
+
+	return newname;
+}
diff --git a/Tools/Source/TianoTools/Pccts/dlg/tokens.h b/Tools/Source/TianoTools/Pccts/dlg/tokens.h
new file mode 100644
index 0000000000..73e502b7e1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/dlg/tokens.h
@@ -0,0 +1,133 @@
+#ifndef tokens_h
+#define tokens_h
+/* tokens.h -- List of labelled tokens and stuff
+ *
+ * Generated from: dlg_p.g
+ *
+ * Terence Parr, Will Cohen, and Hank Dietz: 1989-2001
+ * Purdue University Electrical Engineering
+ * ANTLR Version 1.33MR33
+ */
+#define zzEOF_TOKEN 1
+#define L_EOF 4
+#define PER_PER 5
+#define NAME_PER_PER 6
+#define LEXMEMBER 7
+#define LEXACTION 8
+#define PARSERCLASS 9
+#define LEXPREFIX 10
+#define ACTION 11
+#define GREAT_GREAT 12
+#define L_BRACE 13
+#define R_BRACE 14
+#define L_PAR 15
+#define R_PAR 16
+#define L_BRACK 17
+#define R_BRACK 18
+#define ZERO_MORE 19
+#define ONE_MORE 20
+#define OR 21
+#define RANGE 22
+#define NOT 23
+#define OCTAL_VALUE 24
+#define HEX_VALUE 25
+#define DEC_VALUE 26
+#define TAB 27
+#define NL 28
+#define CR 29
+#define BS 30
+#define CONTINUATION 31
+#define LIT 32
+#define REGCHAR 33
+
+#ifdef __USE_PROTOS
+void grammar(void);
+#else
+extern void grammar();
+#endif
+
+#ifdef __USE_PROTOS
+void start_states(void);
+#else
+extern void start_states();
+#endif
+
+#ifdef __USE_PROTOS
+void do_conversion(void);
+#else
+extern void do_conversion();
+#endif
+
+#ifdef __USE_PROTOS
+void rule_list(void);
+#else
+extern void rule_list();
+#endif
+
+#ifdef __USE_PROTOS
+void rule(void);
+#else
+extern void rule();
+#endif
+
+#ifdef __USE_PROTOS
+void reg_expr(void);
+#else
+extern void reg_expr();
+#endif
+
+#ifdef __USE_PROTOS
+void and_expr(void);
+#else
+extern void and_expr();
+#endif
+
+#ifdef __USE_PROTOS
+void repeat_expr(void);
+#else
+extern void repeat_expr();
+#endif
+
+#ifdef __USE_PROTOS
+void expr(void);
+#else
+extern void expr();
+#endif
+
+#ifdef __USE_PROTOS
+void atom_list(void);
+#else
+extern void atom_list();
+#endif
+
+#ifdef __USE_PROTOS
+void near_atom(void);
+#else
+extern void near_atom();
+#endif
+
+#ifdef __USE_PROTOS
+void atom(void);
+#else
+extern void atom();
+#endif
+
+#ifdef __USE_PROTOS
+void anychar(void);
+#else
+extern void anychar();
+#endif
+
+#endif
+extern SetWordType zzerr1[];
+extern SetWordType zzerr2[];
+extern SetWordType zzerr3[];
+extern SetWordType setwd1[];
+extern SetWordType zzerr4[];
+extern SetWordType zzerr5[];
+extern SetWordType zzerr6[];
+extern SetWordType setwd2[];
+extern SetWordType zzerr7[];
+extern SetWordType zzerr8[];
+extern SetWordType zzerr9[];
+extern SetWordType setwd3[];
diff --git a/Tools/Source/TianoTools/Pccts/h/AParser.cpp b/Tools/Source/TianoTools/Pccts/h/AParser.cpp
new file mode 100644
index 0000000000..720fe75af1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/AParser.cpp
@@ -0,0 +1,871 @@
+/* ANTLRParser.C
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+#include "pccts_stdlib.h"
+#include "pccts_stdarg.h"
+#include "pccts_string.h"
+#include "pccts_stdio.h"
+
+PCCTS_NAMESPACE_STD
+
+/* I have to put this here due to C++ limitation
+ * that you can't have a 'forward' decl for enums.
+ * I hate C++!!!!!!!!!!!!!!!
+ * Of course, if I could use real templates, this would go away.
+ */
+// MR1
+// MR1  10-Apr-97  133MR1  Prevent use of varying sizes for the
+// MR1  			ANTLRTokenType enum
+// MR1
+
+enum ANTLRTokenType { TER_HATES_CPP=0, ITS_TOO_COMPLICATED=9999};	    // MR1
+
+#define ANTLR_SUPPORT_CODE
+
+#include ATOKEN_H
+#include ATOKENBUFFER_H
+#include APARSER_H
+
+static const int zzINF_DEF_TOKEN_BUFFER_SIZE = 2000;    /* MR14 */
+static const int zzINF_BUFFER_TOKEN_CHUNK_SIZE = 1000;  /* MR14 */
+
+                 /* L o o k a h e a d  M a c r o s */
+
+/* maximum of 32 bits/unsigned int and must be 8 bits/byte;
+ * we only use 8 bits of it.
+ */
+SetWordType ANTLRParser::bitmask[sizeof(SetWordType)*8] = {
+	0x00000001, 0x00000002, 0x00000004, 0x00000008,
+	0x00000010, 0x00000020, 0x00000040, 0x00000080
+};
+
+char ANTLRParser::eMsgBuffer[500] = "";
+
+ANTLRParser::
+~ANTLRParser()
+{
+	delete [] token_type;
+    delete [] zzFAILtext;       // MR16 Manfred Kogler
+}
+
+ANTLRParser::
+ANTLRParser(ANTLRTokenBuffer *_inputTokens,
+			int k,
+			int use_inf_look,
+			int dlook,
+			int ssize)
+{
+	LLk = k;
+	can_use_inf_look = use_inf_look;
+/* MR14 */    if (dlook != 0) {
+/* MR14 */      panic("ANTLRParser::ANTLRParser - Demand lookahead not supported in C++ mode");
+/* MR14 */
+/* MR14 */    };
+    demand_look = 0;    /* demand_look = dlook; */
+    bsetsize = ssize;
+	guessing = 0;
+	token_tbl = NULL;
+	eofToken = (ANTLRTokenType)1;
+
+	// allocate lookahead buffer
+	token_type = new ANTLRTokenType[LLk];
+	lap = 0;
+	labase = 0;
+#ifdef ZZDEFER_FETCH
+	stillToFetch = 0;                                                   // MR19
+#endif
+	dirty = 0;
+    inf_labase = 0;                                                     // MR7
+    inf_last = 0;                                                       // MR7
+	/* prime lookahead buffer, point to inputTokens */
+	this->inputTokens = _inputTokens;
+	this->inputTokens->setMinTokens(k);
+	_inputTokens->setParser(this);					                    // MR1
+    resynchConsumed=1;                                                  // MR8
+    zzFAILtext=NULL;                                                    // MR9
+    traceOptionValueDefault=0;                                          // MR10
+    traceReset();                                                       // MR10
+    zzGuessSeq=0;                                                       // MR10
+    syntaxErrCount=0;                                                   // MR11
+}
+
+void ANTLRParser::init()
+{
+   prime_lookahead();
+   resynchConsumed=1;                                                   // MR8
+   traceReset();                                                        // MR10
+}
+
+void ANTLRParser::traceReset()
+{
+   traceOptionValue=traceOptionValueDefault;
+   traceGuessOptionValue=1;
+   traceCurrentRuleName=NULL;
+   traceDepth=0;
+}
+
+
+#ifdef _MSC_VER  // MR23
+//Turn off warning:
+//interaction between '_setjmp' and C++ object destruction is non-portable
+#pragma warning(disable : 4611)
+#endif
+int ANTLRParser::
+guess(ANTLRParserState *st)
+{
+	saveState(st);
+	guessing = 1;
+	return setjmp(guess_start.state);
+}
+#ifdef _MSC_VER  // MR23
+#pragma warning(default: 4611)
+#endif
+
+void ANTLRParser::
+saveState(ANTLRParserState *buf)
+{
+	buf->guess_start = guess_start;
+	buf->guessing = guessing;
+	buf->inf_labase = inf_labase;
+	buf->inf_last = inf_last;
+	buf->dirty = dirty;
+    buf->traceOptionValue=traceOptionValue;            /* MR10 */
+    buf->traceGuessOptionValue=traceGuessOptionValue;  /* MR10 */
+    buf->traceCurrentRuleName=traceCurrentRuleName;    /* MR10 */
+    buf->traceDepth=traceDepth;                        /* MR10 */
+}
+
+void ANTLRParser::
+restoreState(ANTLRParserState *buf)
+{
+	int     i;
+    int     prevTraceOptionValue;
+
+	guess_start = buf->guess_start;
+	guessing = buf->guessing;
+	inf_labase = buf->inf_labase;
+	inf_last = buf->inf_last;
+	dirty = buf->dirty;
+
+	// restore lookahead buffer from k tokens before restored TokenBuffer position
+	// if demand_look, then I guess we don't look backwards for these tokens.
+	for (i=1; i<=LLk; i++) token_type[i-1] =
+		inputTokens->bufferedToken(i-LLk)->getType();
+	lap = 0;
+	labase = 0;
+
+    /* MR10 */
+
+    prevTraceOptionValue=traceOptionValue;
+    traceOptionValue=buf->traceOptionValue;
+    if ( (prevTraceOptionValue > 0) !=
+             (traceOptionValue > 0)) {
+      if (traceCurrentRuleName != NULL) {  /* MR21 */
+          if (traceOptionValue > 0) {
+            /* MR23 */ printMessage(stderr,
+                   "trace enable restored in rule %s depth %d\n",
+                   traceCurrentRuleName,
+                   traceDepth);
+          };
+          if (traceOptionValue <= 0) {
+            /* MR23 */ printMessage(stderr,
+            "trace disable restored in rule %s depth %d\n",
+            traceCurrentRuleName, /* MR21 */
+            traceDepth);
+          };
+       }
+    };
+    traceGuessOptionValue=buf->traceGuessOptionValue;
+    traceCurrentRuleName=buf->traceCurrentRuleName;
+    traceDepth=buf->traceDepth;
+    traceGuessDone(buf);
+}
+
+/* Get the next symbol from the input stream; put it into lookahead buffer;
+ * fill token_type[] fast reference cache also.  NLA is the next place where
+ * a lookahead ANTLRAbstractToken should go.
+ */
+void ANTLRParser::
+consume()
+{
+
+#ifdef ZZDEBUG_CONSUME_ACTION
+    zzdebug_consume_action();
+#endif
+
+// MR19 V.H. Simonis
+//      Defer Fetch feature
+//      Moves action of consume() into LA() function
+
+#ifdef ZZDEFER_FETCH
+      stillToFetch++;
+#else
+      NLA = inputTokens->getToken()->getType();
+      dirty--;
+      lap = (lap+1)&(LLk-1);
+#endif
+
+}
+
+_ANTLRTokenPtr ANTLRParser::
+LT(int i)
+{
+
+// MR19 V.H. Simonis
+//      Defer Fetch feature
+//      Moves action of consume() into LA() function
+
+#ifdef ZZDEFER_FETCH
+    undeferFetch();
+#endif
+
+#ifdef DEBUG_TOKENBUFFER
+	if ( i >= inputTokens->bufferSize() || inputTokens->minTokens() < LLk )     /* MR20 Was "<=" */
+	{
+		char buf[2000];                 /* MR20 Was "static" */
+        sprintf(buf, "The minimum number of tokens you requested that the\nANTLRTokenBuffer buffer is not enough to satisfy your\nLT(%d) request; increase 'k' argument to constructor for ANTLRTokenBuffer\n", i);
+		panic(buf);
+	}
+#endif
+	return inputTokens->bufferedToken(i-LLk);
+}
+
+void
+ANTLRParser::
+look(int k)
+{
+	int i, c = k - (LLk-dirty);
+	for (i=1; i<=c; i++) consume();
+}
+
+/* fill the lookahead buffer up with k symbols (even if DEMAND_LOOK);
+ */
+void
+ANTLRParser::
+prime_lookahead()
+{
+	int i;
+	for(i=1;i<=LLk; i++) consume();
+	dirty=0;
+	// lap = 0;     // MR14 Sinan Karasu (sinan.karasu@boeing.com)
+	// labase = 0;  // MR14
+    labase=lap;     // MR14
+}
+
+/* check to see if the current input symbol matches '_t'.
+ * During NON demand lookahead mode, dirty will always be 0 and
+ * hence the extra code for consuming tokens in _match is never
+ * executed; the same routine can be used for both modes.
+ */
+int ANTLRParser::
+_match(ANTLRTokenType _t, ANTLRChar **MissText,
+	   ANTLRTokenType *MissTok, _ANTLRTokenPtr *BadTok,
+	   SetWordType **MissSet)
+{
+	if ( dirty==LLk ) {
+		consume();
+	}
+	if ( LA(1)!=_t ) {
+		*MissText=NULL;
+		*MissTok= _t;
+		*BadTok = LT(1);
+		*MissSet=NULL;
+		return 0;
+	}
+	dirty++;
+	labase = (labase+1)&(LLk-1);	// labase maintained even if !demand look
+	return 1;
+}
+
+/* check to see if the current input symbol matches '_t'.
+ * Used during exception handling.
+ */
+int ANTLRParser::
+_match_wsig(ANTLRTokenType _t)
+{
+	if ( dirty==LLk ) {
+		consume();
+	}
+	if ( LA(1)!=_t ) return 0;
+	dirty++;
+	labase = (labase+1)&(LLk-1);	// labase maintained even if !demand look
+	return 1;
+}
+
+/* check to see if the current input symbol matches any token in a set.
+ * During NON demand lookahead mode, dirty will always be 0 and
+ * hence the extra code for consuming tokens in _match is never
+ * executed; the same routine can be used for both modes.
+ */
+int ANTLRParser::
+_setmatch(SetWordType *tset, ANTLRChar **MissText,
+	   ANTLRTokenType *MissTok, _ANTLRTokenPtr *BadTok,
+	   SetWordType **MissSet, SetWordType *tokclassErrset)
+{
+	if ( dirty==LLk ) {
+		consume();
+	}
+	if ( !set_el(LA(1), tset) ) {
+		*MissText=NULL;										/* MR23 */
+		*MissTok=(ANTLRTokenType) 0;						/* MR23 */
+		*BadTok=LT(1);										/* MR23 */
+		*MissSet=tokclassErrset;							/* MR23 */
+		return 0;
+	}
+	dirty++;
+	labase = (labase+1)&(LLk-1);	// labase maintained even if !demand look
+	return 1;
+}
+
+int ANTLRParser::
+_setmatch_wsig(SetWordType *tset)
+{
+	if ( dirty==LLk ) {
+		consume();
+	}
+	if ( !set_el(LA(1), tset) ) return 0;
+	dirty++;
+	labase = (labase+1)&(LLk-1);	// labase maintained even if !demand look
+	return 1;
+}
+
+                   /* Exception handling routines */
+//
+//  7-Apr-97 133MR1
+//   	     Change suggested by Eli Sternheim (eli@interhdl.com)
+//
+void ANTLRParser::
+consumeUntil(SetWordType *st)
+{
+	ANTLRTokenType		tmp;	                        				// MR1
+	const			int Eof=1;                                          // MR1
+	while ( !set_el( (tmp=LA(1)), st) && tmp!=Eof) { consume(); }       // MR1
+}
+
+//
+//  7-Apr-97 133MR1
+//   	     Change suggested by Eli Sternheim (eli@interhdl.com)
+//
+void ANTLRParser::
+consumeUntilToken(int t)
+{
+	int	tmp;                                                            // MR1
+	const	int Eof=1;                                                  // MR1
+	while ( (tmp=LA(1)) !=t && tmp!=Eof) { consume(); }                 // MR1
+}
+
+
+                        /* Old error stuff */
+
+void ANTLRParser::
+resynch(SetWordType *wd,SetWordType mask)
+{
+
+/* MR8              S.Bochnak@microtool.com.pl                          */
+/* MR8              Change file scope static "consumed" to instance var */
+
+	/* if you enter here without having consumed a token from last resynch
+	 * force a token consumption.
+	 */
+/* MR8 */  	if ( !resynchConsumed ) {consume(); resynchConsumed=1; return;}
+
+   	/* if current token is in resynch set, we've got what we wanted */
+
+/* MR8 */  	if ( wd[LA(1)]&mask || LA(1) == eofToken ) {resynchConsumed=0; return;}
+	
+   	/* scan until we find something in the resynch set */
+
+        	while ( !(wd[LA(1)]&mask) && LA(1) != eofToken ) {consume();}
+
+/* MR8 */	resynchConsumed=1;
+}
+
+/* standard error reporting function that assumes DLG-based scanners;
+ * you should redefine in subclass to change it or if you use your
+ * own scanner.
+ */
+
+/* MR23 THM There appears to be a parameter "badText" passed to syn()
+            which is not present in the parameter list.  This may be
+            because in C mode there is no attribute function which
+            returns the text, so the text representation of the token
+            must be passed explicitly.  I think.
+*/
+           
+void ANTLRParser::
+syn(_ANTLRTokenPtr /*tok MR23*/, ANTLRChar *egroup, SetWordType *eset,
+	ANTLRTokenType etok, int k)
+{
+	int line;
+
+	line = LT(1)->getLine();
+
+    syntaxErrCount++;                                   /* MR11 */
+
+    /* MR23  If the token is not an EOF token, then use the ->getText() value.
+
+             If the token is the EOF token the text returned by ->getText() 
+             may be garbage.  If the text from the token table is "@" use
+             "<eof>" instead, because end-users don't know what "@" means.
+             If the text is not "@" then use that text, which must have been
+             supplied by the grammar writer.
+     */
+	const char * errorAt = LT(1)->getText();
+	if (LA(1) == eofToken) {
+  	  errorAt = parserTokenName(LA(1));
+  	  if (errorAt[0] == '@') errorAt = "<eof>";
+	}
+	/* MR23 */ printMessage(stderr, "line %d: syntax error at \"%s\"",
+					line, errorAt);
+	if ( !etok && !eset ) {/* MR23 */ printMessage(stderr, "\n"); return;}
+	if ( k==1 ) /* MR23 */ printMessage(stderr, " missing");
+	else
+	{
+		/* MR23 */ printMessage(stderr, "; \"%s\" not", LT(k)->getText()); // MR23 use LT(k) since k>1
+		if ( set_deg(eset)>1 ) /* MR23 */ printMessage(stderr, " in");
+	}
+	if ( set_deg(eset)>0 ) edecode(eset);
+	else /* MR23 */ printMessage(stderr, " %s", token_tbl[etok]);
+	if ( strlen(egroup) > 0 ) /* MR23 */ printMessage(stderr, " in %s", egroup);
+	/* MR23 */ printMessage(stderr, "\n");
+}
+
+/* is b an element of set p? */
+int ANTLRParser::
+set_el(ANTLRTokenType b, SetWordType *p)
+{
+	return( p[DIVWORD(b)] & bitmask[MODWORD(b)] );
+}
+
+int ANTLRParser::
+set_deg(SetWordType *a)
+{
+	/* Fast compute degree of a set... the number
+	   of elements present in the set.  Assumes
+	   that all word bits are used in the set
+	*/
+	register SetWordType *p = a;
+	register SetWordType *endp = &(a[bsetsize]);
+	register int degree = 0;
+
+	if ( a == NULL ) return 0;
+	while ( p < endp )
+	{
+		register SetWordType t = *p;
+		register SetWordType *b = &(bitmask[0]);
+		do {
+			if (t & *b) ++degree;
+		} while (++b < &(bitmask[sizeof(SetWordType)*8]));
+		p++;
+	}
+
+	return(degree);
+}
+
+void ANTLRParser::
+edecode(SetWordType *a)
+{
+	register SetWordType *p = a;
+	register SetWordType *endp = &(p[bsetsize]);
+	register unsigned e = 0;
+
+	if ( set_deg(a)>1 ) /* MR23 */ printMessage(stderr, " {");
+	do {
+		register SetWordType t = *p;
+		register SetWordType *b = &(bitmask[0]);
+		do {
+			if ( t & *b ) /* MR23 */ printMessage(stderr, " %s", token_tbl[e]);
+			e++;
+		} while (++b < &(bitmask[sizeof(SetWordType)*8]));
+	} while (++p < endp);
+	if ( set_deg(a)>1 ) /* MR23 */ printMessage(stderr, " }");
+}
+
+/* input looks like:
+ *      zzFAIL(k, e1, e2, ...,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText,&zzErrk)
+ * where the zzMiss stuff is set here to the token that did not match
+ * (and which set wasn't it a member of).
+ */
+
+// MR9 29-Sep-97    Stan Bochnak (S.Bochnak@microTool.com.pl)
+// MR9              Original fix to static allocated text didn't
+// MR9                work because a pointer to it was passed back
+// MR9                to caller.  Replace with instance variable.
+
+const int   SETWORDCOUNT=20;
+
+void
+ANTLRParser::FAIL(int k, ...)
+{
+//
+//  MR1 10-Apr-97	
+//
+
+    if (zzFAILtext == NULL) zzFAILtext=new char [1000];          // MR9
+    SetWordType **f=new SetWordType *[SETWORDCOUNT];             // MR1 // MR9
+    SetWordType **miss_set;
+    ANTLRChar **miss_text;
+    _ANTLRTokenPtr *bad_tok;
+    ANTLRChar **bad_text;
+//
+//  7-Apr-97 133MR1
+//  		err_k is passed as a "int *", not "unsigned *"
+//
+    int	*err_k;                                                         // MR1
+    int i;
+    va_list ap;
+
+    va_start(ap, k);
+
+    zzFAILtext[0] = '\0';
+	if ( k > SETWORDCOUNT ) panic("FAIL: overflowed buffer");
+    for (i=1; i<=k; i++)    /* collect all lookahead sets */
+    {
+        f[i-1] = va_arg(ap, SetWordType *);
+    }
+    for (i=1; i<=k; i++)    /* look for offending token */
+    {
+        if ( i>1 ) strcat(zzFAILtext, " ");
+        strcat(zzFAILtext, LT(i)->getText());
+        if ( !set_el(LA(i), f[i-1]) ) break;
+    }
+    miss_set = va_arg(ap, SetWordType **);
+    miss_text = va_arg(ap, ANTLRChar **);
+    bad_tok = va_arg(ap, _ANTLRTokenPtr *);
+    bad_text = va_arg(ap, ANTLRChar **);
+    err_k = va_arg(ap, int *);                      					// MR1
+    if ( i>k )
+    {
+        /* bad; lookahead is permutation that cannot be matched,
+         * but, the ith token of lookahead is valid at the ith position
+         * (The old LL sub 1 (k) versus LL(k) parsing technique)
+         */
+        *miss_set = NULL;
+        *miss_text = LT(1)->getText();
+        *bad_tok = LT(1);
+        *bad_text = (*bad_tok)->getText();
+        *err_k = k;
+//
+//  MR4 20-May-97	erroneously deleted contents of f[]
+//  MR4			        reported by Bruce Guenter (bruceg@qcc.sk.ca)
+//  MR1 10-Apr-97	release temporary storage
+//
+      delete [] f;                                                      // MR1
+      return;                                                           // MR1
+    }
+/*  MR23 printMessage(stderr, "%s not in %dth set\n", zztokens[LA(i)], i);*/
+    *miss_set = f[i-1];
+    *miss_text = zzFAILtext;
+    *bad_tok = LT(i);
+    *bad_text = (*bad_tok)->getText();
+    if ( i==1 ) *err_k = 1;
+    else *err_k = k;
+//
+//  MR4 20-May-97	erroneously deleted contents of f[]
+//  MR4			      reported by Bruce Guenter (bruceg@qcc.sk.ca)
+//  MR1 10-Apr-97	release temporary storage
+//
+    delete [] f;                                                        // MR1
+    return;                                                             // MR1
+}
+
+int ANTLRParser::
+_match_wdfltsig(ANTLRTokenType tokenWanted, SetWordType *whatFollows)
+{
+	if ( dirty==LLk ) consume();
+
+	if ( LA(1)!=tokenWanted )
+	{
+        syntaxErrCount++;                                   /* MR11 */
+		/* MR23 */ printMessage(stderr,
+				"line %d: syntax error at \"%s\" missing %s\n",
+				LT(1)->getLine(),
+				(LA(1)==eofToken && LT(1)->getText()[0] == '@')?"<eof>":LT(1)->getText(), /* MR21a */
+				token_tbl[tokenWanted]);
+		consumeUntil( whatFollows );
+		return 0;
+	}
+	else {
+		dirty++;
+		labase = (labase+1)&(LLk-1); // labase maintained even if !demand look
+/*		if ( !demand_look ) consume(); */
+		return 1;
+	}
+}
+
+
+int ANTLRParser::
+_setmatch_wdfltsig(SetWordType *tokensWanted,
+					ANTLRTokenType tokenTypeOfSet,
+					SetWordType *whatFollows)
+{
+	if ( dirty==LLk ) consume();
+	if ( !set_el(LA(1), tokensWanted) )
+	{
+        syntaxErrCount++;                                   /* MR11 */
+		/* MR23 */ printMessage(stderr,
+				"line %d: syntax error at \"%s\" missing %s\n",
+				LT(1)->getLine(),
+				(LA(1)==eofToken && LT(1)->getText()[0] == '@')?"<eof>":LT(1)->getText(), /* MR21a */
+				token_tbl[tokenTypeOfSet]);
+		consumeUntil( whatFollows );
+		return 0;
+	}
+	else {
+		dirty++;
+		labase = (labase+1)&(LLk-1); // labase maintained even if !demand look
+/*		if ( !demand_look ) consume(); */
+		return 1;
+	}
+}
+
+char *ANTLRParser::
+eMsgd(char *err,int d)
+{
+	sprintf(eMsgBuffer, err, d);	// dangerous, but I don't care
+	return eMsgBuffer;
+}
+
+char *ANTLRParser::
+eMsg(char *err, char *s)
+{
+	sprintf(eMsgBuffer, err, s);
+	return eMsgBuffer;
+}
+
+char *ANTLRParser::
+eMsg2(char *err,char *s, char *t)
+{
+	sprintf(eMsgBuffer, err, s, t);
+	return eMsgBuffer;
+}
+
+void ANTLRParser::
+panic(const char *msg)  // MR20 const
+{
+	/* MR23 */ printMessage(stderr, "ANTLR panic: %s\n", msg);
+	exit(PCCTS_EXIT_FAILURE);           // MR1
+}
+
+const ANTLRChar *ANTLRParser::          // MR1
+parserTokenName(int tok) {              // MR1
+	return token_tbl[tok];              // MR1
+}                                       // MR1
+
+void ANTLRParser::traceGuessDone(const ANTLRParserState *state) {
+
+  int   doIt=0;
+
+  if (traceCurrentRuleName == NULL) return;
+
+  if (traceOptionValue <= 0) {
+    doIt=0;
+  } else if (traceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    /* MR23 */ printMessage(stderr,"guess done - returning to rule %s {\"%s\"} at depth %d",
+        state->traceCurrentRuleName,
+        LT(1)->getType() == eofToken ? "@" : LT(1)->getText(),
+        state->traceDepth);
+    if (state->guessing != 0) {
+      /* MR23 */ printMessage(stderr," (guess mode continues - an enclosing guess is still active)");
+    } else {
+      /* MR23 */ printMessage(stderr," (guess mode ends)");
+    };
+    /* MR23 */ printMessage(stderr,"\n");
+  };
+}
+
+void ANTLRParser::traceGuessFail() {
+
+  int   doIt=0;
+
+  if (traceCurrentRuleName == NULL) return;     /* MR21 */
+
+  if (traceOptionValue <= 0) {
+    doIt=0;
+  } else if (guessing && traceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    /* MR23 */ printMessage(stderr,"guess failed in %s\n",traceCurrentRuleName);
+  };
+}
+
+/* traceOption:
+     zero value turns off trace
+*/
+
+void ANTLRParser::tracein(const ANTLRChar * rule) {
+
+  int       doIt=0;
+
+  traceDepth++;
+  traceCurrentRuleName=rule;
+
+  if (traceOptionValue <= 0) {
+    doIt=0;
+  } else if (guessing && traceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    /* MR23 */ printMessage(stderr,"enter rule %s {\"%s\"} depth %d",
+            rule,
+            LT(1)->getType() == eofToken ? "@" : LT(1)->getText(),
+            traceDepth);
+    if (guessing) /* MR23 */ printMessage(stderr," guessing");
+    /* MR23 */ printMessage(stderr,"\n");
+  };
+  return;
+}
+
+void ANTLRParser::traceout(const ANTLRChar * rule) {
+
+  int       doIt=0;
+
+  traceDepth--;
+
+  if (traceOptionValue <= 0) {
+    doIt=0;
+  } else if (guessing && traceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    /* MR23 */ printMessage(stderr,"exit rule %s {\"%s\"} depth %d",
+            rule,
+            LT(1)->getType() == eofToken ? "@" : LT(1)->getText(),
+            traceDepth+1);
+    if (guessing) /* MR23 */ printMessage(stderr," guessing");
+    /* MR23 */ printMessage(stderr,"\n");
+  };
+}
+
+int ANTLRParser::traceOption(int delta) {
+
+    int     prevValue=traceOptionValue;
+
+    traceOptionValue=traceOptionValue+delta;
+
+    if (traceCurrentRuleName != NULL) {
+      if (prevValue <= 0 && traceOptionValue > 0) {
+        /* MR23 */ printMessage(stderr,"trace enabled in rule %s depth %d\n",traceCurrentRuleName,traceDepth);
+      };
+      if (prevValue > 0 && traceOptionValue <= 0) {
+        /* MR23 */ printMessage(stderr,"trace disabled in rule %s depth %d\n",traceCurrentRuleName,traceDepth);
+      };
+    };
+
+    return  prevValue;
+}
+
+int ANTLRParser::traceGuessOption(int delta) {
+
+    int     prevValue=traceGuessOptionValue;
+
+    traceGuessOptionValue=traceGuessOptionValue+delta;
+
+    if (traceCurrentRuleName != NULL) {
+      if (prevValue <= 0 && traceGuessOptionValue > 0) {
+        /* MR23 */ printMessage(stderr,"guess trace enabled in rule %s depth %d\n",traceCurrentRuleName,traceDepth);
+      };
+      if (prevValue > 0 && traceGuessOptionValue <= 0) {
+        /* MR23 */ printMessage(stderr,"guess trace disabled in rule %s depth %d\n",traceCurrentRuleName,traceDepth);
+      };
+    };
+    return prevValue;
+}
+
+// MR19 V.H. Simonis Defer Fetch feature
+
+void ANTLRParser::undeferFetch()
+{
+
+#ifdef ZZDEFER_FETCH
+    if (stillToFetch) {
+        for (int stillToFetch_x = 0; stillToFetch_x < stillToFetch; ++stillToFetch_x) {
+    		NLA = inputTokens->getToken()->getType();
+    		dirty--;
+    		lap = (lap+1)&(LLk-1);
+        }
+        stillToFetch = 0;
+    }
+#else
+    return;
+#endif
+
+}
+
+int ANTLRParser::isDeferFetchEnabled()
+{
+#ifdef ZZDEFER_FETCH
+    return 1;
+#else
+    return 0;
+#endif
+}
+
+//MR23
+int ANTLRParser::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+  	int iRet = printMessageV(pFile, pFormat, marker);
+	va_end( marker );
+	return iRet;
+}
+
+int ANTLRParser::printMessageV(FILE* pFile, const char* pFormat, va_list arglist) // MR23
+{
+  	return vfprintf(pFile, pFormat, arglist);
+}
+
+// MR23 Move semantic predicate error handling from macro to virtual function
+//
+// Called by the zzfailed_pred
+
+void ANTLRParser::failedSemanticPredicate(const char* predicate)
+{
+    printMessage(stdout,"line %d: semantic error; failed predicate: '%s'\n",
+    	LT(1)->getLine(), predicate);
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/AParser.h b/Tools/Source/TianoTools/Pccts/h/AParser.h
new file mode 100644
index 0000000000..fe405f4167
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/AParser.h
@@ -0,0 +1,376 @@
+/* ANTLRParser.h
+ *
+ * Define the generic ANTLRParser superclass, which is subclassed to
+ * define an actual parser.
+ *
+ * Before entry into this file: ANTLRTokenType must be set.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef APARSER_H_GATE
+#define APARSER_H_GATE
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_setjmp.h"
+
+PCCTS_NAMESPACE_STD
+
+#include ATOKEN_H
+#include ATOKENBUFFER_H
+
+#ifdef ZZCAN_GUESS
+#ifndef ZZINF_LOOK
+#define ZZINF_LOOK
+#endif
+#endif
+
+
+#define NLA			(token_type[lap&(LLk-1)])/* --> next LA */
+
+typedef unsigned char SetWordType;
+
+/* Define external bit set stuff (for SetWordType) */
+#define EXT_WORDSIZE	(sizeof(char)*8)
+#define EXT_LOGWORDSIZE	3
+
+           /* s y n t a c t i c  p r e d i c a t e  s t u f f */
+
+#ifndef zzUSER_GUESS_HOOK
+#define zzUSER_GUESS_HOOK(seqFrozen,zzrv)
+#endif
+
+#ifndef zzUSER_GUESS_DONE_HOOK
+#define zzUSER_GUESS_DONE_HOOK(seqFrozen)
+#endif
+
+/* MR14 Add zzUSER_GUESS_FAIL_HOOK and related code */
+
+#define zzUSER_GUESS_FAIL_HOOK_INTERNAL zzUSER_GUESS_FAIL_HOOK(SeqFrozen)
+#ifndef zzUSER_GUESS_FAIL_HOOK
+#define zzUSER_GUESS_FAIL_HOOK(zzGuessSeq)
+#endif
+
+
+typedef struct _zzjmp_buf {
+			jmp_buf state;
+		} zzjmp_buf;
+
+/* these need to be macros not member functions */
+#define zzGUESS_BLOCK		ANTLRParserState zzst; int zzrv; int _marker; int zzGuessSeqFrozen;
+#define zzNON_GUESS_MODE	if ( !guessing )
+#define zzGUESS_FAIL		guess_fail();
+
+/*  Note:  zzGUESS_DONE does not execute longjmp() */
+
+#define zzGUESS_DONE		{zzrv=1; inputTokens->rewind(_marker); guess_done(&zzst);zzUSER_GUESS_DONE_HOOK(zzGuessSeqFrozen) }
+#define zzGUESS				saveState(&zzst); \
+							guessing = 1; \
+                            zzGuessSeqFrozen = ++zzGuessSeq; \
+							_marker = inputTokens->mark(); \
+							zzrv = setjmp(guess_start.state); \
+                            zzUSER_GUESS_HOOK(zzGuessSeqFrozen,zzrv) \
+						    if ( zzrv ) zzGUESS_DONE
+
+#define zzTRACEdata     const ANTLRChar *zzTracePrevRuleName = NULL;
+
+#ifndef zzTRACEIN
+#define zzTRACEIN(r)	zzTracePrevRuleName=traceCurrentRuleName;tracein(r);
+#endif
+#ifndef zzTRACEOUT
+#define zzTRACEOUT(r)	traceout(r);traceCurrentRuleName=zzTracePrevRuleName;
+#endif
+
+                  /* a n t l r  p a r s e r  d e f */
+
+struct ANTLRParserState {
+	/* class variables */
+	zzjmp_buf guess_start;
+	int guessing;
+
+	int inf_labase;
+	int inf_last;
+
+	int dirty;
+
+    int             traceOptionValue;       // MR10
+    int             traceGuessOptionValue;  // MR10
+    const ANTLRChar *traceCurrentRuleName;  // MR10
+    int             traceDepth;             // MR10
+
+};
+
+/* notes:
+ *
+ * multiple inheritance is a cool way to include what stuff is needed
+ * in this structure (like guess stuff).  however, i'm not convinced that
+ * multiple inheritance works correctly on all platforms.  not that
+ * much space is used--just include all possibly useful members.
+ *
+ * the class should also be a template with arguments for the lookahead
+ * depth and so on.  that way, more than one parser can be defined (as
+ * each will probably have different lookahead requirements).  however,
+ * am i sure that templates work?  no, i'm not sure.
+ *
+ * no attributes are maintained and, hence, the 'asp' variable is not
+ * needed.  $i can still be referenced, but it refers to the token
+ * associated with that rule element.  question: where are the token's
+ * stored if not on the software stack?  in local variables created
+ * and assigned to by antlr.
+ */
+class ANTLRParser {
+protected:
+	/* class variables */
+	static SetWordType bitmask[sizeof(SetWordType)*8];
+	static char eMsgBuffer[500];
+
+protected:
+	int LLk;					// number of lookahead symbols (old LL_K)
+	int demand_look;
+	ANTLRTokenType eofToken;			// when do I stop during resynch()s
+	int bsetsize;           			// size of bitsets created by ANTLR in
+        								// units of SetWordType
+
+	ANTLRTokenBuffer *inputTokens;	//place to get input tokens
+
+	zzjmp_buf guess_start;		// where to jump back to upon failure
+	int guessing;				// if guessing (using (...)? predicate)
+
+	// infinite lookahead stuff
+	int can_use_inf_look;		// set by subclass (generated by ANTLR)
+	int inf_lap;
+	int inf_labase;
+	int inf_last;
+	int *_inf_line;
+
+	const ANTLRChar **token_tbl; // pointer to table of token type strings MR20 const
+
+	int dirty;					// used during demand lookahead
+
+	ANTLRTokenType *token_type;		// fast reference cache of token.getType()
+//	ANTLRLightweightToken **token;	// the token with all its attributes
+	int lap;
+	int labase;
+#ifdef ZZDEFER_FETCH
+	int stillToFetch;                               // MR19 V.H. Simonis
+#endif
+
+private:
+	void fill_inf_look();
+
+protected:
+	virtual void guess_fail() {                         // MR9 27-Sep-97 make virtual
+        traceGuessFail();                               // MR10
+        longjmp(guess_start.state, 1); }                // MR9
+	virtual void guess_done(ANTLRParserState *st) {     // MR9 27-Sep-97 make virtual
+         restoreState(st); }                            // MR9
+	virtual int guess(ANTLRParserState *);              // MR9 27-Sep-97 make virtual
+	void look(int);
+    int _match(ANTLRTokenType, ANTLRChar **, ANTLRTokenType *,
+			   _ANTLRTokenPtr *, SetWordType **);
+    int _setmatch(SetWordType *, ANTLRChar **, ANTLRTokenType *,
+			   _ANTLRTokenPtr *, SetWordType **,
+			   SetWordType * tokclassErrset /* MR23 */);
+    int _match_wsig(ANTLRTokenType);
+    int _setmatch_wsig(SetWordType *);
+    virtual void consume();
+    virtual void resynch(SetWordType *wd,SetWordType mask); // MR21
+	void prime_lookahead();
+	virtual void tracein(const ANTLRChar *r);              // MR10
+	virtual void traceout(const ANTLRChar *r);             // MR10
+	static unsigned MODWORD(unsigned x) {return x & (EXT_WORDSIZE-1);}	// x % EXT_WORDSIZE // MR9
+	static unsigned DIVWORD(unsigned x) {return x >> EXT_LOGWORDSIZE;}	// x / EXT_WORDSIZE // MR9
+	int set_deg(SetWordType *);
+	int set_el(ANTLRTokenType, SetWordType *);
+	virtual void edecode(SetWordType *);				// MR1
+	virtual void FAIL(int k, ...);					    // MR1
+    int                 traceOptionValue;                           // MR10
+    int                 traceGuessOptionValue;                      // MR10
+    const ANTLRChar     *traceCurrentRuleName;                      // MR10
+    int                 traceDepth;                                 // MR10
+    void                traceReset();                               // MR10
+    virtual void        traceGuessFail();                           // MR10
+    virtual void        traceGuessDone(const ANTLRParserState *);   // MR10
+    int                 zzGuessSeq;                                 // MR10
+
+public:
+	ANTLRParser(ANTLRTokenBuffer *,
+				int k=1,
+				int use_inf_look=0,
+				int demand_look=0,
+				int bsetsize=1);
+	virtual ~ANTLRParser();
+
+	virtual void init();
+	
+	ANTLRTokenType LA(int i)
+	{
+//
+//  MR14 demand look will always be 0 for C++ mode
+//
+////	return demand_look ? token_type[(labase+(i)-1)&(LLk-1)] :
+////						token_type[(lap+(i)-1)&(LLk-1)];
+
+// MR19 V.H. Simonis Defer fetch feature
+
+#ifdef ZZDEFER_FETCH
+      undeferFetch();
+#endif
+	  return token_type[(lap+(i)-1)&(LLk-1)];
+	}
+	_ANTLRTokenPtr LT(int i);
+
+	void setEofToken(ANTLRTokenType t)	{ eofToken = t; }
+	ANTLRTokenType getEofToken() const  { return eofToken; }    // MR14
+
+	void noGarbageCollectTokens()	{ inputTokens->noGarbageCollectTokens(); }
+	void garbageCollectTokens()		{ inputTokens->garbageCollectTokens(); }
+
+    virtual void syn(_ANTLRTokenPtr tok, ANTLRChar *egroup,
+					 SetWordType *eset, ANTLRTokenType etok, int k);
+	virtual void saveState(ANTLRParserState *);     // MR9 27-Sep-97 make virtual
+	virtual void restoreState(ANTLRParserState *);  // MR9 27-Sep-97 make virtual
+
+	virtual void panic(const char *msg); // MR20 const
+
+	static char *eMsgd(char *,int);
+	static char *eMsg(char *,char *);
+	static char *eMsg2(char *,char *,char *);
+
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+	virtual int printMessageV(FILE* pFile, const char* pFormat, va_list arglist); // MR23
+
+	void consumeUntil(SetWordType *st);
+	void consumeUntilToken(int t);
+
+	virtual int _setmatch_wdfltsig(SetWordType *tokensWanted,
+					 ANTLRTokenType tokenTypeOfSet,
+					 SetWordType *whatFollows);
+	virtual int _match_wdfltsig(ANTLRTokenType tokenWanted,
+					 SetWordType *whatFollows);
+	
+	const ANTLRChar * parserTokenName(int tok);			// MR1
+
+    int                 traceOptionValueDefault;        // MR11
+    int                 traceOption(int delta);         // MR11
+    int                 traceGuessOption(int delta);    // MR11
+
+//  MR8  5-Aug-97   S.Bochnak@microtool.com.pl
+//  MR8             Move resynch static local variable
+//  MR8               to class instance
+
+    int                 syntaxErrCount;                      // MR12
+    ANTLRTokenStream   *getLexer() const {                   // MR12
+      return inputTokens ? inputTokens->getLexer() : 0; }    // MR12
+protected:                                              // MR8
+    int     resynchConsumed;                            // MR8
+    char    *zzFAILtext; // workarea required by zzFAIL // MR9
+    void    undeferFetch();                             // MR19 V.H. Simonis
+    int     isDeferFetchEnabled();                      // MR19 V.H. Simonis
+    virtual void failedSemanticPredicate(const char* predicate); /* MR23 */
+};
+
+#define zzmatch(_t)							\
+	if ( !_match((ANTLRTokenType)_t, &zzMissText, &zzMissTok, \
+				 (_ANTLRTokenPtr *) &zzBadTok, &zzMissSet) ) goto fail;
+
+#define zzmatch_wsig(_t,handler)						\
+	if ( !_match_wsig((ANTLRTokenType)_t) ) if ( guessing ) zzGUESS_FAIL else {_signal=MismatchedToken; goto handler;}
+
+#define zzsetmatch(_ts,_tokclassErrset)							\
+	if ( !_setmatch(_ts, &zzMissText, &zzMissTok, \
+				 (_ANTLRTokenPtr *) &zzBadTok, &zzMissSet, _tokclassErrset) ) goto fail;
+
+#define zzsetmatch_wsig(_ts, handler)				\
+	if ( !_setmatch_wsig(_ts) ) if ( guessing ) zzGUESS_FAIL else {_signal=MismatchedToken; goto handler;}
+
+/* For the dflt signal matchers, a FALSE indicates that an error occurred
+ * just like the other matchers, but in this case, the routine has already
+ * recovered--we do NOT want to consume another token.  However, when
+ * the match was successful, we do want to consume hence _signal=0 so that
+ * a token is consumed by the "if (!_signal) consume(); _signal=NoSignal;"
+ * preamble.
+ */
+#define zzsetmatch_wdfltsig(tokensWanted, tokenTypeOfSet, whatFollows) \
+	if ( !_setmatch_wdfltsig(tokensWanted, tokenTypeOfSet, whatFollows) ) \
+		_signal = MismatchedToken;
+
+#define zzmatch_wdfltsig(tokenWanted, whatFollows) \
+	if ( !_match_wdfltsig(tokenWanted, whatFollows) ) _signal = MismatchedToken;
+
+
+//  MR1  10-Apr-97 	zzfailed_pred() macro does not backtrack in guess mode.
+//  MR1	   		    Identification and correction due to J. Lilley
+//
+//  MR23            Call virtual method to report error.
+//  MR23            Provide more control over failed predicate action
+//                  without any need for user to worry about guessing internals.
+
+#ifndef zzfailed_pred
+#define zzfailed_pred(_p,_hasuseraction,_useraction) \
+  if (guessing) { \
+    zzGUESS_FAIL; \
+  } else { \
+    zzfailed_pred_action(_p,_hasuseraction,_useraction) \
+  }
+#endif
+
+//  MR23            Provide more control over failed predicate action
+//                  without any need for user to worry about guessing internals.
+//                  _hasuseraction == 0 => no user specified error action
+//                  _hasuseraction == 1 => user specified error action
+
+#ifndef zzfailed_pred_action
+#define zzfailed_pred_action(_p,_hasuseraction,_useraction) \
+    if (_hasuseraction) { _useraction } else { failedSemanticPredicate(_p); }
+#endif
+
+#define zzRULE \
+		SetWordType *zzMissSet=NULL; ANTLRTokenType zzMissTok=(ANTLRTokenType)0;	\
+		_ANTLRTokenPtr zzBadTok=NULL; ANTLRChar *zzBadText=(ANTLRChar *)"";	\
+		int zzErrk=1,zzpf=0; \
+        zzTRACEdata \
+		ANTLRChar *zzMissText=(ANTLRChar *)"";
+
+#endif
+
+        /* S t a n d a r d  E x c e p t i o n  S i g n a l s */
+
+#define NoSignal			0
+#define MismatchedToken		1
+#define NoViableAlt			2
+#define NoSemViableAlt		3
+
+/* MR7  Allow more control over signalling                                  */
+/*        by adding "Unwind" and "SetSignal"                                */
+
+#define Unwind              4
+#define setSignal(newValue) *_retsignal=_signal=(newValue)
+#define suppressSignal       *_retsignal=_signal=0
+#define exportSignal        *_retsignal=_signal
diff --git a/Tools/Source/TianoTools/Pccts/h/ASTBase.cpp b/Tools/Source/TianoTools/Pccts/h/ASTBase.cpp
new file mode 100644
index 0000000000..a94f080c86
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ASTBase.cpp
@@ -0,0 +1,256 @@
+/* Abstract syntax tree manipulation functions
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_stdarg.h"
+
+PCCTS_NAMESPACE_STD
+
+#define ANTLR_SUPPORT_CODE
+
+#include "ASTBase.h"
+
+/* ensure that tree manipulation variables are current after a rule
+ * reference
+ */
+void
+ASTBase::link(ASTBase **_root, ASTBase **_sibling, ASTBase **_tail)
+{
+	if ( *_sibling == NULL ) return;
+	if ( *_root == NULL ) *_root = *_sibling;
+	else if ( *_root != *_sibling ) (*_root)->_down = *_sibling;
+	if ( *_tail==NULL ) *_tail = *_sibling;
+	while ( (*_tail)->_right != NULL ) *_tail = (*_tail)->_right;
+}
+
+/* add a child node to the current sibling list */
+void
+ASTBase::subchild(ASTBase **_root, ASTBase **_sibling, ASTBase **_tail)
+{
+	if ( *_tail != NULL ) (*_tail)->_right = this;
+	else {
+		*_sibling = this;
+		if ( *_root != NULL ) (*_root)->_down = *_sibling;
+	}
+	*_tail = this;
+	if ( *_root == NULL ) *_root = *_sibling;
+}
+
+/* make a new AST node.  Make the newly-created
+ * node the root for the current sibling list.  If a root node already
+ * exists, make the newly-created node the root of the current root.
+ */
+void
+ASTBase::subroot(ASTBase **_root, ASTBase **_sibling, ASTBase **_tail)
+{
+	if ( *_root != NULL )
+		if ( (*_root)->_down == *_sibling ) *_sibling = *_tail = *_root;
+	*_root = this;
+	(*_root)->_down = *_sibling;
+}
+
+/* Apply preorder_action(), etc.. to root then each sibling */
+//
+//  7-Apr-97 133MR1
+//	Fix suggested by Ron House (house@helios.usq.edu.au)
+//
+void
+ASTBase::preorder(void* pData /*= NULL*/ /* MR23 */)
+{
+	ASTBase *tree = this;
+
+	while ( tree!= NULL )
+	{
+		if ( tree->_down != NULL ) {
+			tree->preorder_before_action(pData); 		// MR1	
+		};
+		tree->preorder_action(pData);
+		if ( tree->_down!=NULL )
+		{
+			tree->_down->preorder(pData);
+			tree->preorder_after_action(pData);			// MR1
+		}
+		tree = tree->_right;
+	}
+}
+
+/* free all AST nodes in tree; apply func to each before freeing */
+void
+ASTBase::destroy()
+{
+   ASTBase* tree = this;
+   while (tree) {
+      if (tree->_down) tree->_down->destroy();
+
+      ASTBase* cur = tree;
+      tree = tree->_right;
+      delete cur;
+   }
+}
+
+/* build a tree (root child1 child2 ... NULL)
+ * If root is NULL, simply make the children siblings and return ptr
+ * to 1st sibling (child1).  If root is not single node, return NULL.
+ *
+ * Siblings that are actually siblins lists themselves are handled
+ * correctly.  For example #( NULL, #( NULL, A, B, C), D) results
+ * in the tree ( NULL A B C D ).
+ *
+ * Requires at least two parameters with the last one being NULL.  If
+ * both are NULL, return NULL.
+ */
+ASTBase *
+ASTBase::tmake(ASTBase *root, ...)
+{
+	va_list ap;
+	register ASTBase *child, *sibling=NULL, *tail=NULL /*MR23*/, *w;
+
+	va_start(ap, root);
+
+	if ( root != NULL )
+		if ( root->_down != NULL ) {  
+            root->reportOverwriteOfDownPointer();  /* MR21 Report problem which almost always an error */
+            return NULL;
+        }
+	child = va_arg(ap, ASTBase *);
+	while ( child != NULL )
+	{
+		for (w=child; w->_right!=NULL; w=w->_right) {;} /* find end of child */
+		if ( sibling == NULL ) {sibling = child; tail = w;}
+		else {tail->_right = child; tail = w;}
+		child = va_arg(ap, ASTBase *);
+	}
+	if ( root==NULL ) root = sibling;
+	else root->_down = sibling;
+	va_end(ap);
+	return root;
+}
+
+#ifndef PCCTS_NOT_USING_SOR
+
+/* tree duplicate */
+// forgot to check for NULL this (TJP July 23,1995)
+ASTBase *
+ASTBase::dup()
+{
+	ASTBase *u, *t=this;
+	
+	if ( t == NULL ) return NULL;
+/*
+	u = new ASTBase;
+	*u = *t;
+*/
+	u = (ASTBase *)this->shallowCopy();
+	if ( t->_right!=NULL ) u->_right = t->_right->dup();
+	else u->_right = NULL;
+	if ( t->_down!=NULL ) u->_down = t->_down->dup();
+	else u->_down = NULL;
+	return u;
+}
+#endif
+
+//
+//  7-Apr-97 133MR1
+//  	     Fix suggested by Asgeir Olafsson (olafsson@cstar.ac.com)
+//
+/* tree duplicate */
+
+#ifndef PCCTS_NOT_USING_SOR
+
+ASTBase *
+ASTDoublyLinkedBase::dup()
+{
+	ASTDoublyLinkedBase *u, *t=this;
+	
+	if ( t == NULL ) return NULL;
+	u = (ASTDoublyLinkedBase *)this->shallowCopy();
+	u->_up = NULL;		/* set by calling invocation */
+	u->_left = NULL;
+	if (t->_right!=NULL) {						// MR1
+          u->_right=t->_right->dup();					// MR1
+	  ((ASTDoublyLinkedBase *)u->_right)->_left = u;		// MR1
+        } else {							// MR1
+	  u->_right = NULL;						// MR1
+        };								// MR1
+	if (t->_down!=NULL) {						// MR1
+  	  u->_down = t->_down->dup();					// MR1
+          ((ASTDoublyLinkedBase *)u->_down)->_up = u;			// MR1
+        } else {							// MR1
+	  u->_down = NULL;						// MR1
+        };								// MR1
+	return u;
+}
+
+#endif
+
+/*
+ * Set the 'up', and 'left' pointers of all nodes in 't'.
+ * Initial call is double_link(your_tree, NULL, NULL).
+ */
+void
+ASTDoublyLinkedBase::double_link(ASTBase *left, ASTBase *up)
+{
+    ASTDoublyLinkedBase *t = this;
+
+    t->_left = (ASTDoublyLinkedBase *) left;
+    t->_up = (ASTDoublyLinkedBase *) up;
+    if (t->_down != NULL)
+		((ASTDoublyLinkedBase *)t->_down)->double_link(NULL, t);
+    if (t->_right != NULL)
+		((ASTDoublyLinkedBase *)t->_right)->double_link(t, up);
+}
+
+// MR21 ASTBase::reportOverwriteOfDownPointer
+
+void ASTBase::reportOverwriteOfDownPointer()
+{
+    panic("Attempt to overwrite down pointer in ASTBase::tmake");
+}
+
+// MR21 ASTBase::panic
+
+void ASTBase::panic(const char *msg)
+{
+	/* MR23 */ printMessage(stderr,"ASTBase panic: %s\n", msg);
+	exit(PCCTS_EXIT_FAILURE);
+}
+
+#ifdef PCCTS_NOT_USING_SOR
+//MR23
+int ASTBase::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+  	int iRet = vfprintf(pFile, pFormat, marker);
+	va_end( marker );
+	return iRet;
+}
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ASTBase.h b/Tools/Source/TianoTools/Pccts/h/ASTBase.h
new file mode 100644
index 0000000000..912f4b8482
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ASTBase.h
@@ -0,0 +1,122 @@
+/* Abstract syntax tree
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ASTBase_H
+#define ASTBase_H
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+
+PCCTS_NAMESPACE_STD
+
+#ifndef PCCTS_NOT_USING_SOR
+#include "PCCTSAST.h"
+#endif
+
+/*
+ * Notes:
+ *
+ * To specify a copy constructor, subclass one of these classes and
+ * give the copy constructor.  To use dup(), you must define shallowCopy().
+ * shallowCopy() can use either a copy constructor or just copy the node
+ * itself.
+ */
+
+#ifdef PCCTS_NOT_USING_SOR
+class DllExportPCCTS ASTBase {
+#else
+class DllExportPCCTS ASTBase : public PCCTS_AST {
+#endif
+
+protected:
+	ASTBase *_right, *_down;
+
+public:
+
+#ifdef PCCTS_NOT_USING_SOR
+	ASTBase *right()	{ return _right; }
+	ASTBase *down()	    { return _down; }
+	void setRight(ASTBase *t)	{ _right = (ASTBase *)t; }
+	void setDown(ASTBase *t)	{ _down = (ASTBase *)t; }
+#else
+	PCCTS_AST *right()	{ return _right; }	// define the SORCERER interface
+	PCCTS_AST *down()	{ return _down; }
+	void setRight(PCCTS_AST *t)	{ _right = (ASTBase *)t; }
+	void setDown(PCCTS_AST *t)	{ _down = (ASTBase *)t; }
+#endif
+	ASTBase() { _right = _down = NULL; }
+	virtual ~ASTBase() { ; }
+#ifndef PCCTS_NOT_USING_SOR
+	virtual ASTBase *dup();
+#endif
+	void destroy();
+	void preorder(void* pData = NULL /* MR23 */);
+	static ASTBase *tmake(ASTBase *, ...);
+	static void link(ASTBase **, ASTBase **, ASTBase **);
+	void subchild(ASTBase **, ASTBase **, ASTBase **);
+	void subroot(ASTBase **, ASTBase **, ASTBase **);
+	virtual void preorder_action(void* /*pData*/ = NULL /* MR23 */) { ; }
+	virtual void preorder_before_action(void* /*pData*/ = NULL /* MR23 */) { /* MR23 */ printMessage(stdout, " ("); }
+	virtual void preorder_after_action(void* /*pData*/ = NULL /* MR23 */) { /* MR23 */ printMessage(stdout, " )"); }
+    virtual void panic(const char *msg);         /* MR21 */
+    virtual void reportOverwriteOfDownPointer(); /* MR21 */
+#ifdef PCCTS_NOT_USING_SOR
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+#endif
+};
+
+class DllExportPCCTS ASTDoublyLinkedBase : public ASTBase {
+protected:
+    ASTDoublyLinkedBase *_left, *_up;
+
+public:
+  void double_link(ASTBase *left, ASTBase *up);
+
+#ifndef PCCTS_NOT_USING_SOR
+  virtual ASTBase *dup();
+#endif
+
+#ifdef PCCTS_NOT_USING_SOR
+  ASTBase *left() { return _left; }
+  ASTBase *up() { return _up; }
+  void setLeft(ASTBase *t) { _left = (ASTDoublyLinkedBase *)t; }    // MR6
+  void setUp(ASTBase *t)   { _up = (ASTDoublyLinkedBase *)t; }	    // MR6
+#else
+  PCCTS_AST *left() { return _left; }
+  PCCTS_AST *up() { return _up; }
+  void setLeft(PCCTS_AST *t) { _left = (ASTDoublyLinkedBase *)t; }  // MR6
+  void setUp(PCCTS_AST *t)   { _up = (ASTDoublyLinkedBase *)t; }	// MR6
+#endif
+
+};
+
+class AST;	// announce that this class will be coming along shortly
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokPtr.h b/Tools/Source/TianoTools/Pccts/h/ATokPtr.h
new file mode 100644
index 0000000000..75b4c86cbf
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ATokPtr.h
@@ -0,0 +1,88 @@
+/* ATokPtr.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Written by Russell Quong June 30, 1995
+ * Adapted by Terence Parr to ANTLR stuff
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ATokPtr_h
+#define ATokPtr_h
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+
+PCCTS_NAMESPACE_STD
+
+// pointer to a reference counted object
+// robust in that an unused ANTLRTokenPtr can point to NULL.
+
+class ANTLRAbstractToken;
+
+class DllExportPCCTS ANTLRTokenPtr {
+public:
+    ANTLRTokenPtr(ANTLRAbstractToken *addr=NULL){ptr_ = addr; ref();}
+    ANTLRTokenPtr(const ANTLRTokenPtr &lhs)	{ptr_ = lhs.ptr_; lhs.ref();}
+    ~ANTLRTokenPtr();
+
+    // use ANTLRTokenPtr as a pointer to ANTLRToken
+//
+//  8-Apr-97	MR1	Make operator -> a const member function
+//			  as well as some other member functions
+//
+    ANTLRAbstractToken *operator-> () const { return ptr_; }		// MR1
+//
+//  7-Apr-97 133MR1
+//	     Fix suggested by Andreas Magnusson
+//			(Andreas.Magnusson@mailbox.swipnet.se)
+    void operator = (const ANTLRTokenPtr & lhs);		    	// MR1
+    void operator = (ANTLRAbstractToken *addr);
+    int operator != (const ANTLRTokenPtr &q) const	    		// MR1 // MR11 unsigned -> int
+	{ return this->ptr_ != q.ptr_; }
+    int operator == (const ANTLRTokenPtr &q) const  			// MR1 // MR11 unsigned -> int
+	{ return this->ptr_ == q.ptr_; }
+    int operator == (const ANTLRAbstractToken *addr) const      // MR11
+    { return this->ptr_ == addr; }
+    int operator != (const ANTLRAbstractToken *addr) const      // MR11
+    { return this->ptr_ != addr; }
+
+    void ref() const;
+    void deref();
+
+protected:
+    ANTLRAbstractToken *ptr_;
+};
+
+//typedef ANTLRTokenPtr _ANTLRTokenPtr;
+
+/*
+ * Since you cannot redefine operator->() to return one of the user's
+ * token object types, we must down cast.  This is a drag.  Here's
+ * a macro that helps.  template: "mytoken(a-smart-ptr)->myfield".
+ */
+#define mytoken(tk) ((ANTLRToken *)(tk.operator->()))
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokPtrImpl.h b/Tools/Source/TianoTools/Pccts/h/ATokPtrImpl.h
new file mode 100644
index 0000000000..9c07cf52a9
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ATokPtrImpl.h
@@ -0,0 +1,88 @@
+/*
+ * ATokPtrImpl.h (formerly ATokPtr.cpp)
+ *
+ * This is #included in ATokBuffer.cpp for historical reasons.
+ * It has been renamed because of problems with the .cpp extension
+ * when used with IDE.
+ *
+ *
+ * ANTLRToken MUST be defined before entry to this file.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Written by Russell Quong June 30, 1995
+ * Adapted by Terence Parr to ANTLR stuff
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+PCCTS_NAMESPACE_STD
+
+#include "ATokPtr.h"
+
+void ANTLRTokenPtr::ref() const
+{
+    if (ptr_ != NULL) {
+		ptr_->ref();
+	}
+}
+
+void ANTLRTokenPtr::deref()
+{
+    if (ptr_ != NULL)
+    {
+		ptr_->deref();
+		if ( ptr_->nref()==0 )
+		{
+		    delete ptr_;
+			ptr_ = NULL;
+		}
+    }
+}
+
+ANTLRTokenPtr::~ANTLRTokenPtr()
+{
+    deref();
+}
+
+//
+//  8-Apr-97	MR1	Make operator -> a const member function
+//			  as weall as some other member functions
+//
+void ANTLRTokenPtr::operator = (const ANTLRTokenPtr & lhs)	// MR1
+{
+    lhs.ref();	// protect against "xp = xp"; ie same underlying object
+    deref();
+    ptr_ = lhs.ptr_;
+}
+
+void ANTLRTokenPtr::operator = (ANTLRAbstractToken *addr)
+{
+    if (addr != NULL) {
+	addr->ref();
+    }
+    deref();
+    ptr_ = addr;
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/AToken.h b/Tools/Source/TianoTools/Pccts/h/AToken.h
new file mode 100644
index 0000000000..6167c21ef5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/AToken.h
@@ -0,0 +1,325 @@
+/* ANTLRToken.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ATOKEN_H_GATE
+#define ATOKEN_H_GATE
+
+#include "pcctscfg.h"
+
+#include "pccts_string.h"
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+#include "pccts_stdarg.h" // MR23
+
+PCCTS_NAMESPACE_STD
+
+// MR9      RJV (JVincent@novell.com) Not needed for variable length strings
+
+//// MR9 #ifndef ANTLRCommonTokenTEXTSIZE
+//// MR9 #define ANTLRCommonTokenTEXTSIZE        	100
+//// MR9 #endif
+
+
+/* must define what a char looks like; can make this a class too */
+typedef char ANTLRChar;
+
+/* D E F I N E  S M A R T  P O I N T E R S */
+
+//#include ATOKPTR_H   not tested yet, leave out
+class ANTLRAbstractToken;
+typedef ANTLRAbstractToken *_ANTLRTokenPtr;
+
+class ANTLRAbstractToken {
+public:
+    virtual ~ANTLRAbstractToken() {;}
+    virtual ANTLRTokenType getType() const = 0;
+    virtual void setType(ANTLRTokenType t) = 0;
+    virtual int getLine() const = 0;
+    virtual void setLine(int line) = 0;
+    virtual ANTLRChar *getText() const = 0;
+    virtual void setText(const ANTLRChar *) = 0;
+
+    /* This function will disappear when I can use templates */
+	virtual ANTLRAbstractToken *makeToken(ANTLRTokenType tt,
+										  ANTLRChar *text,
+										  int line) = 0;
+
+	/* define to satisfy ANTLRTokenBuffer's need to determine whether or
+	   not a token object can be destroyed.  If nref()==0, no one has
+	   a reference, and the object may be destroyed.  This function defaults
+	   to 1, hence, if you use deleteTokens() message with a token object
+	   not derived from ANTLRCommonRefCountToken, the parser will compile
+	   but will not delete objects after they leave the token buffer.
+    */
+
+	virtual unsigned nref() const { return 1; }     // MR11
+	virtual void ref() {;}
+	virtual void deref() {;}
+
+	virtual void panic(const char *msg)             // MR20 const
+		{
+			/* MR23 */ printMessage(stderr, "ANTLRAbstractToken panic: %s\n", msg);
+			exit(PCCTS_EXIT_FAILURE);
+		}
+
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...) // MR23
+		{
+			va_list marker;
+			va_start( marker, pFormat );
+  			int iRet = vfprintf(pFile, pFormat, marker);
+			va_end( marker );
+			return iRet;
+		}
+};
+
+/* This class should be subclassed.  It cannot store token type or text */
+
+class ANTLRRefCountToken : public ANTLRAbstractToken {
+public:
+#ifdef DBG_REFCOUNTTOKEN
+	static int ctor;
+	static int dtor;
+#endif
+protected:
+    unsigned refcnt_;
+#ifdef DBG_REFCOUNTTOKEN
+	char object[200];
+#endif
+
+public:
+
+	// MR23 - No matter what you do, you're hammered.
+	//        Don't give names to formals something breaks.
+	//		  Give names to formals and don't use them it breaks.
+
+#ifndef DBG_REFCOUNTTOKEN
+	ANTLRRefCountToken(ANTLRTokenType /* t MR23 */, const ANTLRChar * /* s MR23 */)
+#else
+	ANTLRRefCountToken(ANTLRTokenType t, const ANTLRChar * s)
+#endif
+
+#ifndef DBG_REFCOUNTTOKEN
+		{
+			refcnt_ = 0;
+		}
+#else
+	{
+		ctor++;
+		refcnt_ = 0;
+		if ( t==1 ) sprintf(object,"tok_EOF");
+		else sprintf(object,"tok_%s",s);
+		/* MR23 */ printMessage(stderr, "ctor %s #%d\n",object,ctor);
+	}
+#endif
+	ANTLRRefCountToken()
+#ifndef DBG_REFCOUNTTOKEN
+		{ refcnt_ = 0; }
+#else
+		{
+			ctor++;
+			refcnt_ = 0;
+			sprintf(object,"tok_blank");
+			/* MR23 */ printMessage(stderr, "ctor %s #%d\n",object,ctor);
+		}
+	virtual ~ANTLRRefCountToken()
+		{
+			dtor++;
+			if ( dtor>ctor ) /* MR23 */ printMessage(stderr, "WARNING: dtor>ctor\n");
+			/* MR23 */ printMessage(stderr, "dtor %s #%d\n", object, dtor);
+			object[0]='\0';
+		}
+#endif
+
+	// reference counting stuff needed by ANTLRTokenPtr.
+	// User should not access these; for C++ language reasons, we had
+	// to make these public.  Yuck.
+
+	void ref()		      { refcnt_++; }
+	void deref()	      { refcnt_--; }
+	unsigned nref()	const { return refcnt_; }   // MR11
+
+	virtual ANTLRAbstractToken *makeToken(ANTLRTokenType /*tt MR23*/,
+										  ANTLRChar * /*txt MR23*/,
+										  int /*line MR23*/)
+	{
+		panic("call to ANTLRRefCountToken::makeToken()\n");
+		return NULL;
+	}
+};
+
+class ANTLRCommonNoRefCountToken : public ANTLRAbstractToken {
+protected:
+	ANTLRTokenType _type;
+	int _line;
+	ANTLRChar *_text;               // MR9 RJV
+
+public:
+	ANTLRCommonNoRefCountToken(ANTLRTokenType t, const ANTLRChar *s)
+	{ setType(t); _line = 0; _text = NULL; setText(s); }
+	ANTLRCommonNoRefCountToken()
+	{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText(""); }
+
+	~ANTLRCommonNoRefCountToken() { if (_text) delete [] _text; }  // MR9 RJV: Added Destructor to remove string
+
+	ANTLRTokenType getType() const 	{ return _type; }
+	void setType(ANTLRTokenType t)	{ _type = t; }
+	virtual int getLine() const		{ return _line; }
+	void setLine(int line)	    	{ _line = line; }
+	ANTLRChar *getText() const   	{ return _text; }
+    int getLength() const           { return strlen(getText()); }       // MR11
+
+// MR9 RJV: Added code for variable length strings to setText()
+
+	void setText(const ANTLRChar *s)
+	{	if (s != _text) {
+          if (_text) delete [] _text;
+          if (s != NULL) {
+         	_text = new ANTLRChar[strlen(s)+1];
+            if (_text == NULL) panic("ANTLRCommonNoRefCountToken::setText new failed");
+            strcpy(_text,s);
+    	  } else {
+            _text = new ANTLRChar[1];
+            if (_text == NULL) panic("ANTLRCommonNoRefCountToken::setText new failed");
+            strcpy(_text,"");
+          };
+        };
+	}
+
+	virtual ANTLRAbstractToken *makeToken(ANTLRTokenType tt,
+										  ANTLRChar *txt,
+										  int line)
+		{
+			ANTLRAbstractToken *t = new ANTLRCommonNoRefCountToken;
+			t->setType(tt); t->setText(txt); t->setLine(line);
+			return t;
+		}
+
+// MR9 THM Copy constructor required when heap allocated string is used with copy semantics
+
+   ANTLRCommonNoRefCountToken (const ANTLRCommonNoRefCountToken& from) :
+         ANTLRAbstractToken(from) {
+ 	 setType(from._type);
+	 setLine(from._line);
+     _text=NULL;
+     setText(from._text);
+  };
+
+// MR9 THM operator =() required when heap allocated string is used with copy semantics
+
+   virtual ANTLRCommonNoRefCountToken& operator =(const ANTLRCommonNoRefCountToken& rhs) {
+
+//////  MR15 WatCom can't hack use of operator =()
+//////  Use this:  *( (ANTRLAbstractToken *) this)=rhs;
+
+     *( (ANTLRAbstractToken *) this ) = rhs;
+
+  	 setType(rhs._type);
+ 	 setLine(rhs._line);
+     setText(rhs._text);
+     return *this;
+   };
+};
+
+class ANTLRCommonToken : public ANTLRRefCountToken {
+protected:
+	ANTLRTokenType       _type;
+	int                  _line;
+	ANTLRChar           *_text;               // MR9 RJV:Added
+
+public:
+	ANTLRCommonToken(ANTLRTokenType t, const ANTLRChar *s) : ANTLRRefCountToken(t,s)
+		{ setType(t); _line = 0; _text = NULL; setText(s); }                    // MR9
+	ANTLRCommonToken()
+		{ setType((ANTLRTokenType)0); _line = 0; _text = NULL; setText(""); }   // MR9
+
+	virtual ~ANTLRCommonToken() { if (_text) delete [] _text; } // MR9 RJV: Added Destructor to remove string
+
+	ANTLRTokenType getType() const 	{ return _type; }
+	void setType(ANTLRTokenType t)	{ _type = t; }
+	virtual int getLine() const		{ return _line; }
+	void setLine(int line)	    	{ _line = line; }
+	ANTLRChar *getText() const		{ return _text; }
+    int getLength() const           { return strlen(getText()); }       // MR11
+
+// MR9 RJV: Added code for variable length strings to setText()
+
+	void setText(const ANTLRChar *s)
+	{	if (s != _text) {
+          if (_text) delete [] _text;
+          if (s != NULL) {
+         	_text = new ANTLRChar[strlen(s)+1];
+            if (_text == NULL) panic("ANTLRCommonToken::setText new failed");
+            strcpy(_text,s);
+    	  } else {
+            _text = new ANTLRChar[1];
+            if (_text == NULL) panic("ANTLRCommonToken::setText new failed");
+            strcpy(_text,"");
+          };
+        };
+	}
+
+	virtual ANTLRAbstractToken *makeToken(ANTLRTokenType tt,
+										  ANTLRChar *txt,
+										  int line)
+	{
+		ANTLRAbstractToken *t = new ANTLRCommonToken(tt,txt);
+		t->setLine(line);
+		return t;
+	}
+
+// MR9 THM Copy constructor required when heap allocated string is used with copy semantics
+
+   ANTLRCommonToken (const ANTLRCommonToken& from) :
+         ANTLRRefCountToken(from) {
+ 	 setType(from._type);
+	 setLine(from._line);
+     _text=NULL;
+     setText(from._text);
+  };
+
+// MR9 THM operator =() required when heap allocated string is used with copy semantics
+
+   virtual ANTLRCommonToken& operator =(const ANTLRCommonToken& rhs) {
+
+//////  MR15 WatCom can't hack use of operator =()
+//////  Use this instead:   *( (ANTRLRRefCountToken *) this)=rhs;
+
+     *( (ANTLRRefCountToken *) this) = rhs;
+
+  	 setType(rhs._type);
+ 	 setLine(rhs._line);
+     setText(rhs._text);
+     return *this;
+   };
+};
+
+// used for backward compatibility
+typedef ANTLRCommonToken ANTLRCommonBacktrackingToken;
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.cpp b/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.cpp
new file mode 100644
index 0000000000..9a2f2fc88b
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.cpp
@@ -0,0 +1,374 @@
+/* ANTLRTokenBuffer.cpp
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+typedef int ANTLRTokenType;	// fool AToken.h into compiling
+
+class ANTLRParser;					/* MR1 */
+
+#define ANTLR_SUPPORT_CODE
+
+#include "pcctscfg.h"
+
+#include ATOKENBUFFER_H
+#include APARSER_H		// MR23
+
+typedef ANTLRAbstractToken *_ANTLRTokenPtr;
+
+#if defined(DBG_TBUF)||defined(DBG_TBUF_MARK_REW)
+static unsigned char test[1000];
+#endif
+
+#ifdef DBG_REFCOUNTTOKEN
+int ANTLRRefCountToken::ctor = 0; /* MR23 */
+int ANTLRRefCountToken::dtor = 0; /* MR23 */
+#endif
+
+ANTLRTokenBuffer::
+ANTLRTokenBuffer(ANTLRTokenStream *_input, int _k, int _chunk_size_formal) /* MR14 */
+{
+	this->input = _input;
+	this->k = _k;
+	buffer_size = chunk_size = _chunk_size_formal;
+	buffer = (_ANTLRTokenPtr *)
+			 calloc(chunk_size+1,sizeof(_ANTLRTokenPtr ));
+	if ( buffer == NULL ) {
+		panic("cannot alloc token buffer");
+	}
+	buffer++;				// leave the first elem empty so tp-1 is valid ptr
+
+	tp = &buffer[0];
+	last = tp-1;
+	next = &buffer[0];
+	num_markers = 0;
+	end_of_buffer = &buffer[buffer_size-1];
+	threshold = &buffer[(int)(buffer_size/2)];	// MR23 - Used to be 1.0/2.0 !
+	_deleteTokens = 1; 	// assume we delete tokens
+	parser=NULL;				// MR5 - uninitialized reference
+}
+
+static void f() {;}
+ANTLRTokenBuffer::
+~ANTLRTokenBuffer()
+{
+	f();
+	// Delete all remaining tokens (from 0..last inclusive)
+	if ( _deleteTokens )
+	{
+		_ANTLRTokenPtr *z;
+		for (z=buffer; z<=last; z++)
+		{
+			(*z)->deref();
+//			z->deref();
+#ifdef DBG_REFCOUNTTOKEN
+					/* MR23 */ printMessage(stderr, "##########dtor: deleting token '%s' (ref %d)\n",
+							((ANTLRCommonToken *)*z)->getText(), (*z)->nref());
+#endif
+			if ( (*z)->nref()==0 )
+			{
+				delete (*z);
+			}
+		}
+	}
+
+	if ( buffer!=NULL ) free((char *)(buffer-1));
+}
+
+#if defined(DBG_TBUF)||defined(DBG_TBUF_MARK_REW)
+#include "pccts_stdio.h"
+PCCTS_NAMESPACE_STD
+#endif
+
+_ANTLRTokenPtr ANTLRTokenBuffer::
+getToken()
+{
+	if ( tp <= last )	// is there any buffered lookahead still to be read?
+	{
+		return *tp++;	// read buffered lookahead
+	}
+	// out of buffered lookahead, get some more "real"
+	// input from getANTLRToken()
+	if ( num_markers==0 )
+	{
+		if( next > threshold )
+		{
+#ifdef DBG_TBUF
+/* MR23 */ printMessage(stderr,"getToken: next > threshold (high water is %d)\n", threshold-buffer);
+#endif
+			makeRoom();
+		}
+	}
+	else {
+		if ( next > end_of_buffer )
+		{
+#ifdef DBG_TBUF
+/* MR23 */ printMessage(stderr,"getToken: next > end_of_buffer (size is %d)\n", buffer_size);
+#endif
+			extendBuffer();
+		}
+	}
+	*next = getANTLRToken();
+	(*next)->ref();				// say we have a copy of this pointer in buffer
+	last = next;
+	next++;
+	tp = last;
+	return *tp++;
+}
+
+void ANTLRTokenBuffer::
+rewind(int pos)
+{
+#if defined(DBG_TBUF)||defined(DBG_TBUF_MARK_REW)
+	/* MR23 */ printMessage(stderr, "rewind(%d)[nm=%d,from=%d,%d.n=%d]\n", pos, num_markers, tp-buffer,pos,test[pos]);
+	test[pos]--;
+#endif
+	tp = &buffer[pos];
+	num_markers--;
+}
+
+/*
+ * This function is used to specify that the token pointers read
+ * by the ANTLRTokenBuffer should be buffered up (to be reused later).
+ */
+int ANTLRTokenBuffer::
+mark()
+{
+#if defined(DBG_TBUF)||defined(DBG_TBUF_MARK_REW)
+	test[tp-buffer]++;
+	/* MR23 */ printMessage(stderr,"mark(%d)[nm=%d,%d.n=%d]\n",tp-buffer,num_markers+1,tp-buffer,test[tp-buffer]);
+#endif
+	num_markers++;
+	return tp - buffer;
+}
+
+/*
+ * returns the token pointer n positions ahead.
+ * This implies that bufferedToken(1) gets the NEXT symbol of lookahead.
+ * This is used in conjunction with the ANTLRParser lookahead buffer.
+ *
+ * No markers are set or anything.  A bunch of input is buffered--that's all.
+ * The tp pointer is left alone as the lookahead has not been advanced
+ * with getToken().  The next call to getToken() will find a token
+ * in the buffer and won't have to call getANTLRToken().
+ *
+ * If this is called before a consume() is done, how_many_more_i_need is
+ * set to 'n'.
+ */
+_ANTLRTokenPtr ANTLRTokenBuffer::
+bufferedToken(int n)
+{
+//	int how_many_more_i_need = (last-tp < 0) ? n : n-(last-tp)-1;
+	int how_many_more_i_need = (tp > last) ? n : n-(last-tp)-1;
+	// Make sure that at least n tokens are available in the buffer
+#ifdef DBG_TBUF
+	/* MR23 */ printMessage(stderr, "bufferedToken(%d)\n", n);
+#endif
+	for (int i=1; i<=how_many_more_i_need; i++)
+	{
+		if ( next > end_of_buffer )	// buffer overflow?
+		{
+			extendBuffer();
+		}
+		*next = getANTLRToken();
+		(*next)->ref();		// say we have a copy of this pointer in buffer
+		last = next;
+		next++;
+	}
+	return tp[n - 1];
+}
+
+/* If no markers are set, the none of the input needs to be saved (except
+ * for the lookahead Token pointers).  We save only k-1 token pointers as
+ * we are guaranteed to do a getANTLRToken() right after this because otherwise
+ * we wouldn't have needed to extend the buffer.
+ *
+ * If there are markers in the buffer, we need to save things and so
+ * extendBuffer() is called.
+ */
+void ANTLRTokenBuffer::
+makeRoom()
+{
+#ifdef DBG_TBUF
+	/* MR23 */ printMessage(stderr, "in makeRoom.................\n");
+	/* MR23 */ printMessage(stderr, "num_markers==%d\n", num_markers);
+#endif
+/*
+	if ( num_markers == 0 )
+	{
+*/
+#ifdef DBG_TBUF
+		/* MR23 */ printMessage(stderr, "moving lookahead and resetting next\n");
+
+		_ANTLRTokenPtr *r;
+		/* MR23 */ printMessage(stderr, "tbuf = [");
+		for (r=buffer; r<=last; r++)
+		{
+			if ( *r==NULL ) /* MR23 */ printMessage(stderr, " xxx");
+			else /* MR23 */ printMessage(stderr, " '%s'", ((ANTLRCommonToken *)*r)->getText());
+		}
+		/* MR23 */ printMessage(stderr, " ]\n");
+
+		/* MR23 */ printMessage(stderr,
+		"before: tp=%d, last=%d, next=%d, threshold=%d\n",tp-buffer,last-buffer,next-buffer,threshold-buffer);
+#endif
+
+		// Delete all tokens from 0..last-(k-1) inclusive
+		if ( _deleteTokens )
+		{
+			_ANTLRTokenPtr *z;
+			for (z=buffer; z<=last-(k-1); z++)
+			{
+				(*z)->deref();
+//				z->deref();
+#ifdef DBG_REFCOUNTTOKEN
+					/* MR23 */ printMessage(stderr, "##########makeRoom: deleting token '%s' (ref %d)\n",
+							((ANTLRCommonToken *)*z)->getText(), (*z)->nref());
+#endif
+				if ( (*z)->nref()==0 )
+				{
+					delete (*z);
+				}
+			}
+		}
+
+		// reset the buffer to initial conditions, but move k-1 symbols
+		// to the beginning of buffer and put new input symbol at k
+		_ANTLRTokenPtr *p = buffer, *q = last-(k-1)+1;
+//		ANTLRAbstractToken **p = buffer, **q = end_of_buffer-(k-1)+1;
+#ifdef DBG_TBUF
+		/* MR23 */ printMessage(stderr, "lookahead buffer = [");
+#endif
+		for (int i=1; i<=(k-1); i++)
+		{
+			*p++ = *q++;
+#ifdef DBG_TBUF
+			/* MR23 */ printMessage(stderr,
+			" '%s'", ((ANTLRCommonToken *)buffer[i-1])->getText());
+#endif
+		}
+#ifdef DBG_TBUF
+		/* MR23 */ printMessage(stderr, " ]\n");
+#endif
+		next = &buffer[k-1];
+		tp = &buffer[k-1];	// tp points to what will be filled in next
+		last = tp-1;
+#ifdef DBG_TBUF
+		/* MR23 */ printMessage(stderr,
+		"after: tp=%d, last=%d, next=%d\n",
+		tp-buffer, last-buffer, next-buffer);
+#endif
+/*
+	}
+	else {
+		extendBuffer();
+	}
+*/
+}
+
+/* This function extends 'buffer' by chunk_size and returns with all
+ * pointers at the same relative positions in the buffer (the buffer base
+ * address could have changed in realloc()) except that 'next' comes
+ * back set to where the next token should be stored.  All other pointers
+ * are untouched.
+ */
+void
+ANTLRTokenBuffer::
+extendBuffer()
+{
+	int save_last = last-buffer, save_tp = tp-buffer, save_next = next-buffer;
+#ifdef DBG_TBUF
+	/* MR23 */ printMessage(stderr, "extending physical buffer\n");
+#endif
+	buffer_size += chunk_size;
+	buffer = (_ANTLRTokenPtr *)
+		realloc((char *)(buffer-1),
+				(buffer_size+1)*sizeof(_ANTLRTokenPtr ));
+	if ( buffer == NULL ) {
+		panic("cannot alloc token buffer");
+	}
+	buffer++;				// leave the first elem empty so tp-1 is valid ptr
+
+	tp = buffer + save_tp;	// put the pointers back to same relative position
+	last = buffer + save_last;
+	next = buffer + save_next;
+	end_of_buffer = &buffer[buffer_size-1];
+	threshold = &buffer[(int)(buffer_size*(1.0/2.0))];
+
+/*
+	// zero out new token ptrs so we'll know if something to delete in buffer
+	ANTLRAbstractToken **p = end_of_buffer-chunk_size+1;
+	for (; p<=end_of_buffer; p++) *p = NULL;
+*/
+}
+
+ANTLRParser * ANTLRTokenBuffer::				// MR1
+setParser(ANTLRParser *p) {					// MR1
+  ANTLRParser	*old=parser;					// MR1
+  parser=p;							// MR1
+  input->setParser(p);						// MR1
+  return old;							// MR1
+}								// MR1
+								// MR1
+ANTLRParser * ANTLRTokenBuffer::				// MR1
+getParser() {							// MR1
+  return parser;						// MR1
+}								// MR1
+
+void ANTLRTokenBuffer::panic(const char *msg) // MR23
+{ 
+	if (parser)				//MR23
+		parser->panic(msg);	//MR23
+	else					//MR23
+		exit(PCCTS_EXIT_FAILURE); 
+} 
+
+//MR23
+int ANTLRTokenBuffer::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+
+	int iRet = 0;
+	if (parser)
+		parser->printMessageV(pFile, pFormat, marker);
+	else
+  		iRet = vfprintf(pFile, pFormat, marker);
+
+	va_end( marker );
+	return iRet;
+}
+
+/* to avoid having to link in another file just for the smart token ptr
+ * stuff, we include it here.  Ugh.
+ *
+ * MR23 This causes nothing but problems for IDEs.
+ *      Change from .cpp to .h
+ *
+ */
+
+#include ATOKPTR_IMPL_H
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.h b/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.h
new file mode 100644
index 0000000000..1c008fd59e
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ATokenBuffer.h
@@ -0,0 +1,109 @@
+/* ANTLRTokenBuffer.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ATOKENBUFFER_H_GATE
+#define ATOKENBUFFER_H_GATE
+
+#include "pcctscfg.h"
+
+#include "pccts_stdlib.h"
+
+PCCTS_NAMESPACE_STD
+
+#include ATOKEN_H
+#include ATOKENSTREAM_H
+
+/*
+ * The parser is "attached" to an ANTLRTokenBuffer via interface
+ * functions: getToken() and bufferedToken().  The object that actually
+ * consumes characters and constructs tokens is connected to the
+ * ANTLRTokenBuffer via interface function ANTLRTokenStream::getToken();
+ * where ANTLRTokenStream is really just a behavior (class with no data).
+ * C++ does not have this abstraction and hence we simply have come up
+ * with a fancy name for "void *".  See the note in ANTLRTokenStream.h on
+ * the "behavior" of ANTLRTokenStream.
+ */
+
+class ANTLRParser;					// MR1
+
+class DllExportPCCTS ANTLRTokenBuffer {
+protected:
+	ANTLRTokenStream *input;        // where do I get tokens
+	int buffer_size;
+	int chunk_size;
+	int num_markers;
+	int k;                          // Need at least this many tokens in buffer
+	_ANTLRTokenPtr *buffer;	// buffer used for arbitrary lookahead
+	_ANTLRTokenPtr *tp;        // pts into buffer; current token ptr
+	_ANTLRTokenPtr *last;      // pts to last valid token in buffer
+	_ANTLRTokenPtr *next;      // place to put token from getANTLRToken()
+	_ANTLRTokenPtr *end_of_buffer;
+	/* when you try to write a token past this and there are no markers
+	   set, then move k-1 tokens back to the beginning of the buffer.
+	   We want to stay away from the end of the buffer because we have
+	   to extend it if a marker is set and we reach the end (we cannot
+	   move tokens to the beginning of the buffer in this case).
+	 */
+	_ANTLRTokenPtr *threshold;
+	unsigned char _deleteTokens;
+
+	// This function is filled in by the subclass; it initiates fetch of input
+	virtual _ANTLRTokenPtr getANTLRToken() { return input->getToken(); }
+	void makeRoom();
+	void extendBuffer();
+
+public:
+	ANTLRTokenBuffer(ANTLRTokenStream *in, int k=1, int chksz=50);
+	virtual ~ANTLRTokenBuffer();
+	virtual _ANTLRTokenPtr getToken();
+	virtual void rewind(int pos);
+	virtual int mark();
+	virtual _ANTLRTokenPtr bufferedToken(int i);
+
+	void noGarbageCollectTokens()	{ _deleteTokens=0; }
+	void garbageCollectTokens()		{ _deleteTokens=1; }
+
+	virtual int bufferSize() { return buffer_size; }
+	virtual int minTokens() { return k; }
+	virtual void setMinTokens(int k_new) { k = k_new; }
+
+	virtual void panic(const char *msg); /* MR20 const */
+
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+
+protected:						// MR1
+	ANTLRParser	*parser;			// MR1
+public:							// MR1
+	ANTLRParser	*setParser(ANTLRParser *p);	// MR1
+	ANTLRParser	*getParser();			    // MR1
+    ANTLRTokenStream *getLexer() const {    // MR12
+      return input;}                        // MR12
+};
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ATokenStream.h b/Tools/Source/TianoTools/Pccts/h/ATokenStream.h
new file mode 100644
index 0000000000..3dfea6ebff
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ATokenStream.h
@@ -0,0 +1,51 @@
+/* ANTLRTokenStream.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ATOKENSTREAM_H_GATE
+#define ATOKENSTREAM_H_GATE
+
+#include "pcctscfg.h"
+
+/* This is really a behavior or protocol; it merely indicates the behavior
+ * required of the input and output of an ANTLRTokenBuffer.  You could
+ * subclass it, but you can also just pass any old pointer to ANTLRTokenBuffer
+ * with a type cast (in which case, your getANTLRToken() would have to
+ * explicitly cast the input pointer to your REAL type (typically your lexer)).
+ */
+
+class ANTLRParser;							// MR1
+
+class DllExportPCCTS ANTLRTokenStream {
+public:
+    virtual _ANTLRTokenPtr getToken() = 0;
+	virtual ANTLRParser * setParser(ANTLRParser * /*p MR23*/) {return 0; };   // MR12
+	virtual ANTLRParser * getParser() { return 0; };		        // MR12
+};
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/BufFileInput.cpp b/Tools/Source/TianoTools/Pccts/h/BufFileInput.cpp
new file mode 100644
index 0000000000..99d08a42a4
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/BufFileInput.cpp
@@ -0,0 +1,100 @@
+// FILE:        BufFileInput.cpp
+// AUTHOR:      Alexey Demakov (AVD) demakov@kazbek.ispras.ru
+// CREATION:    26-JAN-1998
+// DESCRIPTION: File Input Stream with lookahead for Scanner.
+//   See file BufFileInput.h for details
+
+// Change History:
+//
+//   22-Jun-1998    assert.h -> PCCTS_ASSERT_H
+//                  string.h -> PCCTS_STRING_H
+//
+//   28-May-1998    Add virtual destructor to release buffer.
+//
+//                  Add dummy definition for ANTLRTokenType
+//                  to allow compilation without knowing
+//                  token type codes.
+//
+//                  Manfred Kogler (km@cast.uni-linz.ac.at)
+//                  (1.33MR14)
+//
+//   20-Jul-1998    MR14a - Reorder initialization list for ctor.
+//
+
+enum ANTLRTokenType {TER_HATES_CPP=0, SO_DO_OTHERS=9999 };
+
+#include "pcctscfg.h"
+#include "pccts_assert.h"
+#include "pccts_string.h"
+
+PCCTS_NAMESPACE_STD
+
+#include "BufFileInput.h"
+
+BufFileInput::BufFileInput( FILE *f, int buf_size )
+: input( f ),
+  buf( new int[buf_size] ),
+  size( buf_size ),
+  start( 0 ),
+  len( 0 )
+{
+}
+
+BufFileInput::~BufFileInput()
+{
+  delete [] buf;
+}
+
+int BufFileInput::nextChar( void )
+{
+    if( len > 0 )
+    {
+        // get char from buffer
+        int c = buf[start];
+
+        if( c != EOF )
+        {
+            start++; start %= size;
+            len--;
+        }
+        return c;
+    } else {
+        // get char from file
+        int c = getc( input );
+
+        if( c == EOF )
+        {
+            // if EOF - put it in the buffer as indicator
+            buf[start] = EOF;
+            len++;
+        }
+        return c;
+    }
+}
+
+int BufFileInput::lookahead( char* s )
+{
+    int l = strlen( s );
+
+    assert( 0 < l && l <= size );
+
+    while( len < l )
+    {
+        int c = getc( input );
+
+        buf[ (start+len) % size ] = c;
+
+        len++;
+
+        if( c == EOF ) return 0;
+    }
+
+    for( int i = 0; i < l; i++ )
+    {
+        if( s[i] != buf[ (start+i) % size ] ) return 0;
+    }
+    return 1;
+}
+
+// End of file BufFileInput.cpp
+
diff --git a/Tools/Source/TianoTools/Pccts/h/BufFileInput.h b/Tools/Source/TianoTools/Pccts/h/BufFileInput.h
new file mode 100644
index 0000000000..ea54c0ee26
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/BufFileInput.h
@@ -0,0 +1,53 @@
+// FILE:        BufFileInput.h
+// AUTHOR:      Alexey Demakov (AVD) demakov@kazbek.ispras.ru
+// CREATION:    26-JAN-1998
+// DESCRIPTION: File Input Stream with lookahead for Scanner
+// Tested under Win32 with ANTLR 1.33 MR10 and MSVC 5.0
+
+// Change History:
+//
+//   28-May-1998    Add virtual destructor to release buffer
+//                  Manfred Kogler (km@cast.uni-linz.ac.at)
+//                  (1.33MR14)
+
+#ifndef BufFileInput_h
+#define BufFileInput_h
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+
+PCCTS_NAMESPACE_STD
+
+#include "DLexerBase.h"
+
+class DllExportPCCTS BufFileInput : public DLGInputStream
+{
+public:
+    // constructor
+    // f - input stream
+    // buf_size - size of buffer (maximal length for string in is_in)
+
+    BufFileInput(FILE *f, int buf_size = 8 );
+
+    virtual ~BufFileInput();
+
+    // gets next char from stream
+
+    virtual int nextChar( void );
+
+    // looks in stream and compares next l characters with s
+    // returns the result of comparision
+
+    int lookahead( char* s );
+
+private:
+    FILE *input; // input stream;
+    int* buf;    // buffer
+    int  size;   // size of buffer
+    int  start;  // position of the first symbol in buffer
+    int  len;    // count of characters in buffers
+};
+
+#endif
+// end of file BufFileInput.h
diff --git a/Tools/Source/TianoTools/Pccts/h/DLG_stream_input.h b/Tools/Source/TianoTools/Pccts/h/DLG_stream_input.h
new file mode 100644
index 0000000000..d2147f5217
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/DLG_stream_input.h
@@ -0,0 +1,98 @@
+
+/************************************************************/
+/*															*/
+/*		Predefined char stream: Input from (c++) stream.	*/
+/*															*/
+/* By Hubert Holin (Hubert.Holin@Bigfoot.com), 1998.		*/
+/*															*/
+/* This is completely free stuff, do whatever you want with	*/
+/* it (but then, I will take no responsability for whatever	*/
+/* may happen if you do either... caveat emptor!).			*/
+/*															*/
+/************************************************************/
+
+#ifndef _DLG_STREAM_INPUT_H
+#define _DLG_STREAM_INPUT_H
+
+#include "pccts_istream.h"
+
+PCCTS_NAMESPACE_STD
+
+#ifndef DLGX_H
+#include "DLexerBase.h"
+#endif
+
+
+// NOTES:	The semantics of the copy constructor
+//			and the affectation operator may be unwaranted...
+//			and the stream may not be reset.
+//
+//			It would have been so much nicer for nextChar()
+//			to throw (of for the DLGInputStream to change status)
+//			upon hiting EOF than to return an "int"...
+
+template	<
+				class E,
+				class T = ::std::char_traits<E>
+			>
+class DLG_stream_input : public DLGInputStream
+{
+public:
+	
+						DLG_stream_input(::std::basic_istream<E,T> * p_input_stream)
+	:	input(p_input_stream)
+	{
+		// nothing to do!
+	};
+	
+						DLG_stream_input(const DLG_stream_input & a_recopier)
+	:	input(a_recopier.input)
+	{
+		// nothing to do!
+	};
+	
+	virtual				~DLG_stream_input()
+	{
+		this->purge();	// bloody templarized lookup...
+	};
+	
+	DLG_stream_input	operator = (const DLG_stream_input & a_affecter)
+	{
+		if (this != &a_affecter)
+		{
+			input = a_affecter.input;
+		}
+
+		return(*this);
+	};
+	
+	virtual int			nextChar()
+	{
+		E	extracted_stuff;
+		
+		input->get(extracted_stuff);
+		
+		if	(*input)
+		{
+			return(int(extracted_stuff));
+		}
+		else
+		{
+			return(EOF);
+		}
+	};
+	
+protected:
+	
+	::std::basic_istream<E,T> *	input;
+	
+private:
+	
+	void	purge()
+	{
+		// nothing to do!
+	};
+};
+
+#endif /* _DLG_STREAM_INPUT_H */
+
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexer.h b/Tools/Source/TianoTools/Pccts/h/DLexer.h
new file mode 100644
index 0000000000..37cac24f14
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/DLexer.h
@@ -0,0 +1,191 @@
+/* DLexer.h (formerly DLexer.cpp)
+ *
+ * This was renamed because the use of the .cpp extension caused problems
+ * with IDEs.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#define ZZINC {if ( track_columns ) (++_endcol);}
+
+#define ZZGETC {ch = input->nextChar(); cl = ZZSHIFT(ch);}
+
+#define ZZNEWSTATE	(newstate = dfa[state][cl])
+
+#ifndef ZZCOPY
+#define ZZCOPY	\
+	/* Truncate matching buffer to size (not an error) */	\
+	if (nextpos < lastpos){				\
+		*(nextpos++) = ch;			\
+	}else{							\
+		bufovf = 1;					\
+	}
+#endif
+
+void DLGLexer::
+mode( int m )
+{
+	/* points to base of dfa table */
+	if (m<MAX_MODE){
+		automaton = m;
+		/* have to redo class since using different compression */
+		cl = ZZSHIFT(ch);
+	}else{
+		sprintf((char *)ebuf,"Invalid automaton mode = %d ",m);
+		errstd(ebuf);
+	}
+}
+
+ANTLRTokenType DLGLexer::
+nextTokenType(void)
+{
+	register int state, newstate;
+	/* last space reserved for the null char */
+	register DLGChar *lastpos;
+	ANTLRTokenType tk;
+
+skip:
+	bufovf = 0;
+	lastpos = &_lextext[_bufsize-1];
+	nextpos = _lextext;
+	_begcol = _endcol+1;
+more:
+	_begexpr = nextpos;
+	if ( interactive ) {
+		/* interactive version of automaton */
+		/* if there is something in ch, process it */
+		state = newstate = dfa_base[automaton];
+		if (charfull){
+			ZZINC;
+			ZZCOPY;
+			ZZNEWSTATE;
+		}
+		while (alternatives[newstate]){
+			state = newstate;
+			ZZGETC;
+			ZZINC;
+			ZZCOPY;
+			ZZNEWSTATE;
+		}
+		/* figure out if last character really part of token */
+		if ((state != dfa_base[automaton]) && (newstate == DfaStates)){
+			charfull = 1;
+			--nextpos;
+		}else{
+			charfull = 0;
+			state = newstate;
+		}
+		*(nextpos) = '\0';
+		/* Able to transition out of start state to some non err state?*/
+		if ( state == dfa_base[automaton] ){
+			/* make sure doesn't get stuck */
+			advance();
+		}
+	}
+	else { /* non-interactive version of automaton */
+		if (!charfull)
+			advance();
+		else
+			ZZINC;
+		state = dfa_base[automaton];
+		while (ZZNEWSTATE != DfaStates) {
+			state = newstate;
+			ZZCOPY;
+			ZZGETC;
+			ZZINC;
+		}
+		charfull = 1;
+		if ( state == dfa_base[automaton] ){
+			if (nextpos < lastpos){
+				*(nextpos++) = ch;
+			}else{
+				bufovf = 1;
+			}
+			*nextpos = '\0';
+			/* make sure doesn't get stuck */
+			advance();
+		}else{
+			*nextpos = '\0';
+		}
+	}
+	if ( track_columns ) _endcol -= charfull;
+	_endexpr = nextpos -1;
+	add_erase = 0;
+#ifdef OLD
+	tk = (ANTLRTokenType)
+		 (*actions[accepts[state]])(this);	// must pass this manually
+											// actions is not a [] of pointers
+											// to member functions.
+#endif
+	tk = (this->*actions[accepts[state]])();
+
+// MR1
+// MR1 11-Apr-97  Help for tracking DLG results
+// MR1
+
+#ifdef DEBUG_LEXER
+
+/* MR1 */        if (debugLexerFlag) {
+/* MR1 */	   if (parser != NULL) {
+/* MR1 */	     /* MR23 */ printMessage(stdout, "\ntoken name=%s",parser->parserTokenName(tk));
+/* MR1 */	   } else {
+/* MR1 */	     /* MR23 */ printMessage(stdout, "\ntoken nnumber=%d",tk);
+/* MR1 */	   };
+/* MR1 */	   /* MR23 */ printMessage(stdout, " lextext=(%s) mode=%d",
+/* MR1 */		 (_lextext[0]=='\n' && _lextext[1]==0) ?
+/* MR1 */			"newline" : _lextext,
+/* MR1 */				automaton);
+/* MR1 */          if (interactive && !charfull) {
+/* MR1 */	     /* MR23 */ printMessage(stdout, " char=empty");
+/* MR1 */          } else {
+/* MR1 */	     if (ch=='\n') {
+/* MR1 */	       /* MR23 */ printMessage(stdout, " char=newline");
+/* MR1 */	     } else {
+/* MR1 */	       /* MR23 */ printMessage(stdout, " char=(%c)",ch);
+/* MR1 */	     };
+/* MR1 */	   };
+/* MR1 */	   /* MR23 */ printMessage(stdout, " %s\n",
+/* MR1 */		 (add_erase==1 ? "skip()" :
+/* MR1 */		  add_erase==2 ? "more()" :
+/* MR1 */		  ""));
+/* MR1 */        };
+
+#endif
+
+	switch (add_erase) {
+		case 1: goto skip;
+		case 2: goto more;
+	}
+	return tk;
+}
+
+void DLGLexer::
+advance()
+{
+	if ( input==NULL ) err_in();
+	ZZGETC; charfull = 1; ZZINC;
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexerBase.cpp b/Tools/Source/TianoTools/Pccts/h/DLexerBase.cpp
new file mode 100644
index 0000000000..b218afc038
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/DLexerBase.cpp
@@ -0,0 +1,302 @@
+/* DLGLexerBase.c
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+
+PCCTS_NAMESPACE_STD
+
+/* I have to put this here due to C++ limitation
+ * that you can't have a 'forward' decl for enums.
+ * I hate C++!!!!!!!!!!!!!!!
+ */
+
+// MR1
+// MR1  10-Apr-97  133MR1  Prevent use of varying sizes for the
+// MR1  			ANTLRTokenType enum
+// MR1
+
+enum ANTLRTokenType { TER_HATES_CPP=0, ITS_UTTER_GARBAGE,		// MR1
+					 WITH_SOME_GOOD_IDEAS=9999};	// MR1
+
+#define ANTLR_SUPPORT_CODE
+
+#include "pcctscfg.h"
+#include DLEXERBASE_H
+#include APARSER_H		// MR23
+
+DLGLexerBase::
+DLGLexerBase(DLGInputStream *in,
+	     unsigned bufsize,
+	     int _interactive,
+	     int _track_columns)
+{
+	this->_bufsize = bufsize;
+	this->_lextext = new DLGChar[_bufsize];
+	if ( this->_lextext==NULL ) {
+	    panic("text buffer is NULL");
+	}
+	this->_begexpr = this->_endexpr = NULL;
+	this->ch = this->bufovf = 0;
+	this->nextpos = NULL;
+	this->cl = 0;
+	this->add_erase = 0;
+	this->input = in;
+	this->_begcol = 0;
+	this->_endcol = 0;
+	this->_line = 1;
+	this->charfull = 0;
+	this->automaton = 0;
+	this->token_to_fill = NULL;
+	this->interactive = _interactive;
+	this->track_columns = _track_columns;
+	this->debugLexerFlag = 0;					// MR1
+	this->parser = NULL;						// MR1
+    this->lexErrCount=0;                        // MR11
+}
+
+// MR19  THM 
+
+void DLGLexerBase::reset()
+{
+	this->charfull = 0;
+	this->_begcol = 0;
+	this->_endcol = 0;
+	this->automaton = 0;
+	this->_line=1;
+	this->lexErrCount=0;
+}
+
+void DLGLexerBase::
+setInputStream( DLGInputStream *in )
+{
+	this->input = in;
+	_line = 1;
+	charfull = 0;
+}
+
+/* saves dlg state, but not what feeds dlg (such as file position) */
+void DLGLexerBase::
+saveState(DLGState *state)
+{
+	state->input = input;
+	state->interactive = interactive;
+	state->track_columns = track_columns;
+	state->auto_num = automaton;
+	state->add_erase = add_erase;
+	state->lookc = ch;
+	state->char_full = charfull;
+	state->begcol = _begcol;
+	state->endcol = _endcol;
+	state->line = _line;
+	state->lextext = _lextext;
+	state->begexpr = _begexpr;
+	state->endexpr = _endexpr;
+	state->bufsize = _bufsize;
+	state->bufovf = bufovf;
+	state->nextpos = nextpos;
+	state->class_num = cl;
+	state->debugLexerFlag = debugLexerFlag;				// MR1
+	state->parser = parser;						// MR1
+}
+
+void DLGLexerBase::
+restoreState(DLGState *state)
+{
+	input = state->input;
+	interactive = state->interactive;
+	track_columns = state->track_columns;
+	automaton = state->auto_num;
+	add_erase = state->add_erase;
+	ch = state->lookc;
+	charfull = state->char_full;
+	_begcol = state->begcol;
+	_endcol = state->endcol;
+	_line = state->line;
+	_lextext = state->lextext;
+	_begexpr = state->begexpr;
+	_endexpr = state->endexpr;
+	_bufsize = state->bufsize;
+	bufovf = state->bufovf;
+	nextpos = state->nextpos;
+	cl = state->class_num;
+	debugLexerFlag = state->debugLexerFlag;				// MR1
+	parser = state->parser;						// MR1
+}
+
+/* erase what is currently in the buffer, and get a new reg. expr */
+void DLGLexerBase::
+skip()
+{
+	add_erase = 1;
+}
+
+/* don't erase what is in the lextext buffer, add on to it */
+void DLGLexerBase::
+more()
+{
+	add_erase = 2;
+}
+
+/* substitute c for the reg. expr last matched and is in the buffer */
+void DLGLexerBase::
+replchar(DLGChar c)
+{
+	/* can't allow overwriting null at end of string */
+	if (_begexpr < &_lextext[_bufsize-1]){
+		*_begexpr = c;
+		*(_begexpr+1) = '\0';
+	}
+	_endexpr = _begexpr;
+	if (c != '\0') {
+		nextpos = _begexpr + 1;
+	}
+	else {
+		nextpos = _begexpr;	/* MR30 Zero terminates string. */
+	}
+}
+
+/* replace the string s for the reg. expr last matched and in the buffer */
+
+#ifdef _MSC_VER  // MR23
+//Turn off "assignment within conditional expression" warning
+#pragma warning(disable : 4706)
+#endif
+void DLGLexerBase::
+replstr(const DLGChar *s) /* MR20 const */
+{
+	register DLGChar *l= &_lextext[_bufsize -1];
+
+	nextpos = _begexpr;
+	if (s){
+		while ((nextpos <= l) && (*(nextpos++) = *(s++))){
+			/* empty */
+		}
+		/* correct for NULL at end of string */
+		nextpos--;
+	}
+	if ((nextpos <= l) && (*(--s) == 0)){
+		bufovf = 0;
+	}else{
+		bufovf = 1;
+	}
+	*(nextpos) = '\0';
+	_endexpr = nextpos - 1;
+}
+#ifdef _MSC_VER  // MR23
+#pragma warning(default: 4706)
+#endif
+
+void DLGLexerBase::
+errstd(const char *s)                               /* MR20 const */
+{
+        lexErrCount++;                              /* MR11 */
+        /* MR23 */ printMessage(stderr,
+                "%s near line %d (text was '%s')\n",
+                ((s == NULL) ? "Lexical error" : s),
+                _line,_lextext);
+}
+
+int DLGLexerBase::
+err_in()
+{
+	/* MR23 */ printMessage(stderr,"No input stream, function, or string\n");
+	/* return eof to get out gracefully */
+	return EOF;
+}
+
+ANTLRTokenType DLGLexerBase::
+erraction()
+{
+	errstd("invalid token");
+	advance();
+	skip();
+	return (ANTLRTokenType) 0;	// bogus, but satisfies compiler
+}
+
+_ANTLRTokenPtr DLGLexerBase::
+getToken()
+{
+	if ( token_to_fill==NULL ) panic("NULL token_to_fill");
+	ANTLRTokenType tt = nextTokenType();
+	_ANTLRTokenPtr tk = token_to_fill->makeToken(tt, _lextext,_line);
+	return tk;
+}
+
+void DLGLexerBase::
+panic(const char *msg)      /* MR20 const */
+{
+	if (parser)				//MR23
+		parser->panic(msg);	//MR23
+	else					//MR23
+	{
+		/* MR23 */ printMessage(stderr, "DLG panic: %s\n", msg);
+	//
+	//  7-Apr-97 133MR1
+	//
+		exit(PCCTS_EXIT_FAILURE);					// MR1
+	}
+}
+
+ANTLRParser * DLGLexerBase::						// MR1
+setParser(ANTLRParser *p) {						// MR1
+  ANTLRParser	*oldValue=parser;					// MR1
+  parser=p;								// MR1
+  return oldValue;							// MR1
+}									// MR1
+									// MR1
+ANTLRParser * DLGLexerBase::						// MR1
+getParser() {								// MR1
+  return parser;							// MR1
+}									// MR1
+									// MR1
+int DLGLexerBase::							// MR1
+debugLexer(int newValue) {						// MR1
+  int	oldValue=debugLexerFlag;					// MR1
+  debugLexerFlag=newValue;						// MR1
+  return oldValue;							// MR1
+}									// MR1
+
+//MR23
+int DLGLexerBase::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+
+	int iRet = 0;
+	if (parser)
+		parser->printMessageV(pFile, pFormat, marker);
+	else
+  		iRet = vfprintf(pFile, pFormat, marker);
+
+	va_end( marker );
+	return iRet;
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/DLexerBase.h b/Tools/Source/TianoTools/Pccts/h/DLexerBase.h
new file mode 100644
index 0000000000..db6cc1890c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/DLexerBase.h
@@ -0,0 +1,198 @@
+/* DLGLexerBase.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef DLGX_H
+#define DLGX_H
+
+#include "pcctscfg.h"
+#include "pccts_stdio.h"
+
+PCCTS_NAMESPACE_STD
+
+#include ATOKEN_H
+#include ATOKENSTREAM_H
+
+class ANTLRParser;							// MR1
+
+/* must define what a char looks like; can make this a class too */
+typedef char DLGChar;
+
+/*  Can have it as a class too: (ack this looks weird; is it right?)
+class DllExportPCCTS DLGChar {
+private:
+	int c;
+public:
+	DLGChar(int ch) { c = ch; }
+	int atom() { return c; }
+};
+*/
+
+/* user must subclass this */
+class DllExportPCCTS DLGInputStream {
+public:
+	virtual int nextChar() = 0;
+};
+
+/* Predefined char stream: Input from FILE */
+class DllExportPCCTS DLGFileInput : public DLGInputStream {
+private:
+	int found_eof;
+	FILE *input;
+public:
+	DLGFileInput(FILE *f) { input = f; found_eof = 0; }
+	int nextChar() {
+			int c;
+			if ( found_eof ) return EOF;
+			else {
+				c=getc(input);
+				if ( c==EOF ) found_eof = 1;
+				return c;
+			}
+	}
+    void DLGFileReset(FILE *f) {input=f; found_eof = 0; };              // MR11
+};
+
+// MR9  Suggested by Bruce Guenter (bruceg@qcc.sk.ca)
+// MR9  Make DLGStringInput const correct
+
+/* Predefined char stream: Input from string */
+class DllExportPCCTS DLGStringInput : public DLGInputStream {
+private:
+	const DLGChar *input;                                           // MR9
+	const DLGChar *p;                                               // MR9
+public:
+	DLGStringInput(const DLGChar *s) { input = s; p = &input[0];}   // MR9
+	int nextChar()
+		{
+			if (*p) return (int) (unsigned char) *p++;              // MR14
+			else return EOF;
+		}
+
+    void DLGStringReset(const DLGChar *s) {input=s; p= &input[0]; }; // MR11 // MR16
+};
+
+class DllExportPCCTS DLGState {
+public:
+	DLGInputStream *input;
+	int interactive;
+	int track_columns;
+	int auto_num;
+	int add_erase;
+	int lookc;
+	int char_full;
+	int begcol, endcol;
+	int line;
+	DLGChar *lextext, *begexpr, *endexpr;
+	int bufsize;
+	int bufovf;
+	DLGChar *nextpos;
+	int	class_num;
+	int	debugLexerFlag;						// MR1
+	ANTLRParser *parser;						// MR1
+};
+
+/* user must subclass this */
+class DllExportPCCTS DLGLexerBase : public ANTLRTokenStream {
+public:
+	virtual ANTLRTokenType erraction();
+
+protected:
+	DLGInputStream *input;
+	int interactive;
+	int track_columns;
+	DLGChar	*_lextext;	/* text of most recently matched token */
+	DLGChar	*_begexpr;	/* beginning of last reg expr recogn. */
+	DLGChar	*_endexpr;	/* beginning of last reg expr recogn. */
+	int	_bufsize;		/* number of characters in lextext */
+	int	_begcol;		/* column that first character of token is in*/
+	int	_endcol;		/* column that last character of token is in */
+	int	_line;			/* line current token is on */
+	int	ch;				/* character to determine next state */
+	int	bufovf;			/* indicates that buffer too small for text */
+	int	charfull;
+	DLGChar	*nextpos;	/* points to next available position in lextext*/
+	int	cl;
+	int automaton;
+	int	add_erase;
+	DLGChar ebuf[70];
+	_ANTLRTokenPtr token_to_fill;
+
+	int	debugLexerFlag;						// MR1
+	ANTLRParser	*parser;					// MR1
+public:
+	virtual _ANTLRTokenPtr getToken();      // MR12 public
+	virtual void advance(void) = 0;
+	void	skip(void);		/* erase lextext, look for antoher token */
+	void	more(void);		/* keep lextext, look for another token */
+	void	mode(int k);	/* switch to automaton 'k' */
+	void	saveState(DLGState *);
+	void	restoreState(DLGState *);
+	virtual ANTLRTokenType nextTokenType(void)=0;/* get next token */
+	void	replchar(DLGChar c);	/* replace last recognized reg. expr. with
+									 a character */
+	void	replstr(const DLGChar *s);	/* replace last recognized reg. expr. with
+    									 a string */ /* MR20 const */
+        virtual int err_in();						// MR1
+	virtual void errstd(const char *);				// MR1  MR20 const
+	int		line()		{ return _line; }
+	void	set_line(int newValue)	{ _line=newValue; };		// MR1
+	virtual void newline()	{ _line++; }
+	DLGChar	*lextext()	{ return _lextext; }
+
+	int		begcol()	{ return _begcol; }
+	int		endcol()	{ return _endcol; }
+	void	set_begcol(int a)	{ _begcol=a; }
+	void	set_endcol(int a)	{ _endcol=a; }
+	DLGChar	*begexpr()	{ return _begexpr; }
+	DLGChar	*endexpr()	{ return _endexpr; }
+	int		bufsize()	{ return _bufsize; }
+
+	void	setToken(ANTLRAbstractToken *t)	{ token_to_fill = t; }
+
+	void	setInputStream(DLGInputStream *);
+	DLGLexerBase(DLGInputStream *in,
+				 unsigned bufsize=2000,
+				 int interactive=0,
+				 int track_columns=0);
+	void reset();									// MR19
+	virtual ~DLGLexerBase() { delete [] _lextext; }
+	virtual void panic(const char *msg);			// MR1  MR20 const
+	void	trackColumns() {
+				track_columns = 1;
+				this->_begcol = 0;
+				this->_endcol = 0;
+			};
+	virtual ANTLRParser *setParser(ANTLRParser *p);			// MR1
+	virtual ANTLRParser *getParser();				// MR1
+	virtual int debugLexer(int value);				// MR1
+    int     lexErrCount;                            // MR12
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+};
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/PBlackBox.h b/Tools/Source/TianoTools/Pccts/h/PBlackBox.h
new file mode 100644
index 0000000000..d25b8d6939
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/PBlackBox.h
@@ -0,0 +1,134 @@
+#ifndef PBLACKBOX_H
+#define PBLACKBOX_H
+
+/*
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+/* Completely rewritten by Chris Uzdavinis (chris@atdesk.com) for MR23 */
+
+#include "pcctscfg.h"
+
+#include "pccts_iostream.h"
+
+PCCTS_NAMESPACE_STD
+
+//  MR20 Added #include for "DLexerBase.h"
+
+#include "DLexerBase.h"
+
+//
+//  The default buffer size of the lexer is given by the
+//   second argument of the lexer's ctor.  It is optional
+//   and defaults to 2000
+//
+
+template<class Lexer, class Parser, class Token>
+class DllExportPCCTS ParserBlackBox {
+private:
+  // no copy construction allowed
+  ParserBlackBox(ParserBlackBox const &);
+
+  // no copy assignment allowed
+  ParserBlackBox & operator=(ParserBlackBox const &);
+  
+protected:
+  DLGFileInput *in;
+  Lexer *scan;
+  _ANTLRTokenPtr tok;
+  ANTLRTokenBuffer *pipe;
+  Parser *_parser;
+  FILE *file;
+  int openByBlackBox;    /* MR21 Don't close what we haven't opened */
+public:
+	
+  ParserBlackBox(FILE *f)
+    : in(0)
+    , scan(0)
+    , tok(0)
+    , pipe(0)
+    , _parser(0)
+    , file(0)
+    , openByBlackBox(0)
+  {
+    if (f == NULL)
+    {
+      cerr << "invalid file pointer\n"; 
+    }
+    else
+    {
+      openByBlackBox = 0;     /* MR21a */
+      file = f;
+      in = new DLGFileInput(f);
+      scan = new Lexer(in);
+      pipe = new ANTLRTokenBuffer(scan);
+      tok = new Token;
+      scan->setToken(tok);
+      _parser = new Parser(pipe);
+      _parser->init();
+    }
+  }
+  ParserBlackBox(char *fname)
+    : in(0)
+    , scan(0)
+    , tok(0)
+    , pipe(0)
+    , _parser(0)
+    , file(0)
+    , openByBlackBox(0)
+  {
+    FILE *f = fopen(fname, "r");
+    if ( f==NULL ) {
+      openByBlackBox = 0;
+      cerr << "cannot open " << fname << "\n"; return;
+    }
+    else {
+      openByBlackBox = 1;
+      file = f;
+      in = new DLGFileInput(f);
+      scan = new Lexer(in);
+      pipe = new ANTLRTokenBuffer(scan);
+      tok = new Token;
+      scan->setToken(tok);
+      _parser = new Parser(pipe);
+      _parser->init();
+    }
+  }
+	
+  ~ParserBlackBox()
+  {
+    delete in; delete scan; delete pipe; delete _parser; delete tok;
+    if (1 == openByBlackBox) {
+      fclose(file);
+    }
+  }
+
+  Parser *parser()	   { return _parser; }
+  Lexer  *getLexer()     { return scan; }
+};
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/PCCTSAST.cpp b/Tools/Source/TianoTools/Pccts/h/PCCTSAST.cpp
new file mode 100644
index 0000000000..a8249cdac0
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/PCCTSAST.cpp
@@ -0,0 +1,684 @@
+/*
+ * PCCTSAST.C
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to SORCERER -- SORCERER is in the public
+ * domain.  An individual or company may do whatever they wish with
+ * source code distributed with SORCERER or the code generated by
+ * SORCERER, including the incorporation of SORCERER, or its output, into
+ * commerical software.
+ *
+ * We encourage users to develop software with SORCERER.  However, we do
+ * ask that credit is given to us for developing SORCERER.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like SORCERER and have developed a nice tool with the
+ * output, please mention that you developed it using SORCERER.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * SORCERER 1.00B14 and ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * AHPCRC, University of Minnesota
+ * 1992-2000
+ */
+
+#define ANTLR_SUPPORT_CODE
+
+#include "pcctscfg.h"
+
+#include "PCCTSAST.h"
+#include "pccts_stdarg.h"
+
+PCCTS_NAMESPACE_STD
+
+#include <ctype.h>
+
+//#include "SList.h"
+
+               /* String Scanning/Parsing Stuff */
+
+const char *PCCTS_AST::scan_token_tbl[] = {     /* MR20 const */
+	"invalid",	/*	0 */
+	"LPAREN",	/*	1 */
+	"RPAREN",	/*	2 */
+	"PERCENT",	/*	3 */
+	"INT",		/*	4 */
+	"COLON",	/*	5 */
+	"POUND",	/*	6 */
+	"PERIOD",	/*	7 */
+};
+
+void PCCTS_AST::
+addChild(PCCTS_AST *t)
+{
+	if ( t==NULL ) return;
+	PCCTS_AST *s = down();
+	if ( s!=NULL )
+	{
+		while ( s->right()!=NULL ) s = s->right();
+		s->setRight(t);
+	}
+	else
+		this->setDown(t);
+}
+
+void PCCTS_AST::
+lisp(FILE *f)
+{
+	if ( down() != NULL ) /* MR23 */ printMessage(f," (");
+	lisp_action(f);
+	if ( down()!=NULL ) down()->lisp(f);
+	if ( down() != NULL ) /* MR23 */ printMessage(f," )");
+	if ( right()!=NULL ) right()->lisp(f);
+}
+
+/* build a tree (root child1 child2 ... NULL)
+ * If root is NULL, simply make the children siblings and return ptr
+ * to 1st sibling (child1).  If root is not single node, return NULL.
+ *
+ * Siblings that are actually sibling lists themselves are handled
+ * correctly.  For example #( NULL, #( NULL, A, B, C), D) results
+ * in the tree ( NULL A B C D ).
+ *
+ * Requires at least two parameters with the last one being NULL.  If
+ * both are NULL, return NULL.
+ *
+ * The down() and right() down/right pointers are used to make the tree.
+ */
+PCCTS_AST *PCCTS_AST::
+make(PCCTS_AST *rt, ...)
+{
+	va_list ap;
+	register PCCTS_AST *child, *sibling=NULL, *tail=NULL /*MR23*/, *w;
+	PCCTS_AST *root;
+
+	va_start(ap, rt);
+	root = rt;
+
+	if ( root != NULL )
+		if ( root->down() != NULL ) return NULL;
+	child = va_arg(ap, PCCTS_AST *);
+	while ( child != NULL )
+	{
+		/* find end of child */
+		for (w=child; w->right()!=NULL; w=w->right()) {;}
+		if ( sibling == NULL ) {sibling = child; tail = w;}
+		else {tail->setRight(child); tail = w;}
+		child = va_arg(ap, PCCTS_AST *);
+	}
+	if ( root==NULL ) root = sibling;
+	else root->setDown(sibling);
+	va_end(ap);
+	return root;
+}
+
+/* The following push and pop routines are only used by ast_find_all() */
+
+void PCCTS_AST::
+_push(PCCTS_AST **st, int *sp, PCCTS_AST *e)
+{
+	(*sp)--;
+	require((*sp)>=0, "stack overflow");
+	st[(*sp)] = e;
+}
+
+PCCTS_AST *PCCTS_AST::
+_pop(PCCTS_AST **st, int *sp)
+{
+	PCCTS_AST *e = st[*sp];
+	(*sp)++;
+	require((*sp)<=MaxTreeStackDepth, "stack underflow");
+	return e;
+}
+
+/* Find all occurrences of u in t.
+ * 'cursor' must be initialized to 't'.  It eventually
+ * returns NULL when no more occurrences of 'u' are found.
+ */
+PCCTS_AST *PCCTS_AST::
+ast_find_all(PCCTS_AST *u, PCCTS_AST **cursor)
+{
+	PCCTS_AST *sib;
+	/*** static ***/ PCCTS_AST *template_stack[MaxTreeStackDepth];  /* MR23 Remove "static" */
+	/*** static ***/ int tsp = MaxTreeStackDepth;                   /* MR23 Remove "static" */
+
+////static int nesting = 0;                                         /* MR23 Not referenced */
+
+	if ( *cursor == NULL ) return NULL;
+	if ( *cursor!=this ) sib = *cursor;
+	else {
+		/* else, first time--start at top of template 't' */
+		tsp = MaxTreeStackDepth;
+		sib = this;
+		/* bottom of stack is always a NULL--"cookie" indicates "done" */
+		_push(template_stack, &tsp, NULL);
+	}
+
+keep_looking:
+	if ( sib==NULL )	/* hit end of sibling list */
+	{
+		sib = _pop(template_stack, &tsp);
+		if ( sib == NULL ) { *cursor = NULL; return NULL; }
+	}
+
+	if ( sib->type() != u->type() )
+	{
+		/* look for another match */
+		if ( sib->down()!=NULL )
+		{
+			if ( sib->right()!=NULL ) _push(template_stack, &tsp, sib->right());
+			sib=sib->down();
+			goto keep_looking;
+		}
+		/* nothing below to try, try next sibling */
+		sib=sib->right();
+		goto keep_looking;
+	}
+
+	/* found a matching root node, try to match what's below */
+	if ( match_partial(sib, u) )
+	{
+		/* record sibling cursor so we can pick up next from there */
+		if ( sib->down()!=NULL )
+		{
+			if ( sib->right()!=NULL ) _push(template_stack, &tsp, sib->right());
+			*cursor = sib->down();
+		}
+		else if ( sib->right()!=NULL ) *cursor = sib->right();
+		else *cursor = _pop(template_stack, &tsp);
+		return sib;
+	}
+
+	/* no match, keep searching */
+	if ( sib->down()!=NULL )
+	{
+		if ( sib->right()!=NULL ) _push(template_stack, &tsp, sib->right());
+		sib=sib->down();
+	}
+	else sib = sib->right();	/* else, try to right if zip below */
+	goto keep_looking;
+}
+
+/* are two trees exactly alike? */
+int PCCTS_AST::
+match(PCCTS_AST *u)
+{
+	PCCTS_AST *t = this;
+	PCCTS_AST *sib;
+
+	if ( u==NULL ) return 0;
+
+	for (sib=t; sib!=NULL&&u!=NULL; sib=sib->right(), u=u->right())
+	{
+		if ( sib->type() != u->type() ) return 0;
+		if ( sib->down()!=NULL )
+			if ( !sib->down()->match(u->down()) ) return 0;
+	}
+	return 1;
+}
+
+/* Is 'u' a subtree of 't' beginning at the root? */
+int PCCTS_AST::
+match_partial(PCCTS_AST *t, PCCTS_AST *u)
+{
+	PCCTS_AST *sib;
+
+	if ( u==NULL ) return 1;
+	if ( t==NULL ) return 0; /* MR23 removed unreachable code */
+
+	for (sib=t; sib!=NULL&&u!=NULL; sib=sib->right(), u=u->right())
+	{
+		if ( sib->type() != u->type() ) return 0;
+		if ( sib->down()!=NULL )
+			if ( !match_partial(sib->down(), u->down()) ) return 0;
+	}
+	return 1;
+}
+
+#ifdef _MSC_VER  // MR23
+//Turn off "unreachable code" warning
+#pragma warning(disable : 4702)
+#endif
+/* Walk the template tree 't' (matching against 'this'), filling in the
+ * 'labels' array, and setting 'n' according to how many labels were matched.
+ */
+int PCCTS_AST::
+scanmatch(ScanAST *t, PCCTS_AST **labels[], int *n)
+{
+	ScanAST *sib;
+	PCCTS_AST *u = this;
+
+	if ( u==NULL ) return 0;
+
+	for (sib=t; sib!=NULL&&u!=NULL; sib=sib->right(), u=u->right())
+	{
+		/* make sure tokens match; token of '0' means wildcard match */
+		if ( sib->type() != u->type() && sib->type()!=0 ) return 0;
+		/* we have a matched token here; set label pointers if exists */
+		if ( sib->label_num>0 )
+		{
+			require(labels!=NULL, "label found in template, but no array of labels");
+			(*n)++;
+			*(labels[sib->label_num-1]) = u;
+		}
+		/* match what's below if something there and current node is not wildcard */
+		if ( sib->down()!=NULL && sib->type()!=0 )
+		{
+			if ( sib->down()==NULL ) 
+			{
+				if ( u->down()!=NULL ) 
+					return 0; 
+				else 
+					return 1;
+			}
+			if ( !u->down()->scanmatch(sib->down(), labels, n) ) return 0;
+		}
+	}
+	return 1;
+}
+#ifdef _MSC_VER  // MR23
+#pragma warning(default : 4702)
+#endif
+
+void PCCTS_AST::
+insert_after(PCCTS_AST *b)
+{
+	PCCTS_AST *end;
+	if ( b==NULL ) return;
+	/* find end of b's child list */
+	for (end=b; end->right()!=NULL; end=end->right()) {;}
+	end->setRight(this->right());
+	this->setRight(b);
+}
+
+void PCCTS_AST::
+append(PCCTS_AST *b)
+{
+	PCCTS_AST *end;
+	require(b!=NULL, "append: NULL input tree");
+	/* find end of child list */
+	for (end=this; end->right()!=NULL; end=end->right()) {;}
+	end->setRight(b);
+}
+
+PCCTS_AST *PCCTS_AST::
+tail()
+{
+	PCCTS_AST *end;
+	/* find end of child list */
+	for (end=this; end->right()!=NULL; end=end->right()) {;}
+	return end;
+}
+
+PCCTS_AST *PCCTS_AST::
+bottom()
+{
+	PCCTS_AST *end;
+	/* find end of child list */
+	for (end=this; end->down()!=NULL; end=end->down()) {;}
+	return end;
+}
+
+PCCTS_AST *PCCTS_AST::
+cut_between(PCCTS_AST *a, PCCTS_AST *b)
+{
+	PCCTS_AST *end, *ret;
+	if (a==NULL||b==NULL) return NULL;
+	/* find node pointing to b */
+	for (end=a; end->right()!=NULL&&end->right()!=b; end=end->right())
+		{;}
+	if (end->right()==NULL) return NULL; //ast_cut_between: a,b not connected
+	end->setRight(NULL);	/* don't want it point to 'b' anymore */
+	ret = a->right();
+	a->setRight(b);
+	return ret;
+}
+
+#ifdef NOT_YET
+SList *PCCTS_AST::
+to_slist()
+{
+	SList *list = new SList;
+	PCCTS_AST *p;
+
+	for (p=this; p!=NULL; p=p->right())
+	{
+		list->add(p);
+	}
+	return list;
+}
+#endif
+
+void PCCTS_AST::
+tfree()
+{
+	PCCTS_AST *t = this;
+    if ( t->down()!=NULL ) t->down()->tfree();
+    if ( t->right()!=NULL ) t->right()->tfree();
+    delete t;
+}
+
+int PCCTS_AST::
+nsiblings()
+{
+	PCCTS_AST *t = this;
+	int n=0;
+
+	while ( t!=NULL )
+	{
+		n++;
+		t = t->right();
+	}
+	return n;
+}
+
+PCCTS_AST *PCCTS_AST::
+sibling_index(int i)
+{
+	PCCTS_AST *t = this;
+	int j=1;
+	require(i>0, "sibling_index: i<=0");
+
+	while ( t!=NULL )
+	{
+		if ( j==i ) return t;
+		j++;
+		t = t->right();
+	}
+	return NULL;
+}
+
+/* Assume this is a root node of a tree--
+ * duplicate that node and what's below; ignore siblings of root node.
+ */
+
+// MR9 23-Sep-97 RJV
+// MR9
+// MR9 RJV: Original version only duplicated the node and down elements.
+// MR9      Made copies of the pointers to sibling.
+// MR9      Changed call "down()->deepCopy()" to "down()->deepCopyBushy()"
+// MR9
+
+PCCTS_AST *PCCTS_AST::
+deepCopy()
+{
+	PCCTS_AST *u = this->shallowCopy();
+	if ( down()!=NULL ) u->setDown(down()->deepCopyBushy());
+    u->setRight(NULL);
+	return u;
+}
+
+/* Copy all nodes including siblings of root. */
+PCCTS_AST *PCCTS_AST::
+deepCopyBushy()
+{
+	PCCTS_AST *u = this->shallowCopy();
+	/* copy the rest of the tree */
+	if ( down()!=NULL ) u->setDown(down()->deepCopyBushy());
+	if ( right()!=NULL ) u->setRight(right()->deepCopyBushy());
+	return u;
+}
+
+void PCCTS_AST::
+scanast_free(ScanAST *t)
+{
+    if ( t == NULL ) return;
+    scanast_free( t->down() );
+    scanast_free( t->right() );
+    free( (char *) t );							// MR1
+}
+
+/*
+ * scan
+ *
+ * This function is like scanf(): it attempts to match a template
+ * against an input tree.  A variable number of tree pointers
+ * may be set according to the '%i' labels in the template string.
+ * For example:
+ *
+ *   t->ast_scan("#( 6 #(5 %1:4 %2:3) #(1 %3:3 %4:3) )",
+ *            &w, &x, &y, &z);
+ *
+ * Naturally, you'd want this converted from
+ *
+ *	 t->ast_scan("#( RangeOp #(Minus %1:IConst %2:Var) #(Plus %3:Var %4Var) )",
+ *			  &w, &x, &y, &z);
+ *
+ * by SORCERER.
+ *
+ * This function call must be done withing a SORCERER file because SORCERER
+ * must convert the token references to the associated token number.
+ *
+ * This functions parses the template and creates trees which are then
+ * matched against the input tree.  The labels are set as they are
+ * encountered; hence, partial matches may leave some pointers set
+ * and some NULL.  This routines initializes all argument pointers to NULL
+ * at the beginning.
+ *
+ * This function returns the number of labels matched.
+ */
+int PCCTS_AST::
+ast_scan(char *templ, ...)
+{
+	va_list ap;
+	ScanAST *tmpl;
+	int n, i, found=0;
+	PCCTS_AST ***label_ptrs=NULL;
+
+	va_start(ap, templ);
+
+	/* make a ScanAST tree out of the template */
+	tmpl = stringparser_parse_scanast(templ, &n);
+
+	/* make an array out of the labels */
+	if ( n>0 )
+	{
+		label_ptrs = (PCCTS_AST ***) calloc(n, sizeof(PCCTS_AST **));
+		require(label_ptrs!=NULL, "scan: out of memory");
+		for (i=1; i<=n; i++)
+		{
+			label_ptrs[i-1] = va_arg(ap, PCCTS_AST **);
+			*(label_ptrs[i-1]) = NULL;
+		}
+	}
+
+	/* match the input tree against the template */
+	scanmatch(tmpl, label_ptrs, &found);
+
+	scanast_free(tmpl);
+	free( (char *) label_ptrs);					// MR1
+
+	return found;
+}
+
+ScanAST *PCCTS_AST::
+new_scanast(int tok)
+{
+    ScanAST *p = (ScanAST *) calloc(1, sizeof(ScanAST));
+//
+//  7-Apr-97 133MR1
+//
+    if ( p == NULL )
+        panic("out of memory\n");			// MR23
+	p->_token = tok;
+	return p;
+}
+
+ScanAST *PCCTS_AST::
+stringparser_parse_scanast(char *templ, int *num_labels)
+{
+	StringLexer lex;
+	StringParser parser;
+	ScanAST *t;
+
+	stringlexer_init(&lex, templ);
+	stringparser_init(&parser, &lex);
+	t = stringparser_parse_tree(&parser);
+	*num_labels = parser.num_labels;
+	return t;
+}
+
+void PCCTS_AST::
+stringparser_match(StringParser *parser, int token)
+{
+	if ( parser->token != token ) panic("bad tree in scan()");
+}
+
+/*
+ * Match a tree of the form:
+ *		(root child1 child2 ... childn)
+ * or,
+ *		node
+ *
+ * where the elements are integers or labeled integers.
+ */
+ScanAST *PCCTS_AST::
+stringparser_parse_tree(StringParser *parser)
+{
+	ScanAST *t=NULL, *root, *child, *last=NULL /*MR23*/;
+
+	if ( parser->token != __POUND )
+	{
+		return stringparser_parse_element(parser);
+	}
+	stringparser_match(parser,__POUND);
+	parser->token = stringscan_gettok(parser->lexer);
+	stringparser_match(parser,__LPAREN);
+	parser->token = stringscan_gettok(parser->lexer);
+	root = stringparser_parse_element(parser);
+	while ( parser->token != __RPAREN )
+	{
+		child = stringparser_parse_element(parser);
+		if ( t==NULL ) { t = child; last = t; }
+		else { last->_right = child; last = child; }
+	}
+	stringparser_match(parser,__RPAREN);
+	parser->token = stringscan_gettok(parser->lexer);
+	root->_down = t;
+	return root;
+}
+
+ScanAST *PCCTS_AST::
+stringparser_parse_element(StringParser *parser)
+{
+	char ebuf[100];
+	int label = 0;
+
+	if ( parser->token == __POUND )
+	{
+		return stringparser_parse_tree(parser);
+	}
+	if ( parser->token == __PERCENT )
+	{
+		parser->token = stringscan_gettok(parser->lexer);
+		stringparser_match(parser,__INT);
+		label = atoi(parser->lexer->text);
+		parser->num_labels++;
+		if ( label==0 ) panic("%%0 is an invalid label");
+		parser->token = stringscan_gettok(parser->lexer);
+		stringparser_match(parser,__COLON);
+		parser->token = stringscan_gettok(parser->lexer);
+		/* can label tokens and wildcards */
+		if ( parser->token != __INT && parser->token != __PERIOD )
+			panic("can only label tokens");
+	}
+	if ( parser->token == __INT )
+	{
+		ScanAST *p = new_scanast(atoi(parser->lexer->text));
+		parser->token = stringscan_gettok(parser->lexer);
+		p->label_num = label;
+		return p;
+	}
+	if ( parser->token == __PERIOD )
+	{
+		ScanAST *p = new_scanast(0);	/* token of 0 is wildcard */
+		parser->token = stringscan_gettok(parser->lexer);
+		p->label_num = label;
+		return p;
+	}
+	sprintf(ebuf, "mismatch token in scan(): %s", scan_token_str(parser->token));
+	panic(ebuf);
+	return NULL;
+}
+
+void PCCTS_AST::
+stringparser_init(StringParser *parser, StringLexer *input)
+{
+	parser->lexer = input;
+	parser->token = stringscan_gettok(parser->lexer);
+	parser->num_labels = 0;
+}
+
+void PCCTS_AST::
+stringlexer_init(StringLexer *scanner, char *input)
+{
+	scanner->text[0]='\0';
+	scanner->input = input;
+	scanner->p = input;
+	stringscan_advance(scanner);
+}
+
+void PCCTS_AST::
+stringscan_advance(StringLexer *scanner)
+{
+	if ( *(scanner->p) == '\0' ) scanner->c = __StringScanEOF;
+	scanner->c = *(scanner->p)++;
+}
+
+int PCCTS_AST::
+stringscan_gettok(StringLexer *scanner)
+{
+	char *index = &scanner->text[0];
+	char ebuf[100]; /* MR23 Remove static */
+
+	while ( isspace(scanner->c) ) { stringscan_advance(scanner); }
+	if ( isdigit(scanner->c) )
+	{
+		int tok = __INT;
+		while ( isdigit(scanner->c) ) {
+			*index++ = (char) /* static_cast<char> */ (scanner->c);     // MR23
+			stringscan_advance(scanner);
+		}
+		*index = '\0';
+		return tok;
+	}
+	switch ( scanner->c )
+	{
+		case '#' : stringscan_advance(scanner); return __POUND;
+		case '(' : stringscan_advance(scanner); return __LPAREN;
+		case ')' : stringscan_advance(scanner); return __RPAREN;
+		case '%' : stringscan_advance(scanner); return __PERCENT;
+		case ':' : stringscan_advance(scanner); return __COLON;
+		case '.' : stringscan_advance(scanner); return __PERIOD;
+		case '\0' : return __StringScanEOF;
+		case __StringScanEOF : return __StringScanEOF;
+		default  :
+			sprintf(ebuf, "invalid char in scan: '%c'", scanner->c);
+			panic(ebuf);
+	}
+	return __StringScanEOF;	// never reached
+}
+
+const char *PCCTS_AST:: /* MR20 const */
+scan_token_str(int t)
+{
+	if ( VALID_SCAN_TOKEN(t) ) return scan_token_tbl[t];
+	else if ( t==__StringScanEOF ) return "<end-of-string>";
+	else return "<invalid-token>";
+}
+
+//MR23
+int PCCTS_AST::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+  	int iRet = vfprintf(pFile, pFormat, marker);
+	va_end( marker );
+	return iRet;
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/PCCTSAST.h b/Tools/Source/TianoTools/Pccts/h/PCCTSAST.h
new file mode 100644
index 0000000000..3485da7d1b
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/PCCTSAST.h
@@ -0,0 +1,143 @@
+/* Abstract syntax tree
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef PCCTSAST_H
+#define PCCTSAST_H
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+
+PCCTS_NAMESPACE_STD
+
+//class SList;
+
+#define StringScanMaxText	50
+#define MaxTreeStackDepth	400
+
+//
+//  7-Apr-97 133MR1	signed int not accepted by AT&T cfront
+//
+typedef struct stringlexer {
+			int c;						// MR1
+			char *input;
+			char *p;
+			char text[StringScanMaxText];
+		} StringLexer;
+
+/* Define the structures needed for ast_scan() */
+typedef struct stringparser {
+			int token;
+			StringLexer *lexer;
+			int num_labels;
+		} StringParser;
+
+typedef struct _scanast {
+            struct _scanast *_right, *_down;
+            int _token;
+			int label_num;
+			int type() { return _token; }
+			struct _scanast *right() { return _right; }
+			struct _scanast *down() { return _down; }
+        } ScanAST;
+
+#define VALID_SCAN_TOKEN(t)		(t>=__LPAREN && t<=__PERIOD)
+
+class DllExportPCCTS PCCTS_AST {
+protected:
+	static const char *scan_token_tbl[];    /* MR20 const */
+	enum {
+	__LPAREN=1,
+	__RPAREN=2,
+	__PERCENT=3,
+	__INT=4,
+	__COLON=5,
+	__POUND=6,
+	__PERIOD=7,
+	__StringScanEOF=-1};
+
+protected:
+	const char *scan_token_str(int t);  /* MR20 const */
+	void stringlexer_init(StringLexer *scanner, char *input);
+	void stringparser_init(StringParser *, StringLexer *);
+	ScanAST *stringparser_parse_scanast(char *templ, int *n);
+	ScanAST *stringparser_parse_tree(StringParser *parser);
+	ScanAST *stringparser_parse_element(StringParser *parser);
+	void stringscan_advance(StringLexer *scanner);
+	int stringscan_gettok(StringLexer *scanner);
+	void _push(PCCTS_AST **st, int *sp, PCCTS_AST *e);
+	PCCTS_AST *_pop(PCCTS_AST **st, int *sp);
+	int match_partial(PCCTS_AST *t, PCCTS_AST *u);
+	int scanmatch(ScanAST *t, PCCTS_AST **labels[], int *n);
+	void scanast_free(ScanAST *t);
+	ScanAST *new_scanast(int tok);
+	void stringparser_match(StringParser *parser, int type);
+	virtual PCCTS_AST *deepCopyBushy();
+
+public:
+	PCCTS_AST()	{;}
+	virtual ~PCCTS_AST() {;}
+
+	/* This group must be defined for SORCERER to work correctly */
+	virtual PCCTS_AST *right() = 0;
+	virtual PCCTS_AST *down() = 0;
+	virtual void setRight(PCCTS_AST *t) = 0;
+	virtual void setDown(PCCTS_AST *t) = 0;
+// we define these so ANTLR doesn't have to
+	virtual int type() { return 0; }
+	virtual void setType(int /*t MR23 */) {;}
+	virtual PCCTS_AST *shallowCopy() {panic("no shallowCopy() defined"); return NULL;}
+
+	/* These are not needed by ANTLR, but are support functions */
+	virtual PCCTS_AST *deepCopy();	// used by SORCERER in transform mode
+	virtual void addChild(PCCTS_AST *t);
+	virtual void lisp_action(FILE * /*f MR23 */) {;}
+	virtual void lisp(FILE *f);
+	static PCCTS_AST *make(PCCTS_AST *rt, ...);
+	virtual PCCTS_AST *ast_find_all(PCCTS_AST *u, PCCTS_AST **cursor);
+	virtual int match(PCCTS_AST *u);
+	virtual void insert_after(PCCTS_AST *b);
+	virtual void append(PCCTS_AST *b);
+	virtual PCCTS_AST *tail();
+	virtual PCCTS_AST *bottom();
+	static  PCCTS_AST *cut_between(PCCTS_AST *a, PCCTS_AST *b);
+//	virtual SList *to_slist();
+	virtual void tfree();
+	int ast_scan(char *templ, ...);
+	virtual int nsiblings();
+	virtual PCCTS_AST *sibling_index(int i);
+
+	void require(int e,const char *err){ if ( !e ) panic(err); } /* MR20 const */
+	virtual void panic(const char *err)     // MR20 const
+		{ /* MR23 */ printMessage(stderr, "PCCTS_AST: %s\n", err); exit(PCCTS_EXIT_FAILURE); }
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+};
+
+#endif /* PCCTSAST_H */
diff --git a/Tools/Source/TianoTools/Pccts/h/SList.h b/Tools/Source/TianoTools/Pccts/h/SList.h
new file mode 100644
index 0000000000..5b8bf97427
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/SList.h
@@ -0,0 +1,72 @@
+#ifndef SList_h
+#define SList_h
+
+/*
+ * SList.h
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to SORCERER -- SORCERER is in the public
+ * domain.  An individual or company may do whatever they wish with
+ * source code distributed with SORCERER or the code generated by
+ * SORCERER, including the incorporation of SORCERER, or its output, into
+ * commerical software.
+ *
+ * We encourage users to develop software with SORCERER.  However, we do
+ * ask that credit is given to us for developing SORCERER.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like SORCERER and have developed a nice tool with the
+ * output, please mention that you developed it using SORCERER.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * PCCTS 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1992-2000
+ */
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+
+PCCTS_NAMESPACE_STD
+
+#include "PCCTSAST.h"
+
+class PCCTS_AST;
+
+class SListNode {
+protected:
+	void *_elem;			/* pointer to any kind of element */
+	SListNode *_next;
+public:
+	SListNode()				{_elem=_next=NULL;}
+	virtual ~SListNode()	{_elem=_next=NULL;}
+	void *elem()			{ return _elem; }
+	void setElem(void *e)	{ _elem = e; }
+	void setNext(SListNode *t)	{ _next = t; }
+	SListNode *next()		{ return _next; }
+};
+
+class SList {
+	SListNode *head, *tail;
+public:
+	SList() {head=tail=NULL;}
+	virtual ~SList() {head=tail=NULL;}
+	virtual void *iterate(SListNode **);
+	virtual void add(void *e);
+	virtual void lfree();
+	virtual PCCTS_AST *to_ast(SList list);
+	virtual void require(int e,char *err){ if ( !e ) panic(err); }
+	virtual void panic(char *err){ /* MR23 */ printMessage(stderr, "SList panic: %s\n", err); exit(PCCTS_EXIT_FAILURE); }
+	virtual int printMessage(FILE* pFile, const char* pFormat, ...); // MR23
+};
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/antlr.h b/Tools/Source/TianoTools/Pccts/h/antlr.h
new file mode 100644
index 0000000000..80664535d3
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/antlr.h
@@ -0,0 +1,807 @@
+/* antlr.h 
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ANTLR_H
+#define ANTLR_H
+
+#include "pcctscfg.h"
+
+#include "pccts_stdio.h"
+
+/* turn off warnings for unreferenced labels */
+
+#ifdef _MSC_VER
+#pragma warning(disable:4102)
+#endif
+
+/*
+ * Define all of the stack setup and manipulation of $i, #i variables.
+ *
+ *	Notes:
+ *		The type 'Attrib' must be defined before entry into this .h file.
+ */
+
+
+#ifdef __USE_PROTOS
+#include "pccts_stdlib.h"
+#else
+#ifdef VAXC
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#endif
+#include "pccts_string.h"
+
+#if 0
+#include "set.h"
+#endif
+
+
+typedef int ANTLRTokenType;
+typedef unsigned char SetWordType;
+
+typedef char ANTLRChar;
+
+						/* G u e s s  S t u f f */
+
+#ifdef ZZCAN_GUESS
+#ifndef ZZINF_LOOK
+#define ZZINF_LOOK
+#endif
+#endif
+
+#ifdef ZZCAN_GUESS
+typedef struct _zzjmp_buf {
+			jmp_buf state;
+		} zzjmp_buf;
+#endif
+
+
+/* can make this a power of 2 for more efficient lookup */
+
+#ifndef ZZLEXBUFSIZE
+#define ZZLEXBUFSIZE	8000 /* MR22 raise from 2k to 8k */
+#endif
+
+#define zzOvfChk														\
+            if ( zzasp <= 0 )                                           \
+            {                                                           \
+                fprintf(stderr, zzStackOvfMsg, __FILE__, __LINE__);		\
+                exit(PCCTS_EXIT_FAILURE);                                               \
+            }
+
+#ifndef ZZA_STACKSIZE
+#define ZZA_STACKSIZE	400
+#endif
+#ifndef ZZAST_STACKSIZE
+#define ZZAST_STACKSIZE	400
+#endif
+
+#ifndef zzfailed_pred
+#ifdef ZZCAN_GUESS
+#define zzfailed_pred(_p,_hasuseraction,_useraction) \
+  if (zzguessing) { \
+    zzGUESS_FAIL; \
+  } else { \
+    zzfailed_pred_action(_p,_hasuseraction,_useraction); \
+  }
+#else
+#define zzfailed_pred(_p,_hasuseraction,_useraction) \
+    zzfailed_pred_action(_p,_hasuseraction,_useraction);
+#endif
+#endif
+
+/*  MR23            Provide more control over failed predicate action
+                    without any need for user to worry about guessing internals.
+                    _hasuseraction == 0 => no user specified error action
+                    _hasuseraction == 1 => user specified error action
+*/
+
+#ifndef zzfailed_pred_action
+#define zzfailed_pred_action(_p,_hasuseraction,_useraction) \
+    if (_hasuseraction) { _useraction } \
+    else { fprintf(stderr, "semantic error; failed predicate: '%s'\n",_p); }
+#endif
+
+/* MR19 zzchar_t additions */
+
+#ifdef LL_K
+#define LOOKAHEAD \
+	int zztokenLA[LL_K]; \
+	zzchar_t zztextLA[LL_K][ZZLEXBUFSIZE]; \
+	int zzlap = 0, zzlabase=0; /* labase only used for DEMAND_LOOK */
+#else
+#define LOOKAHEAD												\
+	int zztoken;
+#endif
+
+#ifndef zzcr_ast
+#define zzcr_ast(ast,attr,tok,text)
+#endif
+
+#ifdef DEMAND_LOOK
+#define DemandLookData  int zzdirty=1;
+#else
+#define DemandLookData
+#endif
+
+#ifndef zzUSER_GUESS_HOOK
+#define zzUSER_GUESS_HOOK(seqFrozen,zzrv)
+#endif
+
+#ifndef zzUSER_GUESS_DONE_HOOK
+#define zzUSER_GUESS_DONE_HOOK(seqFrozen)
+#endif
+
+						/* S t a t e  S t u f f */
+
+#ifdef ZZCAN_GUESS
+#define zzGUESS_BLOCK		zzantlr_state zzst; int zzrv; int zzGuessSeqFrozen;
+
+/* MR10 change zzGUESS: do zzGUESS_DONE when zzrv==1 after longjmp as in C++ mode */
+
+#define zzGUESS				zzsave_antlr_state(&zzst); \
+							zzguessing = 1; \
+                            zzGuessSeqFrozen=++zzGuessSeq; \
+							zzrv = setjmp(zzguess_start.state); \
+                            zzUSER_GUESS_HOOK(zzGuessSeqFrozen,zzrv) \
+                            if (zzrv) zzGUESS_DONE;
+#ifdef zzTRACE_RULES
+#define zzGUESS_FAIL		{ zzTraceGuessFail(); longjmp(zzguess_start.state, 1); }
+#else
+#define zzGUESS_FAIL		longjmp(zzguess_start.state, 1)
+#endif
+
+/* MR10 change zzGUESS_DONE: zzrv=1 to simulate longjmp() return value as in C++ mode */
+
+#define zzGUESS_DONE		{ zzrestore_antlr_state(&zzst); zzrv=1; zzUSER_GUESS_DONE_HOOK(zzGuessSeqFrozen) }
+#define zzNON_GUESS_MODE	if ( !zzguessing )
+#define zzGuessData                                     \
+            zzjmp_buf zzguess_start;                    \
+            int zzguessing;
+#else
+#define zzGUESS_BLOCK
+#define zzGUESS
+#define zzGUESS_FAIL
+#define zzGUESS_DONE
+#define zzNON_GUESS_MODE
+#define zzGuessData
+#endif
+
+typedef struct _zzantlr_state {
+#ifdef ZZCAN_GUESS
+			zzjmp_buf guess_start;
+			int guessing;
+#endif
+			int asp;
+			int ast_sp;
+#ifdef ZZINF_LOOK
+			int inf_lap;	/* not sure we need to save this one */
+			int inf_labase;
+			int inf_last;
+
+/* MR6 	Gunnar Rxnning (gunnar@candleweb.no)                                */
+/* MR6	  Additional state needs to be saved/restored                       */
+/* MR6    Matching changes in err.h                                         */
+
+			int *inf_tokens;	                                     /* MR6 */
+			char **inf_text;	                                     /* MR6 */
+			char *inf_text_buffer;		                             /* MR6 */
+			int *inf_line;		                                     /* MR6 */
+#endif
+#ifdef DEMAND_LOOK
+			int dirty;
+#endif
+
+#ifdef LL_K
+			int tokenLA[LL_K];
+			char textLA[LL_K][ZZLEXBUFSIZE];
+			int lap;
+			int labase;
+#else
+			int token;
+			char text[ZZLEXBUFSIZE];
+#endif
+#ifdef zzTRACE_RULES
+            int     traceOptionValue;       /* MR10 */
+            int     traceGuessOptionValue;  /* MR10 */
+            char    *traceCurrentRuleName;  /* MR10 */
+            int     traceDepth;             /* MR10 */
+#endif
+
+		} zzantlr_state;
+
+#ifdef zzTRACE_RULES
+extern int  zzTraceOptionValueDefault;
+extern int  zzTraceOptionValue;
+extern int  zzTraceGuessOptionValue;
+extern char *zzTraceCurrentRuleName;
+extern int  zzTraceDepth;
+#endif
+
+extern int zzGuessSeq;                      /* MR10 */
+extern int zzSyntaxErrCount;                /* MR11 */
+extern int zzLexErrCount;                   /* MR11 */
+
+                 /* I n f i n i t e  L o o k a h e a d */
+
+
+#ifdef ZZINF_LOOK
+#define InfLookData	\
+	int *zzinf_tokens;	\
+	char **zzinf_text;	\
+	char *zzinf_text_buffer;	\
+	int *zzinf_line;        \
+	int zzinf_labase;	\
+	int zzinf_last;
+#else
+#define InfLookData
+#endif
+
+#ifdef ZZINF_LOOK
+
+#ifndef ZZINF_DEF_TEXT_BUFFER_SIZE
+#define ZZINF_DEF_TEXT_BUFFER_SIZE	    20000
+#endif
+#ifndef ZZINF_DEF_TOKEN_BUFFER_SIZE
+#define ZZINF_DEF_TOKEN_BUFFER_SIZE	    2000
+#endif
+/* WARNING!!!!!!
+ * ZZINF_BUFFER_TEXT_CHUNK_SIZE must be > sizeof(text) largest possible token.
+ */
+#ifndef ZZINF_BUFFER_TEXT_CHUNK_SIZE
+#define ZZINF_BUFFER_TEXT_CHUNK_SIZE	5000
+#endif
+#ifndef ZZINF_BUFFER_TOKEN_CHUNK_SIZE
+#define ZZINF_BUFFER_TOKEN_CHUNK_SIZE	1000
+#endif
+
+#if ZZLEXBUFSIZE > ZZINF_BUFFER_TEXT_CHUNK_SIZE
+#define ZZINF_BUFFER_TEXT_CHUNK_SIZE	ZZLEXBUFSIZE+5
+#endif
+
+/* make inf_look user-access macros */
+#ifdef LL_K
+#define ZZINF_LA_VALID(i)	(((zzinf_labase+i-1)-LL_K+1) <= zzinf_last)
+#define ZZINF_LA(i)			zzinf_tokens[(zzinf_labase+i-1)-LL_K+1]
+#define ZZINF_LATEXT(i)		zzinf_text[(zzinf_labase+i-1)-LL_K+1]
+/* MR6	In 1.33 vanilla the #define ZZINF_LINE(i) is was commented out	*/
+#define ZZINF_LINE(i)       zzinf_line[(zzinf_labase+i-1)-LL_K+1]
+#else
+#define ZZINF_LA_VALID(i)	(((zzinf_labase+i-1)) <= zzinf_last)
+#define ZZINF_LA(i)			zzinf_tokens[(zzinf_labase+i-1)]
+#define ZZINF_LATEXT(i)		zzinf_text[(zzinf_labase+i-1)]
+#endif
+
+#define inf_zzgettok _inf_zzgettok()
+extern void _inf_zzgettok();
+
+#endif	/* ZZINF_LOOK */
+
+
+#ifdef LL_K
+
+#ifdef __USE_PROTOS
+#define ANTLR_INFO	\
+	Attrib zzempty_attr(void) {static Attrib a; return a;} \
+	Attrib zzconstr_attr(int _tok, char *_text) \
+		{Attrib a; zzcr_attr((&a),_tok,_text); return a;} \
+	int zzasp=ZZA_STACKSIZE; \
+	char zzStackOvfMsg[]="fatal: attrib/AST stack overflow %s(%d)!\n"; \
+	Attrib zzaStack[ZZA_STACKSIZE]; DemandLookData \
+	InfLookData \
+    zzGuessData
+#else
+#define ANTLR_INFO												\
+	Attrib zzempty_attr() {static Attrib a; return a;}		    \
+	Attrib zzconstr_attr(_tok, _text) int _tok; char *_text;    \
+		{Attrib a; zzcr_attr((&a),_tok,_text); return a;}	    \
+	int zzasp=ZZA_STACKSIZE;					    \
+	char zzStackOvfMsg[]="fatal: attrib/AST stack overflow %s(%d)!\n";  \
+	Attrib zzaStack[ZZA_STACKSIZE]; DemandLookData			    \
+	InfLookData                                                 \
+    zzGuessData
+#endif
+
+#else
+
+#ifdef __USE_PROTOS
+#define ANTLR_INFO												\
+	Attrib zzempty_attr(void) {static Attrib a; return a;}			\
+	Attrib zzconstr_attr(int _tok, char *_text)				\
+		{Attrib a; zzcr_attr((&a),_tok,_text); return a;}		\
+	int zzasp=ZZA_STACKSIZE;						\
+	char zzStackOvfMsg[]="fatal: attrib/AST stack overflow %s(%d)!\n";      \
+	Attrib zzaStack[ZZA_STACKSIZE]; DemandLookData				\
+	InfLookData                                                             \
+    zzGuessData
+#else
+#define ANTLR_INFO												\
+	Attrib zzempty_attr() {static Attrib a; return a;}			\
+	Attrib zzconstr_attr(_tok, _text) int _tok; char *_text;                \
+		{Attrib a; zzcr_attr((&a),_tok,_text); return a;}		\
+	int zzasp=ZZA_STACKSIZE;						\
+	char zzStackOvfMsg[]="fatal: attrib/AST stack overflow %s(%d)!\n";      \
+	Attrib zzaStack[ZZA_STACKSIZE]; DemandLookData				\
+	InfLookData                                                             \
+    zzGuessData
+#endif
+	
+#endif /* LL_k */
+
+
+#ifdef ZZINF_LOOK
+
+#ifdef LL_K
+#ifdef DEMAND_LOOK
+#define zzPrimeLookAhead  {zzdirty=LL_K; zzlap = zzlabase = 0;}
+#else
+#define zzPrimeLookAhead  {zzlap = zzlabase = 0; zzfill_inf_look();\
+						  {int _i;  for(_i=1;_i<=LL_K; _i++)		\
+										{zzCONSUME;} zzlap = zzlabase = 0;}}
+#endif
+
+#else /* LL_K */
+
+#ifdef DEMAND_LOOK
+#define zzPrimeLookAhead  zzfill_inf_look(); zzdirty=1
+#else
+#define zzPrimeLookAhead  zzfill_inf_look(); inf_zzgettok
+
+#endif
+#endif	/* LL_K */
+
+#else	/* ZZINF_LOOK */
+
+#ifdef LL_K
+#ifdef DEMAND_LOOK
+#define zzPrimeLookAhead  {zzdirty=LL_K; zzlap = zzlabase = 0;}
+#else
+#define zzPrimeLookAhead  {int _i; zzlap = 0; for(_i=1;_i<=LL_K; _i++)		\
+										{zzCONSUME;} zzlap = 0;}
+#endif
+
+#else
+
+#ifdef DEMAND_LOOK
+#define zzPrimeLookAhead  zzdirty=1
+#else
+#define zzPrimeLookAhead  zzgettok()
+#endif
+#endif	/* LL_K */
+
+#endif	/* ZZINF_LOOK */
+
+
+#ifdef LL_K
+#define zzenterANTLRs(s)                            \
+        zzlextext = &(zztextLA[0][0]); zzrdstr( s ); zzPrimeLookAhead;
+#define zzenterANTLRf(f)							\
+		zzlextext = &(zztextLA[0][0]); zzrdfunc( f ); zzPrimeLookAhead;
+#define zzenterANTLR(f)							\
+		zzlextext = &(zztextLA[0][0]); zzrdstream( f ); zzPrimeLookAhead;
+#ifdef ZZINF_LOOK
+#define zzleaveANTLR(f)			free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#define zzleaveANTLRf(f)	   	free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#define zzleaveANTLRs(f)		free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#else
+#define zzleaveANTLR(f)
+#define zzleaveANTLRf(f)
+#define zzleaveANTLRs(f)
+#endif
+
+#else
+
+#define zzenterANTLRs(s)                            \
+        {static char zztoktext[ZZLEXBUFSIZE];   \
+        zzlextext = zztoktext; zzrdstr( s ); zzPrimeLookAhead;}
+#define zzenterANTLRf(f)							\
+		{static char zztoktext[ZZLEXBUFSIZE];	\
+		zzlextext = zztoktext; zzrdfunc( f ); zzPrimeLookAhead;}
+#define zzenterANTLR(f)							\
+		{static char zztoktext[ZZLEXBUFSIZE];	\
+		zzlextext = zztoktext; zzrdstream( f ); zzPrimeLookAhead;}
+#ifdef ZZINF_LOOK
+#define zzleaveANTLR(f)			free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#define zzleaveANTLRf(f)	   	free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#define zzleaveANTLRs(f)		free(zzinf_text_buffer); free(zzinf_text); free(zzinf_tokens); free(zzinf_line);
+#else
+#define zzleaveANTLR(f)
+#define zzleaveANTLRf(f)
+#define zzleaveANTLRs(f)
+#endif
+
+#endif
+
+/* MR19 Paul D. Smith (psmith@baynetworks.com)
+   Need to adjust AST stack pointer at exit.
+   Referenced in ANTLRx macros.
+*/
+
+#ifdef GENAST
+#define ZZAST_ADJUST ++zzast_sp;
+#else
+#define ZZAST_ADJUST
+#endif
+
+#define ANTLR(st, f)	zzbufsize = ZZLEXBUFSIZE;	\
+						zzenterANTLR(f);			\
+            {                                            \
+              zzBLOCK(zztasp1);                          \
+						  st; /* ++zzasp; Removed MR20 G. Hobbelt */     \
+						      /* ZZAST_ADJUST Removed MR20 G. Hobbelt */ \
+              /* MR20 G. Hobbelt. Kill the top' attribute (+AST stack corr.) */  \
+              zzEXIT_ANTLR(zztasp1 + 1);                 \
+            }                                            \
+						zzleaveANTLR(f);
+						
+#define ANTLRm(st, f, _m)	zzbufsize = ZZLEXBUFSIZE;	\
+						zzmode(_m);				\
+						zzenterANTLR(f);			\
+            {                                            \
+              zzBLOCK(zztasp1);                          \
+						  st; /* ++zzasp; Removed MR20 G. Hobbelt */     \
+						      /* ZZAST_ADJUST Removed MR20 G. Hobbelt */ \
+              /* MR20 G. Hobbelt. Kill the top' attribute (+AST stack corr.) */  \
+              zzEXIT_ANTLR(zztasp1 + 1);                 \
+            }                                            \
+						zzleaveANTLR(f);
+						
+#define ANTLRf(st, f)	zzbufsize = ZZLEXBUFSIZE;	\
+						zzenterANTLRf(f);			\
+            {                                            \
+              zzBLOCK(zztasp1);                          \
+						  st; /* ++zzasp; Removed MR20 G. Hobbelt */     \
+						      /* ZZAST_ADJUST Removed MR20 G. Hobbelt */ \
+              /* MR20 G. Hobbelt. Kill the top' attribute (+AST stack corr.) */  \
+              zzEXIT_ANTLR(zztasp1 + 1);                 \
+            }                                            \
+						zzleaveANTLRf(f);
+
+#define ANTLRs(st, s)   zzbufsize = ZZLEXBUFSIZE;	\
+                        zzenterANTLRs(s);           \
+            {                                            \
+              zzBLOCK(zztasp1);                          \
+						  st; /* ++zzasp; Removed MR20 G. Hobbelt */     \
+						      /* ZZAST_ADJUST Removed MR20 G. Hobbelt */ \
+              /* MR20 G. Hobbelt. Kill the top' attribute (+AST stack corr.) */  \
+              zzEXIT_ANTLR(zztasp1 + 1);                 \
+            }                                            \
+                        zzleaveANTLRs(s);
+
+#ifdef LL_K
+#define zztext		(&(zztextLA[zzlap][0]))
+#else
+#define zztext		zzlextext
+#endif
+
+
+					/* A r g u m e n t  A c c e s s */
+
+#define zzaCur			(zzaStack[zzasp])
+#define zzaRet			(*zzaRetPtr)
+#define zzaArg(v,n)		zzaStack[v-n]
+#define zzMakeAttr		{ zzNON_GUESS_MODE {zzOvfChk; --zzasp; zzcr_attr(&(zzaStack[zzasp]),LA(1),LATEXT(1));}}
+#ifdef zzdef0
+#define zzMake0			{ zzOvfChk; --zzasp; zzdef0(&(zzaStack[zzasp]));}
+#else
+#define zzMake0			{ zzOvfChk; --zzasp;}
+#endif
+#define zzaPush(_v)		{ zzOvfChk; zzaStack[--zzasp] = _v;}
+#ifndef zzd_attr
+#define zzREL(t)		zzasp=(t);		/* Restore state of stack */
+#else
+#define zzREL(t)		for (; zzasp<(t); zzasp++)				\
+						{ zzd_attr(&(zzaStack[zzasp])); }
+#endif
+
+
+#define zzsetmatch(_es,_tokclassErrset)						\
+	if ( !_zzsetmatch(_es, &zzBadText, &zzMissText, &zzMissTok, &zzBadTok, &zzMissSet, _tokclassErrset) ) goto fail; /* MR23 */
+
+#ifdef ZZCAN_GUESS
+#define zzsetmatch_wsig(_es, handler)		\
+	if ( !_zzsetmatch_wsig(_es) ) if (zzguessing) { zzGUESS_FAIL; } else {_signal=MismatchedToken; goto handler;}
+#else
+#define zzsetmatch_wsig(_es, handler)		\
+	if ( !_zzsetmatch_wsig(_es) ) {_signal=MismatchedToken; goto handler;}
+#endif
+
+#ifdef __USE_PROTOS
+extern int _zzsetmatch(SetWordType *, char **, char **, int *, int *, SetWordType **, SetWordType * /* MR23 */); 
+extern int _zzsetmatch_wsig(SetWordType *);
+#else
+extern int _zzsetmatch();
+extern int _zzsetmatch_wsig();
+#endif
+
+#define zzmatch(_t)							\
+	if ( !_zzmatch(_t, &zzBadText, &zzMissText, &zzMissTok, &zzBadTok, &zzMissSet) ) goto fail;
+
+#ifdef ZZCAN_GUESS
+#define zzmatch_wsig(_t,handler)			\
+	if ( !_zzmatch_wsig(_t) ) if (zzguessing) { zzGUESS_FAIL; } else {_signal=MismatchedToken; goto handler;}
+#else
+#define zzmatch_wsig(_t,handler)			\
+	if ( !_zzmatch_wsig(_t) ) {_signal=MismatchedToken; goto handler;}
+#endif
+
+#ifdef __USE_PROTOS
+extern int _zzmatch(int, char **, char **, int *, int *, SetWordType **);
+extern int _zzmatch_wsig(int);
+#else
+extern int _zzmatch();
+extern int _zzmatch_wsig();
+#endif
+
+#define zzmatch_wdfltsig(_t,_f)			\
+	if ( !_zzmatch_wdfltsig(_t,_f) ) _signal=MismatchedToken;
+#define zzsetmatch_wdfltsig(tw,tt,wf)		\
+	if ( !_zzsetmatch_wdfltsig(tw,tt,wf) ) _signal=MismatchedToken;
+
+#ifdef __USE_PROTOS
+extern int _zzmatch_wdfltsig(int, SetWordType *);
+extern int _zzsetmatch_wdfltsig(SetWordType *tokensWanted,
+								int tokenTypeOfSet,
+								SetWordType *whatFollows);
+#else
+extern int _zzmatch_wdfltsig();
+extern int _zzsetmatch_wdfltsig();
+#endif
+
+#ifdef GENAST
+#define zzRULE		Attrib *zzaRetPtr = &(zzaStack[zzasp-1]);	\
+					SetWordType *zzMissSet=NULL; int zzMissTok=0;		\
+					int zzBadTok=0; char *zzBadText="";		\
+					int zzErrk=1,zzpf=0;					\
+                    zzTRACEdata \
+					char *zzMissText=""; zzASTVars
+#else
+#define zzRULE		Attrib *zzaRetPtr = &(zzaStack[zzasp-1]);	\
+					int zzBadTok=0; char *zzBadText="";		\
+					int zzErrk=1,zzpf=0;								\
+                    zzTRACEdata \
+					SetWordType *zzMissSet=NULL; int zzMissTok=0; char *zzMissText=""
+#endif
+
+#ifdef GENAST
+#define zzBLOCK(i)	int i = zzasp - 1; int zztsp = zzast_sp
+#define zzEXIT(i)	zzREL(i); zzastREL; zzNON_GUESS_MODE { zzastPush(*_root); }
+#define zzEXIT_ANTLR(i)	zzREL(i); zzastREL /* [i_a] added as we want this for the ANTLRx() macros */
+#define zzLOOP(i)	zzREL(i); zzastREL
+#else
+#define zzBLOCK(i)	int i = zzasp - 1
+#define zzEXIT(i)	zzREL(i)
+#define zzEXIT_ANTLR(i)	zzREL(i)           /* [i_a] added as we want this for the ANTLRx() macros */
+#define zzLOOP(i)	zzREL(i)
+#endif
+
+#ifdef LL_K
+
+#ifdef DEMAND_LOOK
+#define LOOK(_k)	{int i,stop=_k-(LL_K-zzdirty); for (i=1; i<=stop; i++)	\
+					zzCONSUME;}
+#define zzCONSUME	{zzgettok(); zzdirty--;							\
+					zzlap = (zzlap+1)&(LL_K-1);						\
+					zzlextext = &(zztextLA[zzlap][0]);}
+#else
+#ifdef ZZINF_LOOK
+#define zzCONSUME	{inf_zzgettok; 									\
+					zzlap = (zzlap+1)&(LL_K-1);						\
+					zzlextext = &(zztextLA[zzlap][0]);				\
+					}
+#else
+#define zzCONSUME	{zzgettok(); 									\
+					zzlap = (zzlap+1)&(LL_K-1);						\
+					zzlextext = &(zztextLA[zzlap][0]);}
+#endif /* ZZINF_LOOK */
+#endif /* DEMAND_LOOK */
+
+#else /* LL_K */
+
+#ifdef DEMAND_LOOK
+#define LOOK(_k)	if ( zzdirty) zzCONSUME;
+#ifdef ZZINF_LOOK
+#define zzCONSUME	inf_zzgettok; zzdirty=0;
+#else
+#define zzCONSUME	zzgettok(); zzdirty=0;
+#endif /* ZZINF_LOOK */
+
+#else  /* DEMAND_LOOK */
+
+#ifdef ZZINF_LOOK
+#define zzCONSUME	inf_zzgettok
+#else
+#define zzCONSUME	zzgettok();
+#endif
+
+#endif /* DEMAND_LOOK */
+
+#endif /* LL_K */
+
+#ifdef LL_K
+#define NLA			zztokenLA[zzlap&(LL_K-1)]	/* --> next LA */
+#define NLATEXT		zztextLA[zzlap&(LL_K-1)]	/* --> next text of LA */
+#ifdef DEMAND_LOOK
+#define LA(i)       zztokenLA[(zzlabase+(i)-1)&(LL_K-1)]
+#define LATEXT(i)   (&(zztextLA[(zzlabase+(i)-1)&(LL_K-1)][0]))
+#else
+#define LA(i)       zztokenLA[(zzlap+(i)-1)&(LL_K-1)]
+#define LATEXT(i)   (&(zztextLA[(zzlap+(i)-1)&(LL_K-1)][0]))
+#endif
+#else
+#define NLA			zztoken
+#define NLATEXT		zztext
+#define LA(i)       zztoken
+#define LATEXT(i)   zztext
+#endif
+
+
+           /* S t a n d a r d  S i g n a l s */
+
+#define NoSignal			0
+#define MismatchedToken		1
+#define NoViableAlt			2
+#define NoSemViableAlt		3
+
+/* MR7  Allow more control over signalling                                  */
+/*        by adding "Unwind" and "zzsetSignal"                              */
+
+#define Unwind              4
+#define zzsetSignal(newValue) *_retsignal=_signal=(newValue)
+#define zzsuppressSignal *_retsignal=_signal=0
+#define zzexportSignal    *_retsignal=_signal
+
+           /* F u n c t i o n  T r a c i n g */
+
+#ifndef zzTRACE_RULES
+#define zzTRACEdata
+#else
+#ifndef zzTRACEdata
+#define zzTRACEdata     ANTLRChar *zzTracePrevRuleName = NULL;
+#endif
+#endif
+
+#ifndef zzTRACEIN
+#define zzTRACEIN(r)	zzTracePrevRuleName=zzTraceCurrentRuleName;zzTraceIn(r);
+#endif
+#ifndef zzTRACEOUT
+#define zzTRACEOUT(r)	zzTraceOut(r);zzTraceCurrentRuleName=zzTracePrevRuleName;
+#endif
+
+/* MR19 zzchar_t additions */
+
+#ifndef zzchar_t
+#ifdef ZZWCHAR_T
+#define zzchar_t wchar_t
+#else
+#define zzchar_t char
+#endif
+#endif
+
+
+/* MR26 */
+
+#ifdef PCCTS_USE_STDARG
+extern void zzFAIL(int k, ...);
+#else
+extern void zzFAIL();
+#endif
+				/* E x t e r n  D e f s */
+
+#ifdef __USE_PROTOS
+extern Attrib zzempty_attr(void);
+extern Attrib zzconstr_attr(int, char *);
+extern void zzsyn(char *, int, char *, SetWordType *, int, int, char *);
+extern int zzset_el(unsigned, SetWordType *);
+extern int zzset_deg(SetWordType *);
+extern void zzedecode(SetWordType *);
+
+extern void zzresynch(SetWordType *, SetWordType);
+extern void zzsave_antlr_state(zzantlr_state *);
+extern void zzrestore_antlr_state(zzantlr_state *);
+extern void zzfill_inf_look(void);
+extern void zzconsumeUntil(SetWordType *st);                         /* MR7 */
+extern void zzconsumeUntilToken(int t);                              /* MR7 */
+extern void zzTraceIn(char * ruleName);                              /* MR10 */
+extern void zzTraceOut(char * ruleName);                             /* MR10 */
+extern int  zzTraceOption(int delta);                                /* MR10 */
+extern int  zzTraceGuessOption(int delta);                           /* MR10 */
+extern void zzTraceReset(void);                                      /* MR10 */
+extern void zzTraceGuessFail(void);                                  /* MR10 */
+#ifdef EXCEPTION_HANDLING
+extern void zzdflthandlers(int, int *);
+#endif
+#else
+extern Attrib zzempty_attr();
+extern Attrib zzconstr_attr();
+extern void zzsyn();
+extern int zzset_el();
+extern int zzset_deg();
+extern void zzedecode();
+extern void zzresynch();
+extern void zzsave_antlr_state();
+extern void zzrestore_antlr_state();
+extern void zzfill_inf_look();
+extern void zzconsumeUntil();                                        /* MR7 */
+extern void zzconsumeUntilToken();                                   /* MR7 */
+extern void zzTraceIn();                                             /* MR10 */
+extern void zzTraceOut();                                            /* MR10 */
+extern int  zzTraceOption();                                         /* MR10 */
+extern int  zzTraceGuessOption();                                    /* MR10 */
+extern void zzTraceReset();                                          /* MR10 */
+extern void zzTraceGuessFail();                                      /* MR10 */
+#ifdef EXCEPTION_HANDLING
+extern void zzdflthandlers();
+#endif
+#endif
+
+				/* G l o b a l  V a r i a b l e s */
+
+/* Define a parser; user should do a "#parser myname" in their grammar file */
+/*extern struct pccts_parser zzparser;*/
+
+extern char *zztokens[];
+#ifdef LL_K
+extern int zztokenLA[];
+extern zzchar_t zztextLA[][ZZLEXBUFSIZE];
+extern int zzlap;
+extern int zzlabase;
+#else
+extern int zztoken;
+#endif
+
+extern char zzStackOvfMsg[];
+extern int zzasp;
+extern Attrib zzaStack[];
+#ifdef ZZINF_LOOK
+extern int *zzinf_tokens;
+extern char **zzinf_text;
+extern char *zzinf_text_buffer;
+extern int *zzinf_line;
+extern int zzinf_labase;
+extern int zzinf_last;
+#endif
+#ifdef DEMAND_LOOK
+extern int zzdirty;
+#endif
+#ifdef ZZCAN_GUESS
+extern int zzguessing;
+extern zzjmp_buf zzguess_start;
+#endif
+
+/* Define global veriables that refer to values exported by the scanner.
+ * These declarations duplicate those in dlgdef.h, but are needed
+ * if ANTLR is not to generate a .dlg file (-gx); PS, this is a hack.
+ */
+extern zzchar_t *zzlextext;     /* text of most recently matched token */
+extern int      zzbufsize;      /* how long zzlextext is */
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ast.c b/Tools/Source/TianoTools/Pccts/h/ast.c
new file mode 100644
index 0000000000..9326ae16ae
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ast.c
@@ -0,0 +1,345 @@
+/* Abstract syntax tree manipulation functions
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed. 
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+#ifdef PCCTS_USE_STDARG
+#include "pccts_stdarg.h"
+#else
+#include <varargs.h>
+#endif
+
+/* ensure that tree manipulation variables are current after a rule
+ * reference
+ */
+
+void
+#ifdef __USE_PROTOS
+zzlink(AST **_root, AST **_sibling, AST **_tail)
+#else
+zzlink(_root, _sibling, _tail)
+AST **_root, **_sibling, **_tail;
+#endif
+{
+	if ( *_sibling == NULL ) return;
+	if ( *_root == NULL ) *_root = *_sibling;
+	else if ( *_root != *_sibling ) (*_root)->down = *_sibling;
+	if ( *_tail==NULL ) *_tail = *_sibling;
+	while ( (*_tail)->right != NULL ) *_tail = (*_tail)->right;
+}
+
+AST *
+#ifdef __USE_PROTOS
+zzastnew(void)
+#else
+zzastnew()
+#endif
+{
+	AST *p = (AST *) calloc(1, sizeof(AST));
+	if ( p == NULL ) fprintf(stderr,"%s(%d): cannot allocate AST node\n",__FILE__,__LINE__);
+	return p;
+}
+
+/* add a child node to the current sibling list */
+void
+#ifdef __USE_PROTOS
+zzsubchild(AST **_root, AST **_sibling, AST **_tail)
+#else
+zzsubchild(_root, _sibling, _tail)
+AST **_root, **_sibling, **_tail;
+#endif
+{
+	AST *n;
+	zzNON_GUESS_MODE {
+	n = zzastnew();
+#ifdef DEMAND_LOOK
+	zzcr_ast(n, &(zzaCur), LA(0), LATEXT(0));
+#else
+	zzcr_ast(n, &(zzaCur), LA(1), LATEXT(1));
+#endif
+	zzastPush( n );
+	if ( *_tail != NULL ) (*_tail)->right = n;
+	else {
+		*_sibling = n;
+		if ( *_root != NULL ) (*_root)->down = *_sibling;
+	}
+	*_tail = n;
+	if ( *_root == NULL ) *_root = *_sibling;
+	}
+}
+
+/* make a new AST node.  Make the newly-created
+ * node the root for the current sibling list.  If a root node already
+ * exists, make the newly-created node the root of the current root.
+ */
+void
+#ifdef __USE_PROTOS
+zzsubroot(AST **_root, AST **_sibling, AST **_tail)
+#else
+zzsubroot(_root, _sibling, _tail)
+AST **_root, **_sibling, **_tail;
+#endif
+{
+	AST *n;
+	zzNON_GUESS_MODE {
+	n = zzastnew();
+#ifdef DEMAND_LOOK
+	zzcr_ast(n, &(zzaCur), LA(0), LATEXT(0));
+#else
+	zzcr_ast(n, &(zzaCur), LA(1), LATEXT(1));
+#endif
+	zzastPush( n );
+	if ( *_root != NULL )
+		if ( (*_root)->down == *_sibling ) *_sibling = *_tail = *_root;
+	*_root = n;
+	(*_root)->down = *_sibling;
+	}
+}
+
+/* Apply function to root then each sibling
+ * example: print tree in child-sibling LISP-format (AST has token field)
+ *
+ *	void show(tree)
+ *	AST *tree;
+ *	{
+ *		if ( tree == NULL ) return;
+ *		printf(" %s", zztokens[tree->token]);
+ *	}
+ *
+ *	void before() { printf(" ("); }
+ *	void after()  { printf(" )"); }
+ *
+ *	LISPdump() { zzpre_ast(tree, show, before, after); }
+ *
+ */
+void
+#ifdef __USE_PROTOS
+zzpre_ast(
+	  AST *tree,
+	  void (*func)(AST *),   /* apply this to each tree node */
+	  void (*before)(AST *), /* apply this to root of subtree before preordering it */
+	  void (*after)(AST *))  /* apply this to root of subtree after preordering it */
+#else
+zzpre_ast(tree, func, before, after)
+AST *tree;
+void (*func)(),   /* apply this to each tree node */
+	 (*before)(), /* apply this to root of subtree before preordering it */
+	 (*after)();  /* apply this to root of subtree after preordering it */
+#endif
+{
+	while ( tree!= NULL )
+	{
+		if ( tree->down != NULL ) (*before)(tree);
+		(*func)(tree);
+		zzpre_ast(tree->down, func, before, after);
+		if ( tree->down != NULL ) (*after)(tree);
+		tree = tree->right;
+	}
+}
+
+/* free all AST nodes in tree; apply func to each before freeing */
+
+#if 0
+////void
+////#ifdef __USE_PROTOS
+////zzfree_ast(AST *tree)
+////#else
+////zzfree_ast(tree)
+////AST *tree;
+////#endif
+////{
+////	if ( tree == NULL ) return;
+////	zzfree_ast( tree->down );
+////	zzfree_ast( tree->right );
+////	zztfree( tree );
+////}
+#endif
+
+/*
+   MR19 Optimize freeing of the following structure to limit recursion
+   SAKAI Kiyotaka (ksakai@isr.co.jp)
+*/
+
+/*
+         NULL o
+             / \
+           NULL o
+               / \
+            NULL NULL
+*/
+
+/*
+   MR21 Another refinement to replace recursion with iteration
+   NAKAJIMA Mutsuki (muc@isr.co.jp).
+*/
+
+void
+#ifdef __USE_PROTOS
+zzfree_ast(AST *tree)
+#else
+zzfree_ast(tree)
+AST *tree;
+#endif
+{
+
+    AST *otree;
+
+    if (tree == NULL) return;
+
+    while (tree->down == NULL || tree->right == NULL) {
+
+        if (tree->down == NULL && tree->right == NULL) {
+            zztfree(tree);
+            return;
+        }
+
+        otree = tree;
+        if (tree->down == NULL) {
+            tree = tree->right;
+        } else {
+            tree = tree->down;
+        }
+        zztfree( otree );
+    }
+
+    while (tree != NULL) {
+        zzfree_ast(tree->down);
+        otree = tree;
+        tree = otree->right;
+        zztfree(otree);
+    }
+}
+
+/* build a tree (root child1 child2 ... NULL)
+ * If root is NULL, simply make the children siblings and return ptr
+ * to 1st sibling (child1).  If root is not single node, return NULL.
+ *
+ * Siblings that are actually siblins lists themselves are handled
+ * correctly.  For example #( NULL, #( NULL, A, B, C), D) results
+ * in the tree ( NULL A B C D ).
+ *
+ * Requires at least two parameters with the last one being NULL.  If
+ * both are NULL, return NULL.
+ */
+#ifdef PCCTS_USE_STDARG
+AST *zztmake(AST *rt, ...)
+#else
+AST *zztmake(va_alist)
+va_dcl
+#endif
+{
+	va_list ap;
+	register AST *child, *sibling=NULL, *tail=NULL /* MR20 */, *w;
+	AST *root;
+
+#ifdef PCCTS_USE_STDARG
+	va_start(ap, rt);
+	root = rt;
+#else
+	va_start(ap);
+	root = va_arg(ap, AST *);
+#endif
+
+	if ( root != NULL )
+		if ( root->down != NULL ) return NULL;
+	child = va_arg(ap, AST *);
+	while ( child != NULL )
+	{
+		for (w=child; w->right!=NULL; w=w->right) {;} /* find end of child */
+		if ( sibling == NULL ) {sibling = child; tail = w;}
+		else {tail->right = child; tail = w;}
+		child = va_arg(ap, AST *);
+	}
+	if ( root==NULL ) root = sibling;
+	else root->down = sibling;
+	va_end(ap);
+	return root;
+}
+
+/* tree duplicate */
+AST *
+#ifdef __USE_PROTOS
+zzdup_ast(AST *t)
+#else
+zzdup_ast(t)
+AST *t;
+#endif
+{
+	AST *u;
+	
+	if ( t == NULL ) return NULL;
+	u = zzastnew();
+	*u = *t;
+#ifdef zzAST_DOUBLE
+	u->up = NULL;		/* set by calling invocation */
+	u->left = NULL;
+#endif
+	u->right = zzdup_ast(t->right);
+	u->down = zzdup_ast(t->down);
+#ifdef zzAST_DOUBLE
+	if ( u->right!=NULL ) u->right->left = u;
+	if ( u->down!=NULL ) u->down->up = u;
+#endif
+	return u;
+}
+
+void
+#ifdef __USE_PROTOS
+zztfree(AST *t)
+#else
+zztfree(t)
+AST *t;
+#endif
+{
+#ifdef zzd_ast
+	zzd_ast( t );
+#endif
+	free( t );
+}
+
+#ifdef zzAST_DOUBLE
+/*
+ * Set the 'up', and 'left' pointers of all nodes in 't'.
+ * Initial call is double_link(your_tree, NULL, NULL).
+ */
+void
+#ifdef __USE_PROTOS
+zzdouble_link(AST *t, AST *left, AST *up)
+#else
+zzdouble_link(t, left, up)
+AST *t, *left, *up;
+#endif
+{
+	if ( t==NULL ) return;
+	t->left = left;
+	t->up = up;
+	zzdouble_link(t->down, NULL, t);
+	zzdouble_link(t->right, t, up);
+}
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/ast.h b/Tools/Source/TianoTools/Pccts/h/ast.h
new file mode 100644
index 0000000000..5ff84bd76c
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/ast.h
@@ -0,0 +1,121 @@
+/* Abstract syntax tree
+ *
+ * Macros, definitions
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ZZAST_H
+#define ZZAST_H
+
+#define zzastOvfChk														\
+			if ( zzast_sp <= 0 )                                        \
+            {                                                           \
+                fprintf(stderr, zzStackOvfMsg, __FILE__, __LINE__);    	\
+                exit(PCCTS_EXIT_FAILURE);                                               \
+            }
+
+#ifndef USER_DEFINED_AST
+#ifndef AST_FIELDS
+#define AST_FIELDS
+#endif
+
+typedef struct _ast {
+            struct _ast *right, *down;
+#ifdef zzAST_DOUBLE
+            struct _ast *left, *up;
+#endif
+            AST_FIELDS
+} AST;
+
+#else
+
+#ifdef zzAST_DOUBLE
+#define AST_REQUIRED_FIELDS   struct _ast *right, *down, *left, *up;
+#else
+#define AST_REQUIRED_FIELDS   struct _ast *right, *down;
+#endif
+
+#endif
+
+
+/* N o d e  a c c e s s  m a c r o s */
+#define zzchild(t)		(((t)==NULL)? (AST *) NULL:(t->down))   /* MR19 */
+#define zzsibling(t)	(((t)==NULL)? (AST *) NULL:(t->right))  /* MR19 */
+
+
+/* define global variables needed by #i stack */
+#define zzASTgvars												\
+	AST *zzastStack[ZZAST_STACKSIZE];							\
+	int zzast_sp = ZZAST_STACKSIZE;
+
+#define zzASTVars	AST *_ast = NULL, *_sibling = NULL, *_tail = NULL
+#define zzSTR		( (_tail==NULL)?(&_sibling):(&(_tail->right)) )
+#define zzastCur	(zzastStack[zzast_sp])
+#define zzastArg(i)	(zzastStack[zztsp-i])
+#define zzastPush(p) zzastOvfChk; zzastStack[--zzast_sp] = p;
+#define zzastDPush	--zzast_sp
+#define zzastMARK	zztsp=zzast_sp;		/* Save state of stack */
+#define zzastREL	zzast_sp=zztsp;		/* Return state of stack */
+#define zzrm_ast	{zzfree_ast(*_root); _tail = _sibling = (*_root)=NULL;}
+
+extern int zzast_sp;
+extern AST *zzastStack[];
+
+/* MR26 */
+
+#ifdef PCCTS_USE_STDARG
+AST *zztmake(AST *, ...);
+#else
+AST *zztmake();
+#endif
+
+#ifdef __USE_PROTOS
+void zzlink(AST **, AST **, AST **);
+void zzsubchild(AST **, AST **, AST **);
+void zzsubroot(AST **, AST **, AST **);
+void zzpre_ast(AST *, void (*)(AST *), void (*)(AST *), void (*)(AST *));
+void zzfree_ast(AST *);
+AST *zzdup_ast(AST *);
+void zztfree(AST *);
+void zzdouble_link(AST *, AST *, AST *);
+AST *zzastnew(void);
+
+#else
+
+void zzlink();
+AST *zzastnew();
+void zzsubchild();
+void zzsubroot();
+void zzpre_ast();
+void zzfree_ast();
+AST *zzdup_ast();
+void zztfree();
+void zzdouble_link();
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/charbuf.h b/Tools/Source/TianoTools/Pccts/h/charbuf.h
new file mode 100644
index 0000000000..5f01c8ba35
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/charbuf.h
@@ -0,0 +1,46 @@
+/* ANTLR attribute definition -- constant width text
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ZZCHARBUF_H
+#define ZZCHARBUF_H
+
+#include "pcctscfg.h"
+
+#include "pccts_string.h"
+
+#ifndef D_TextSize
+#define D_TextSize	30
+#endif
+
+typedef struct { char text[D_TextSize]; } Attrib;
+
+#define zzcr_attr(a,tok,t)	strncpy((a)->text, t, D_TextSize-1); \
+							(a)->text[D_TextSize-1] = '\0';
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/charptr.c b/Tools/Source/TianoTools/Pccts/h/charptr.c
new file mode 100644
index 0000000000..d3f80e60ba
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/charptr.c
@@ -0,0 +1,58 @@
+/*
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#include "pcctscfg.h"
+
+#ifdef __STDC__
+#include "pccts_stdlib.h"
+#else
+#include <malloc.h>
+#endif
+#include "pccts_string.h"
+
+/* 133MR1 include stdio.h for fprintf in charptr.c */
+
+#include "pccts_stdio.h"
+
+/* 133MR1 include charptr.h for Attrib in charptr.c */
+
+#include "charptr.h"
+
+#ifdef __USE_PROTOS
+zzcr_attr(Attrib *a,int token,char *text)
+#else
+zzcr_attr(a,token,text)
+Attrib *a;
+int token;
+char *text;
+#endif
+{
+	*a = (char *) malloc(strlen(text)+1);			/* MR6 */
+	if ( *a == NULL ) {fprintf(stderr, "zzcr_attr: out of memory!\n"); exit(-1);}
+	strcpy(*a, text);
+}
diff --git a/Tools/Source/TianoTools/Pccts/h/charptr.h b/Tools/Source/TianoTools/Pccts/h/charptr.h
new file mode 100644
index 0000000000..e73da681a4
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/charptr.h
@@ -0,0 +1,48 @@
+/*
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+/*
+ * WARNING!!!!: charptr.h does NOT make copies and the
+ * memory is freed after the attribute scope exits.
+ */
+
+#ifndef ZZCHARPTR_H
+#define ZZCHARPTR_H
+
+typedef char *Attrib;
+#define zzdef0(a)		{*(a)=NULL;}
+/* MR8  Jens Tingleff (jensting@imaginet.fr)                                */
+/*          Set memory pointer to null after free()                         */
+#define zzd_attr(a)		{if ( *(a)!=NULL ) {free(*(a)); *(a)=NULL; }; }
+
+#ifdef __STDC__
+extern zzcr_attr(Attrib *,int,char *);
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/config.h b/Tools/Source/TianoTools/Pccts/h/config.h
new file mode 100644
index 0000000000..8aa50ad618
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/config.h
@@ -0,0 +1 @@
+#include "pcctscfg.h"
diff --git a/Tools/Source/TianoTools/Pccts/h/dlgauto.h b/Tools/Source/TianoTools/Pccts/h/dlgauto.h
new file mode 100644
index 0000000000..db94cefaca
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/dlgauto.h
@@ -0,0 +1,504 @@
+/* dlgauto.h automaton
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Will Cohen and Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ZZDEFAUTO_H
+#define ZZDEFAUTO_H
+
+/*  10-Apr-97 133MR1	Uses __USE_PROTOS show should #include pcctscfg.h */
+
+#include "pcctscfg.h"
+
+zzchar_t	*zzlextext;	/* text of most recently matched token */
+zzchar_t	*zzbegexpr;	/* beginning of last reg expr recogn. */
+zzchar_t	*zzendexpr;	/* beginning of last reg expr recogn. */
+int	zzbufsize = 0;	/* number of characters in zzlextext */          /* MR7 */
+int	zzbegcol = 0;	/* column that first character of token is in*/
+int	zzendcol = 0;	/* column that last character of token is in */
+int	zzline = 1;	/* line current token is on */
+int	zzreal_line=1;	/* line of 1st portion of token that is not skipped */
+int	zzchar;		/* character to determine next state */
+int	zzbufovf;	/* indicates that buffer too small for text */
+int	zzcharfull = 0;
+static zzchar_t	*zznextpos;/* points to next available position in zzlextext*/
+static int 	zzclass;
+
+#ifdef __USE_PROTOS
+void	zzerrstd(const char *);
+void	(*zzerr)(const char *)=zzerrstd;/* pointer to error reporting function */
+extern int	zzerr_in(void);
+static int	(*zzfunc_in)(void) = zzerr_in;  /* MR20 */
+#else
+void	zzerrstd();
+void	(*zzerr)()=zzerrstd;	/* pointer to error reporting function */
+extern int	zzerr_in();
+static int	(*zzfunc_in)() = zzerr_in;      /* MR20 */
+#endif
+
+static FILE	*zzstream_in=0;
+static zzchar_t	*zzstr_in=0;
+
+#ifdef USER_ZZMODE_STACK
+int 	          zzauto = 0;
+#else
+static int     zzauto = 0;
+#endif
+static int	zzadd_erase;
+static char 	zzebuf[70];
+
+#ifdef ZZCOL
+#define ZZINC (++zzendcol)
+#else
+#define ZZINC
+#endif
+
+
+#define ZZGETC_STREAM {zzchar = getc(zzstream_in); zzclass = ZZSHIFT(zzchar);}
+#define ZZGETC_FUNC {zzchar = (*zzfunc_in)(); zzclass = ZZSHIFT(zzchar);}
+#define ZZGETC_STR { 			\
+	if (*zzstr_in){				\
+		zzchar = *zzstr_in;		\
+		++zzstr_in;				\
+	}else{						\
+		zzchar = EOF;			\
+	}							\
+	zzclass = ZZSHIFT(zzchar);	\
+}
+
+#define ZZNEWSTATE	(newstate = dfa[state][zzclass])
+
+#ifndef ZZCOPY
+#define ZZCOPY	\
+	/* Truncate matching buffer to size (not an error) */	\
+	if (zznextpos < lastpos){				\
+		*(zznextpos++) = zzchar;			\
+	}else{							\
+		zzbufovf = 1;					\
+	}
+#endif
+
+void
+#ifdef __USE_PROTOS
+zzrdstream( FILE *f )
+#else
+zzrdstream( f )
+FILE *f;
+#endif
+{
+	/* make sure that it is really set to something, otherwise just
+	   leave it be.
+	*/
+	if (f){
+		/* make sure that there is always someplace to get input
+		   before closing zzstream_in
+		*/
+#if 0
+		if (zzstream_in && zzstream_in!=stdin) fclose( zzstream_in );
+#endif
+		zzline = 1;
+		zzstream_in = f;
+		zzfunc_in = NULL;
+		zzstr_in = 0;
+		zzcharfull = 0;
+	}
+}
+
+void
+#ifdef __USE_PROTOS
+zzrdfunc( int (*f)(void) )
+#else
+zzrdfunc( f )
+int (*f)();
+#endif
+{
+	/* make sure that it is really set to something, otherwise just
+	   leave it be.
+	*/
+	if (f){
+		/* make sure that there is always someplace to get input
+		   before closing zzstream_in
+		*/
+#if 0
+		if (zzstream_in && zzstream_in!=stdin) fclose( zzstream_in );
+#endif
+		zzline = 1;
+		zzstream_in = NULL;
+		zzfunc_in = f;
+		zzstr_in = 0;
+		zzcharfull = 0;
+	}
+}
+
+
+void
+#ifdef __USE_PROTOS
+zzrdstr( zzchar_t *s )
+#else
+zzrdstr( s )
+zzchar_t *s;
+#endif
+{
+	/* make sure that it is really set to something, otherwise just
+	   leave it be.
+	*/
+	if (s){
+		/* make sure that there is always someplace to get input
+		   before closing zzstream_in
+		*/
+#if 0
+		if (zzstream_in && zzstream_in!=stdin) fclose( zzstream_in );
+#endif
+		zzline = 1;
+		zzstream_in = NULL;
+		zzfunc_in = 0;
+		zzstr_in = s;
+		zzcharfull = 0;
+	}
+}
+
+
+#ifdef __USE_PROTOS
+void zzclose_stream(void)
+#else
+void zzclose_stream()
+#endif
+{
+#if 0
+	fclose( zzstream_in );
+	zzstream_in = NULL;
+	zzfunc_in = NULL;
+#endif
+}
+
+/* saves dlg state, but not what feeds dlg (such as file position) */
+void
+#ifdef __USE_PROTOS
+zzsave_dlg_state(struct zzdlg_state *state)
+#else
+zzsave_dlg_state(state)
+struct zzdlg_state *state;
+#endif
+{
+	state->stream = zzstream_in;
+	state->func_ptr = zzfunc_in;
+	state->str = zzstr_in;
+	state->auto_num = zzauto;
+	state->add_erase = zzadd_erase;
+	state->lookc = zzchar;
+	state->char_full = zzcharfull;
+	state->begcol = zzbegcol;
+	state->endcol = zzendcol;
+	state->line = zzline;
+	state->lextext = zzlextext;
+	state->begexpr = zzbegexpr;
+	state->endexpr = zzendexpr;
+	state->bufsize = zzbufsize;
+	state->bufovf = zzbufovf;
+	state->nextpos = zznextpos;
+	state->class_num = zzclass;
+}
+
+void
+#ifdef __USE_PROTOS
+zzrestore_dlg_state(struct zzdlg_state *state)
+#else
+zzrestore_dlg_state(state)
+struct zzdlg_state *state;
+#endif
+{
+	zzstream_in = state->stream;
+	zzfunc_in = state->func_ptr;
+	zzstr_in = state->str;
+	zzauto = state->auto_num;
+	zzadd_erase = state->add_erase;
+	zzchar = state->lookc;
+	zzcharfull = state->char_full;
+	zzbegcol = state->begcol;
+	zzendcol = state->endcol;
+	zzline = state->line;
+	zzlextext = state->lextext;
+	zzbegexpr = state->begexpr;
+	zzendexpr = state->endexpr;
+	zzbufsize = state->bufsize;
+	zzbufovf = state->bufovf;
+	zznextpos = state->nextpos;
+	zzclass = state->class_num;
+}
+
+void
+#ifdef __USE_PROTOS
+zzmode( int m )
+#else
+zzmode( m )
+int m;
+#endif
+{
+	/* points to base of dfa table */
+	if (m<MAX_MODE){
+		zzauto = m;
+		/* have to redo class since using different compression */
+		zzclass = ZZSHIFT(zzchar);
+	}else{
+		sprintf(zzebuf,"Invalid automaton mode = %d ",m);
+		zzerr(zzebuf);
+	}
+}
+
+/* erase what is currently in the buffer, and get a new reg. expr */
+
+#ifdef __USE_PROTOS
+void zzskip(void)
+#else
+void zzskip()
+#endif
+{
+	zzadd_erase = 1;
+}
+
+/* don't erase what is in the zzlextext buffer, add on to it */
+#ifdef __USE_PROTOS
+void zzmore()
+#else
+void zzmore()
+#endif
+{
+	zzadd_erase = 2;
+}
+
+/* substitute c for the reg. expr last matched and is in the buffer */
+#ifdef __USE_PROTOS
+void
+zzreplchar(zzchar_t c)
+#else
+void
+zzreplchar(c)
+zzchar_t c;
+#endif
+{
+	/* can't allow overwriting null at end of string */
+	if (zzbegexpr < &zzlextext[zzbufsize-1]){
+		*zzbegexpr = c;
+		*(zzbegexpr+1) = '\0';
+	}
+	zzendexpr = zzbegexpr;
+	if (c != '\0') {
+		zznextpos = zzbegexpr + 1;
+	}
+	else {
+		zznextpos = zzbegexpr;	/* MR30 Zero terminates string. */
+	}
+}
+
+/* replace the string s for the reg. expr last matched and in the buffer */
+void
+#ifdef __USE_PROTOS
+zzreplstr(register zzchar_t *s)
+#else
+zzreplstr(s)
+register zzchar_t *s;
+#endif
+{
+	register zzchar_t *l= &zzlextext[zzbufsize -1];
+
+	zznextpos = zzbegexpr;
+	if (s){
+	 	while ((zznextpos <= l) && (*(zznextpos++) = *(s++))!=0){
+			/* empty */
+		}
+		/* correct for NULL at end of string */
+		zznextpos--;
+	}
+	if ((zznextpos <= l) && (*(--s) == 0)){
+		zzbufovf = 0;
+	}else{
+		zzbufovf = 1;
+	}
+	*(zznextpos) = '\0';
+	zzendexpr = zznextpos - 1;
+}
+
+#ifdef __USE_PROTOS
+void zzgettok(void)
+#else
+void zzgettok()
+#endif
+{
+	register int state, newstate;
+	/* last space reserved for the null char */
+	zzchar_t *lastpos;  /* MR27 Remove register since address operator used. */
+
+skip:
+	zzreal_line = zzline;
+	zzbufovf = 0;
+	lastpos = &zzlextext[zzbufsize-1];
+	zznextpos = zzlextext;
+	zzbegcol = zzendcol+1;
+more:
+	zzbegexpr = zznextpos;
+#ifdef ZZINTERACTIVE
+	/* interactive version of automaton */
+	/* if there is something in zzchar, process it */
+	state = newstate = dfa_base[zzauto];
+	if (zzcharfull){
+		ZZINC;
+		ZZCOPY;
+		ZZNEWSTATE;
+	}
+	if (zzstr_in)
+		while (zzalternatives[newstate]){
+			state = newstate;
+			ZZGETC_STR;
+			ZZINC;
+			ZZCOPY;
+			ZZNEWSTATE;
+		}
+	else if (zzstream_in)
+		while (zzalternatives[newstate]){
+			state = newstate;
+			ZZGETC_STREAM;
+			ZZINC;
+			ZZCOPY;
+			ZZNEWSTATE;
+		}
+	else if (zzfunc_in)
+		while (zzalternatives[newstate]){
+			state = newstate;
+			ZZGETC_FUNC;
+			ZZINC;
+			ZZCOPY;
+			ZZNEWSTATE;
+		}
+	/* figure out if last character really part of token */
+	if ((state != dfa_base[zzauto]) && (newstate == DfaStates)){
+		zzcharfull = 1;
+		--zznextpos;
+	}else{
+		zzcharfull = 0;
+		state = newstate;
+	}
+	*(zznextpos) = '\0';
+	/* Able to transition out of start state to some non err state?*/
+	if ( state == dfa_base[zzauto] ){
+		/* make sure doesn't get stuck */
+		zzadvance();
+	}
+#else
+	/* non-interactive version of automaton */
+	if (!zzcharfull)
+		zzadvance();
+	else
+		ZZINC;
+	state = dfa_base[zzauto];
+	if (zzstr_in)
+		while (ZZNEWSTATE != DfaStates){
+			state = newstate;
+			ZZCOPY;
+			ZZGETC_STR;
+			ZZINC;
+		}
+	else if (zzstream_in)
+		while (ZZNEWSTATE != DfaStates){
+			state = newstate;
+			ZZCOPY;
+			ZZGETC_STREAM;
+			ZZINC;
+		}
+	else if (zzfunc_in)
+		while (ZZNEWSTATE != DfaStates){
+			state = newstate;
+			ZZCOPY;
+			ZZGETC_FUNC;
+			ZZINC;
+		}
+	zzcharfull = 1;
+	if ( state == dfa_base[zzauto] ){
+		if (zznextpos < lastpos){
+			*(zznextpos++) = zzchar;
+		}else{
+			zzbufovf = 1;
+		}
+		*zznextpos = '\0';
+		/* make sure doesn't get stuck */
+		zzadvance();
+	}else{
+		*zznextpos = '\0';
+	}
+#endif
+#ifdef ZZCOL
+	zzendcol -= zzcharfull;
+#endif
+	zzendexpr = zznextpos -1;
+	zzadd_erase = 0;
+	(*actions[accepts[state]])();
+	switch (zzadd_erase) {
+		case 1: goto skip;
+		case 2: goto more;
+	}
+}
+
+#ifdef __USE_PROTOS
+void zzadvance(void)
+#else
+void zzadvance()
+#endif
+{
+	if (zzstream_in) { ZZGETC_STREAM; zzcharfull = 1; ZZINC;}
+	if (zzfunc_in) { ZZGETC_FUNC; zzcharfull = 1; ZZINC;}
+	if (zzstr_in) { ZZGETC_STR; zzcharfull = 1; ZZINC;}
+	if (!(zzstream_in || zzfunc_in || zzstr_in)){
+		zzerr_in();
+	}
+}
+
+void
+#ifdef __USE_PROTOS
+zzerrstd(const char *s)
+#else
+zzerrstd(s)
+char *s;
+#endif
+{
+        zzLexErrCount++;                /* MR11 */
+        fprintf(stderr,
+                "%s near line %d (text was '%s')\n",
+                ((s == NULL) ? "Lexical error" : s),
+                zzline,zzlextext);
+}
+
+#ifdef __USE_PROTOS
+int zzerr_in(void)
+#else
+int zzerr_in()
+#endif
+{
+	fprintf(stderr,"No input stream, function, or string\n");
+	/* return eof to get out gracefully */
+	return EOF;
+}
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/dlgdef.h b/Tools/Source/TianoTools/Pccts/h/dlgdef.h
new file mode 100644
index 0000000000..733d2568e3
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/dlgdef.h
@@ -0,0 +1,128 @@
+/* dlgdef.h
+ * Things in scanner produced by dlg that should be visible to the outside
+ * world
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ZZDLGDEF_H
+#define ZZDLGDEF_H
+
+#include "pcctscfg.h"
+
+#ifndef zzchar_t
+#ifdef ZZWCHAR_T
+#define zzchar_t wchar_t
+#else
+#define zzchar_t char
+#endif
+#endif
+
+struct zzdlg_state {
+	FILE *stream;
+#ifdef __USE_PROTOS
+	int (*func_ptr)(void);
+#else
+	int (*func_ptr)();
+#endif
+	zzchar_t *str;
+	int auto_num;
+	int add_erase;
+	int lookc;
+	int char_full;
+	int begcol, endcol;
+	int line;
+	zzchar_t *lextext, *begexpr, *endexpr;
+	int bufsize;
+	int bufovf;
+	zzchar_t *nextpos;
+	int	class_num;
+};
+
+extern zzchar_t	*zzlextext;  	/* text of most recently matched token */
+extern zzchar_t	*zzbegexpr;	/* beginning of last reg expr recogn. */
+extern zzchar_t	*zzendexpr;	/* beginning of last reg expr recogn. */
+extern int	zzbufsize;	/* how long zzlextext is */
+extern int	zzbegcol;	/* column that first character of token is in*/
+extern int	zzendcol;	/* column that last character of token is in */
+extern int	zzline;		/* line current token is on */
+extern int	zzreal_line;		/* line of 1st portion of token that is not skipped */
+extern int	zzchar;		/* character to determine next state */
+extern int	zzbufovf;	/* indicates that buffer too small for text */
+#ifdef __USE_PROTOS
+extern void	(*zzerr)(const char *);/* pointer to error reporting function */
+#else
+extern void	(*zzerr)();
+#endif
+
+#ifdef USER_ZZMODE_STACK
+extern int     zzauto;
+#endif
+
+#ifdef __USE_PROTOS
+extern void	zzadvance(void);
+extern void	zzskip(void);	/* erase zzlextext, look for antoher token */
+extern void	zzmore(void);	/* keep zzlextext, look for another token */
+extern void	zzmode(int k);	/* switch to automaton 'k' */
+extern void	zzrdstream(FILE *);/* what stream to read from */
+extern void	zzclose_stream(void);/* close the current input stream */
+extern void	zzrdfunc(int (*)(void));/* what function to get char from */
+extern void zzrdstr( zzchar_t * );
+extern void	zzgettok(void);	/* get next token */
+extern void	zzreplchar(zzchar_t c);/* replace last recognized reg. expr. with
+					a character */
+extern void	zzreplstr(zzchar_t *s);/* replace last recognized reg. expr. with
+					a string */
+extern void zzsave_dlg_state(struct zzdlg_state *);
+extern void zzrestore_dlg_state(struct zzdlg_state *);
+extern int zzerr_in(void);
+extern void	zzerrstd(const char *);
+extern void zzerraction(void);
+
+#else
+
+extern void	zzadvance();
+extern void	zzskip();	/* erase zzlextext, look for antoher token */
+extern void	zzmore();	/* keep zzlextext, look for another token */
+extern void	zzmode(/*k*/);	/* switch to automaton 'k' */
+extern void	zzrdstream();	/* what stream to read from */
+extern void	zzclose_stream();/* close the current input stream */
+extern void	zzrdfunc();	/* what function to get char from */
+extern void zzrdstr();
+extern void	zzgettok();	/* get next token */
+extern void	zzreplchar();	/* replace last recognized reg. expr. with
+					a character */
+extern void	zzreplstr();	/* replace last recognized reg. expr. with
+					a string */
+extern void zzsave_dlg_state();
+extern void zzrestore_dlg_state();
+extern int zzerr_in();
+extern void	zzerrstd();
+extern void zzerraction();
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/err.h b/Tools/Source/TianoTools/Pccts/h/err.h
new file mode 100644
index 0000000000..b2b196bd75
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/err.h
@@ -0,0 +1,1170 @@
+/*
+ * err.h
+ *
+ * Standard error handling mechanism
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * Has grown to hold all kinds of stuff (err.h is increasingly misnamed)
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ERR_H
+#define ERR_H
+
+#include "pcctscfg.h"
+#include <stdlib.h>
+#include <assert.h>
+
+/*									      */
+/*  7-Apr-97  133MR1							      */
+/*		Proper choice of STDC and cplusplus pre-processor symbols (?) */
+/*									      */
+#include "pccts_string.h"
+
+#ifdef PCCTS_USE_STDARG
+#include "pccts_stdarg.h"
+#else
+#include <varargs.h>
+#endif
+
+#ifdef DUM
+/* Define usable bits per unsigned int word (used for set stuff) */
+#ifdef PC
+#define BSETWORDSIZE 16
+#define BSETLOGWORDSIZE	4
+#else
+#define	BSETWORDSIZE 32
+#define BSETLOGWORDSIZE 5
+#endif
+#endif
+
+#define	BSETWORDSIZE 8
+#define BSETLOGWORDSIZE 3		/* SetWordType is 8bits */
+
+#define	BSETMODWORD(x) ((x) & (BSETWORDSIZE-1))		/* x % BSETWORDSIZE */
+#define	BSETDIVWORD(x) ((x) >> BSETLOGWORDSIZE)		/* x / BSETWORDSIZE */
+
+/* This is not put into the global pccts_parser structure because it is
+ * hidden and does not need to be saved during a "save state" operation
+ */
+/* maximum of 32 bits/unsigned int and must be 8 bits/byte */
+static SetWordType bitmask[] = {
+	0x00000001, 0x00000002, 0x00000004, 0x00000008,
+	0x00000010, 0x00000020, 0x00000040, 0x00000080
+};
+
+#ifdef zzTRACE_RULES
+int  zzTraceOptionValueDefault=1;
+int  zzTraceOptionValue=1;
+int  zzTraceGuessOptionValue=1;
+char *zzTraceCurrentRuleName=NULL;
+int  zzTraceDepth=0;
+#endif
+
+int  zzGuessSeq=0;          /* MR10 */
+int  zzSyntaxErrCount=0;    /* MR11 */
+int  zzLexErrCount=0;       /* MR11 */
+
+void
+#ifdef __USE_PROTOS
+zzresynch(SetWordType *wd,SetWordType mask)
+#else
+zzresynch(wd,mask)
+SetWordType *wd, mask;
+#endif
+{
+	static int consumed = 1;
+
+	/* if you enter here without having consumed a token from last resynch
+	 * force a token consumption.
+	 */
+	if ( !consumed ) {zzCONSUME; consumed=1; return;}   /* MR10 */
+
+	/* if current token is in resynch set, we've got what we wanted */
+	if ( wd[LA(1)]&mask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;}
+	
+	/* scan until we find something in the resynch set */
+	while ( !(wd[LA(1)]&mask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;}
+	consumed=1;
+}
+
+/*                                                                          */
+/*  7-Apr-97 133MR1 for C++ and MR7 for C                                   */
+/*   	     Change suggested by Eli Sternheim (eli@interhdl.com)           */
+/*                                                                          */
+
+void
+#ifdef __USE_PROTOS
+zzconsumeUntil(SetWordType *st)
+#else
+zzconsumeUntil(st)
+SetWordType *st;
+#endif
+{
+    int     tmp;                                                     /* MR7 */
+	while ( !zzset_el( (tmp=LA(1)), st) && tmp!=1 /* Eof */) {       /* MR7 */
+                                                      zzCONSUME; }   /* MR7 */
+}
+
+/*                                                                          */
+/*  7-Apr-97 133MR1 for C++ and MR7 for C                                   */
+/*   	     Change suggested by Eli Sternheim (eli@interhdl.com)           */
+/*                                                                          */
+
+void
+#ifdef __USE_PROTOS
+zzconsumeUntilToken(int t)
+#else
+zzconsumeUntilToken(t)
+int t;
+#endif
+{
+    int     tmp;                                                     /* MR7 */
+	while ( (tmp=LA(1)) !=t && tmp!=1 /* Eof */) { zzCONSUME; }      /* MR7 */
+}
+
+/* input looks like:
+ *		zzFAIL(k, e1, e2, ...,&zzMissSet,&zzMissText,&zzBadTok,&zzBadText)
+ * where the zzMiss stuff is set here to the token that did not match
+ * (and which set wasn't it a member of).
+ */
+
+#ifdef PCCTS_USE_STDARG
+void zzFAIL(int k, ...)
+#else
+void zzFAIL(va_alist)
+va_dcl
+#endif
+{
+#ifdef LL_K
+	static char text[LL_K*ZZLEXBUFSIZE+1];
+	SetWordType *f[LL_K];
+#else
+	static char text[ZZLEXBUFSIZE+1];
+	SetWordType *f[1];
+#endif
+	SetWordType **miss_set;
+	char **miss_text;
+	int *bad_tok;
+	char **bad_text;
+	int *err_k;
+	int i;
+	va_list ap;
+#ifndef PCCTS_USE_STDARG			/* MR20 */
+	int k;
+#endif
+#ifdef PCCTS_USE_STDARG         /* MR20 */
+	va_start(ap, k);
+#else
+	va_start(ap);
+	k = va_arg(ap, int);	/* how many lookahead sets? */
+#endif
+    assert(k <= sizeof(f)/sizeof(f[0]));    /* MR20 G. Hobbelt */
+	text[0] = '\0';
+	for (i=1; i<=k; i++)	/* collect all lookahead sets */
+	{
+		f[i-1] = va_arg(ap, SetWordType *);
+	}
+	for (i=1; i<=k; i++)	/* look for offending token */
+	{
+		if ( i>1 ) strcat(text, " ");
+		strcat(text, LATEXT(i));
+		if ( !zzset_el((unsigned)LA(i), f[i-1]) ) break;
+	}
+	miss_set = va_arg(ap, SetWordType **);
+	miss_text = va_arg(ap, char **);
+	bad_tok = va_arg(ap, int *);
+	bad_text = va_arg(ap, char **);
+	err_k = va_arg(ap, int *);
+	if ( i>k )
+	{
+		/* bad; lookahead is permutation that cannot be matched,
+		 * but, the ith token of lookahead is valid at the ith position
+		 * (The old LL sub 1 (k) versus LL(k) parsing technique)
+		 */
+		*miss_set = NULL;
+		*miss_text = zzlextext;
+		*bad_tok = LA(1);
+		*bad_text = LATEXT(1);
+		*err_k = k;
+		return;
+	}
+/*	fprintf(stderr, "%s not in %dth set\n", zztokens[LA(i)], i);*/
+	*miss_set = f[i-1];
+	*miss_text = text;
+	*bad_tok = LA(i);
+	*bad_text = LATEXT(i);
+	if ( i==1 ) *err_k = 1;
+	else *err_k = k;
+}
+
+#ifdef __USE_PROTOS
+void zzTraceGuessDone(zzantlr_state *state)
+#else
+void zzTraceGuessDone(state)
+  zzantlr_state     *state;
+#endif
+{
+#ifdef zzTRACE_RULES
+#ifdef ZZCAN_GUESS
+
+  int   doIt=0;
+
+  if (zzTraceCurrentRuleName == NULL) return;
+
+  if (zzTraceOptionValue <= 0) {
+    doIt=0;
+  } else if (zzTraceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    fprintf(stderr,"guess done - returning to rule %s {\"%s\"} at depth %d",
+        state->traceCurrentRuleName,
+        LATEXT(1),
+        state->traceDepth);
+    if (state->guessing != 0) {
+      fprintf(stderr," (guess mode continues - an enclosing guess is still active)");
+    } else {
+      fprintf(stderr," (guess mode ends)");
+    };
+    fprintf(stderr,"\n");
+  };
+#endif
+#endif
+}
+
+void
+#ifdef __USE_PROTOS
+zzsave_antlr_state(zzantlr_state *buf)
+#else
+zzsave_antlr_state(buf)
+zzantlr_state *buf;
+#endif
+{
+#ifdef LL_K
+	int     i;
+#endif
+
+#ifdef ZZCAN_GUESS
+	buf->guess_start = zzguess_start;
+	buf->guessing = zzguessing;
+#endif
+	buf->asp = zzasp;
+#ifdef GENAST
+	buf->ast_sp = zzast_sp;
+#endif
+#ifdef ZZINF_LOOK
+	buf->inf_labase = zzinf_labase;
+	buf->inf_last = zzinf_last;
+
+/* MR6 	Gunnar Rxnning (gunnar@candleweb.no)                                */
+/* MR6	  Additional state needs to be saved/restored                       */
+
+  	buf->inf_tokens = zzinf_tokens;                                  /* MR6 */
+	buf->inf_text = zzinf_text;                                      /* MR6 */
+	buf->inf_text_buffer = zzinf_text_buffer;                        /* MR6 */
+	buf->inf_line = zzinf_line;			                             /* MR6 */
+
+#endif
+#ifdef DEMAND_LOOK
+	buf->dirty = zzdirty;
+#endif
+#ifdef LL_K
+	for (i=0; i<LL_K; i++) buf->tokenLA[i] = zztokenLA[i];
+	for (i=0; i<LL_K; i++) strcpy(buf->textLA[i], zztextLA[i]);
+	buf->lap = zzlap;
+	buf->labase = zzlabase;
+#else
+	buf->token = zztoken;
+	strcpy(buf->text, zzlextext);
+#endif
+#ifdef zzTRACE_RULES
+
+    /* MR10 */
+
+    buf->traceOptionValue=zzTraceOptionValue;
+    buf->traceGuessOptionValue=zzTraceGuessOptionValue;
+    buf->traceCurrentRuleName=zzTraceCurrentRuleName;
+    buf->traceDepth=zzTraceDepth;
+#endif
+}
+
+void
+#ifdef __USE_PROTOS
+zzrestore_antlr_state(zzantlr_state *buf)
+#else
+zzrestore_antlr_state(buf)
+zzantlr_state *buf;
+#endif
+{
+
+#ifdef zzTRACE_RULES
+    int     prevTraceOptionValue;
+#endif
+
+#ifdef LL_K
+	int     i;
+#endif
+
+#ifdef ZZCAN_GUESS
+	zzguess_start = buf->guess_start;
+	zzguessing = buf->guessing;
+#endif
+	zzasp = buf->asp;
+#ifdef GENAST
+	zzast_sp = buf->ast_sp;
+#endif
+#ifdef ZZINF_LOOK
+	zzinf_labase = buf->inf_labase;
+	zzinf_last = buf->inf_last;
+
+/* MR6 	Gunnar Rxnning (gunnar@candleweb.no)                                */
+/* MR6	  Additional state needs to be saved/restored                       */
+
+	zzinf_tokens = buf->inf_tokens;                                  /* MR6 */
+	zzinf_text = buf->inf_text;                                      /* MR6 */
+	zzinf_text_buffer = buf->inf_text_buffer;                        /* MR6 */
+	zzinf_line = buf->inf_line;			                             /* MR6 */
+#endif
+#ifdef DEMAND_LOOK
+	zzdirty = buf->dirty;
+#endif
+#ifdef LL_K
+	for (i=0; i<LL_K; i++) zztokenLA[i] = buf->tokenLA[i];
+	for (i=0; i<LL_K; i++) strcpy(zztextLA[i], buf->textLA[i]);
+	zzlap = buf->lap;
+	zzlabase = buf->labase;
+#else
+	zztoken = buf->token;
+	strcpy(zzlextext, buf->text);
+#endif
+#ifdef zzTRACE_RULES
+
+    prevTraceOptionValue=zzTraceOptionValue;
+    zzTraceOptionValue=buf->traceOptionValue;
+    if ( (prevTraceOptionValue > 0) !=
+             (zzTraceOptionValue > 0)) {
+      if (zzTraceOptionValue > 0) {
+        fprintf(stderr,"trace enable restored in rule %s depth %d\n",
+                        zzTraceCurrentRuleName,zzTraceDepth);
+      };
+      if (zzTraceOptionValue <= 0) {
+        fprintf(stderr,"trace disable restored in rule %s depth %d\n",
+                        zzTraceCurrentRuleName,zzTraceDepth);
+      };
+    };
+
+    zzTraceOptionValue=buf->traceOptionValue;            /* MR10 */
+    zzTraceGuessOptionValue=buf->traceGuessOptionValue;  /* MR10 */
+    zzTraceCurrentRuleName=buf->traceCurrentRuleName;    /* MR10 */
+    zzTraceDepth=buf->traceDepth;                        /* MR10 */
+    zzTraceGuessDone(buf);                               /* MR10 */
+#endif
+}
+
+void
+#ifdef __USE_PROTOS
+zzedecode(SetWordType *a)
+#else
+zzedecode(a)
+SetWordType *a;
+#endif
+{
+	register SetWordType *p = a;
+	register SetWordType *endp = &(p[zzSET_SIZE]);
+	register unsigned e = 0;
+
+	if ( zzset_deg(a)>1 ) fprintf(stderr, " {");
+	do {
+		register SetWordType t = *p;
+		register SetWordType *b = &(bitmask[0]);
+		do {
+			if ( t & *b ) fprintf(stderr, " %s", zztokens[e]);
+			e++;
+		} while (++b < &(bitmask[sizeof(SetWordType)*8]));
+	} while (++p < endp);
+	if ( zzset_deg(a)>1 ) fprintf(stderr, " }");
+}
+
+#ifndef USER_ZZSYN
+/* standard error reporting function */
+void
+#ifdef __USE_PROTOS
+zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, char *bad_text)
+#else
+zzsyn(text, tok, egroup, eset, etok, k, bad_text)
+char *text, *egroup, *bad_text;
+int tok;
+int etok;
+int k;
+SetWordType *eset;
+#endif
+{
+	
+    zzSyntaxErrCount++;                             /* MR11 */
+	fprintf(stderr, "line %d: syntax error at \"%s\"", zzline, (tok==zzEOF_TOKEN)?"EOF":bad_text);
+	if ( !etok && !eset ) {fprintf(stderr, "\n"); return;}
+	if ( k==1 ) fprintf(stderr, " missing");
+	else
+	{
+		fprintf(stderr, "; \"%s\" not", bad_text);
+		if ( zzset_deg(eset)>1 ) fprintf(stderr, " in");
+	}
+	if ( zzset_deg(eset)>0 ) zzedecode(eset);
+	else fprintf(stderr, " %s", zztokens[etok]);
+	if ( strlen(egroup) > 0 ) fprintf(stderr, " in %s", egroup);
+	fprintf(stderr, "\n");
+}
+#endif
+
+/* is b an element of set p? */
+int
+#ifdef __USE_PROTOS
+zzset_el(unsigned b, SetWordType *p)
+#else
+zzset_el(b,p)
+unsigned b;
+SetWordType *p;
+#endif
+{
+	return( p[BSETDIVWORD(b)] & bitmask[BSETMODWORD(b)] );
+}
+
+int
+#ifdef __USE_PROTOS
+zzset_deg(SetWordType *a)
+#else
+zzset_deg(a)
+SetWordType *a;
+#endif
+{
+	/* Fast compute degree of a set... the number
+	   of elements present in the set.  Assumes
+	   that all word bits are used in the set
+	*/
+	register SetWordType *p = a;
+	register SetWordType *endp = &(a[zzSET_SIZE]);
+	register int degree = 0;
+
+	if ( a == NULL ) return 0;
+	while ( p < endp )
+	{
+		register SetWordType t = *p;
+		register SetWordType *b = &(bitmask[0]);
+		do {
+			if (t & *b) ++degree;
+		} while (++b < &(bitmask[sizeof(SetWordType)*8]));
+		p++;
+	}
+
+	return(degree);
+}
+
+#ifdef DEMAND_LOOK
+
+#ifdef LL_K
+int
+#ifdef __USE_PROTOS
+_zzmatch(int _t, char **zzBadText, char **zzMissText,
+		int *zzMissTok, int *zzBadTok,
+		SetWordType **zzMissSet)
+#else
+_zzmatch(_t, zzBadText, zzMissText, zzMissTok, zzBadTok, zzMissSet)
+int _t;
+char **zzBadText;
+char **zzMissText;
+int *zzMissTok, *zzBadTok;
+SetWordType **zzMissSet;
+#endif
+{
+	if ( zzdirty==LL_K ) {
+		zzCONSUME;
+	}
+	if ( LA(1)!=_t ) {
+		*zzBadText = *zzMissText=LATEXT(1);	
+		*zzMissTok= _t; *zzBadTok=LA(1);
+		*zzMissSet=NULL;				
+		return 0;
+	}
+	zzMakeAttr						
+	zzdirty++;						
+	zzlabase++;						
+	return 1;
+}
+
+int
+#ifdef __USE_PROTOS
+_zzmatch_wsig(int _t)
+#else
+_zzmatch_wsig(_t)
+int _t;
+#endif
+{
+	if ( zzdirty==LL_K ) {
+		zzCONSUME;
+	}
+	if ( LA(1)!=_t ) {
+		return 0;
+	}
+	zzMakeAttr						
+	zzdirty++;						
+	zzlabase++;						
+	return 1;
+}
+
+#else
+
+int
+#ifdef __USE_PROTOS
+_zzmatch(int _t, char **zzBadText, char **zzMissText,
+		 int *zzMissTok, int *zzBadTok, SetWordType **zzMissSet)
+#else
+_zzmatch(_t, zzBadText, zzMissText, zzMissTok, zzBadTok, zzMissSet)
+int _t;
+char **zzBadText;
+char **zzMissText;
+int *zzMissTok, *zzBadTok;
+SetWordType **zzMissSet;
+#endif
+{								
+	if ( zzdirty ) {zzCONSUME;}		
+	if ( LA(1)!=_t ) {
+		*zzBadText = *zzMissText=LATEXT(1);	
+		*zzMissTok= _t; *zzBadTok=LA(1);
+		*zzMissSet=NULL;				
+		return 0;
+	}								
+	zzdirty = 1;					
+	zzMakeAttr						
+	return 1;
+}
+
+int
+#ifdef __USE_PROTOS
+_zzmatch_wsig(int _t)
+#else
+_zzmatch_wsig(_t)
+int _t;
+#endif
+{
+	if ( zzdirty ) {zzCONSUME;}		
+	if ( LA(1)!=_t ) {
+		return 0;
+	}
+	zzdirty = 1;					
+	zzMakeAttr						
+	return 1;
+}
+
+#endif /*LL_K*/
+
+#else
+
+int
+#ifdef __USE_PROTOS
+_zzmatch(int _t, char **zzBadText, char **zzMissText,
+		int *zzMissTok, int *zzBadTok,
+		SetWordType **zzMissSet)
+#else
+_zzmatch(_t, zzBadText, zzMissText, zzMissTok, zzBadTok, zzMissSet)
+int _t;
+char **zzBadText;
+char **zzMissText;
+int *zzMissTok, *zzBadTok;
+SetWordType **zzMissSet;
+#endif
+{
+	if ( LA(1)!=_t ) {				
+		*zzBadText = *zzMissText=LATEXT(1);	
+		*zzMissTok= _t; *zzBadTok=LA(1);
+		*zzMissSet=NULL;				
+		return 0;
+	}
+	zzMakeAttr
+	return 1;
+}
+
+int
+#ifdef __USE_PROTOS
+_zzmatch_wsig(int _t)
+#else
+_zzmatch_wsig(_t)
+int _t;
+#endif
+{
+	if ( LA(1)!=_t ) return 0;
+	zzMakeAttr						
+	return 1;
+}
+
+#endif /*DEMAND_LOOK*/
+
+#ifdef ZZINF_LOOK
+void
+#ifdef __USE_PROTOS
+_inf_zzgettok(void)
+#else
+_inf_zzgettok()
+#endif
+{
+	if ( zzinf_labase >= zzinf_last )					
+		{NLA = zzEOF_TOKEN; strcpy(NLATEXT, "");}	
+	else {											
+		NLA = zzinf_tokens[zzinf_labase];
+		zzline = zzinf_line[zzinf_labase];	/* wrong in 1.21 */
+		strcpy(NLATEXT, zzinf_text[zzinf_labase]);		
+		zzinf_labase++; 								
+	}												
+}
+#endif
+
+#ifdef ZZINF_LOOK
+/* allocate default size text,token and line arrays;
+ * then, read all of the input reallocing the arrays as needed.
+ * Once the number of total tokens is known, the LATEXT(i) array (zzinf_text)
+ * is allocated and it's pointers are set to the tokens in zzinf_text_buffer.
+ */
+void
+#ifdef __USE_PROTOS
+zzfill_inf_look(void)
+#else
+zzfill_inf_look()
+#endif
+{
+	int tok, line;
+	int zzinf_token_buffer_size = ZZINF_DEF_TOKEN_BUFFER_SIZE;
+	int zzinf_text_buffer_size = ZZINF_DEF_TEXT_BUFFER_SIZE;
+	int zzinf_text_buffer_index = 0;
+	int zzinf_lap = 0;
+
+	/* allocate text/token buffers */
+	zzinf_text_buffer = (char *) malloc(zzinf_text_buffer_size);
+	if ( zzinf_text_buffer == NULL )
+	{
+		fprintf(stderr, "cannot allocate lookahead text buffer (%d bytes)\n",
+		zzinf_text_buffer_size);
+		exit(PCCTS_EXIT_FAILURE);									
+	}
+	zzinf_tokens = (int *) calloc(zzinf_token_buffer_size,sizeof(int));
+	if ( zzinf_tokens == NULL )
+	{
+		fprintf(stderr,	"cannot allocate token buffer (%d tokens)\n",
+				zzinf_token_buffer_size);
+		exit(PCCTS_EXIT_FAILURE);									
+	}
+    zzinf_line = (int *) calloc(zzinf_token_buffer_size,sizeof(int));
+    if ( zzinf_line == NULL )
+    {
+        fprintf(stderr, "cannot allocate line buffer (%d ints)\n",
+                zzinf_token_buffer_size);
+        exit(PCCTS_EXIT_FAILURE);
+	}
+
+	/* get tokens, copying text to text buffer */
+	zzinf_text_buffer_index = 0;
+	do {
+		zzgettok();
+		line = zzreal_line;
+		while ( zzinf_lap>=zzinf_token_buffer_size )
+		{
+			zzinf_token_buffer_size += ZZINF_BUFFER_TOKEN_CHUNK_SIZE;
+			zzinf_tokens = (int *) realloc(zzinf_tokens,
+												 zzinf_token_buffer_size*sizeof(int));
+			if ( zzinf_tokens == NULL )
+			{
+				fprintf(stderr, "cannot allocate lookahead token buffer (%d tokens)\n",
+						zzinf_token_buffer_size);
+				exit(PCCTS_EXIT_FAILURE);
+			}
+            zzinf_line = (int *) realloc(zzinf_line,
+                                         zzinf_token_buffer_size*sizeof(int));
+            if ( zzinf_line == NULL )
+            {
+                fprintf(stderr, "cannot allocate lookahead line buffer (%d ints)\n",
+                        zzinf_token_buffer_size);
+                exit(PCCTS_EXIT_FAILURE);
+			}
+
+		}
+		while ( (zzinf_text_buffer_index+strlen(NLATEXT)+1) >= zzinf_text_buffer_size )
+		{
+			zzinf_text_buffer_size += ZZINF_BUFFER_TEXT_CHUNK_SIZE;
+			zzinf_text_buffer = (char *) realloc(zzinf_text_buffer,
+												 zzinf_text_buffer_size);
+			if ( zzinf_text_buffer == NULL )
+			{
+				fprintf(stderr,	"cannot allocate lookahead text buffer (%d bytes)\n",
+						zzinf_text_buffer_size);
+				exit(PCCTS_EXIT_FAILURE);
+			}
+		}
+		/* record token and text and line of input symbol */
+		tok = zzinf_tokens[zzinf_lap] = NLA;
+		strcpy(&zzinf_text_buffer[zzinf_text_buffer_index], NLATEXT);
+		zzinf_text_buffer_index += strlen(NLATEXT)+1;
+        zzinf_line[zzinf_lap] = line;
+		zzinf_lap++;
+	} while (tok!=zzEOF_TOKEN);
+	zzinf_labase = 0;
+	zzinf_last = zzinf_lap-1;
+
+	/* allocate ptrs to text of ith token */
+	zzinf_text = (char **) calloc(zzinf_last+1,sizeof(char *));
+	if ( zzinf_text == NULL )
+	{
+		fprintf(stderr,	"cannot allocate lookahead text buffer (%d)\n",
+				zzinf_text_buffer_size);
+		exit(PCCTS_EXIT_FAILURE);										
+	}													
+	zzinf_text_buffer_index = 0;
+	zzinf_lap = 0;
+	/* set ptrs so that zzinf_text[i] is the text of the ith token found on input */
+	while (zzinf_lap<=zzinf_last)
+	{
+	    zzinf_text[zzinf_lap++] = &zzinf_text_buffer[zzinf_text_buffer_index];
+		zzinf_text_buffer_index += strlen(&zzinf_text_buffer[zzinf_text_buffer_index])+1;
+	}
+}
+#endif
+
+int
+#ifdef __USE_PROTOS
+_zzsetmatch(SetWordType *e, char **zzBadText, char **zzMissText,
+			int *zzMissTok, int *zzBadTok,
+			SetWordType **zzMissSet,
+			SetWordType *zzTokclassErrset /* MR23 */)
+#else
+_zzsetmatch(e, zzBadText, zzMissText, zzMissTok, zzBadTok, zzMissSet, zzTokclassErrset /* MR23 */)
+SetWordType *e;
+char **zzBadText;
+char **zzMissText;
+int *zzMissTok, *zzBadTok;
+SetWordType **zzMissSet;
+SetWordType *zzTokclassErrset;
+#endif
+{
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	if ( zzdirty==LL_K ) {zzCONSUME;}
+#else
+	if ( zzdirty ) {zzCONSUME;}
+#endif
+#endif
+	if ( !zzset_el((unsigned)LA(1), e) ) {
+		*zzBadText = LATEXT(1); *zzMissText=NULL;
+		*zzMissTok= 0; *zzBadTok=LA(1);
+		*zzMissSet=zzTokclassErrset; /* MR23 */
+		return 0;
+	}
+	zzMakeAttr           /* MR14 Ger Hobbelt (hobbelt@axa.nl) */
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	zzdirty++;
+    zzlabase++;          /* MR14 Ger Hobbelt (hobbelt@axa.nl) */
+#else
+	zzdirty = 1;
+#endif
+#endif
+	return 1;
+}
+
+int
+#ifdef __USE_PROTOS
+_zzmatch_wdfltsig(int tokenWanted, SetWordType *whatFollows)
+#else
+_zzmatch_wdfltsig(tokenWanted, whatFollows)
+int tokenWanted;
+SetWordType *whatFollows;
+#endif
+{
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	if ( zzdirty==LL_K ) {
+			zzCONSUME;
+	}
+#else
+	if ( zzdirty ) {zzCONSUME;}
+#endif
+#endif
+
+	if ( LA(1)!=tokenWanted )
+	{
+        zzSyntaxErrCount++;     /* MR11 */
+		fprintf(stderr,
+				"line %d: syntax error at \"%s\" missing %s\n",
+				zzline,
+				(LA(1)==zzEOF_TOKEN)?"<eof>":(char *)LATEXT(1),
+				zztokens[tokenWanted]);
+		zzconsumeUntil( whatFollows );
+		return 0;
+	}
+	else {
+		zzMakeAttr						
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+		zzdirty++;
+		zzlabase++;
+#else
+		zzdirty = 1;
+#endif
+#else
+/*		zzCONSUME;		 consume if not demand lookahead */
+#endif
+		return 1;
+	}
+}
+
+int
+#ifdef __USE_PROTOS
+_zzsetmatch_wdfltsig(SetWordType *tokensWanted,
+					 int tokenTypeOfSet,
+					 SetWordType *whatFollows)
+#else
+_zzsetmatch_wdfltsig(tokensWanted, tokenTypeOfSet, whatFollows)
+SetWordType *tokensWanted;
+int tokenTypeOfSet;
+SetWordType *whatFollows;
+#endif
+{
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	if ( zzdirty==LL_K ) {zzCONSUME;}
+#else
+	if ( zzdirty ) {zzCONSUME;}
+#endif
+#endif
+	if ( !zzset_el((unsigned)LA(1), tokensWanted) )
+	{
+        zzSyntaxErrCount++;     /* MR11 */
+		fprintf(stderr,
+				"line %d: syntax error at \"%s\" missing %s\n",
+				zzline,
+				(LA(1)==zzEOF_TOKEN)?"<eof>":(char *)LATEXT(1),
+				zztokens[tokenTypeOfSet]);
+		zzconsumeUntil( whatFollows );
+		return 0;
+	}
+	else {
+		zzMakeAttr
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+		zzdirty++;
+		zzlabase++;
+#else
+		zzdirty = 1;
+#endif
+#else
+/*		zzCONSUME;		consume if not demand lookahead */
+#endif
+		return 1;
+	}
+}
+
+int
+#ifdef __USE_PROTOS
+_zzsetmatch_wsig(SetWordType *e)
+#else
+_zzsetmatch_wsig(e)
+SetWordType *e;
+#endif
+{
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	if ( zzdirty==LL_K ) {zzCONSUME;}
+#else
+	if ( zzdirty ) {zzCONSUME;}
+#endif
+#endif
+	if ( !zzset_el((unsigned)LA(1), e) ) return 0;
+	zzMakeAttr           /* MR14 Ger Hobbelt (hobbelt@axa.nl) */
+#ifdef DEMAND_LOOK
+#ifdef LL_K
+	zzdirty++;
+    zzlabase++;          /* MR14 Ger Hobbelt (hobbelt@axa.nl) */
+#else
+	zzdirty = 1;
+#endif
+#endif
+	return 1;
+}
+
+#ifdef USER_ZZMODE_STACK
+static int  zzmstk[ZZMAXSTK] = { -1 };
+static int  zzmdep = 0;
+static char zzmbuf[70];
+
+void
+#ifdef __USE_PROTOS
+zzmpush( int m )
+#else
+zzmpush( m )
+int m;
+#endif
+{
+   if(zzmdep == ZZMAXSTK - 1) {
+     sprintf(zzmbuf, "Mode stack overflow ");
+     zzerr(zzmbuf);
+   } else {
+     zzmstk[zzmdep++] = zzauto;
+     zzmode(m);
+   }
+}
+
+void
+#ifdef __USE_PROTOS
+zzmpop( void )
+#else
+zzmpop( )
+#endif
+{
+   if(zzmdep == 0)
+   {  sprintf(zzmbuf, "Mode stack underflow ");
+      zzerr(zzmbuf);
+   }
+   else
+   {  zzmdep--;
+      zzmode(zzmstk[zzmdep]);
+   }
+}
+
+void
+#ifdef __USE_PROTOS
+zzsave_mode_stack( int modeStack[], int *modeLevel )
+#else
+zzsave_mode_stack( modeStack, modeLevel )
+int modeStack[];
+int *modeLevel;
+#endif
+{
+  int i;
+  memcpy(modeStack, zzmstk, sizeof(zzmstk));
+  *modeLevel = zzmdep;
+  zzmdep = 0;
+
+  return;
+}
+
+void
+#ifdef __USE_PROTOS
+zzrestore_mode_stack( int modeStack[], int *modeLevel )
+#else
+zzrestore_mode_stack( modeStack, modeLevel )
+int modeStack[];
+int *modeLevel;
+#endif
+{
+  int i;
+
+  memcpy(zzmstk, modeStack, sizeof(zzmstk));
+  zzmdep = *modeLevel;
+
+  return;
+}
+#endif /* USER_ZZMODE_STACK */
+
+#ifdef __USE_PROTOS
+void zzTraceReset(void)
+#else
+void zzTraceReset()
+#endif
+{
+#ifdef zzTRACE_RULES
+  zzTraceOptionValue=zzTraceOptionValueDefault;
+  zzTraceGuessOptionValue=1;
+  zzTraceCurrentRuleName=NULL;
+  zzTraceDepth=0;
+#endif
+}
+
+#ifdef __USE_PROTOS
+void zzTraceGuessFail(void)
+#else
+void zzTraceGuessFail()
+#endif
+{
+
+#ifdef zzTRACE_RULES
+#ifdef ZZCAN_GUESS
+
+  int   doIt=0;
+
+  if (zzTraceOptionValue <= 0) {
+    doIt=0;
+  } else if (zzguessing && zzTraceGuessOptionValue <= 0) {
+    doIt=0;
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    fprintf(stderr,"guess failed\n");
+  };
+#endif
+#endif
+}
+
+/* zzTraceOption:
+     zero value turns off trace
+*/
+
+#ifdef __USE_PROTOS
+void zzTraceIn(char * rule)
+#else
+void zzTraceIn(rule)
+  char  *rule;
+#endif
+{
+#ifdef zzTRACE_RULES
+
+  int           doIt=0;
+
+  zzTraceDepth++;
+  zzTraceCurrentRuleName=rule;
+
+  if (zzTraceOptionValue <= 0) {
+    doIt=0;
+#ifdef ZZCAN_GUESS
+  } else if (zzguessing && zzTraceGuessOptionValue <= 0) {
+    doIt=0;
+#endif
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    fprintf(stderr,"enter rule %s {\"%s\"} depth %d",
+            rule,
+            LA(1)==1 ? "@" : (char *) LATEXT(1),    /* MR19 */
+            zzTraceDepth);
+#ifdef ZZCAN_GUESS
+    if (zzguessing) fprintf(stderr," guessing");
+#endif
+    fprintf(stderr,"\n");
+  };
+#endif
+  return;
+}
+
+#ifdef __USE_PROTOS
+void zzTraceOut(char * rule)
+#else
+void zzTraceOut(rule)
+  char  *rule;
+#endif
+{
+#ifdef zzTRACE_RULES
+  int       doIt=0;
+
+  zzTraceDepth--;
+
+  if (zzTraceOptionValue <= 0) {
+    doIt=0;
+#ifdef ZZCAN_GUESS
+  } else if (zzguessing && zzTraceGuessOptionValue <= 0) {
+    doIt=0;
+#endif
+  } else {
+    doIt=1;
+  };
+
+  if (doIt) {
+    fprintf(stderr,"exit rule %s {\"%s\"} depth %d",
+            rule,
+            LA(1)==1 ? "@" : (char *) LATEXT(1), /* MR19 */
+            zzTraceDepth+1);
+#ifdef ZZCAN_GUESS
+    if (zzguessing) fprintf(stderr," guessing");
+#endif
+    fprintf(stderr,"\n");
+  };
+#endif
+}
+
+#ifdef __USE_PROTOS
+int zzTraceOption(int delta)
+#else
+int zzTraceOption(delta)
+  int   delta;
+#endif
+{
+#ifdef zzTRACE_RULES
+    int     prevValue=zzTraceOptionValue;
+
+    zzTraceOptionValue=zzTraceOptionValue+delta;
+
+    if (zzTraceCurrentRuleName != NULL) {
+      if (prevValue <= 0 && zzTraceOptionValue > 0) {
+        fprintf(stderr,"trace enabled in rule %s depth %d\n",
+                                            zzTraceCurrentRuleName,zzTraceDepth);
+      };
+      if (prevValue > 0 && zzTraceOptionValue <= 0) {
+        fprintf(stderr,"trace disabled in rule %s depth %d\n",
+                                            zzTraceCurrentRuleName,zzTraceDepth);
+      };
+    };
+    return  prevValue;
+#else
+    return 0;
+#endif
+}
+
+#ifdef __USE_PROTOS
+int zzTraceGuessOption(int delta)
+#else
+int zzTraceGuessOption(delta)
+  int   delta;
+#endif
+{
+#ifdef zzTRACE_RULES
+#ifdef ZZCAN_GUESS
+    int     prevValue=zzTraceGuessOptionValue;
+
+    zzTraceGuessOptionValue=zzTraceGuessOptionValue+delta;
+
+    if (zzTraceCurrentRuleName != NULL) {
+      if (prevValue <= 0 && zzTraceGuessOptionValue > 0) {
+        fprintf(stderr,"guess trace enabled in rule %s depth %d\n",
+                                                zzTraceCurrentRuleName,zzTraceDepth);
+      };
+      if (prevValue > 0 && zzTraceGuessOptionValue <= 0) {
+        fprintf(stderr,"guess trace disabled in rule %s depth %d\n",
+                                                zzTraceCurrentRuleName,zzTraceDepth);
+      };
+    };
+    return prevValue;
+#else
+    return 0;
+#endif
+#else
+    return 0;
+#endif
+}
+
+#endif /* ERR_H */
diff --git a/Tools/Source/TianoTools/Pccts/h/int.h b/Tools/Source/TianoTools/Pccts/h/int.h
new file mode 100644
index 0000000000..cdcaa92426
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/int.h
@@ -0,0 +1,37 @@
+/* ANTLR attribute definition -- long integers
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * ANTLR 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+#ifndef ZZINT_H
+#define ZZINT_H
+
+typedef long Attrib;
+
+#define zzcr_attr(a,tok,t)	*(a) = atol(t);
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_assert.h b/Tools/Source/TianoTools/Pccts/h/pccts_assert.h
new file mode 100644
index 0000000000..ff0dfb5126
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_assert.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_ASSERT_H__
+#define __PCCTS_ASSERT_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <cassert>
+#else
+#include <assert.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_iostream.h b/Tools/Source/TianoTools/Pccts/h/pccts_iostream.h
new file mode 100644
index 0000000000..972b32cbd1
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_iostream.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_IOSTREAM_H__
+#define __PCCTS_IOSTREAM_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <iostream>
+#else
+#include <iostream.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_istream.h b/Tools/Source/TianoTools/Pccts/h/pccts_istream.h
new file mode 100644
index 0000000000..e25cb8c483
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_istream.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_ISTREAM_H__
+#define __PCCTS_ISTREAM_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <istream>
+#else
+#include <istream.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_setjmp.h b/Tools/Source/TianoTools/Pccts/h/pccts_setjmp.h
new file mode 100644
index 0000000000..9ea185ca73
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_setjmp.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_SETJMP_H__
+#define __PCCTS_SETJMP_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <csetjmp>
+#else
+#include <setjmp.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdarg.h b/Tools/Source/TianoTools/Pccts/h/pccts_stdarg.h
new file mode 100644
index 0000000000..e957430c32
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_stdarg.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_STDARG_H__
+#define __PCCTS_STDARG_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <cstdarg>
+#else
+#include <stdarg.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdio.h b/Tools/Source/TianoTools/Pccts/h/pccts_stdio.h
new file mode 100644
index 0000000000..ac34d1086d
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_stdio.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_STDIO_H__
+#define __PCCTS_STDIO_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <cstdio>
+#else
+#include <stdio.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_stdlib.h b/Tools/Source/TianoTools/Pccts/h/pccts_stdlib.h
new file mode 100644
index 0000000000..f0b344e8dc
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_stdlib.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_STDLIB_H__
+#define __PCCTS_STDLIB_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pccts_string.h b/Tools/Source/TianoTools/Pccts/h/pccts_string.h
new file mode 100644
index 0000000000..458a08a94b
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pccts_string.h
@@ -0,0 +1,10 @@
+#ifndef __PCCTS_STRING_H__
+#define __PCCTS_STRING_H__
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#include <cstring>
+#else
+#include <string.h>
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pcctscfg.h b/Tools/Source/TianoTools/Pccts/h/pcctscfg.h
new file mode 100644
index 0000000000..0c3c5ba6fd
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pcctscfg.h
@@ -0,0 +1,359 @@
+#ifndef PCCTS_CONFIG_H
+#define PCCTS_CONFIG_H
+/*
+ * pcctscfg.h (formerly config.h) (for ANTLR, DLG, and SORCERER)
+ *
+ * This is a simple configuration file that doesn't have config stuff
+ * in it, but it's a start.
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to the Purdue Compiler Construction Tool
+ * Set (PCCTS) -- PCCTS is in the public domain.  An individual or
+ * company may do whatever they wish with source code distributed with
+ * PCCTS or the code generated by PCCTS, including the incorporation of
+ * PCCTS, or its output, into commerical software.
+ *
+ * We encourage users to develop software with PCCTS.  However, we do ask
+ * that credit is given to us for developing PCCTS.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like PCCTS and have developed a nice tool with the
+ * output, please mention that you developed it using PCCTS.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * Used by PCCTS 1.33 (SORCERER 1.00B11 and up)
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1989-2000
+ */
+
+/* This file knows about the following ``environments''
+	UNIX    (default)
+	DOS     (use #define PC)
+	MAC     (use #define MPW; has a few things for THINK C, Metrowerks)
+    MS/C++  (MR14 Microsoft Visual C++ environment uses symbol _MSC_VER)
+
+ */
+
+/* should test __STDC__ for 1, but some compilers don't set value, just def */
+
+#ifndef __USE_PROTOS
+#ifdef __STDC__
+#define __USE_PROTOS
+#endif
+#ifdef __cplusplus
+#define __USE_PROTOS
+#endif
+#endif
+
+#ifdef PCCTS_USE_NAMESPACE_STD
+#define PCCTS_NAMESPACE_STD     namespace std {}; using namespace std;
+#else
+#define PCCTS_NAMESPACE_STD
+#endif
+
+#include "pccts_stdio.h"
+#include "pccts_stdlib.h"
+
+/* largest file name size */
+
+#ifdef _MAX_PATH
+#define MaxFileName		_MAX_PATH /* MR9 RJV: MAX_PATH defined in stdlib.h (MSVC++ 5.0) */
+#else
+#define MaxFileName		300
+#endif
+
+/*
+*  Define PC32 if in a 32-bit PC environment (e.g. extended DOS or Win32).
+*  The macros tested here are defined by Watcom, Microsoft, Borland,
+*  and djgpp, respectively, when they are used as 32-bit compilers.
+*  Users of these compilers *must* be sure to define PC in their
+*  makefiles for this to work correctly.
+*/
+#ifdef PC
+# if (defined(__WATCOMC__) || defined(_WIN32) || defined(__WIN32__) || \
+   defined(__GNUC__) || defined(__GNUG__))
+#     ifndef PC32
+#        define PC32
+#     endif
+#  endif
+#endif
+
+/* MR1  10-Apr-97  Default for PC is short file names			            */
+/* MR1		   Default for non-PC is long file names                		*/
+/* MR1		   Can override via command line option LONGFILENAMES           */
+
+#ifndef LONGFILENAMES
+#ifndef PC
+#define LONGFILENAMES
+#endif
+#endif
+
+#ifndef LONGFILENAMES
+#define ATOKEN_H			"AToken.h"
+#define ATOKPTR_H			"ATokPtr.h"
+#define ATOKPTR_IMPL_H		"ATokPtrIm.h"
+#define ATOKENBUFFER_H		"ATokBuf.h"
+#define ATOKENBUFFER_C      "ATokBuf.cpp"
+#define ATOKENSTREAM_H		"ATokStr.h"
+#define APARSER_H			"AParser.h"
+#define APARSER_C           "AParser.cpp"
+#define ASTBASE_H			"ASTBase.h"
+#define ASTBASE_C           "ASTBase.cpp"
+#define PCCTSAST_C          "PCCTSAST.cpp"
+#define LIST_C              "List.cpp"
+#define DLEXERBASE_H		"DLexBase.h"
+#define DLEXERBASE_C        "DLexBase.cpp"
+#define DLEXER_H            "DLexer.h"
+#define STREESUPPORT_C		"STreeSup.C"
+#else
+#define ATOKEN_H			"AToken.h"
+#define ATOKPTR_H			"ATokPtr.h"
+#define ATOKPTR_IMPL_H		"ATokPtrImpl.h"
+#define ATOKENBUFFER_H		"ATokenBuffer.h"
+#define ATOKENBUFFER_C		"ATokenBuffer.cpp"
+#define ATOKENSTREAM_H		"ATokenStream.h"
+#define APARSER_H			"AParser.h"
+#define APARSER_C			"AParser.cpp"
+#define ASTBASE_H			"ASTBase.h"
+#define ASTBASE_C		    "ASTBase.cpp"
+#define PCCTSAST_C			"PCCTSAST.cpp"
+#define LIST_C				"List.cpp"
+#define DLEXERBASE_H		"DLexerBase.h"
+#define DLEXERBASE_C		"DLexerBase.cpp"
+#define DLEXER_H			"DLexer.h"
+#define STREESUPPORT_C		"STreeSupport.cpp"
+#endif
+
+/* SORCERER Stuff */
+
+/* MR8 6-Aug-97     Change from ifdef PC to ifndef LONGFILENAMES            */
+
+#ifndef LONGFILENAMES
+#define STPARSER_H			"STreePar.h"
+#define STPARSER_C			"STreePar.C"
+#else
+#define STPARSER_H			"STreeParser.h"
+#define STPARSER_C			"STreeParser.cpp"
+#endif
+
+#ifdef MPW
+#define CPP_FILE_SUFFIX		".cp"
+#define CPP_FILE_SUFFIX_NO_DOT	"cp"
+#define OBJ_FILE_SUFFIX		".o"
+#else
+#ifdef PC
+#define CPP_FILE_SUFFIX		".cpp"
+#define CPP_FILE_SUFFIX_NO_DOT	"cpp"
+#define OBJ_FILE_SUFFIX		".obj"
+#else
+#ifdef __VMS
+#define CPP_FILE_SUFFIX		".cpp"
+#define CPP_FILE_SUFFIX_NO_DOT	"cpp"
+#define OBJ_FILE_SUFFIX		".obj"
+#else
+#define CPP_FILE_SUFFIX		".cpp"
+#define CPP_FILE_SUFFIX_NO_DOT	"cpp"
+#define OBJ_FILE_SUFFIX		".o"
+#endif
+#endif
+#endif
+
+/* User may redefine how line information looks */     /* make it #line MR7 */
+/* MR21 Use #ifndef */
+
+#ifndef LineInfoFormatStr
+#define LineInfoFormatStr "#line %d \"%s\"\n"
+#endif
+
+#ifdef MPW	                    /* Macintosh Programmer's Workshop */
+#define ErrHdr "File \"%s\"; Line %d #"
+#else
+#ifdef _MSC_VER                 /* MR14 Microsoft Visual C++ environment */
+#define ErrHdr "%s(%d) :"
+#else
+#define ErrHdr "%s, line %d:"   /* default */
+#endif
+#endif
+
+/* must assume old K&R cpp here, can't use #if defined(..)... */
+
+#ifdef MPW
+#define TopDirectory	":"
+#define DirectorySymbol	":"
+#define OutputDirectoryOption "Directory where all output files should go (default=\":\")"
+#else
+#ifdef PC
+#define TopDirectory	"."
+#define DirectorySymbol	"\\"
+#define OutputDirectoryOption "Directory where all output files should go (default=\".\")"
+#else
+#ifdef __VMS
+#define TopDirectory  "[000000]"
+#define DirectorySymbol       "]"
+#define OutputDirectoryOption "Directory where all output files should go (default=\"[]\")"
+#else
+#define TopDirectory	"."
+#define DirectorySymbol	"/"
+#define OutputDirectoryOption "Directory where all output files should go (default=\".\")"
+#endif
+#endif
+#endif
+
+#ifdef MPW
+
+/* Make sure we have prototypes for all functions under MPW */
+
+#include "pccts_string.h"
+#include "pccts_stdlib.h"
+
+/* MR6 2-Jun-97	Fixes false dependency caused by VC++ #include scanner	*/
+/* MR6		   Reported by Brad Schick (schick@interaccess.com)	*/
+#define	MPW_CursorCtl_Header <CursorCtl.h>
+#include MPW_CursorCtl_Header
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void fsetfileinfo (const char *filename, unsigned long newcreator, unsigned long newtype);
+#ifdef __cplusplus
+}
+#endif
+
+/* File creators for various popular development environments */
+
+#define MAC_FILE_CREATOR 'MPS '   /* MPW Text files */
+#if 0
+#define MAC_FILE_CREATOR 'KAHL'   /* THINK C/Symantec C++ Text files */
+#endif
+#if 0
+#define MAC_FILE_CREATOR 'CWIE'   /* Metrowerks C/C++ Text files */
+#endif
+
+#endif
+
+#ifdef MPW
+#define DAWDLE	SpinCursor(1)
+#else
+#define DAWDLE
+#endif
+
+#ifdef MPW
+#define SPECIAL_INITS
+#define SPECIAL_FOPEN
+#endif
+
+#ifdef MPW
+#ifdef __cplusplus
+inline
+#else
+static
+#endif
+void special_inits()
+{
+  InitCursorCtl((acurHandle) 0);
+}
+#endif
+
+#ifdef MPW
+#ifdef __cplusplus
+inline
+#else
+static
+#endif
+void special_fopen_actions(char * s)
+{
+  fsetfileinfo (s, MAC_FILE_CREATOR, 'TEXT');
+}
+#endif
+
+/* Define usable bits for set.c stuff */
+#define BytesPerWord	sizeof(unsigned)
+#define	WORDSIZE		(sizeof(unsigned)*8)
+#define LogWordSize     (WORDSIZE==16?4:5)
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#if defined(VAXC) || defined(__VMS)
+#include <ssdef.h>
+#define PCCTS_EXIT_SUCCESS 1
+#define PCCTS_EXIT_FAILURE SS$_ABORT
+#define zzDIE		return SS$_ABORT;
+#define zzDONE	return 1;
+
+#else /* !VAXC and !__VMS */
+
+#define PCCTS_EXIT_SUCCESS 0
+#define PCCTS_EXIT_FAILURE 1
+#define zzDIE		return 1;
+#define zzDONE	return 0;
+
+#endif
+
+#ifdef USER_ZZMODE_STACK
+# ifndef ZZSTACK_MAX_MODE
+#  define  ZZSTACK_MAX_MODE 32
+# endif
+# define  ZZMAXSTK (ZZSTACK_MAX_MODE * 2)
+#endif
+
+#ifndef DllExportPCCTS
+#define DllExportPCCTS
+#endif
+
+#ifdef PC
+#ifndef PCCTS_CASE_INSENSITIVE_FILE_NAME
+#define PCCTS_CASE_INSENSITIVE_FILE_NAME
+#endif
+#endif
+
+#ifdef PC32
+#ifndef PCCTS_CASE_INSENSITIVE_FILE_NAME
+#define PCCTS_CASE_INSENSITIVE_FILE_NAME
+#endif
+#endif
+
+#ifdef __VMS
+#ifndef PCCTS_CASE_INSENSITIVE_FILE_NAME
+#define PCCTS_CASE_INSENSITIVE_FILE_NAME
+#endif
+#endif
+
+#ifdef __USE_PROTOS
+#ifndef PCCTS_USE_STDARG
+#define PCCTS_USE_STDARG
+#endif
+#endif
+
+#ifdef __STDC__
+#ifndef PCCTS_USE_STDARG
+#define PCCTS_USE_STDARG
+#endif
+#endif
+
+#ifdef __cplusplus
+#ifndef PCCTS_USE_STDARG
+#define PCCTS_USE_STDARG
+#endif
+#endif
+
+#ifdef _MSC_VER
+/*Turn off the warnings for:
+  unreferenced inline/local function has been removed
+*/
+#pragma warning(disable : 4514)
+/* function not expanded */
+#pragma warning(disable : 4710)
+#endif
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/h/pcnames.bat b/Tools/Source/TianoTools/Pccts/h/pcnames.bat
new file mode 100644
index 0000000000..8784aee9ab
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/pcnames.bat
@@ -0,0 +1,11 @@
+ren aparser.c aparser.cpp
+ren astbase.c astbase.cpp
+ren atokenbu.c atokbuf.cpp
+ren atokenbu.h atokbuf.h
+ren atokenst.h atokstr.h
+ren dlexerba.c dlexbase.cpp
+ren dlexerba.h dlexbase.h
+ren dlexer.c dlexer.cpp
+ren list.c list.cpp
+ren pblackbo.h pblckbox.h
+ren pcctsast.c pcctsast.cpp
diff --git a/Tools/Source/TianoTools/Pccts/h/slist.cpp b/Tools/Source/TianoTools/Pccts/h/slist.cpp
new file mode 100644
index 0000000000..faf2fe4967
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/h/slist.cpp
@@ -0,0 +1,116 @@
+/*
+ * SList.C
+ *
+ * SOFTWARE RIGHTS
+ *
+ * We reserve no LEGAL rights to SORCERER -- SORCERER is in the public
+ * domain.  An individual or company may do whatever they wish with
+ * source code distributed with SORCERER or the code generated by
+ * SORCERER, including the incorporation of SORCERER, or its output, into
+ * commerical software.
+ *
+ * We encourage users to develop software with SORCERER.  However, we do
+ * ask that credit is given to us for developing SORCERER.  By "credit",
+ * we mean that if you incorporate our source code into one of your
+ * programs (commercial product, research project, or otherwise) that you
+ * acknowledge this fact somewhere in the documentation, research report,
+ * etc...  If you like SORCERER and have developed a nice tool with the
+ * output, please mention that you developed it using SORCERER.  In
+ * addition, we ask that this header remain intact in our source code.
+ * As long as these guidelines are kept, we expect to continue enhancing
+ * this system and expect to make other tools available as they are
+ * completed.
+ *
+ * PCCTS 1.33
+ * Terence Parr
+ * Parr Research Corporation
+ * with Purdue University and AHPCRC, University of Minnesota
+ * 1992-2000
+ */
+
+#define ANTLR_SUPPORT_CODE
+
+#include "SList.h"
+#include "pccts_stdarg.h" // MR23
+
+/* Iterate over a list of elements; returns ptr to a new element
+ * in list upon every call and NULL when no more are left.
+ * Very useful like this:
+ *
+ *		cursor = mylist;
+ *		while ( (p=mylist->iterate(&cursor)) ) {
+ *			// place with element p
+ *		}
+ *
+ * The cursor must be initialized to point to the list to iterate over.
+ */
+void *SList::
+iterate(SListNode **cursor)
+{
+	void *e;
+
+	if ( cursor == NULL || *cursor==NULL ) return NULL;
+	if ( head == *cursor ) { *cursor = (*cursor)->next(); }
+	e = (*cursor)->elem();
+	(*cursor) = (*cursor)->next();
+	return e;
+}
+
+/* add an element to end of list. */
+void SList::
+add(void *e)
+{
+	SListNode *p, *tail=NULL;
+	require(e!=NULL, "slist_add: attempting to add NULL list element");
+
+	p = new SListNode;
+	require(p!=NULL, "add: cannot alloc new list node");
+	p->setElem(e);
+	if ( head == NULL )
+	{
+		head = tail = p;
+	}
+	else								/* find end of list */
+	{
+		tail->setNext(p);
+		tail = p;
+	}
+}
+
+void SList::
+lfree()
+{
+	SListNode *p,*q;
+
+	if ( head==NULL ) return;	/* empty list */
+	for (p = head; p!=NULL; p=q)
+	{
+		q = p->next();
+		free(p);
+	}
+}
+
+PCCTS_AST *SList::
+to_ast(SList list)
+{
+	PCCTS_AST *t=NULL, *last=NULL;
+	SListNode *p;
+
+	for (p = head; p!=NULL; p=p->next())
+	{
+		PCCTS_AST *u = (PCCTS_AST *)p->elem();
+		if ( last==NULL ) last = t = u;
+		else { last->setRight(u); last = u; }
+	}
+	return t;
+}
+
+// MR23
+int SList::printMessage(FILE* pFile, const char* pFormat, ...)
+{
+	va_list marker;
+	va_start( marker, pFormat );
+  	int iRet = vfprintf(pFile, pFormat, marker);
+	va_end( marker );
+	return iRet;
+}
diff --git a/Tools/Source/TianoTools/Pccts/history.ps b/Tools/Source/TianoTools/Pccts/history.ps
new file mode 100644
index 0000000000..e2600d5129
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/history.ps
@@ -0,0 +1,473 @@
+%!PS-Adobe-3.0
+%%Creator: groff version 1.06
+%%DocumentNeededResources: font Times-Roman
+%%+ font Times-Italic
+%%+ font Courier
+%%DocumentSuppliedResources: procset grops 1.06 0
+%%Pages: 3
+%%PageOrder: Ascend
+%%Orientation: Portrait
+%%EndComments
+%%BeginProlog
+%%BeginResource: procset grops 1.06 0
+
+/setpacking where {
+	pop
+	currentpacking
+	true setpacking
+} if
+
+/grops 120 dict dup begin 
+
+% The ASCII code of the space character.
+/SC 32 def
+
+/A /show load def
+/B { 0 SC 3 -1 roll widthshow } bind def
+/C { 0 exch ashow } bind def
+/D { 0 exch 0 SC 5 2 roll awidthshow } bind def
+/E { 0 rmoveto show } bind def
+/F { 0 rmoveto 0 SC 3 -1 roll widthshow } bind def
+/G { 0 rmoveto 0 exch ashow } bind def
+/H { 0 rmoveto 0 exch 0 SC 5 2 roll awidthshow } bind def
+/I { 0 exch rmoveto show } bind def
+/J { 0 exch rmoveto 0 SC 3 -1 roll widthshow } bind def
+/K { 0 exch rmoveto 0 exch ashow } bind def
+/L { 0 exch rmoveto 0 exch 0 SC 5 2 roll awidthshow } bind def
+/M { rmoveto show } bind def
+/N { rmoveto 0 SC 3 -1 roll widthshow } bind def
+/O { rmoveto 0 exch ashow } bind def
+/P { rmoveto 0 exch 0 SC 5 2 roll awidthshow } bind def
+/Q { moveto show } bind def 
+/R { moveto 0 SC 3 -1 roll widthshow } bind def
+/S { moveto 0 exch ashow } bind def
+/T { moveto 0 exch 0 SC 5 2 roll awidthshow } bind def
+
+% name size font SF -
+
+/SF {
+	findfont exch
+	[ exch dup 0 exch 0 exch neg 0 0 ] makefont
+	dup setfont
+	[ exch /setfont cvx ] cvx bind def
+} bind def
+
+% name a c d font MF -
+
+/MF {
+	findfont
+	[ 5 2 roll
+	0 3 1 roll % b
+	neg 0 0 ] makefont
+	dup setfont
+	[ exch /setfont cvx ] cvx bind def
+} bind def
+
+/level0 0 def
+/RES 0 def
+/PL 0 def
+/LS 0 def
+
+% Guess the page length.
+% This assumes that the imageable area is vertically centered on the page.
+% PLG - length
+
+/PLG {
+	gsave newpath clippath pathbbox grestore
+	exch pop add exch pop
+} bind def
+
+% BP -
+
+/BP {
+	/level0 save def
+	1 setlinecap
+	1 setlinejoin
+	72 RES div dup scale
+	LS {
+		90 rotate
+	} {
+		0 PL translate
+	} ifelse
+	1 -1 scale
+} bind def
+
+/EP {
+	level0 restore
+	showpage
+} bind def
+
+
+% centerx centery radius startangle endangle DA -
+
+/DA {
+	newpath arcn stroke
+} bind def
+
+% x y SN - x' y'
+% round a position to nearest (pixel + (.25,.25))
+
+/SN {
+	transform 
+	.25 sub exch .25 sub exch
+	round .25 add exch round .25 add exch
+	itransform
+} bind def
+	
+% endx endy startx starty DL -
+% we round the endpoints of the line, so that parallel horizontal
+% and vertical lines will appear even
+
+/DL {
+	SN
+	moveto
+	SN
+	lineto stroke
+} bind def
+
+% centerx centery radius DC -
+
+/DC {
+	newpath 0 360 arc closepath
+} bind def
+
+
+/TM matrix def
+
+%  width height centerx centery DE -
+
+/DE {
+	TM currentmatrix pop
+	translate scale newpath 0 0 .5 0 360 arc closepath
+	TM setmatrix
+} bind def
+
+% these are for splines
+
+/RC /rcurveto load def
+/RL /rlineto load def
+/ST /stroke load def
+/MT /moveto load def
+/CL /closepath load def
+
+% fill the last path
+
+% amount FL -
+
+/FL {
+	currentgray exch setgray fill setgray
+} bind def
+
+% fill with the ``current color''
+
+/BL /fill load def
+
+/LW /setlinewidth load def
+% new_font_name encoding_vector old_font_name RE -
+
+/RE {
+	findfont
+	dup maxlength dict begin
+	{
+		1 index /FID ne { def } { pop pop } ifelse
+	} forall
+	/Encoding exch def
+	dup /FontName exch def
+	currentdict end definefont pop
+} bind def
+
+/DEFS 0 def
+
+% hpos vpos EBEGIN -
+
+/EBEGIN {
+	moveto
+	DEFS begin
+} bind def
+
+/EEND /end load def
+
+/CNT 0 def
+/level1 0 def
+
+% llx lly newwid wid newht ht newllx newlly PBEGIN -
+
+/PBEGIN {
+	/level1 save def
+	translate
+	div 3 1 roll div exch scale
+	neg exch neg exch translate
+	% set the graphics state to default values
+	0 setgray
+	0 setlinecap
+	1 setlinewidth
+	0 setlinejoin
+	10 setmiterlimit
+	[] 0 setdash
+	/setstrokeadjust where {
+		pop
+		false setstrokeadjust
+	} if
+	/setoverprint where {
+		pop
+		false setoverprint
+	} if
+	newpath
+	/CNT countdictstack def
+	userdict begin
+	/showpage {} def
+} bind def
+
+/PEND {
+	clear
+	countdictstack CNT sub { end } repeat
+	level1 restore
+} bind def
+
+end def
+
+/setpacking where {
+	pop
+	setpacking
+} if
+%%EndResource
+%%IncludeResource: font Times-Roman
+%%IncludeResource: font Times-Italic
+%%IncludeResource: font Courier
+grops begin/DEFS 1 dict def DEFS begin/u{.001 mul}bind def end/RES 72 def/PL
+792 def/LS false def/ENC0[/asciicircum/asciitilde/Scaron/Zcaron/scaron/zcaron
+/Ydieresis/trademark/quotesingle/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef
+/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/.notdef/space
+/exclam/quotedbl/numbersign/dollar/percent/ampersand/quoteright/parenleft
+/parenright/asterisk/plus/comma/hyphen/period/slash/zero/one/two/three/four
+/five/six/seven/eight/nine/colon/semicolon/less/equal/greater/question/at/A/B/C
+/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R/S/T/U/V/W/X/Y/Z/bracketleft/backslash
+/bracketright/circumflex/underscore/quoteleft/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q
+/r/s/t/u/v/w/x/y/z/braceleft/bar/braceright/tilde/.notdef/quotesinglbase
+/guillemotleft/guillemotright/bullet/florin/fraction/perthousand/dagger
+/daggerdbl/endash/emdash/ff/fi/fl/ffi/ffl/dotlessi/dotlessj/grave/hungarumlaut
+/dotaccent/breve/caron/ring/ogonek/quotedblleft/quotedblright/oe/lslash
+/quotedblbase/OE/Lslash/.notdef/exclamdown/cent/sterling/currency/yen/brokenbar
+/section/dieresis/copyright/ordfeminine/guilsinglleft/logicalnot/minus
+/registered/macron/degree/plusminus/twosuperior/threesuperior/acute/mu
+/paragraph/periodcentered/cedilla/onesuperior/ordmasculine/guilsinglright
+/onequarter/onehalf/threequarters/questiondown/Agrave/Aacute/Acircumflex/Atilde
+/Adieresis/Aring/AE/Ccedilla/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute
+/Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis
+/multiply/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls
+/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla/egrave/eacute
+/ecircumflex/edieresis/igrave/iacute/icircumflex/idieresis/eth/ntilde/ograve
+/oacute/ocircumflex/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex
+/udieresis/yacute/thorn/ydieresis]def/Courier@0 ENC0/Courier RE/Times-Italic@0
+ENC0/Times-Italic RE/Times-Roman@0 ENC0/Times-Roman RE
+%%EndProlog
+%%Page: 1 1
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 13/Times-Roman@0 SF(The History of PCCTS)228.232 84 Q/F1 11/Times-Roman@0
+SF(The Purdue Compiler)190.468 108 Q(-Construction T)-.22 E(ool Set)-.88 E/F2
+10/Times-Italic@0 SF -.92(Te)262.245 144 S -.37(re).92 G(nce P).37 E(arr)-.8 E
+/F3 10/Times-Roman@0 SF -.15(Pa)234.755 156 S(rr Research Corporation).15 E
+(Minneapolis, Minnesota)239.39 168 Q(and)280.78 180 Q(Uni)239.315 192 Q -.15
+(ve)-.25 G(rsity of Minnesota).15 E
+(Army High Performance Computing Research Center)180.38 204 Q F2
+([Updated 8-7-94])252.31 228 Q F1 .084(The PCCTS project be)97 259.6 R -.055
+(ga)-.165 G 2.834(na).055 G 2.833(sap)220.547 259.6 S(arser)240.876 259.6 Q
+.083(-generator project for a graduate course at Purdue Uni-)-.22 F -.165(ve)72
+275.6 S 1.085(rsity in the F).165 F 1.086
+(all of 1988 taught by Hank Dietz\212 translator)-.165 F 1.086
+(-writing systems.)-.22 F 1.086(Under the guid-)6.586 F .627
+(ance of Professor Dietz, the parser generator)72 291.6 R 3.377(,A)-.44 G .626
+(NTLR \(originally called YUCC\), continued after)285.18 291.6 R .253
+(the termination of the course and e)72 307.6 R -.165(ve)-.275 G .254
+(ntually became the subject of T).165 F .254(erence P)-.77 F(arr')-.165 E 3.004
+(sM)-.605 G(aster')445.083 307.6 Q 3.004(st)-.605 G(hesis.)479.25 307.6 Q
+(Originally)72 323.6 Q 4.092(,l)-.715 G -.165(ex)126.406 323.6 S 1.342
+(ical analysis w).165 F 1.342(as performed via ALX which w)-.11 F 1.342
+(as soon replaced by W)-.11 F 1.341(ill Cohen')-.44 F(s)-.605 E .594
+(DLG in the F)72 339.6 R .594(all of 1989 \(DF)-.165 F .595(A-based le)-.814 F
+.595(xical-analyzer generator)-.165 F 3.345(,a)-.44 G .595(lso an of)367.188
+339.6 R .595(fshoot of the graduate)-.275 F(translation course\).)72 355.6 Q
+.877(The alpha v)97 375.2 R .877(ersion of ANTLR w)-.165 F .877(as totally re)
+-.11 F .876(written resulting in 1.00B.)-.275 F -1.221(Ve)6.376 G .876
+(rsion 1.00B w)1.221 F(as)-.11 E 1.577(released via an internet ne)72 391.2 R
+1.577(wsgroup \(comp.compilers\) posting in February of 1990 and quickly)-.275
+F -.055(ga)72 407.2 S .356(thered a lar).055 F .356(ge follo)-.198 F 3.106
+(wing. 1.00B)-.275 F .356(generated only LL\(1\) parsers, b)3.106 F .356
+(ut allo)-.22 F .356(wed the mer)-.275 F .356(ged descrip-)-.198 F 1.859
+(tion of le)72 423.2 R 1.859(xical and syntactic analysis.)-.165 F 1.86
+(It had rudimentary attrib)7.359 F 1.86(ute handling similar to that of)-.22 F
+-.55 -1.32(YA C)72 439.2 T 3.549(Ca)1.32 G .799
+(nd did not incorporate rule parameters or return v)109.231 439.2 R .798
+(alues; do)-.275 F(wnw)-.275 E .798(ard inheritance w)-.11 F .798(as v)-.11 F
+(ery)-.165 E -.165(aw)72 455.2 S(kw).165 E 6.433(ard. 1.00B-generated)-.11 F
+3.684(parsers terminated upon the \214rst syntax error)6.433 F 9.184(.L)-.605 G
+-.165(ex)440.916 455.2 S 3.684(ical classes).165 F(\(modes\) were not allo)72
+471.2 Q(wed and DLG did not ha)-.275 E .33 -.165(ve a)-.22 H 2.75(ni).165 G
+(nteracti)305.959 471.2 Q .33 -.165(ve m)-.275 H(ode.).165 E .831
+(Upon starting his Ph.D. at Purdue in the F)97 490.8 R .83(all of 1990, T)-.165
+F .83(erence P)-.77 F .83(arr be)-.165 F -.055(ga)-.165 G 3.58(nt).055 G .83
+(he second total)436.351 490.8 R(re)72 506.8 Q 1.646(write of ANTLR.)-.275 F
+1.646(The method by which grammars may be practically analyzed to generate)
+7.146 F/F4 11/Times-Italic@0 SF(LL)72.638 522.8 Q F1(\().583 E F4(k).396 E F1
+3.849(\)l).737 G 1.099(ookahead information w)105.703 522.8 R 1.099(as disco)
+-.11 F -.165(ve)-.165 G 1.099(red in August of 1990 just before his return.)
+.165 F -1.221(Ve)6.598 G(rsion)1.221 E .626
+(1.00 incorporated this algorithm and included the AST mechanism, le)72 538.8 R
+.626(xical classes, error classes,)-.165 F .354(and automatic error reco)72
+554.8 R -.165(ve)-.165 G .353(ry; code quality and portability were higher).165
+F 5.853(.I)-.605 G 3.103(nF)395.965 554.8 S .353(ebruary of 1992 1.00)410.684
+554.8 R -.11(wa)72 570.8 S 2.76(sr).11 G .01
+(eleased via an article in SIGPLAN Notices.)95.418 570.8 R .01
+(Peter Dahl, Ph.D. candidate, and Professor Matt)5.51 F(O'K)72 586.8 Q 2.074
+(eefe \(both at the Uni)-.275 F -.165(ve)-.275 G 2.073
+(rsity of Minnesota\) tested this v).165 F 2.073(ersion e)-.165 F(xtensi)-.165
+E -.165(ve)-.275 G(ly).165 E 7.573(.D)-.715 G 2.073(ana Hogg)448.522 586.8 R
+(att)-.055 E .078(\(Micro Data Base Systems, Inc.\) came up with the idea of e\
+rror grouping \(strings attached to non-)72 602.8 R
+(terminals\) and tested 1.00 hea)72 618.8 Q(vily)-.22 E(.)-.715 E -1.221(Ve)97
+638.4 S .878(rsion 1.06 w)1.221 F .877
+(as released in December 1992 and represented a lar)-.11 F .877
+(ge feature enhancement)-.198 F -.165(ove)72 654.4 S 3.648(r1).165 G 3.648
+(.00. F)100.365 654.4 R .898(or e)-.165 F .899
+(xample, rudimentary semantic predicates were introduced, error messages were)
+-.165 F 2.281(signi\214cantly impro)72 670.4 R -.165(ve)-.165 G 5.031(df).165 G
+(or)181.953 670.4 Q F4(k)5.427 E F1 2.281
+(>1 lookahead and ANTLR parsers could indicate that lookahead).737 F 1.381
+(fetches were to occur only when necessary for the parse \(normally)72 686.4 R
+4.131(,t)-.715 G 1.381(he lookahead `)387.051 686.4 R(`pipe')-.814 E 4.132('w)
+-.814 G(as)494.837 686.4 Q 1.182(constantly full\).)72 702.4 R 1.182
+(Russell Quong joined the project in the Spring of 1992 to aid in the semantic)
+6.682 F .681(predicate design.)72 718.4 R(Be)6.181 E .681(ginning and adv)-.165
+F .682(anced tutorials were created and released as well.)-.275 F 3.432(Am)
+6.182 G(ak)485.179 718.4 Q(e-)-.11 E .993(\214le generator w)72 734.4 R .993
+(as included that sets up dependencies and such correctly for ANTLR and DLG.)
+-.11 F EP
+%%Page: 2 2
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 11/Times-Roman@0 SF 2.75(-2-)278.837 52 S -1.221(Ve)72 88 S 1.414(ry fe)
+1.221 F 4.164(w1)-.275 G 1.414(.00 incompatibilities were introduced \(1.00 w)
+122.81 88 R 1.415(as quite dif)-.11 F 1.415(ferent from 1.00B in some)-.275 F
+(areas\).)72 104 Q 1.089(1.10 w)97 123.6 R 1.088
+(as released on August 31, 1993 and incorporated b)-.11 F 1.088(ug \214x)-.22 F
+1.088(es, a fe)-.165 F 3.838(wf)-.275 G 1.088(eature enhance-)433.59 123.6 R
+3.112(ments and a major ne)72 139.6 R 5.863(wc)-.275 G(apability \212)196.957
+139.6 Q 3.113(an arbitrary lookahead operator \(syntactic predicate\),)5.863 F
+/F1 11/Courier@0 SF(\(alpha\)?beta)72 155.6 Q F0 6.754(.T)C 1.254
+(his feature w)167.425 155.6 R 1.254
+(as co-designed with Professor Russell Quong also at Purdue.)-.11 F 3.297 -.88
+(To s)72 171.6 T 1.537
+(upport in\214nite lookahead, a preprocessor \215ag, ZZINF_LOOK, w).88 F 1.537
+(as created that forced the)-.11 F .21(ANTLR\(\) macro to tok)72 187.6 R .21
+(enize all input prior to parsing.)-.11 F .209(Hence, at an)5.709 F 2.959(ym)
+-.165 G .209(oment, an action or predi-)389.215 187.6 R .936
+(cate can see the entire input sentence.)72 203.6 R .936
+(The predicate mechanism of 1.06 w)6.436 F .937(as e)-.11 F .937
+(xtended to allo)-.165 F(w)-.275 E .55
+(multiple predicates to be hoisted; the syntactic conte)72 219.6 R .55
+(xt of a predicate w)-.165 F .55(as also mo)-.11 F -.165(ve)-.165 G 3.299(da)
+.165 G .549(long with)461.585 219.6 R(the predicate.)72 235.6 Q .754
+(In February of 1994, SORCERER \(a simple tree-parser generator\) w)97 255.2 R
+.755(as released.)-.11 F .755(This tool)6.255 F(allo)72 271.2 Q .6(ws the user\
+ to parse child-sibling trees by specifying a grammar rather than b)-.275 F
+.599(uilding a recur)-.22 F(-)-.22 E(si)72 287.2 Q -.165(ve)-.275 G 1.39
+(-descent tree w).165 F(alk)-.11 E 1.391(er by hand.)-.11 F -.88(Wo)6.891 G
+1.391(rk to).88 F -.11(wa)-.275 G 1.391
+(rds a library of tree transformations is underw).11 F(ay)-.11 E(.)-.715 E .581
+(Aaron Sa)72 303.2 R(wde)-.165 E 3.331(ya)-.165 G 3.331(tT)145.531 303.2 S .581
+(he Uni)158.641 303.2 R -.165(ve)-.275 G .58
+(rsity of Minnesota became a second author of SORCERER after the).165 F
+(initial release.)72 319.2 Q .627(On April 1, 1994, PCCTS 1.20 w)97 338.8 R
+.627(as released.)-.11 F .627(This w)6.127 F .627(as the \214rst v)-.11 F .627
+(ersion to acti)-.165 F -.165(ve)-.275 G .627(ly support).165 F 1.664
+(C++ output.)72 354.8 R 1.664(It also included important \214x)7.164 F 1.663
+(es re)-.165 F -.055(ga)-.165 G 1.663
+(rding semantic predicates and \(..\)+ subrules.).055 F(This v)72 370.8 Q
+(ersion also introduced tok)-.165 E(en classes, the `)-.11 E(`)-.814 E/F2 11
+/Times-Italic@0 SF(not)A F0 1.628 -.814('' o)D(perator).814 E 2.75(,a)-.44 G
+(nd tok)355.294 370.8 Q(en ranges.)-.11 E .764
+(On June 19, 1994, SORCERER 1.00B9 w)97 390.4 R .765(as released.)-.11 F .765
+(Gary Funck of Intrepid T)6.265 F(echnology)-.77 E .807
+(joined the SORCERER team and pro)72 406.4 R .807(vided v)-.165 F .807(ery v)
+-.165 F .807(aluable suggestions re)-.275 F -.055(ga)-.165 G .806(rding the `)
+.055 F(`transform')-.814 E(')-.814 E(mode of SORCERER.)72 422.4 Q 1.137
+(On August 8, 1994, PCCTS 1.21 w)97 442 R 1.137(as released.)-.11 F 1.138
+(It mainly cleaned up the C++ output and)6.637 F(included a number of b)72 458
+Q(ug \214x)-.22 E(es.)-.165 E .316(From the 1.21 release forw)97 477.6 R .316
+(ard, the maintenance and support of all PCCTS tools will be pri-)-.11 F 1.557
+(marily pro)72 493.6 R 1.557(vided by P)-.165 F 1.557
+(arr Research Corporation, Minneapolis MN---an or)-.165 F -.055(ga)-.198 G
+1.558(nization founded on).055 F 1.616(the principles of e)72 509.6 R 1.616
+(xcellence in research and inte)-.165 F 1.616(grity in b)-.165 F 1.616
+(usiness; we are de)-.22 F -.22(vo)-.275 G 1.616(ted to pro).22 F(viding)-.165
+E 1.202(really cool softw)72 525.6 R 1.202(are tools.)-.11 F 1.202
+(Please see \214le PCCTS.FUTURE for more information.)6.702 F 1.203(All PCCTS)
+6.703 F(tools currently in the public domain will continue to be in the public\
+ domain.)72 541.6 Q 1.198(Looking to)97 561.2 R -.11(wa)-.275 G 1.198
+(rds the future, a graphical user).11 F(-interf)-.22 E 1.197
+(ace is in the design phase.)-.11 F 1.197(This w)6.697 F(ould)-.11 E(allo)72
+577.2 Q 2.753(wu)-.275 G .003(sers to vie)104.42 577.2 R 2.753(wt)-.275 G .004
+(he syntax diagram representation of their grammars and w)162.509 577.2 R .004
+(ould highlight non-)-.11 F 1.181(deterministic productions.)72 593.2 R -.165
+(Pa)6.681 G 1.18(rsing can be traced graphically as well.).165 F 1.18
+(This system will be b)6.68 F(uilt)-.22 E .167(using a multiplatform windo)72
+609.2 R 2.917(wl)-.275 G(ibrary)211.73 609.2 Q 5.667(.W)-.715 G 2.917(ea)
+255.204 609.2 S .168(lso anticipate the introduction of a sophisticated error)
+267.889 609.2 R(handling mechanism called `)72 625.2 Q(`parser e)-.814 E
+(xception handling')-.165 E 2.75('i)-.814 G 2.75(nan)327.431 625.2 S
+(ear future release.)348.815 625.2 Q(Currently)97 644.8 Q 3.019(,P)-.715 G .269
+(CCTS is used at o)150.333 644.8 R -.165(ve)-.165 G 3.019(r1).165 G .269
+(000 kno)253.098 644.8 R .268(wn academic, go)-.275 F -.165(ve)-.165 G .268
+(rnment, and commercial sites).165 F .859(in 37 countries.)72 660.8 R .859
+(Of course, the true number of users is unkno)6.359 F .859(wn due to the lar)
+-.275 F .859(ge number of ftp)-.198 F(sites.)72 676.8 Q EP
+%%Page: 3 3
+%%BeginPageSetup
+BP
+%%EndPageSetup
+/F0 11/Times-Roman@0 SF 2.75(-3-)278.837 52 S(Credits)272.11 88 Q .44 LW
+472.162 103.75 103.838 103.75 DL(Idea/T)134.236 117 Q 52.987(ool Coder)-.88 F
+(Co-designer\(s\))345.436 117 Q 281.334 103.75 281.334 124.75 DL 209.273 103.75
+209.273 124.75 DL 209.273 124.75 103.838 124.75 DL 103.838 126.75 209.273
+126.75 DL 281.334 124.75 209.273 124.75 DL 209.273 126.75 281.334 126.75 DL
+472.162 124.75 281.334 124.75 DL 281.334 126.75 472.162 126.75 DL(ANTLR 1.00A)
+109.338 140 Q -.77(Te)217.523 140 S(rence P).77 E 13.75(arr Hank)-.165 F(Dietz)
+2.75 E 82.83(ALX T)109.338 156 R(erence P)-.77 E 13.75(arr Hank)-.165 F(Dietz)
+2.75 E(ANTLR 1.00B)109.338 172 Q -.77(Te)217.523 172 S(rence P).77 E 13.75
+(arr Hank)-.165 F(Dietz, W)2.75 E(ill Cohen)-.44 E(DLG 1.00B)109.338 188 Q -.44
+(Wi)217.523 188 S(ll Cohen).44 E -.77(Te)289.584 188 S(rence P).77 E(arr)-.165
+E 2.75(,H)-.44 G(ank Dietz)358.147 188 Q(NF)109.338 204 Q 2.75(AR)-.814 G
+30.778(elabelling W)140.611 204 R(ill Cohen)-.44 E/F1 11/Times-Italic@0 SF(LL)
+109.976 220 Q F0(\().583 E F1(k).396 E F0 2.75(\)a).737 G 40.447(nalysis T)
+143.768 220 R(erence P)-.77 E 13.75(arr Hank)-.165 F(Dietz)2.75 E(ANTLR 1.00)
+109.338 236 Q -.77(Te)217.523 236 S(rence P).77 E 13.75(arr Hank)-.165 F
+(Dietz, W)2.75 E(ill Cohen)-.44 E(DLG 1.00)109.338 252 Q -.44(Wi)217.523 252 S
+(ll Cohen).44 E -.77(Te)289.584 252 S(rence P).77 E(arr)-.165 E 2.75(,H)-.44 G
+(ank Dietz)358.147 252 Q(ANTLR 1.06)109.338 268 Q -.77(Te)217.523 268 S
+(rence P).77 E 13.75(arr W)-.165 F(ill Cohen, Russell Quong, Hank Dietz)-.44 E
+(DLG 1.06)109.338 284 Q -.44(Wi)217.523 284 S(ll Cohen).44 E -.77(Te)289.584
+284 S(rence P).77 E(arr)-.165 E 2.75(,H)-.44 G(ank Dietz)358.147 284 Q
+(ANTLR 1.10)109.338 300 Q -.77(Te)217.523 300 S(rence P).77 E 13.75(arr W)-.165
+F(ill Cohen, Russell Quong)-.44 E(ANTLR 1.20)109.338 316 Q -.77(Te)217.523 316
+S(rence P).77 E 13.75(arr W)-.165 F(ill Cohen, Russell Quong)-.44 E(ANTLR 1.21)
+109.338 332 Q -.77(Te)217.523 332 S(rence P).77 E 13.75(arr Russell)-.165 F
+(Quong)2.75 E(DLG 1.10)109.338 348 Q -.44(Wi)217.523 348 S(ll Cohen).44 E -.77
+(Te)289.584 348 S(rence P).77 E(arr)-.165 E(DLG 1.20)109.338 364 Q -.44(Wi)
+217.523 364 S(ll Cohen).44 E -.77(Te)289.584 364 S(rence P).77 E(arr)-.165 E
+(DLG 1.21)109.338 380 Q -.77(Te)217.523 380 S(rence P).77 E(arr)-.165 E
+(Semantic predicates)109.338 396 Q -.77(Te)217.523 396 S(rence P).77 E 13.75
+(arr Russell)-.165 F(Quonq)2.75 E(Syntactic predicates)109.338 412 Q -.77(Te)
+217.523 412 S(rence P).77 E 13.75(arr Russell)-.165 F(Quonq)2.75 E
+(SORCERER 1.00A)109.338 428 Q -.77(Te)217.523 428 S(rence P).77 E(arr)-.165 E
+(SORCERER 1.00B)109.338 444 Q -.77(Te)217.523 444 S(rence P).77 E 13.75
+(arr Aaron)-.165 F(Sa)2.75 E(wde)-.165 E(y)-.165 E(SORCERER 1.00B9)109.338 460
+Q -.77(Te)217.523 460 S(rence P).77 E 13.75(arr Aaron)-.165 F(Sa)2.75 E(wde)
+-.165 E 1.43 -.715(y, G)-.165 H(ary Funck).715 E 472.162 467.75 103.838 467.75
+DL 472.162 103.75 472.162 467.75 DL 103.838 103.75 103.838 467.75 DL EP
+%%Trailer
+end
+%%EOF
diff --git a/Tools/Source/TianoTools/Pccts/history.txt b/Tools/Source/TianoTools/Pccts/history.txt
new file mode 100644
index 0000000000..89ad8408c9
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/history.txt
@@ -0,0 +1,186 @@
+
+
+
+                    The History of PCCTS
+
+         The Purdue Compiler-Construction Tool Set
+
+
+                        Terence Parr
+                 Parr Research Corporation
+                   Minneapolis, Minnesota
+                            and
+                  University of Minnesota
+      Army High Performance Computing Research Center
+
+                      [Updated 8-7-94]
+
+
+     The PCCTS project began as a parser-generator project for a  gra-
+duate  course  at Purdue University in the Fall of 1988 taught by Hank
+Dietz- translator-writing systems.  Under the  guidance  of  Professor
+Dietz, the parser generator, ANTLR (originally called YUCC), continued
+after the termination of the course and eventually became the  subject
+of  Terence  Parr's Master's thesis.  Originally, lexical analysis was
+performed via ALX which was soon replaced by Will Cohen's DLG  in  the
+Fall  of  1989 (DFA-based lexical-analyzer generator, also an offshoot
+of the graduate translation course).
+
+     The alpha version of ANTLR was  totally  rewritten  resulting  in
+1.00B.    Version   1.00B  was  released  via  an  internet  newsgroup
+(comp.compilers) posting in February of 1990 and  quickly  gathered  a
+large  following.  1.00B generated only LL(1) parsers, but allowed the
+merged description of lexical and syntactic analysis.  It had rudimen-
+tary  attribute  handling  similar  to that of YACC and did not incor-
+porate rule parameters or return values; downward inheritance was very
+awkward.   1.00B-generated  parsers  terminated  upon the first syntax
+error.  Lexical classes (modes) were not allowed and DLG did not  have
+an interactive mode.
+
+     Upon starting his Ph.D. at Purdue in the Fall  of  1990,  Terence
+Parr  began  the  second  total rewrite of ANTLR.  The method by which
+grammars may be  practically  analyzed  to  generate  LL(k)  lookahead
+information  was  discovered in August of 1990 just before his return.
+Version 1.00 incorporated this algorithm and included the AST  mechan-
+ism,  lexical  classes,  error  classes, and automatic error recovery;
+code quality and portability were higher.  In February  of  1992  1.00
+was  released  via  an  article in SIGPLAN Notices.  Peter Dahl, Ph.D.
+candidate, and Professor Matt O'Keefe (both at the University of  Min-
+nesota)  tested  this  version  extensively.  Dana Hoggatt (Micro Data
+Base Systems, Inc.) came up with the idea of error  grouping  (strings
+attached to non-terminals) and tested 1.00 heavily.
+
+     Version 1.06 was released in  December  1992  and  represented  a
+large  feature enhancement over 1.00.  For example, rudimentary seman-
+tic predicates were  introduced,  error  messages  were  significantly
+improved  for k>1 lookahead and ANTLR parsers could indicate that loo-
+kahead fetches were  to  occur  only  when  necessary  for  the  parse
+
+
+
+                                                                Page 1
+
+                                                                 PCCTS
+
+
+(normally,  the  lookahead "pipe" was constantly full).  Russell Quong
+joined the project in the Spring of 1992 to aid in the semantic predi-
+cate  design.   Beginning  and  advanced  tutorials  were  created and
+released as well.  A makefile generator  was  included  that  sets  up
+dependencies  and  such  correctly  for  ANTLR and DLG.  Very few 1.00
+incompatibilities were introduced (1.00 was quite different from 1.00B
+in some areas).
+
+     1.10 was released on August 31, 1993 and incorporated bug  fixes,
+a  few  feature enhancements and a major new capability - an arbitrary
+lookahead operator (syntactic predicate), (alpha)?beta.  This  feature
+was  co-designed with Professor Russell Quong also at Purdue.  To sup-
+port infinite lookahead, a preprocessor flag, ZZINF_LOOK, was  created
+that  forced the ANTLR() macro to tokenize all input prior to parsing.
+Hence, at any moment, an action or predicate can see the entire  input
+sentence.   The predicate mechanism of 1.06 was extended to allow mul-
+tiple predicates to be hoisted; the syntactic context of  a  predicate
+was also moved along with the predicate.
+
+     In February of 1994, SORCERER (a  simple  tree-parser  generator)
+was  released.  This tool allows the user to parse child-sibling trees
+by specifying a grammar rather than building a recursive-descent  tree
+walker  by  hand.   Work  towards a library of tree transformations is
+underway.  Aaron Sawdey at The University of Minnesota became a second
+author of SORCERER after the initial release.
+
+     On April 1, 1994, PCCTS 1.20 was released.  This  was  the  first
+version  to  actively  support C++ output.  It also included important
+fixes regarding semantic predicates and (..)+ subrules.  This  version
+also introduced token classes, the "not" operator, and token ranges.
+
+     On June 19, 1994, SORCERER 1.00B9 was released.   Gary  Funck  of
+Intrepid  Technology  joined the SORCERER team and provided very valu-
+able suggestions regarding the "transform" mode of SORCERER.
+
+     On August 8, 1994, PCCTS 1.21 was released.  It mainly cleaned up
+the C++ output and included a number of bug fixes.
+
+     From the 1.21 release forward, the maintenance and support of all
+PCCTS  tools  will be primarily provided by Parr Research Corporation,
+Minneapolis MN---an organization founded on the principles  of  excel-
+lence in research and integrity in business; we are devoted to provid-
+ing really cool software tools.  Please see file PCCTS.FUTURE for more
+information.  All PCCTS tools currently in the public domain will con-
+tinue to be in the public domain.
+
+     Looking towards the future, a graphical user-interface is in  the
+design  phase.   This  would  allow  users  to view the syntax diagram
+representation of their grammars and would highlight  nondeterministic
+productions.   Parsing can be traced graphically as well.  This system
+will be built using a multiplatform window library.  We  also  antici-
+pate  the  introduction  of  a  sophisticated error handling mechanism
+called "parser exception handling" in a near future release.
+
+
+
+
+                                                                Page 2
+
+                                                                 PCCTS
+
+
+     Currently, PCCTS is used at over 1000 known academic, government,
+and  commercial  sites in 37 countries.  Of course, the true number of
+users is unknown due to the large number of ftp sites.
+                               Credits
+
+_____________________________________________________________________________
+_____________________________________________________________________________
+|ANTLR 1.00A            Terence Parr   Hank Dietz                           |
+|ALX                    Terence Parr   Hank Dietz                           |
+|ANTLR 1.00B            Terence Parr   Hank Dietz, Will Cohen               |
+|DLG 1.00B              Will Cohen     Terence Parr, Hank Dietz             |
+|NFA Relabelling        Will Cohen                                          |
+|LL(k) analysis         Terence Parr   Hank Dietz                           |
+|ANTLR 1.00             Terence Parr   Hank Dietz, Will Cohen               |
+|DLG 1.00               Will Cohen     Terence Parr, Hank Dietz             |
+|ANTLR 1.06             Terence Parr   Will Cohen, Russell Quong, Hank Dietz|
+|DLG 1.06               Will Cohen     Terence Parr, Hank Dietz             |
+|ANTLR 1.10             Terence Parr   Will Cohen, Russell Quong            |
+|ANTLR 1.20             Terence Parr   Will Cohen, Russell Quong            |
+|ANTLR 1.21             Terence Parr   Russell Quong                        |
+|DLG 1.10               Will Cohen     Terence Parr                         |
+|DLG 1.20               Will Cohen     Terence Parr                         |
+|DLG 1.21               Terence Parr                                        |
+|Semantic predicates    Terence Parr   Russell Quonq                        |
+|Syntactic predicates   Terence Parr   Russell Quonq                        |
+|SORCERER 1.00A         Terence Parr                                        |
+|SORCERER 1.00B         Terence Parr   Aaron Sawdey                         |
+|SORCERER 1.00B9        Terence Parr   Aaron Sawdey, Gary Funck             |
+|___________________________________________________________________________|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                Page 3
+
diff --git a/Tools/Source/TianoTools/Pccts/makefile b/Tools/Source/TianoTools/Pccts/makefile
new file mode 100644
index 0000000000..f9b2dd2b9b
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/makefile
@@ -0,0 +1,66 @@
+#
+# Main makefile for PCCTS 1.33MR33	/* MRXXX */
+#
+# Terence Parr
+# Parr Research Corporation
+#
+# verbosity versus silence...
+PSss=
+#
+# this can be set to /user/local/bin etc...
+BINDIR=bin
+# This part added by Thomas Herter, M"unchen, Germany. See also manpages
+# target.
+MANDIR=$(HOME)/man
+MANEXT=1
+MANFILES=dlg/dlg.1 antlr/antlr.1
+
+#CC=cc
+#CC=gcc
+#COPT=-O2
+
+pccts:
+	@echo " "
+	@echo "             Welcome to PCCTS 1.33MR33 installation"
+	@echo " "
+	@echo "             (Version 1.33 Maintenance Release #33)" # mrxxx
+	@echo " "
+	@echo "                  Released 19 April 2002"
+	@echo " "
+	@echo "                        Featuring"
+	@echo "         ANTLR     -- ANother Tool for Language Recognition"
+	@echo "         DLG       -- DFA-based Lexical Analyzer Generator"
+	@echo "         SORCERER  -- Source-to-source translator (tree walker)" 
+	@echo " "
+	@echo "                  http://www.antlr.org"	
+	@echo " "
+	@echo "             Trouble reports to tmoog@polhode.com"
+	@echo "             Additional PCCTS 1.33 information at"
+	@echo "                  http://www.polhode.com"
+	@echo
+	@echo
+	@echo "To substitute gcc for CC to invoke compiler: make CC=gcc"
+	@echo "If there are problems with cr and lf try: unzip -a ..."
+	@echo
+#
+	@if [ ! -d $(BINDIR) ] ; then mkdir $(BINDIR) ; fi
+	@echo Making executables...
+	(cd ./antlr; $(MAKE) CC="$(CC)" COPT="$(COPT)")
+	@echo antlr executable now in $(BINDIR)
+	(cd ./dlg; $(MAKE) CC="$(CC)" COPT="$(COPT)")
+	@echo dlg executable now in $(BINDIR)
+	@echo
+	@echo "       PCCTS 1.33MR33 installation complete"  # MRXXX
+
+clean:
+	(cd ./antlr; $(MAKE) -s clean)
+	(cd ./dlg; $(MAKE) -s clean)
+
+
+manpages:
+	# mkdir -p $(MANDIR)/man$(MANEXT)
+	if [ ! -d $(MANDIR) ] ; then \
+	  mkdir $(MANDIR) ; fi
+	if [ ! -d $(MANDIR)/man$(MANEXT) ] ; then \
+	  mkdir $(MANDIR)/man$(MANEXT); fi
+	cp -p $(MANFILES) $(MANDIR)/man$(MANEXT)
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/genmk.c b/Tools/Source/TianoTools/Pccts/support/genmk/genmk.c
new file mode 100644
index 0000000000..4952a30b38
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/genmk/genmk.c
@@ -0,0 +1,1063 @@
+/*
+ * genmk -- a program to make makefiles for PCCTS
+ *
+ * ANTLR 1.33MR23
+ * Terence John Parr 1989 - 2000
+ * Purdue University
+ * U of MN
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "pcctscfg.h" /* be sensitive to what ANTLR/DLG call the files */
+
+#ifdef VAXC
+#define DIE		return 0;
+#define DONE	return 1;
+#else
+#define DIE		return 1;
+#define DONE	return 0;
+#endif
+
+#ifndef require
+#define require(expr, err) {if ( !(expr) ) fatal(err);}
+#endif
+
+#define MAX_FILES	50
+#define MAX_CFILES	1600
+#define MAX_SFILES	50
+#define MAX_SORS	50
+#define MAX_CLASSES	50
+
+char *RENAME_OBJ_FLAG="-o",
+     *RENAME_EXE_FLAG="-o";
+
+char *dlg = "parser.dlg";
+char *err = "err.c";
+char *hdr = "stdpccts.h";
+char *tok = "tokens.h";
+char *mode = "mode.h";
+char *scan = "scan";
+
+char ATOKENBUFFER_O[100];
+char APARSER_O[100];
+char ASTBASE_O[100];
+char PCCTSAST_O[100];
+char LIST_O[100];
+char DLEXERBASE_O[100];
+
+/* Option flags */
+static char *project="t", *files[MAX_FILES], *classes[MAX_CLASSES];
+static char *cfiles[MAX_CFILES];
+static char *sfiles[MAX_SORS][MAX_SFILES],*sclasses[MAX_SORS];
+static int  num_sfiles[MAX_SORS]; /*sorcerer files in group */
+static int  num_sors = 0; /*sorcerer groups */
+static int  num_files = 0; /* grammar files */
+static int  num_cfiles = 0; /* additional C/C++ files */
+static int  num_classes = 0; /* ANTLR classes */
+static int  user_lexer = 0;
+static char *user_token_types = NULL;
+static int  gen_CPP = 0;
+static char *outdir=".";
+static char *dlg_class = "DLGLexer";
+static int  gen_trees = 0;
+static int  gen_hoist = 0;
+static int  nondef_comp = 0; /* 1=compiler is non default */
+static char *compilerCCC="CC";
+static char *compilerCC="cc";
+static char *pccts_path="/usr/local/pccts";
+
+#ifdef __STDC__
+void help(void);
+void mk(char *project, char **files, int n, int argc, char **argv);
+void pfiles(char **files, int n, char *suffix);
+void fatal(char *msg);
+void warn(char *msg);
+#else
+void help();
+void mk();
+void pfiles();
+void fatal();
+void warn();
+#endif
+
+typedef struct _Opt {
+			char *option;
+			int arg;
+#ifdef __cplusplus
+			void (*process)(...);
+#else
+			void (*process)();
+#endif
+			char *descr;
+		} Opt;
+
+#ifdef __STDC__
+static void ProcessArgs(int, char **, Opt *);
+#else
+static void ProcessArgs();
+#endif
+
+static void
+#ifdef __STDC__
+pProj(char *s, char *t )
+#else
+pProj( s, t )
+char *s;
+char *t;
+#endif
+{
+	project = t;
+}
+
+static void
+#ifdef __STDC__
+pUL( char *s )
+#else
+pUL( s )
+char *s;
+#endif
+{
+	user_lexer = 1;
+}
+
+static void
+#ifdef __STDC__
+pCPP( char *s )
+#else
+pCPP( s )
+char *s;
+#endif
+{
+	gen_CPP = 1;
+}
+
+static void
+#ifdef __STDC__
+pUT( char *s, char *t )
+#else
+pUT( s, t )
+char *s;
+char *t;
+#endif
+{
+	user_token_types = t;
+}
+
+static void
+#ifdef __STDC__
+pTrees( char *s )
+#else
+pTrees( s )
+char *s;
+#endif
+{
+	gen_trees = 1;
+}
+
+static void
+#ifdef __STDC__
+pHoist( char *s )
+#else
+pHoist( s )
+char *s;
+#endif
+{
+	gen_hoist = 1;
+}
+
+static void
+#ifdef __STDC__
+pSor( char *s )
+#else
+pSor( s )
+char *s;
+#endif
+{
+	require(num_sors<MAX_SORS, "exceeded max # of sorcerer groups");
+	num_sors++;
+	pTrees(NULL); /* silently turn on tree generation */
+}
+
+static void
+#ifdef __STDC__
+pSFiles( char *s, char *t )
+#else
+pSFiles( s, t )
+char *s;
+char *t;
+#endif
+{
+	if (num_sors==0)
+	{
+		pSor(NULL);
+		warn("sorcerer input file before any '-sor' option");
+	}
+		
+	require(num_sfiles[num_sors-1]<MAX_SFILES,
+		 "exceeded max # of sorcerer input files");
+	sfiles[num_sors-1][num_sfiles[num_sors-1]++] = t;
+}
+
+static void
+#ifdef __STDC__
+pCFiles( char *s, char *t )
+#else
+pCFiles( s, t )
+char *s;
+char *t;
+#endif
+{
+	require(num_cfiles<MAX_CFILES, "exceeded max # of C/C++ input files");
+	cfiles[num_cfiles++] = t;
+}
+
+int
+#ifdef __STDC__
+isKnownSuffix( char *s )
+#else
+isKnownSuffix( s )
+	char *s;
+#endif
+{
+	if(s==NULL) return 0;
+	if (strcasecmp(s,".c")==0) return 1;
+	if (strcasecmp(s,".cc")==0) return 1;
+	if (strcasecmp(s,".cpp")==0) return 1;
+	if (strcasecmp(s,".cxx")==0) return 1;
+	if (strcasecmp(s,CPP_FILE_SUFFIX)==0) return 1;
+	if (strcasecmp(s,".sor")==0) return 2;
+	return 0;
+}
+
+static void
+#ifdef __STDC__
+pFile( char *s )
+#else
+pFile( s )
+char *s;
+#endif
+{
+	if ( *s=='-' )
+	{
+		fprintf(stderr, "invalid option: '%s'; ignored...",s);
+		return;
+	}
+	switch(isKnownSuffix(strrchr(s,'.')))
+	{
+	 case 1: /* c/c++ */
+		pCFiles("-cfiles",s);
+		return;
+	 case 2: /* sorcerer */
+		pSFiles("",s);
+		return;
+	 default: /* grammar (ANTLR) */
+		break;
+	}
+	require(num_files<MAX_FILES, "exceeded max # of input files");
+	files[num_files++] = s;
+}
+
+static void
+#ifdef __STDC__
+pClass( char *s, char *t )
+#else
+pClass( s, t )
+char *s;
+char *t;
+#endif
+{
+	if (num_sors==0)
+	{
+		require(num_classes<MAX_CLASSES, "exceeded max # of grammar classes");
+		classes[num_classes++] = t;
+	} else
+	{
+		sclasses[num_sors-1] = t; /* one class per sorcerer group (last valid) */
+	}
+}
+
+static void
+#ifdef __STDC__
+pDLGClass( char *s, char *t )
+#else
+pDLGClass( s, t )
+char *s;
+char *t;
+#endif
+{
+	if ( !gen_CPP ) {
+		fprintf(stderr, "-dlg-class makes no sense without C++ mode; ignored...");
+	}
+	else dlg_class = t;
+}
+
+static void
+#ifdef __STDC__
+pOdir( char *s, char *t )
+#else
+pOdir( s, t )
+char *s;
+char *t;
+#endif
+{
+	outdir = t;
+}
+
+static void
+#ifdef __STDC__
+pHdr( char *s, char *t )
+#else
+pHdr( s, t )
+char *s;
+char *t;
+#endif
+{
+	hdr = t;
+}
+
+static void
+#ifdef __STDC__
+pCompiler( char *s, char *t )
+#else
+pCompiler( s, t )
+char *s;
+char *t;
+#endif
+{
+	compilerCCC = t;
+	compilerCC = t;
+	nondef_comp = 1;
+}
+
+static void
+#ifdef __STDC__
+ppccts_path( char *s, char *t )
+#else
+ppccts_path( s, t )
+char *s;
+char *t;
+#endif
+{
+	pccts_path = t;
+}
+
+Opt options[] = {
+	{ "-CC", 0,	pCPP,			"Generate C++ output"},
+	{ "-class", 1,	pClass,		"Name of a grammar class defined in grammar (if C++)"},
+	{ "-dlg-class", 1,pDLGClass,"Name of DLG lexer class (default=DLGLexer) (if C++)"},
+	{ "-header", 1,pHdr,		"Name of ANTLR standard header info (default=no file)"},
+	{ "-o", 1,	pOdir,			"Directory where output files should go (default=\".\")"},
+	{ "-project", 1,	pProj,	"Name of executable to create (default=t)"},
+	{ "-token-types", 1, pUT,	"Token types are in this file (don't use tokens.h)"},
+	{ "-trees", 0, pTrees,		"Generate ASTs"},
+	{ "-user-lexer", 0,	pUL,	"Do not create a DLG-based scanner"},
+	{ "-mrhoist",0,pHoist,      "Maintenance release style hoisting"},
+	{ "-cfiles",1,pCFiles,      "Additional files in C or C++ to compile"},
+	{ "-sor",0,pSor,           "Start of sorcerer group"},
+	{ "-pccts_path",1,ppccts_path,
+			"Path for $PCCTS directory (default is /usr/local/pccts)"},
+	{ "-compiler",1,pCompiler,
+			"Default compiler (default is CC/cc)"},
+	{ "*", 0,pFile, 	        "" },	/* anything else is a file */
+	{ NULL, 0, NULL, NULL }
+};
+
+#ifdef __STDC__
+extern char *DIR(void);
+#else
+extern char *DIR();
+#endif
+
+#ifdef __STDC__
+int main(int argc, char **argv)
+#else
+int main(argc, argv)
+int argc;
+char **argv;
+#endif
+{
+	int i;
+	
+	if ( argc == 1 ) { help(); DIE; }
+	for(i=0;i<MAX_SORS;i++) num_sfiles[i]=0;
+	
+	ProcessArgs(argc-1, &(argv[1]), options);
+
+	strcpy(ATOKENBUFFER_O, ATOKENBUFFER_C);
+	ATOKENBUFFER_O[strlen(ATOKENBUFFER_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(ATOKENBUFFER_O, OBJ_FILE_SUFFIX);
+	strcpy(APARSER_O, APARSER_C);
+	APARSER_O[strlen(APARSER_O)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(APARSER_O, OBJ_FILE_SUFFIX);
+
+	strcpy(ASTBASE_O, ASTBASE_C);
+	ASTBASE_O[strlen(ASTBASE_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(ASTBASE_O, OBJ_FILE_SUFFIX);
+
+	strcpy(PCCTSAST_O, PCCTSAST_C);
+	PCCTSAST_O[strlen(PCCTSAST_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(PCCTSAST_O, OBJ_FILE_SUFFIX);
+
+	strcpy(LIST_O, LIST_C);
+	LIST_O[strlen(LIST_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(LIST_O, OBJ_FILE_SUFFIX);
+
+	strcpy(DLEXERBASE_O, DLEXERBASE_C);
+	DLEXERBASE_O[strlen(DLEXERBASE_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(DLEXERBASE_O, OBJ_FILE_SUFFIX);
+
+	if ( num_files == 0 ) fatal("no grammar files specified; exiting...");
+	if ( !gen_CPP && num_classes>0 ) {
+		warn("can't define classes w/o C++ mode; turning on C++ mode...\n");
+		gen_CPP=1;
+	}
+	if (!gen_CPP && num_sors) {
+		warn("can't define sorcerer group in C mode (yet); turning on C++ mode...\n");
+		gen_CPP=1;
+	}
+	if ( gen_CPP && num_classes==0 ) {
+		fatal("must define classes >0 grammar classes in C++ mode\n");
+	}
+
+	mk(project, files, num_files, argc, argv);
+	DONE;
+}
+
+#ifdef __STDC__
+void help(void)
+#else
+void help()
+#endif
+{
+	Opt *p = options;
+	static char buf[1000+1];
+
+	fprintf(stderr, "genmk [options] f1.g ... fn.g\n");
+	while ( p->option!=NULL && *(p->option) != '*' )
+	{
+		buf[0]='\0';
+		if ( p->arg ) sprintf(buf, "%s ___", p->option);
+		else strcpy(buf, p->option);
+		fprintf(stderr, "\t%-16s   %s\n", buf, p->descr);
+		p++;
+	}
+}
+
+#ifdef __STDC__
+void mk(char *project, char **files, int n, int argc, char **argv)
+#else
+void mk(project, files, n, argc, argv)
+char *project;
+char **files;
+int n;
+int argc;
+char **argv;
+#endif
+{
+	int i,j;
+
+	printf("#\n");
+	printf("# PCCTS makefile for: ");
+	pfiles(files, n, NULL);
+	printf("\n");
+	printf("#\n");
+	printf("# Created from:");
+	for (i=0; i<argc; i++) printf(" %s", argv[i]);
+	printf("\n");
+	printf("#\n");
+	printf("# PCCTS release 1.33MR23\n");
+	printf("# Project: %s\n", project);
+	if ( gen_CPP ) printf("# C++ output\n");
+	else printf("# C output\n");
+	if ( user_lexer ) printf("# User-defined scanner\n");
+	else printf("# DLG scanner\n");
+	if ( user_token_types!=NULL ) printf("# User-defined token types in '%s'\n", user_token_types);
+	else printf("# ANTLR-defined token types\n");
+	printf("#\n");
+/***********
+	printf(".SUFFIXES:\n.SUFFIXES:\t.o .cpp .c .h .g .i .dlg .sor\n"); 
+ ***********/
+	if ( user_token_types!=NULL ) {
+		printf("# Make sure #tokdefs directive in ANTLR grammar lists this file:\n");
+		printf("TOKENS = %s", user_token_types);
+	}
+	else printf("TOKENS = %stokens.h", DIR());
+	printf("\n");
+	printf("#\n");
+	printf("# The following filenames must be consistent with ANTLR/DLG flags\n");
+	printf("DLG_FILE = %s%s\n", DIR(), dlg);
+	printf("ERR = %serr\n", DIR());
+	if ( strcmp(hdr,"stdpccts.h")!=0 ) printf("HDR_FILE = %s%s\n", DIR(), hdr);
+	else printf("HDR_FILE =\n");
+	if ( !gen_CPP ) printf("MOD_FILE = %s%s\n", DIR(), mode);
+	if ( !gen_CPP ) printf("SCAN = %s\n", scan);
+	else printf("SCAN = %s%s\n", DIR(), dlg_class);
+
+	printf("PCCTS = %s\n",pccts_path);
+	printf("ANTLR_H = $(PCCTS)%sh\n", DirectorySymbol);
+	if (num_sors>0) {
+		printf("SOR_H = $(PCCTS)%ssorcerer%sh\n", DirectorySymbol, DirectorySymbol);
+		printf("SOR_LIB = $(PCCTS)%ssorcerer%slib\n",
+			 	DirectorySymbol, DirectorySymbol);
+	}
+	printf("BIN = $(PCCTS)%sbin\n", DirectorySymbol);
+	printf("ANTLR = $(BIN)%santlr\n", DirectorySymbol);
+	printf("DLG = $(BIN)%sdlg\n", DirectorySymbol);
+	if (num_sors>0) printf("SOR = $(BIN)%ssor\n", DirectorySymbol);
+	printf("CFLAGS = -I. -I$(ANTLR_H)");
+	if (num_sors>0) printf(" -I$(SOR_H)");
+	if ( strcmp(outdir, ".")!=0 ) printf(" -I%s", outdir);
+	printf(" $(COTHER)");
+	printf("\n");
+	printf("AFLAGS =");
+	if ( strcmp(outdir,".")!=0 ) printf(" -o %s", outdir);
+	if ( user_lexer ) printf(" -gx");
+	if ( gen_CPP ) printf(" -CC");
+	if ( strcmp(hdr,"stdpccts.h")!=0 ) printf(" -gh %s", hdr);
+	if ( gen_trees ) printf(" -gt");
+	if ( gen_hoist ) {
+		printf(" -mrhoist on") ;
+	} else {
+		printf(" -mrhoist off");
+	};
+	printf(" $(AOTHER)");
+	printf("\n");
+	printf("DFLAGS = -C2 -i");
+	if ( gen_CPP ) printf(" -CC");
+	if ( strcmp(dlg_class,"DLGLexer")!=0 ) printf(" -cl %s", dlg_class);
+	if ( strcmp(outdir,".")!=0 ) printf(" -o %s", outdir);
+	printf(" $(DOTHER)");
+	printf("\n");
+	if (num_sors>0)
+	{
+		printf("SFLAGS = -CPP");
+		if ( strcmp(outdir,".")!=0 ) printf(" -out-dir %s", outdir);
+		printf(" $(SOTHER)\n");
+	}
+	printf("GRM = ");
+	pfiles(files, n, NULL);
+	printf("\n");
+	printf("SRC = ");
+	if ( gen_CPP ) pfiles(files, n, CPP_FILE_SUFFIX_NO_DOT);
+	else pfiles(files, n, "c");
+	if ( gen_CPP ) {
+		printf(" \\\n\t");
+		pclasses(classes, num_classes, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" \\\n\t");
+		printf("$(ANTLR_H)%s%s", DirectorySymbol, APARSER_C);
+		if ( !user_lexer ) printf(" $(ANTLR_H)%s%s", DirectorySymbol, DLEXERBASE_C);
+		if ( gen_trees ) {
+			printf(" \\\n\t");
+			printf("$(ANTLR_H)%s%s", DirectorySymbol, ASTBASE_C);
+			printf(" $(ANTLR_H)%s%s", DirectorySymbol, PCCTSAST_C);
+/*			printf(" $(ANTLR_H)%s%s", DirectorySymbol, LIST_C); */
+			printf(" \\\n\t");
+		}
+		printf(" $(ANTLR_H)%s%s", DirectorySymbol, ATOKENBUFFER_C);
+	}
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf(" $(SCAN)%s", CPP_FILE_SUFFIX);
+		else printf(" %s$(SCAN).c", DIR());
+	}
+	if ( !gen_CPP ) printf(" $(ERR).c");
+	for (i=0;i<num_sors;i++)
+	{
+		printf(" \\\n\t");
+		pclasses(&sclasses[i],1,CPP_FILE_SUFFIX_NO_DOT);
+		printf(" ");
+		pfiles(&sfiles[i][0],num_sfiles[i],CPP_FILE_SUFFIX_NO_DOT);
+	}
+	if(num_sors>0)
+		printf(" \\\n\t$(SOR_LIB)%sSTreeParser.cpp", DirectorySymbol);
+	if (num_cfiles>0)
+	{
+		printf(" \\\n\t");
+		pfiles(cfiles,num_cfiles,NULL);
+	}
+	printf("\n\n");
+	printf("OBJ = ");
+	pfiles(files, n, "o");
+	if ( gen_CPP ) {
+		printf(" \\\n\t");
+		pclasses(classes, num_classes, "o");
+		printf(" \\\n\t");
+		printf("%s%s", DIR(), APARSER_O);
+		if ( !user_lexer ) {
+			printf(" %s%s", DIR(), DLEXERBASE_O);
+		}
+		if ( gen_trees ) {
+			printf(" \\\n\t");
+			printf("%s%s", DIR(), ASTBASE_O);
+			printf(" %s%s", DIR(), PCCTSAST_O);
+/*			printf(" %s%s", DIR(), LIST_O); */
+			printf(" \\\n\t");
+		}
+		printf(" %s%s", DIR(), ATOKENBUFFER_O);
+	}
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf(" $(SCAN)%s", OBJ_FILE_SUFFIX);
+		else printf(" %s$(SCAN)%s", DIR(), OBJ_FILE_SUFFIX);
+	}
+	if ( !gen_CPP ) printf(" $(ERR)%s", OBJ_FILE_SUFFIX);
+	for (i=0;i<num_sors;i++)
+	{
+		printf(" \\\n\t");
+		pclasses(&sclasses[i],1,"o");
+		printf(" ");
+		pfiles(&sfiles[i][0],num_sfiles[i],"o");
+	}
+	if(num_sors>0) printf(" \\\n\tSTreeParser.o");
+	if (num_cfiles>0)
+	{
+		printf(" \\\n\t");
+		pfiles(cfiles,num_cfiles,"o");
+	}
+	printf("\n\n");
+
+	printf("ANTLR_SPAWN = ");
+	if ( gen_CPP ) pfiles(files, n, CPP_FILE_SUFFIX_NO_DOT);
+	else pfiles(files, n, "c");
+	if ( gen_CPP ) {
+		printf(" ");
+		pclasses(classes, num_classes, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" \\\n\t\t");
+		pclasses(classes, num_classes, "h");
+		if ( strcmp(hdr,"stdpccts.h")!=0 ) {
+			printf(" \\\n\t\t");
+			printf("$(HDR_FILE) stdpccts.h");
+		}
+	}
+	if ( user_lexer ) {
+		if ( !user_token_types ) printf(" $(TOKENS)");
+	}
+	else {
+		printf(" $(DLG_FILE)");
+		if ( !user_token_types ) printf(" $(TOKENS)");
+	}
+	if ( !gen_CPP ) printf(" $(ERR).c");
+	printf("\n");
+
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf("DLG_SPAWN = $(SCAN)%s", CPP_FILE_SUFFIX);
+		else printf("DLG_SPAWN = %s$(SCAN).c", DIR());
+		if ( gen_CPP ) printf(" $(SCAN).h");
+		if ( !gen_CPP ) printf(" $(MOD_FILE)");
+		printf("\n");
+	}
+
+	if ( gen_CPP ) {
+		if ( !nondef_comp )
+			printf("ifdef CXX\nCCC = $(CXX)\nendif\n\nifndef CCC\n");
+		printf("CCC = %s\n",compilerCCC);
+		if ( !nondef_comp ) printf("endif\n\n");
+	}
+	else
+	{
+		if ( !nondef_comp ) printf("ifndef CC\n");
+		printf("CC = %s\n",compilerCC);
+		if ( !nondef_comp ) printf("endif\n\n");
+	}
+
+	/* set up dependencies */
+	printf("\n%s : $(SRC) $(OBJ)\n", project);
+	printf("\t%s %s %s $(CFLAGS) $(OBJ)\n",
+		gen_CPP?"$(CCC)":"$(CC)",
+		RENAME_EXE_FLAG,
+		project);
+	printf("\n");
+
+	/* implicit rules */
+
+/*	if(gen_CPP)
+		printf("%%.o : %%.cpp\n\t$(CCC) -c $(CFLAGS) $<\n\n");
+
+	printf("%%.o : %%.c\n\t%s -c $(CFLAGS) $<\n\n",
+			gen_CPP?"$(CCC)":"$(CC)");
+*/
+	/* how to compile parser files */
+
+	for (i=0; i<num_files; i++)
+	{
+		pfiles(&files[i], 1, "o");
+		if ( user_lexer ) {
+			printf(" : $(TOKENS)");
+		}
+		else {
+			if ( gen_CPP ) printf(" : $(TOKENS) $(SCAN).h");
+			else printf(" : $(MOD_FILE) $(TOKENS)");
+		}
+		printf(" ");
+		if ( gen_CPP ) pfiles(&files[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&files[i], 1, "c");
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+		printf("\n");
+		printf("\t%s -c $(CFLAGS) %s ",
+			gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+		pfiles(&files[i], 1, "o");
+		printf(" ");
+		if ( gen_CPP ) pfiles(&files[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&files[i], 1, "c");
+		printf("\n\n");
+	}
+
+	for (i=0; i<num_cfiles; i++)
+	{
+		pfiles(&cfiles[i], 1, "o");
+		printf(" : ");
+		pfiles(&cfiles[i], 1, NULL);
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+/***	printf(" "); ***/
+/***	pfiles(&cfiles[i], 1, "h"); ***/
+		printf("\n");
+		printf("\t%s -c $(CFLAGS) %s ",
+			gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+		pfiles(&cfiles[i], 1, "o");
+		printf(" ");
+		pfiles(&cfiles[i], 1, NULL);
+		printf("\n\n");
+
+/*
+ *		pfiles(&cfiles[i], 1, "h");
+ *		printf(" :\ntouch ");
+ *		pfiles(&cfiles[i], 1, "h");
+ *		printf("\n\n");
+ */
+	}
+
+	/* how to compile err.c */
+	if ( !gen_CPP ) {
+		printf("$(ERR)%s : $(ERR).c", OBJ_FILE_SUFFIX);
+		if ( !user_lexer ) printf(" $(TOKENS)");
+		printf("\n");
+		printf("\t%s -c $(CFLAGS) %s $(ERR)%s $(ERR).c",
+			gen_CPP?"$(CCC)":"$(CC)",
+			RENAME_OBJ_FLAG,
+			OBJ_FILE_SUFFIX);
+		printf("\n\n");
+	}
+
+	/* how to compile Class.c */
+	for (i=0; i<num_classes; i++)
+	{
+		pclasses(&classes[i], 1, "o");
+		if ( user_lexer ) {
+			printf(" : $(TOKENS)");
+		}
+		else {
+			printf(" : $(TOKENS) $(SCAN).h");
+		}
+		printf(" ");
+		pclasses(&classes[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" ");
+		pclasses(&classes[i], 1, "h");
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+		printf("\n");
+		printf("\t%s -c $(CFLAGS) %s ",
+			gen_CPP?"$(CCC)":"$(CC)",
+			RENAME_OBJ_FLAG);
+		pclasses(&classes[i], 1, "o");
+		printf(" ");
+		pclasses(&classes[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf("\n\n");
+	}
+
+	/* how to compile scan.c */
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf("$(SCAN)%s : $(SCAN)%s", OBJ_FILE_SUFFIX, CPP_FILE_SUFFIX);
+		else printf("%s$(SCAN)%s : %s$(SCAN).c", DIR(), OBJ_FILE_SUFFIX, DIR());
+		if ( !user_lexer ) printf(" $(TOKENS)");
+		printf("\n");
+		if ( gen_CPP ) printf("\t$(CCC) -c $(CFLAGS) %s $(SCAN)%s $(SCAN)%s",
+							RENAME_OBJ_FLAG,
+							OBJ_FILE_SUFFIX,
+							CPP_FILE_SUFFIX);
+		else printf("\t$(CC) -c $(CFLAGS) %s %s$(SCAN)%s %s$(SCAN).c",
+					RENAME_OBJ_FLAG,
+					DIR(),
+					OBJ_FILE_SUFFIX,
+					DIR());
+		printf("\n\n");
+	}
+/* how to compile sorcerer classes */
+	for (i=0;i<num_sors;i++)
+	{
+		pclasses(&sclasses[i], 1, "o");
+		printf(" : ");
+		pclasses(&sclasses[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" ");
+		pclasses(&sclasses[i], 1, "h");
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+		printf("\n");
+		printf("\t%s -c $(CFLAGS) %s ",
+				gen_CPP?"$(CCC)":"$(CC)",
+				RENAME_OBJ_FLAG);
+		pclasses(&sclasses[i], 1, "o");
+		printf(" ");
+		pclasses(&sclasses[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf("\n\n");
+/* how to compile i-th sorcerer's files*/
+		for (j=0; j<num_sfiles[i]; j++)
+		{
+			pfiles(&sfiles[i][j], 1, "o");
+			printf(" : ");
+			if ( gen_CPP ) pfiles(&sfiles[i][j], 1, CPP_FILE_SUFFIX_NO_DOT);
+			else pfiles(&sfiles[i][j], 1, "c");
+			if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+			printf("\n");
+			printf("\t%s -c $(CFLAGS) %s ",
+					gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+			pfiles(&sfiles[i][j], 1, "o");
+			printf(" ");
+			if ( gen_CPP ) pfiles(&sfiles[i][j], 1, CPP_FILE_SUFFIX_NO_DOT);
+			else pfiles(&sfiles[i][j], 1, "c");
+			printf("\n\n");
+		}
+		if ( gen_CPP ) pfiles(&sfiles[i][0], num_sfiles[i], CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&sfiles[i][0], num_sfiles[i], "c");
+		if ( gen_CPP )
+		{
+			printf(" ");
+			pclasses(&sclasses[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+			printf(" ");
+			pclasses(&sclasses[i], 1, "h");
+			if ( strcmp(hdr,"stdpccts.h")!=0 ) 
+			{
+				printf(" ");
+				printf("$(HDR_FILE) stdpccts.h");
+			}
+		}
+		printf(" : ");
+		pfiles(&sfiles[i][0],num_sfiles[i],NULL);
+		printf("\n\t$(SOR) $(SFLAGS) ");
+		pfiles(&sfiles[i][0],num_sfiles[i],NULL);
+		printf("\n\n");
+	}
+	if(num_sors>0)
+	{
+		printf("STreeParser%s : $(SOR_LIB)%sSTreeParser.cpp\n",
+				OBJ_FILE_SUFFIX,DirectorySymbol);
+		printf("\t%s -c $(CFLAGS) %s ",
+				gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+		printf("STreeParser%s ",OBJ_FILE_SUFFIX);
+		printf("$(SOR_LIB)%sSTreeParser.cpp\n\n",DirectorySymbol);
+	}
+	
+	printf("$(ANTLR_SPAWN) : $(GRM)\n");
+	printf("\t$(ANTLR) $(AFLAGS) $(GRM)\n");
+
+	if ( !user_lexer )
+	{
+		printf("\n");
+		printf("$(DLG_SPAWN) : $(DLG_FILE)\n");
+		if ( gen_CPP ) printf("\t$(DLG) $(DFLAGS) $(DLG_FILE)\n");
+		else printf("\t$(DLG) $(DFLAGS) $(DLG_FILE) $(SCAN).c\n");
+	}
+
+	/* do the makes for ANTLR/DLG support */
+	if ( gen_CPP ) {
+		printf("\n");
+		printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), APARSER_O, DirectorySymbol, APARSER_C);
+		printf("\t%s -c $(CFLAGS) %s ",
+				gen_CPP?"$(CCC)":"$(CC)",
+				RENAME_OBJ_FLAG);
+		printf("%s%s $(ANTLR_H)%s%s\n", DIR(), APARSER_O, DirectorySymbol, APARSER_C);
+		printf("\n");
+		printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), ATOKENBUFFER_O, DirectorySymbol, ATOKENBUFFER_C);
+		printf("\t%s -c $(CFLAGS) %s ",
+				gen_CPP?"$(CCC)":"$(CC)",
+				RENAME_OBJ_FLAG);
+		printf("%s%s $(ANTLR_H)%s%s\n", DIR(), ATOKENBUFFER_O, DirectorySymbol, ATOKENBUFFER_C);
+		if ( !user_lexer ) {
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), DLEXERBASE_O, DirectorySymbol, DLEXERBASE_C);
+			printf("\t%s -c $(CFLAGS) %s ",
+					gen_CPP?"$(CCC)":"$(CC)",
+					RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), DLEXERBASE_O, DirectorySymbol, DLEXERBASE_C);
+		}
+		if ( gen_trees ) {
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), ASTBASE_O, DirectorySymbol, ASTBASE_C);
+			printf("\t%s -c $(CFLAGS) %s ",
+					gen_CPP?"$(CCC)":"$(CC)",
+					RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), ASTBASE_O, DirectorySymbol, ASTBASE_C);
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), PCCTSAST_O, DirectorySymbol, PCCTSAST_C);
+			printf("\t%s -c $(CFLAGS) %s ",
+					gen_CPP?"$(CCC)":"$(CC)",
+					RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), PCCTSAST_O, DirectorySymbol, PCCTSAST_C);
+			printf("\n");
+/*
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), LIST_O, DirectorySymbol, LIST_C);
+			printf("\t%s -c $(CFLAGS) %s ",
+					gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), LIST_O, DirectorySymbol, LIST_C);
+*/
+		}
+	}
+
+	/* clean and scrub targets */
+
+	printf("\nclean:\n");
+	printf("\trm -f *%s core %s", OBJ_FILE_SUFFIX, project);
+	if ( strcmp(outdir, ".")!=0 ) printf(" %s*%s", DIR(), OBJ_FILE_SUFFIX);
+	printf("\n");
+
+	printf("\nscrub: clean\n");
+/*	printf("\trm -f *%s core %s", OBJ_FILE_SUFFIX, project); */
+/*	if ( strcmp(outdir, ".")!=0 ) printf(" %s*%s", DIR(), OBJ_FILE_SUFFIX); */
+	printf("\trm -f $(ANTLR_SPAWN)");
+	if ( !user_lexer ) printf(" $(DLG_SPAWN)");
+	for (i=0;i<num_sors;i++)
+	{
+		printf(" ");
+		if ( gen_CPP ) pfiles(&sfiles[i][0], num_sfiles[i], CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&sfiles[i][0], num_sfiles[i], "c");
+		if ( gen_CPP )
+		{
+			printf(" ");
+			pclasses(&sclasses[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+			printf(" ");
+			pclasses(&sclasses[i], 1, "h");
+		}
+	}
+	printf("\n\n");
+}
+
+#ifdef __STDC__
+void pfiles(char **files, int n, char *suffix)
+#else
+void pfiles(files, n, suffix)
+char **files;
+int n;
+char *suffix;
+#endif
+{
+	int first=1;
+
+	while ( n>0 )
+	{
+		char *p = &(*files)[strlen(*files)-1];
+		if ( !first ) putchar(' ');
+		first=0;
+		while ( p > *files && *p != '.' ) --p;
+		if ( p == *files )
+		{
+			fprintf(stderr,
+					"genmk: filenames must be file.suffix format: %s\n",
+					*files);
+			exit(-1);
+		}
+		if ( suffix == NULL ) printf("%s", *files);
+		else
+		{
+			*p = '\0';
+			printf("%s", DIR());
+			if ( strcmp(suffix, "o")==0 ) printf("%s%s", *files, OBJ_FILE_SUFFIX);
+			else printf("%s.%s", *files, suffix);
+			*p = '.';
+		}
+		files++;
+		--n;
+	}
+}
+
+#ifdef __STDC__
+pclasses(char **classes, int n, char *suffix)
+#else
+pclasses(classes, n, suffix)
+char **classes;
+int n;
+char *suffix;
+#endif
+{
+	int first=1;
+
+	while ( n>0 )
+	{
+		if ( !first ) putchar(' ');
+		first=0;
+		if ( suffix == NULL ) printf("%s", *classes);
+		else {
+			printf("%s", DIR());
+			if ( strcmp(suffix, "o")==0 ) printf("%s%s", *classes, OBJ_FILE_SUFFIX);
+			else printf("%s.%s", *classes, suffix);
+		}
+		classes++;
+		--n;
+	}
+}
+
+static void
+#ifdef __STDC__
+ProcessArgs( int argc, char **argv, Opt *options )
+#else
+ProcessArgs( argc, argv, options )
+int argc;
+char **argv;
+Opt *options;
+#endif
+{
+	Opt *p;
+	require(argv!=NULL, "ProcessArgs: command line NULL");
+
+	while ( argc-- > 0 )
+	{
+		p = options;
+		while ( p->option != NULL )
+		{
+			if ( strcmp(p->option, "*") == 0 ||
+				 strcmp(p->option, *argv) == 0 )
+			{
+				if ( p->arg )
+				{
+					(*p->process)( *argv, *(argv+1) );
+					argv++;
+					argc--;
+				}
+				else
+					(*p->process)( *argv );
+				break;
+			}
+			p++;
+		}
+		argv++;
+	}
+}
+
+#ifdef __STDC__
+void fatal( char *err_)
+#else
+void fatal( err_)
+char *err_;
+#endif
+{
+	fprintf(stderr, "genmk: %s\n", err_);
+	exit(1);
+}
+
+#ifdef __STDC__
+void warn( char *err_)
+#else
+void warn( err_)
+char *err_;
+#endif
+{
+	fprintf(stderr, "genmk: %s\n", err_);
+}
+
+#ifdef __STDC__
+char *DIR(void)
+#else
+char *DIR()
+#endif
+{
+	static char buf[200+1];
+	
+	if ( strcmp(outdir,TopDirectory)==0 ) return "";
+	sprintf(buf, "%s%s", outdir, DirectorySymbol);
+	return buf;
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/genmk_old.c b/Tools/Source/TianoTools/Pccts/support/genmk/genmk_old.c
new file mode 100644
index 0000000000..2cf9fad727
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/genmk/genmk_old.c
@@ -0,0 +1,762 @@
+/*
+ * genmk -- a program to make makefiles for PCCTS
+ *
+ * ANTLR 1.33MR10
+ * Terence John Parr 1989 - 1998
+ * Purdue University
+ * U of MN
+ */
+
+#include <stdio.h>
+#include "pcctscfg.h" /* be sensitive to what ANTLR/DLG call the files */
+
+#ifdef VAXC
+#define DIE		return 0;
+#define DONE	return 1;
+#else
+#define DIE		return 1;
+#define DONE	return 0;
+#endif
+
+#ifndef require
+#define require(expr, err) {if ( !(expr) ) fatal(err);}
+#endif
+
+#define MAX_FILES	50
+#define MAX_CLASSES	50
+
+char *RENAME_OBJ_FLAG="-o",
+     *RENAME_EXE_FLAG="-o";
+
+char *dlg = "parser.dlg";
+char *err = "err.c";
+char *hdr = "stdpccts.h";
+char *tok = "tokens.h";
+char *mode = "mode.h";
+char *scan = "scan";
+
+char ATOKENBUFFER_O[100];
+char APARSER_O[100];
+char ASTBASE_O[100];
+char PCCTSAST_O[100];
+char LIST_O[100];
+char DLEXERBASE_O[100];
+
+/* Option flags */
+static char *project="t", *files[MAX_FILES], *classes[MAX_CLASSES];
+static int	num_files = 0;
+static int	num_classes = 0;
+static int	user_lexer = 0;
+static char	*user_token_types = NULL;
+static int	gen_CPP = 0;
+static char *outdir=".";
+static char *dlg_class = "DLGLexer";
+static int	gen_trees = 0;
+static int  gen_hoist = 0;
+static char cfiles[1600]="";
+static char *compilerCCC="CC";
+static char *compilerCC="cc";
+static char *pccts_path="/usr/local/pccts";
+
+void help();
+void mk();
+void pfiles();
+void pclasses();
+void fatal();
+void warn();
+
+typedef struct _Opt {
+			char *option;
+			int  arg;
+#ifdef __cplusplus
+			void (*process)(...);
+#else
+			void (*process)();
+#endif
+			char *descr;
+		} Opt;
+
+#ifdef __STDC__
+static void ProcessArgs(int, char **, Opt *);
+#else
+static void ProcessArgs();
+#endif
+
+static void
+pProj( s, t )
+char *s;
+char *t;
+{
+	project = t;
+}
+
+static void
+pUL( s )
+char *s;
+{
+	user_lexer = 1;
+}
+
+static void
+pCPP( s )
+char *s;
+{
+	gen_CPP = 1;
+}
+
+static void
+pUT( s, t )
+char *s;
+char *t;
+{
+	user_token_types = t;
+}
+
+static void
+pTrees( s )
+char *s;
+{
+	gen_trees = 1;
+}
+
+static void
+pHoist( s )
+char *s;
+{
+	gen_hoist = 1;
+}
+
+static void
+#ifdef __STDC__
+pFile( char *s )
+#else
+pFile( s )
+char *s;
+#endif
+{
+	if ( *s=='-' )
+	{
+		fprintf(stderr, "invalid option: '%s'; ignored...",s);
+		return;
+	}
+
+	require(num_files<MAX_FILES, "exceeded max # of input files");
+	files[num_files++] = s;
+}
+
+static void
+#ifdef __STDC__
+pClass( char *s, char *t )
+#else
+pClass( s, t )
+char *s;
+char *t;
+#endif
+{
+	require(num_classes<MAX_CLASSES, "exceeded max # of grammar classes");
+	classes[num_classes++] = t;
+}
+
+static void
+#ifdef __STDC__
+pDLGClass( char *s, char *t )
+#else
+pDLGClass( s, t )
+char *s;
+char *t;
+#endif
+{
+	if ( !gen_CPP ) {
+		fprintf(stderr, "-dlg-class makes no sense without C++ mode; ignored...");
+	}
+	else dlg_class = t;
+}
+
+static void
+#ifdef __STDC__
+pOdir( char *s, char *t )
+#else
+pOdir( s, t )
+char *s;
+char *t;
+#endif
+{
+	outdir = t;
+}
+
+static void
+#ifdef __STDC__
+pHdr( char *s, char *t )
+#else
+pHdr( s, t )
+char *s;
+char *t;
+#endif
+{
+	hdr = t;
+}
+
+static void
+#ifdef __STDC__
+pCFiles( char *s, char *t )
+#else
+pCFiles( s, t )
+char *s;
+char *t;
+#endif
+{
+	strcat(strcat(cfiles," "), t);
+}
+
+static void
+#ifdef __STDC__
+pCompiler( char *s, char *t )
+#else
+pCompiler( s, t )
+char *s;
+char *t;
+#endif
+{
+        compilerCCC = t;
+	compilerCC = t;
+}
+
+static void
+#ifdef __STDC__
+ppccts_path( char *s, char *t )
+#else
+ppccts_path( s, t )
+char *s;
+char *t;
+#endif
+{
+        pccts_path = t;
+}
+
+Opt options[] = {
+    { "-CC", 0,	pCPP,			"Generate C++ output"},
+    { "-class", 1,	pClass,		"Name of a grammar class defined in grammar (if C++)"},
+    { "-dlg-class", 1,pDLGClass,"Name of DLG lexer class (default=DLGLexer) (if C++)"},
+    { "-header", 1,pHdr,		"Name of ANTLR standard header info (default=no file)"},
+    { "-o", 1,	pOdir,			"Directory where output files should go (default=\".\")"},
+    { "-project", 1,	pProj,	"Name of executable to create (default=t)"},
+    { "-token-types", 1, pUT,	"Token types are in this file (don't use tokens.h)"},
+    { "-trees", 0, pTrees,		"Generate ASTs"},
+    { "-user-lexer", 0,	pUL,	"Do not create a DLG-based scanner"},
+    { "-mrhoist",0,pHoist,      "Maintenance release style hoisting"},
+    { "-cfiles",1,pCFiles,      "Additional files in C or C++ to compile"},
+    { "-pccts_path",1,ppccts_path,
+              "Path for $PCCTS directory (default is /usr/local/pccts)"},
+    { "-compiler",1,pCompiler,
+              "Default compiler (default is CC/cc)"},
+    { "*", 0,pFile, 	        "" },	/* anything else is a file */
+	{ NULL, 0, NULL, NULL }
+};
+
+extern char *DIR();
+
+int main(argc, argv)
+int argc;
+char **argv;
+{
+	if ( argc == 1 ) { help(); DIE; }
+	ProcessArgs(argc-1, &(argv[1]), options);
+
+	strcpy(ATOKENBUFFER_O, ATOKENBUFFER_C);
+	ATOKENBUFFER_O[strlen(ATOKENBUFFER_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(ATOKENBUFFER_O, OBJ_FILE_SUFFIX);
+	strcpy(APARSER_O, APARSER_C);
+	APARSER_O[strlen(APARSER_O)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(APARSER_O, OBJ_FILE_SUFFIX);
+
+	strcpy(ASTBASE_O, ASTBASE_C);
+	ASTBASE_O[strlen(ASTBASE_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(ASTBASE_O, OBJ_FILE_SUFFIX);
+
+	strcpy(PCCTSAST_O, PCCTSAST_C);
+	PCCTSAST_O[strlen(PCCTSAST_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(PCCTSAST_O, OBJ_FILE_SUFFIX);
+
+	strcpy(LIST_O, LIST_C);
+	LIST_O[strlen(LIST_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(LIST_O, OBJ_FILE_SUFFIX);
+
+	strcpy(DLEXERBASE_O, DLEXERBASE_C);
+	DLEXERBASE_O[strlen(DLEXERBASE_C)-strlen(CPP_FILE_SUFFIX)] = '\0';
+	strcat(DLEXERBASE_O, OBJ_FILE_SUFFIX);
+
+	if ( num_files == 0 ) fatal("no grammar files specified; exiting...");
+	if ( !gen_CPP && num_classes>0 ) {
+		warn("can't define classes w/o C++ mode; turning on C++ mode...\n");
+		gen_CPP=1;
+	}
+	if ( gen_CPP && num_classes==0 ) {
+		fatal("must define classes >0 grammar classes in C++ mode\n");
+	}
+
+	mk(project, files, num_files, argc, argv);
+	DONE;
+}
+
+void help()
+{
+	Opt *p = options;
+	static char buf[1000+1];
+
+	fprintf(stderr, "genmk [options] f1.g ... fn.g\n");
+	while ( p->option!=NULL && *(p->option) != '*' )
+	{
+		buf[0]='\0';
+		if ( p->arg ) sprintf(buf, "%s ___", p->option);
+		else strcpy(buf, p->option);
+		fprintf(stderr, "\t%-16s   %s\n", buf, p->descr);
+		p++;
+	}
+}
+
+void mk(project, files, n, argc, argv)
+char *project;
+char **files;
+int n;
+int argc;
+char **argv;
+{
+	int i;
+
+	printf("#\n");
+	printf("# PCCTS makefile for: ");
+	pfiles(files, n, NULL);
+	printf("\n");
+	printf("#\n");
+	printf("# Created from:");
+	for (i=0; i<argc; i++) printf(" %s", argv[i]);
+	printf("\n");
+	printf("#\n");
+	printf("# PCCTS release 1.33MR21\n");
+	printf("# Project: %s\n", project);
+	if ( gen_CPP ) printf("# C++ output\n");
+	else printf("# C output\n");
+	if ( user_lexer ) printf("# User-defined scanner\n");
+	else printf("# DLG scanner\n");
+	if ( user_token_types!=NULL ) printf("# User-defined token types in '%s'\n", user_token_types);
+	else printf("# ANTLR-defined token types\n");
+	printf("#\n");
+	printf(".SUFFIXES:\n.SUFFIXES:      .o .cpp .c .h .g .i .dlg\n"); 
+	if ( user_token_types!=NULL ) {
+		printf("# Make sure #tokdefs directive in ANTLR grammar lists this file:\n");
+		printf("TOKENS = %s", user_token_types);
+	}
+	else printf("TOKENS = %stokens.h", DIR());
+	printf("\n");
+	printf("#\n");
+	printf("# The following filenames must be consistent with ANTLR/DLG flags\n");
+	printf("DLG_FILE = %s%s\n", DIR(), dlg);
+	printf("ERR = %serr\n", DIR());
+	if ( strcmp(hdr,"stdpccts.h")!=0 ) printf("HDR_FILE = %s%s\n", DIR(), hdr);
+	else printf("HDR_FILE =\n");
+	if ( !gen_CPP ) printf("MOD_FILE = %s%s\n", DIR(), mode);
+	if ( !gen_CPP ) printf("SCAN = %s\n", scan);
+	else printf("SCAN = %s%s\n", DIR(), dlg_class);
+
+	printf("PCCTS = %s\n",pccts_path);
+	printf("ANTLR_H = $(PCCTS)%sh\n", DirectorySymbol);
+	printf("BIN = $(PCCTS)%sbin\n", DirectorySymbol);
+	printf("ANTLR = $(BIN)%santlr\n", DirectorySymbol);
+	printf("DLG = $(BIN)%sdlg\n", DirectorySymbol);
+	printf("CFLAGS = -I. -I$(ANTLR_H)");
+	if ( strcmp(outdir, ".")!=0 ) printf(" -I%s", outdir);
+    printf(" $(COTHER)");
+	printf("\n");
+	printf("AFLAGS =");
+	if ( strcmp(outdir,".")!=0 ) printf(" -o %s", outdir);
+	if ( user_lexer ) printf(" -gx");
+	if ( gen_CPP ) printf(" -CC");
+	if ( strcmp(hdr,"stdpccts.h")!=0 ) printf(" -gh %s", hdr);
+	if ( gen_trees ) printf(" -gt");
+    if ( gen_hoist ) {
+      printf(" -mrhoist on") ;
+    } else {
+      printf(" -mrhoist off");
+    };
+    printf(" $(AOTHER)");
+	printf("\n");
+	printf("DFLAGS = -C2 -i");
+	if ( gen_CPP ) printf(" -CC");
+	if ( strcmp(dlg_class,"DLGLexer")!=0 ) printf(" -cl %s", dlg_class);
+	if ( strcmp(outdir,".")!=0 ) printf(" -o %s", outdir);
+    printf(" $(DOTHER)");
+	printf("\n");
+	printf("GRM = ");
+	pfiles(files, n, NULL);
+	printf("\n");
+	printf("MYFILES = %s\n",cfiles);
+	printf("SRC = ");
+	if ( gen_CPP ) pfiles(files, n, CPP_FILE_SUFFIX_NO_DOT);
+	else pfiles(files, n, "c");
+	if ( gen_CPP ) {
+		printf(" \\\n     ");
+		printf(" ");
+		pclasses(classes, num_classes, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" \\\n      ");
+		printf("$(ANTLR_H)%s%s", DirectorySymbol, APARSER_C);
+		if ( !user_lexer ) printf(" $(ANTLR_H)%s%s", DirectorySymbol, DLEXERBASE_C);
+		if ( gen_trees ) {
+			printf(" \\\n      ");
+			printf("$(ANTLR_H)%s%s", DirectorySymbol, ASTBASE_C);
+			printf(" $(ANTLR_H)%s%s", DirectorySymbol, PCCTSAST_C);
+/*			printf(" $(ANTLR_H)%s%s", DirectorySymbol, LIST_C); */
+			printf(" \\\n      ");
+		}
+		printf(" $(ANTLR_H)%s%s", DirectorySymbol, ATOKENBUFFER_C);
+	}
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf(" $(SCAN)%s", CPP_FILE_SUFFIX);
+		else printf(" %s$(SCAN).c", DIR());
+	}
+	if ( !gen_CPP ) printf(" $(ERR).c");
+	printf("\\\n	$(MYFILES)\n");
+	printf("OBJ = ");
+	pfiles(files, n, "o");
+	if ( gen_CPP ) {
+		printf(" \\\n     ");
+		printf(" ");
+		pclasses(classes, num_classes, "o");
+		printf(" \\\n      ");
+		printf(" %s%s", DIR(), APARSER_O);
+		if ( !user_lexer ) {
+			printf(" %s%s", DIR(), DLEXERBASE_O);
+		}
+		if ( gen_trees ) {
+			printf(" \\\n      ");
+			printf("%s%s", DIR(), ASTBASE_O);
+			printf(" %s%s", DIR(), PCCTSAST_O);
+/*			printf(" %s%s", DIR(), LIST_O); */
+			printf(" \\\n      ");
+		}
+		printf(" %s%s", DIR(), ATOKENBUFFER_O);
+	}
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf(" $(SCAN)%s", OBJ_FILE_SUFFIX);
+		else printf(" %s$(SCAN)%s", DIR(), OBJ_FILE_SUFFIX);
+	}
+	if ( !gen_CPP ) printf(" $(ERR)%s", OBJ_FILE_SUFFIX);
+	printf("\\\n	$(MYFILES:.cpp=.o)\n");
+
+	printf("ANTLR_SPAWN = ");
+	if ( gen_CPP ) pfiles(files, n, CPP_FILE_SUFFIX_NO_DOT);
+	else pfiles(files, n, "c");
+	if ( gen_CPP ) {
+		printf(" ");
+		pclasses(classes, num_classes, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" \\\n              ");
+		pclasses(classes, num_classes, "h");
+		if ( strcmp(hdr,"stdpccts.h")!=0 ) {
+			printf(" \\\n              ");
+			printf("$(HDR_FILE) stdpccts.h");
+		}
+	}
+	if ( user_lexer ) {
+		if ( !user_token_types ) printf(" $(TOKENS)");
+	}
+	else {
+		printf(" $(DLG_FILE)");
+		if ( !user_token_types ) printf(" $(TOKENS)");
+	}
+	if ( !gen_CPP ) printf(" $(ERR).c");
+	printf("\n");
+
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf("DLG_SPAWN = $(SCAN)%s", CPP_FILE_SUFFIX);
+		else printf("DLG_SPAWN = %s$(SCAN).c", DIR());
+		if ( gen_CPP ) printf(" $(SCAN).h");
+		if ( !gen_CPP ) printf(" $(MOD_FILE)");
+		printf("\n");
+	}
+
+	if ( gen_CPP ) {
+		printf("CCC = %s\n",compilerCCC);
+	}
+	else printf("CC = %s\n",compilerCC);
+
+	/* set up dependencies */
+	printf("\n%s : $(OBJ) $(SRC)\n", project);
+	printf("	%s %s %s $(CFLAGS) $(OBJ)\n",
+		   gen_CPP?"$(CCC)":"$(CC)",
+		   RENAME_EXE_FLAG,
+		   project);
+	printf("\n");
+
+	/* implicit rules */
+
+	if(gen_CPP)
+		printf("%%.o : %%.cpp\n\t$(CCC) -c $(CFLAGS) $<\n\n");
+
+	printf("%%.o : %%.c\n\t%s -c $(CFLAGS) $<\n\n",
+			gen_CPP?"$(CCC)":"$(CC)");
+
+	/* how to compile parser files */
+
+	for (i=0; i<num_files; i++)
+	{
+		pfiles(&files[i], 1, "o");
+		if ( user_lexer ) {
+			printf(" : $(TOKENS)");
+		}
+		else {
+			if ( gen_CPP ) printf(" : $(TOKENS) $(SCAN).h");
+			else printf(" : $(MOD_FILE) $(TOKENS)");
+		}
+		printf(" ");
+		if ( gen_CPP ) pfiles(&files[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&files[i], 1, "c");
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+		printf("\n");
+		printf("	%s -c $(CFLAGS) %s ",
+		       gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+		pfiles(&files[i], 1, "o");
+		printf(" ");
+		if ( gen_CPP ) pfiles(&files[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		else pfiles(&files[i], 1, "c");
+		printf("\n\n");
+	}
+
+	/* how to compile err.c */
+	if ( !gen_CPP ) {
+		printf("$(ERR)%s : $(ERR).c", OBJ_FILE_SUFFIX);
+		if ( !user_lexer ) printf(" $(TOKENS)");
+		printf("\n");
+		printf("	%s -c $(CFLAGS) %s $(ERR)%s $(ERR).c",
+			   gen_CPP?"$(CCC)":"$(CC)",
+			   RENAME_OBJ_FLAG,
+			   OBJ_FILE_SUFFIX);
+		printf("\n\n");
+	}
+
+	/* how to compile Class.c */
+	for (i=0; i<num_classes; i++)
+	{
+		pclasses(&classes[i], 1, "o");
+		if ( user_lexer ) {
+			printf(" : $(TOKENS)");
+		}
+		else {
+			printf(" : $(TOKENS) $(SCAN).h");
+		}
+		printf(" ");
+		pclasses(&classes[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf(" ");
+		pclasses(&classes[i], 1, "h");
+		if ( gen_CPP && strcmp(hdr,"stdpccts.h")!=0 ) printf(" $(HDR_FILE)");
+		printf("\n");
+		printf("	%s -c $(CFLAGS) %s ",
+			   gen_CPP?"$(CCC)":"$(CC)",
+			   RENAME_OBJ_FLAG);
+		pclasses(&classes[i], 1, "o");
+		printf(" ");
+		pclasses(&classes[i], 1, CPP_FILE_SUFFIX_NO_DOT);
+		printf("\n\n");
+	}
+
+	/* how to compile scan.c */
+	if ( !user_lexer ) {
+		if ( gen_CPP ) printf("$(SCAN)%s : $(SCAN)%s", OBJ_FILE_SUFFIX, CPP_FILE_SUFFIX);
+		else printf("%s$(SCAN)%s : %s$(SCAN).c", DIR(), OBJ_FILE_SUFFIX, DIR());
+		if ( !user_lexer ) printf(" $(TOKENS)");
+		printf("\n");
+		if ( gen_CPP ) printf("	$(CCC) -c $(CFLAGS) %s $(SCAN)%s $(SCAN)%s",
+							  RENAME_OBJ_FLAG,
+							  OBJ_FILE_SUFFIX,
+							  CPP_FILE_SUFFIX);
+		else printf("	$(CC) -c $(CFLAGS) %s %s$(SCAN)%s %s$(SCAN).c",
+					RENAME_OBJ_FLAG,
+					DIR(),
+					OBJ_FILE_SUFFIX,
+					DIR());
+		printf("\n\n");
+	}
+
+	printf("$(ANTLR_SPAWN) : $(GRM)\n");
+	printf("	$(ANTLR) $(AFLAGS) $(GRM)\n");
+
+	if ( !user_lexer )
+	{
+		printf("\n");
+		printf("$(DLG_SPAWN) : $(DLG_FILE)\n");
+		if ( gen_CPP ) printf("	$(DLG) $(DFLAGS) $(DLG_FILE)\n");
+		else printf("	$(DLG) $(DFLAGS) $(DLG_FILE) $(SCAN).c\n");
+	}
+
+	/* do the makes for ANTLR/DLG support */
+	if ( gen_CPP ) {
+		printf("\n");
+		printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), APARSER_O, DirectorySymbol, APARSER_C);
+		printf("	%s -c $(CFLAGS) %s ",
+			   gen_CPP?"$(CCC)":"$(CC)",
+			   RENAME_OBJ_FLAG);
+		printf("%s%s $(ANTLR_H)%s%s\n", DIR(), APARSER_O, DirectorySymbol, APARSER_C);
+		printf("\n");
+		printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), ATOKENBUFFER_O, DirectorySymbol, ATOKENBUFFER_C);
+		printf("	%s -c $(CFLAGS) %s ",
+			   gen_CPP?"$(CCC)":"$(CC)",
+			   RENAME_OBJ_FLAG);
+		printf("%s%s $(ANTLR_H)%s%s\n", DIR(), ATOKENBUFFER_O, DirectorySymbol, ATOKENBUFFER_C);
+		if ( !user_lexer ) {
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), DLEXERBASE_O, DirectorySymbol, DLEXERBASE_C);
+			printf("	%s -c $(CFLAGS) %s ",
+				   gen_CPP?"$(CCC)":"$(CC)",
+				   RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), DLEXERBASE_O, DirectorySymbol, DLEXERBASE_C);
+		}
+		if ( gen_trees ) {
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), ASTBASE_O, DirectorySymbol, ASTBASE_C);
+			printf("	%s -c $(CFLAGS) %s ",
+				   gen_CPP?"$(CCC)":"$(CC)",
+				   RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), ASTBASE_O, DirectorySymbol, ASTBASE_C);
+			printf("\n");
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), PCCTSAST_O, DirectorySymbol, PCCTSAST_C);
+			printf("	%s -c $(CFLAGS) %s ",
+				   gen_CPP?"$(CCC)":"$(CC)",
+				   RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), PCCTSAST_O, DirectorySymbol, PCCTSAST_C);
+			printf("\n");
+/*
+			printf("%s%s : $(ANTLR_H)%s%s\n", DIR(), LIST_O, DirectorySymbol, LIST_C);
+			printf("	%s -c $(CFLAGS) %s ",
+			       gen_CPP?"$(CCC)":"$(CC)",RENAME_OBJ_FLAG);
+			printf("%s%s $(ANTLR_H)%s%s\n", DIR(), LIST_O, DirectorySymbol, LIST_C);
+*/
+		}
+	}
+
+	/* clean and scrub targets */
+
+	printf("\nclean:\n");
+	printf("	rm -f *%s core %s", OBJ_FILE_SUFFIX, project);
+	if ( strcmp(outdir, ".")!=0 ) printf(" %s*%s", DIR(), OBJ_FILE_SUFFIX);
+	printf("\n");
+
+	printf("\nscrub:\n");
+	printf("	rm -f *%s core %s", OBJ_FILE_SUFFIX, project);
+	if ( strcmp(outdir, ".")!=0 ) printf(" %s*%s", DIR(), OBJ_FILE_SUFFIX);
+	printf(" $(ANTLR_SPAWN)");
+	if ( !user_lexer ) printf(" $(DLG_SPAWN)");
+	printf("\n");
+}
+
+void pfiles(files, n, suffix)
+char **files;
+int n;
+char *suffix;
+{
+	int first=1;
+
+	while ( n>0 )
+	{
+		char *p = &(*files)[strlen(*files)-1];
+		if ( !first ) putchar(' ');
+		first=0;
+		while ( p > *files && *p != '.' ) --p;
+		if ( p == *files )
+		{
+			fprintf(stderr,
+					"genmk: filenames must be file.suffix format: %s\n",
+					*files);
+			exit(-1);
+		}
+		if ( suffix == NULL ) printf("%s", *files);
+		else
+		{
+			*p = '\0';
+			printf("%s", DIR());
+			if ( strcmp(suffix, "o")==0 ) printf("%s%s", *files, OBJ_FILE_SUFFIX);
+			else printf("%s.%s", *files, suffix);
+			*p = '.';
+		}
+		files++;
+		--n;
+	}
+}
+
+void pclasses(classes, n, suffix)
+char **classes;
+int n;
+char *suffix;
+{
+	int first=1;
+
+	while ( n>0 )
+	{
+		if ( !first ) putchar(' ');
+		first=0;
+		if ( suffix == NULL ) printf("%s", *classes);
+		else {
+			printf("%s", DIR());
+			if ( strcmp(suffix, "o")==0 ) printf("%s%s", *classes, OBJ_FILE_SUFFIX);
+			else printf("%s.%s", *classes, suffix);
+		}
+		classes++;
+		--n;
+	}
+}
+
+static void
+#ifdef __STDC__
+ProcessArgs( int argc, char **argv, Opt *options )
+#else
+ProcessArgs( argc, argv, options )
+int argc;
+char **argv;
+Opt *options;
+#endif
+{
+	Opt *p;
+	require(argv!=NULL, "ProcessArgs: command line NULL");
+
+	while ( argc-- > 0 )
+	{
+		p = options;
+		while ( p->option != NULL )
+		{
+			if ( strcmp(p->option, "*") == 0 ||
+				 strcmp(p->option, *argv) == 0 )
+			{
+				if ( p->arg )
+				{
+					(*p->process)( *argv, *(argv+1) );
+					argv++;
+					argc--;
+				}
+				else
+					(*p->process)( *argv );
+				break;
+			}
+			p++;
+		}
+		argv++;
+	}
+}
+
+void fatal( err_)
+char *err_;
+{
+    fprintf(stderr, "genmk: %s\n", err_);
+    exit(1);
+}
+
+void warn( err_)
+char *err_;
+{
+    fprintf(stderr, "genmk: %s\n", err_);
+}
+
+char *DIR()
+{
+	static char buf[200+1];
+	
+	if ( strcmp(outdir,TopDirectory)==0 ) return "";
+	sprintf(buf, "%s%s", outdir, DirectorySymbol);
+	return buf;
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/genmk/makefile b/Tools/Source/TianoTools/Pccts/support/genmk/makefile
new file mode 100644
index 0000000000..a003c2f321
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/genmk/makefile
@@ -0,0 +1,29 @@
+##
+##  7-Apr-97
+##  added support/genmk/makefile to pccts 1.33MR1 distribution kit
+##		(support/genmk/makefile" omitted from 1.33 distribution kit)
+##
+SRC=genmk.c
+OBJ=genmk.o
+# Define PC if you use a PC OS (changes directory symbol and object file extension)
+# see pccts/h/pcctscfg.h
+CC=cc
+COPT=-O
+#CFLAGS=-I../../h -DPC
+CFLAGS=$(COPT) -I../../h
+BAG=../../bin/bag
+
+genmk: $(OBJ) $(SRC) ../../h/pcctscfg.h
+	$(CC) -o genmk $(OBJ)
+
+clean:
+	rm -rf core *.o
+
+scrub:
+	rm -rf genmk core *.o
+
+shar:
+	shar genmk.c makefile > genmk.shar
+
+archive:
+	$(BAG) genmk.c makefile > genmk.bag
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/makefile b/Tools/Source/TianoTools/Pccts/support/rexpr/makefile
new file mode 100644
index 0000000000..44caef1aa5
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/rexpr/makefile
@@ -0,0 +1,19 @@
+BAG=../../bin/bag
+SRC=test.c rexpr.c
+OBJ=test.o rexpr.o
+CFLAGS = -g
+
+test: $(OBJ) $(SRC)
+	cc -g -o texpr $(OBJ)
+
+shar:
+	shar makefile test.c rexpr.c rexpr.h > rexpr.shar
+
+archive:
+	$(BAG) makefile test.c rexpr.c rexpr.h > rexpr.bag
+
+clean:
+	rm -rf *.o core texpr
+
+scrub:
+	rm -rf *.o core texpr
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.c b/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.c
new file mode 100644
index 0000000000..805bf65533
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.c
@@ -0,0 +1,586 @@
+/*
+ * This file contains code for
+ *
+ *      int rexpr(char *expr, char *s);
+ *
+ * which answers
+ *
+ *      1 if 's' is in the language described by the regular expression 'expr'
+ *      0 if it is not
+ *     -1 if the regular expression is invalid
+ *
+ * Language membership is determined by constructing a non-deterministic
+ * finite automata (NFA) from the regular expression.  A depth-
+ * first-search is performed on the NFA (graph) to check for a match of 's'.
+ * Each non-epsilon arc consumes one character from 's'.  Backtracking is
+ * performed to check all possible paths through the NFA.
+ *
+ * Regular expressions follow the meta-language:
+ *
+ * <regExpr>        ::= <andExpr> ( '|' <andExpr> )*
+ *
+ * <andExpr>        ::= <expr> ( <expr> )*
+ *
+ * <expr>           ::= {'~'} '[' <atomList> ']' <repeatSymbol>
+ *                      | '(' <regExpr> ')' <repeatSymbol>
+ *                      | '{' <regExpr> '}' <repeatSymbol>
+ *                      | <atom> <repeatSymbol>
+ *
+ * <repeatSymbol>   ::= { '*' | '+' }
+ *
+ * <atomList>       ::= <atom> ( <atom> )*
+ *                      | { <atomList> } <atom> '-' <atom> { <atomList> }
+ *
+ * <atom>           ::= Token[Atom]
+ *
+ * Notes:
+ *		~	means complement the set in [..]. i.e. all characters not listed
+ *		*	means match 0 or more times (can be on expression or atom)
+ *		+	means match 1 or more times (can be on expression or atom)
+ *		{}	optional
+ *		()	grouping
+ *		[]	set of atoms
+ *		x-y	all characters from x to y (found only in [..])
+ *		\xx the character with value xx
+ *
+ * Examples:
+ *		[a-z]+
+ *			match 1 or more lower-case letters (e.g. variable)
+ *
+ *		0x[0-9A-Fa-f]+
+ *			match a hex number with 0x on front (e.g. 0xA1FF)
+ *
+ *		[0-9]+.[0-9]+{e[0-9]+}
+ *			match a floating point number (e.g. 3.14e21)
+ *
+ * Code example:
+ *		if ( rexpr("[a-zA-Z][a-zA-Z0-9]+", str) ) then str is keyword
+ *
+ * Terence Parr
+ * Purdue University
+ * April 1991
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include "rexpr.h"
+
+#ifdef __USE_PROTOS
+static int regExpr( GraphPtr g );
+static int andExpr( GraphPtr g );
+static int expr( GraphPtr g );
+static int repeatSymbol( GraphPtr g );
+static int atomList( char *p, int complement );
+static void next( void );
+static ArcPtr newGraphArc( void );
+static NodePtr newNode( void );
+static int ArcBetweenGraphNode( NodePtr i, NodePtr j, int label );
+static Graph BuildNFA_atom( int label );
+static Graph BuildNFA_AB( Graph A, Graph B );
+static Graph BuildNFA_AorB( Graph A, Graph B );
+static Graph BuildNFA_set( char *s );
+static Graph BuildNFA_Astar( Graph A );
+static Graph BuildNFA_Aplus( Graph A );
+static Graph BuildNFA_Aoptional( Graph A );
+#else
+static int regExpr();
+static int andExpr();
+static int expr();
+static int repeatSymbol();
+static int atomList();
+static void next();
+static ArcPtr newGraphArc();
+static NodePtr newNode();
+static int ArcBetweenGraphNode();
+static Graph BuildNFA_atom();
+static Graph BuildNFA_AB();
+static Graph BuildNFA_AorB();
+static Graph BuildNFA_set();
+static Graph BuildNFA_Astar();
+static Graph BuildNFA_Aplus();
+static Graph BuildNFA_Aoptional();
+#endif
+
+static char *_c;
+static int token, tokchar;
+static NodePtr accept;
+static NodePtr freelist = NULL;
+
+/*
+ * return 1 if s in language described by expr
+ *        0 if s is not
+ *       -1 if expr is an invalid regular expression
+ */
+#ifdef __USE_PROTOS
+static int rexpr(char *expr,char *s)
+#else
+static int rexpr(expr, s)
+char *expr, *s;
+#endif
+{
+	NodePtr p,q;
+	Graph nfa;
+	int result;
+
+	fprintf(stderr, "rexpr(%s,%s);\n", expr,s);
+	freelist = NULL;
+	_c = expr;
+	next();
+	if ( regExpr(&nfa) == -1 ) return -1;
+	accept = nfa.right;
+	result = match(nfa.left, s);
+	/* free all your memory */
+	p = q = freelist;
+	while ( p!=NULL ) { q = p->track; free(p); p = q; }
+	return result;
+}
+
+/*
+ * do a depth-first-search on the NFA looking for a path from start to
+ * accept state labelled with the characters of 's'.
+ */
+
+#ifdef __USE_PROTOS
+static int match(NodePtr automaton,char *s)
+#else
+static int match(automaton, s)
+NodePtr automaton;
+char *s;
+#endif
+{
+	ArcPtr p;
+	
+	if ( automaton == accept && *s == '\0' ) return 1;	/* match */
+
+	for (p=automaton->arcs; p!=NULL; p=p->next)			/* try all arcs */
+	{
+		if ( p->label == Epsilon )
+		{
+			if ( match(p->target, s) ) return 1;
+		}
+		else if ( p->label == *s )
+				if ( match(p->target, s+1) ) return 1;
+	}
+	return 0;
+}
+
+/*
+ * <regExpr>        ::= <andExpr> ( '|' {<andExpr>} )*
+ *
+ * Return -1 if syntax error
+ * Return  0 if none found
+ * Return  1 if a regExrp was found
+ */
+
+#ifdef __USE_PROTOS
+static int regExpr(GraphPtr g)
+#else
+static int regExpr(g)
+GraphPtr g;
+#endif
+{
+	Graph g1, g2;
+	
+	if ( andExpr(&g1) == -1 )
+	{
+		return -1;
+	}
+	
+	while ( token == '|' )
+	{
+		int a;
+		next();
+		a = andExpr(&g2);
+		if ( a == -1 ) return -1;	/* syntax error below */
+		else if ( !a ) return 1;	/* empty alternative */
+		g1 = BuildNFA_AorB(g1, g2);
+	}
+	
+	if ( token!='\0' ) return -1;
+
+	*g = g1;
+	return 1;
+}
+
+/*
+ * <andExpr>        ::= <expr> ( <expr> )*
+ */
+
+#ifdef __USE_PROTOS
+static int andExpr(GraphPtr g)
+#else
+static int andExpr(g)
+GraphPtr g;
+#endif
+{
+	Graph g1, g2;
+	
+	if ( expr(&g1) == -1 )
+	{
+		return -1;
+	}
+	
+	while ( token==Atom || token=='{' || token=='(' || token=='~' || token=='[' )
+	{
+		if (expr(&g2) == -1) return -1;
+		g1 = BuildNFA_AB(g1, g2);
+	}
+	
+	*g = g1;
+	return 1;
+}
+
+/*
+ * <expr>           ::=    {'~'} '[' <atomList> ']' <repeatSymbol>
+ *                      | '(' <regExpr> ')' <repeatSymbol>
+ *                      | '{' <regExpr> '}' <repeatSymbol>
+ *                      | <atom> <repeatSymbol>
+ */
+
+#ifdef __USE_PROTOS
+static int expr(GraphPtr g)
+#else
+static int expr(g)
+GraphPtr g;
+#endif
+{
+	int complement = 0;
+	char s[257];    /* alloc space for string of char in [] */
+	
+	if ( token == '~' || token == '[' )
+	{
+		if ( token == '~' ) {complement = 1; next();}
+		if ( token != '[' ) return -1;
+		next();
+		if ( atomList( s, complement ) == -1 ) return -1;
+		*g = BuildNFA_set( s );
+		if ( token != ']' ) return -1;
+		next();
+		repeatSymbol( g );
+		return 1;
+	}
+	if ( token == '(' )
+	{
+		next();
+		if ( regExpr( g ) == -1 ) return -1;
+		if ( token != ')' ) return -1;
+		next();
+		repeatSymbol( g );
+		return 1;
+	}
+	if ( token == '{' )
+	{
+		next();
+		if ( regExpr( g ) == -1 ) return -1;
+		if ( token != '}' ) return -1;
+		next();
+		/* S p e c i a l  C a s e   O p t i o n a l  {  } */
+		if ( token != '*' && token != '+' )
+		{
+			*g = BuildNFA_Aoptional( *g );
+		}
+		repeatSymbol( g );
+		return 1;
+	}
+	if ( token == Atom )
+	{
+		*g = BuildNFA_atom( tokchar );
+		next();
+		repeatSymbol( g );
+		return 1;
+	}
+	
+	return -1;
+}
+
+/*
+ * <repeatSymbol>   ::= { '*' | '+' }
+ */
+#ifdef __USE_PROTOS
+static int repeatSymbol(GraphPtr g)
+#else
+static int repeatSymbol(g)
+GraphPtr g;
+#endif
+{
+	switch ( token )
+	{
+		case '*' : *g = BuildNFA_Astar( *g ); next(); break;
+		case '+' : *g = BuildNFA_Aplus( *g ); next(); break;
+	}
+	return 1;
+}
+
+/*
+ * <atomList>       ::= <atom> { <atom> }*
+ *                      { <atomList> } <atom> '-' <atom> { <atomList> }
+ *
+ * a-b is same as ab
+ * q-a is same as q
+ */
+
+#ifdef __USE_PROTOS
+static int atomList(char *p, int complement)
+#else
+static int atomList(p, complement)
+char *p;
+int complement;
+#endif
+{
+	static unsigned char set[256];		/* no duplicates */
+	int first, last, i;
+	char *s = p;
+	
+	if ( token != Atom ) return -1;
+	
+	for (i=0; i<256; i++) set[i] = 0;
+	while ( token == Atom )
+	{
+		if ( !set[tokchar] ) *s++ = tokchar;
+		set[tokchar] = 1;    			/* Add atom to set */
+		next();
+		if ( token == '-' )         	/* have we found '-' */
+		{
+			first = *(s-1);             /* Get last char */
+			next();
+			if ( token != Atom ) return -1;
+			else
+			{
+				last = tokchar;
+			}
+			for (i = first+1; i <= last; i++)
+			{
+				if ( !set[tokchar] ) *s++ = i;
+				set[i] = 1;    			/* Add atom to set */
+			}
+			next();
+		}
+	}
+	*s = '\0';
+	if ( complement )
+	{
+		for (i=0; i<256; i++) set[i] = !set[i];
+		for (i=1,s=p; i<256; i++) if ( set[i] ) *s++ = i;
+		*s = '\0';
+	}
+	return 1;
+}
+
+/* a somewhat stupid lexical analyzer */
+
+#ifdef __USE_PROTOS
+static void next(void)
+#else
+static void next()
+#endif
+{
+	while ( *_c==' ' || *_c=='\t' || *_c=='\n' ) _c++;
+	if ( *_c=='\\' )
+	{
+		_c++;
+		if ( isdigit(*_c) )
+		{
+			int n=0;
+			while ( isdigit(*_c) )
+			{
+				n = n*10 + (*_c++ - '0');
+			}
+			if ( n>255 ) n=255;
+			tokchar = n;
+		}
+		else
+		{
+			switch (*_c)
+			{
+				case 'n' : tokchar = '\n'; break;
+				case 't' : tokchar = '\t'; break;
+				case 'r' : tokchar = '\r'; break;
+				default  : tokchar = *_c;
+			}
+			_c++;
+		}
+		token = Atom;
+	}
+	else if ( isgraph(*_c) && *_c!='[' && *_c!='(' && *_c!='{' &&
+			  *_c!='-' && *_c!='}' && *_c!=')' && *_c!=']' &&
+			  *_c!='+' && *_c!='*' && *_c!='~' && *_c!='|' )
+	{
+		token = Atom;
+		tokchar = *_c++;
+	}
+	else
+	{
+		token = tokchar = *_c++;
+	}
+}
+
+/* N F A  B u i l d i n g  R o u t i n e s */
+
+#ifdef __USE_PROTOS
+static ArcPtr newGraphArc(void)
+#else
+static ArcPtr newGraphArc()
+#endif
+{
+	ArcPtr p;
+	p = (ArcPtr) calloc(1, sizeof(Arc));
+	if ( p==NULL ) {fprintf(stderr,"rexpr: out of memory\n"); exit(-1);}
+	if ( freelist != NULL ) p->track = (ArcPtr) freelist;
+	freelist = (NodePtr) p;
+	return p;
+}
+
+#ifdef __USE_PROTOS
+static NodePtr newNode(void)
+#else
+static NodePtr newNode()
+#endif
+{
+	NodePtr p;
+	p = (NodePtr) calloc(1, sizeof(Node));
+	if ( p==NULL ) {fprintf(stderr,"rexpr: out of memory\n"); exit(-1);}
+	if ( freelist != NULL ) p->track = freelist;
+	freelist = p;
+	return p;
+}
+
+#ifdef __USE_PROTOS
+static void ArcBetweenGraphNodes(NodePtr i,NodePtr j,int label)
+#else
+static void ArcBetweenGraphNodes(i, j, label)
+NodePtr i, j;
+int label;
+#endif
+{
+	ArcPtr a;
+	
+	a = newGraphArc();
+	if ( i->arcs == NULL ) i->arctail = i->arcs = a;
+	else {(i->arctail)->next = a; i->arctail = a;}
+	a->label = label;
+	a->target = j;
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_atom(int label)
+#else
+static Graph BuildNFA_atom(label)
+int label;
+#endif
+{
+	Graph g;
+	
+	g.left = newNode();
+	g.right = newNode();
+	ArcBetweenGraphNodes(g.left, g.right, label);
+	return( g );
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_AB(Graph A,Graph B)
+#else
+static Graph BuildNFA_AB(A, B)
+Graph A, B;
+#endif
+{
+	Graph g;
+	
+	ArcBetweenGraphNodes(A.right, B.left, Epsilon);
+	g.left = A.left;
+	g.right = B.right;
+	return( g );
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_AorB(Graph A,Graph B)
+#else
+static Graph BuildNFA_AorB(A, B)
+Graph A, B;
+#endif
+{
+	Graph g;
+	
+	g.left = newNode();
+	ArcBetweenGraphNodes(g.left, A.left, Epsilon);
+	ArcBetweenGraphNodes(g.left, B.left, Epsilon);
+	g.right = newNode();
+	ArcBetweenGraphNodes(A.right, g.right, Epsilon);
+	ArcBetweenGraphNodes(B.right, g.right, Epsilon);
+	return( g );
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_set(char *s)
+#else
+static Graph BuildNFA_set( s )
+char *s;
+#endif
+{
+	Graph g;
+	
+	if ( s == NULL ) return g;
+	
+	g.left = newNode();
+	g.right = newNode();
+	while ( *s != '\0' )
+	{
+		ArcBetweenGraphNodes(g.left, g.right, *s++);
+	}
+	return g;
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_Astar(Graph A)
+#else
+static Graph BuildNFA_Astar( A )
+Graph A;
+#endif
+{
+	Graph g;
+
+	g.left = newNode();
+	g.right = newNode();
+	
+	ArcBetweenGraphNodes(g.left, A.left, Epsilon);
+	ArcBetweenGraphNodes(g.left, g.right, Epsilon);
+	ArcBetweenGraphNodes(A.right, g.right, Epsilon);
+	ArcBetweenGraphNodes(A.right, A.left, Epsilon);
+	
+	return( g );
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_Aplus(Graph A)
+#else
+static Graph BuildNFA_Aplus( A )
+Graph A;
+#endif
+{
+	ArcBetweenGraphNodes(A.right, A.left, Epsilon);
+	
+	return( A );
+}
+
+#ifdef __USE_PROTOS
+static Graph BuildNFA_Aoptional(Graph A)
+#else
+static Graph BuildNFA_Aoptional( A )
+Graph A;
+#endif
+{
+	Graph g;
+	
+	g.left = newNode();
+	g.right = newNode();
+	
+	ArcBetweenGraphNodes(g.left, A.left, Epsilon);
+	ArcBetweenGraphNodes(g.left, g.right, Epsilon);
+	ArcBetweenGraphNodes(A.right, g.right, Epsilon);
+	
+	return( g );
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.h b/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.h
new file mode 100644
index 0000000000..e67a9652fb
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/rexpr/rexpr.h
@@ -0,0 +1,30 @@
+#define Atom	256		/* token Atom (an impossible char value) */
+#define Epsilon	257		/* epsilon arc (an impossible char value) */
+
+/* track field must be same for all node types */
+typedef struct _a {
+					struct _a *track;	/* track mem allocation */
+					int label;
+					struct _a *next;
+					struct _n *target;
+				} Arc, *ArcPtr;
+
+typedef struct _n {
+					struct _n *track;
+					ArcPtr arcs, arctail;
+				} Node, *NodePtr;
+
+typedef struct	{
+					NodePtr left,
+						 	right;
+				} Graph, *GraphPtr;
+
+#ifdef __USE_PROTOS
+int rexpr( char *expr, char *s );
+int match( NodePtr automaton, char *s );
+#else
+int rexpr();
+int match();
+#endif
+
+
diff --git a/Tools/Source/TianoTools/Pccts/support/rexpr/test.c b/Tools/Source/TianoTools/Pccts/support/rexpr/test.c
new file mode 100644
index 0000000000..2619539e4b
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/rexpr/test.c
@@ -0,0 +1,19 @@
+#include <stdio.h>
+#include "rexpr.h"
+
+/*
+ * test for rexpr().
+ * To make this test:
+ *	cc -o rexpr test.c rexpr.c
+ * Then from command line type:
+ *	rexpr r string
+ * where r is the regular expression that decribes a language
+ * and string is the string to verify.
+ */
+main(argc,argv)
+int argc;
+char *argv[];
+{
+	if ( argc!=3 ) fprintf(stderr,"rexpr: expr s\n");
+	else printf("%d\n", rexpr(argv[1], argv[2]));
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/set/set.c b/Tools/Source/TianoTools/Pccts/support/set/set.c
new file mode 100644
index 0000000000..eb6fba7393
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/set/set.c
@@ -0,0 +1,816 @@
+/*	set.c
+
+	The following is a general-purpose set library originally developed
+	by Hank Dietz and enhanced by Terence Parr to allow dynamic sets.
+	
+	Sets are now structs containing the #words in the set and
+	a pointer to the actual set words.
+	
+	Generally, sets need not be explicitly allocated.  They are
+	created/extended/shrunk when appropriate (e.g. in set_of()).
+	HOWEVER, sets need to be destroyed (free()ed) when they go out of scope
+	or are otherwise no longer needed.  A routine is provided to
+	free a set.
+	
+	Sets can be explicitly created with set_new(s, max_elem).
+	
+	Sets can be declared to have minimum size to reduce realloc traffic.
+	Default minimum size = 1.
+	
+	Sets can be explicitly initialized to have no elements (set.n == 0)
+	by using the 'empty' initializer:
+	
+	Examples:
+		set a = empty;	-- set_deg(a) == 0
+		
+		return( empty );
+	
+	Example set creation and destruction:
+	
+	set
+	set_of2(e,g)
+	unsigned e,g;
+	{
+		set a,b,c;
+		
+		b = set_of(e);		-- Creates space for b and sticks in e
+		set_new(c, g);		-- set_new(); set_orel() ==> set_of()
+		set_orel(g, &c);
+		a = set_or(b, c);
+		.
+		.
+		.
+		set_free(b);
+		set_free(c);
+		return( a );
+	}
+
+	1987 by Hank Dietz
+	
+	Modified by:
+		Terence Parr
+		Purdue University
+		October 1989
+
+	Made it smell less bad to C++ 7/31/93 -- TJP
+*/
+
+#include <stdio.h>
+#include "pcctscfg.h"
+#ifdef __STDC__
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include <string.h>
+
+#include "set.h"
+
+#define MIN(i,j) ( (i) > (j) ? (j) : (i))
+#define MAX(i,j) ( (i) < (j) ? (j) : (i))
+
+/* elems can be a maximum of 32 bits */
+static unsigned bitmask[] = {
+	0x00000001, 0x00000002, 0x00000004, 0x00000008,
+	0x00000010, 0x00000020, 0x00000040, 0x00000080,
+	0x00000100, 0x00000200, 0x00000400, 0x00000800,
+	0x00001000, 0x00002000, 0x00004000, 0x00008000,
+#if !defined(PC) || defined(PC32)
+	0x00010000, 0x00020000, 0x00040000, 0x00080000,
+	0x00100000, 0x00200000, 0x00400000, 0x00800000,
+	0x01000000, 0x02000000, 0x04000000, 0x08000000,
+	0x10000000, 0x20000000, 0x40000000, 0x80000000
+#endif
+};
+
+set empty = set_init;
+static unsigned min=1;
+
+#define StrSize		200
+
+#ifdef MEMCHK
+#define CHK(a)					\
+	if ( a.setword != NULL )	\
+	  if ( !valid(a.setword) )	\
+		{fprintf(stderr, "%s(%d): invalid set\n",__FILE__,__LINE__); exit(-1);}
+#else
+#define CHK(a)
+#endif
+
+/*
+ * Set the minimum size (in words) of a set to reduce realloc calls
+ */
+void
+#ifdef __USE_PROTOS
+set_size( unsigned n )
+#else
+set_size( n )
+unsigned n;
+#endif
+{
+	min = n;
+}
+
+unsigned int
+#ifdef __USE_PROTOS
+set_deg( set a )
+#else
+set_deg( a )
+set a;
+#endif
+{
+	/* Fast compute degree of a set... the number
+	   of elements present in the set.  Assumes
+	   that all word bits are used in the set
+	   and that SETSIZE(a) is a multiple of WORDSIZE.
+	*/
+	register unsigned *p = &(a.setword[0]);
+	register unsigned *endp = NULL; /* MR27 Avoid false memory check report */
+	register unsigned degree = 0;
+
+	CHK(a);
+	if ( a.n == 0 ) return(0);
+	endp = &(a.setword[a.n]);
+	while ( p < endp )
+	{
+		register unsigned t = *p;
+		register unsigned *b = &(bitmask[0]);
+		do {
+			if (t & *b) ++degree;
+		} while (++b < &(bitmask[WORDSIZE]));
+		p++;
+	}
+
+	return(degree);
+}
+
+set
+#ifdef __USE_PROTOS
+set_or( set b, set c )
+#else
+set_or( b, c )
+set b;
+set c;
+#endif
+{
+	/* Fast set union operation */
+	/* resultant set size is max(b, c); */
+	set *big;
+	set t;
+	unsigned int m,n;
+	register unsigned *r, *p, *q, *endp;
+
+	CHK(b); CHK(c);
+	t = empty;
+	if (b.n > c.n) {big= &b; m=b.n; n=c.n;} else {big= &c; m=c.n; n=b.n;}
+	set_ext(&t, m);
+	r = t.setword;
+
+	/* Or b,c until max of smaller set */
+	q = c.setword;
+	p = b.setword;
+	endp = &(b.setword[n]);
+	while ( p < endp ) *r++ = *p++ | *q++;	
+
+	/* Copy rest of bigger set into result */
+	p = &(big->setword[n]);
+	endp = &(big->setword[m]);
+	while ( p < endp ) *r++ = *p++;
+
+	return(t);
+}
+
+set
+#ifdef __USE_PROTOS
+set_and( set b, set c )
+#else
+set_and( b, c )
+set b;
+set c;
+#endif
+{
+	/* Fast set intersection operation */
+	/* resultant set size is min(b, c); */
+	set t;
+	unsigned int n;
+	register unsigned *r, *p, *q, *endp;
+
+	CHK(b); CHK(c);
+	t = empty;
+	n = (b.n > c.n) ? c.n : b.n;
+	if ( n == 0 ) return t;		/* TJP 4-27-92 fixed for empty set */
+	set_ext(&t, n);
+	r = t.setword;
+
+	/* & b,c until max of smaller set */
+	q = c.setword;
+	p = b.setword;
+	endp = &(b.setword[n]);
+	while ( p < endp ) *r++ = *p++ & *q++;	
+
+	return(t);
+}
+
+set
+#ifdef __USE_PROTOS
+set_dif( set b, set c )
+#else
+set_dif( b, c )
+set b;
+set c;
+#endif
+{
+	/* Fast set difference operation b - c */
+	/* resultant set size is size(b) */
+	set t;
+	unsigned int n;
+	register unsigned *r, *p, *q, *endp;
+
+	CHK(b); CHK(c);
+	t = empty;
+	n = (b.n <= c.n) ? b.n : c.n ;
+	if ( b.n == 0 ) return t;		/* TJP 4-27-92 fixed for empty set */
+									/* WEC 12-1-92 fixed for c.n = 0 */
+	set_ext(&t, b.n);
+	r = t.setword;
+
+	/* Dif b,c until smaller set size */
+	q = c.setword;
+	p = b.setword;
+	endp = &(b.setword[n]);
+	while ( p < endp ) *r++ = *p++ & (~ *q++);	
+
+	/* Copy rest of b into result if size(b) > c */
+	if ( b.n > n )
+	{
+		p = &(b.setword[n]);
+		endp = &(b.setword[b.n]);
+		while ( p < endp ) *r++ = *p++;
+	}
+
+	return(t);
+}
+
+set
+#ifdef __USE_PROTOS
+set_of( unsigned b )
+#else
+set_of( b )
+unsigned b;
+#endif
+{
+	/* Fast singleton set constructor operation */
+	static set a;
+
+	if ( b == nil ) return( empty );
+	set_new(a, b);
+	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
+
+	return(a);
+}
+
+/*
+ * Extend (or shrink) the set passed in to have n words.
+ *
+ * if n is smaller than the minimum, boost n to have the minimum.
+ * if the new set size is the same as the old one, do nothing.
+ *
+ * TJP 4-27-92 Fixed so won't try to alloc 0 bytes
+ */
+void
+#ifdef __USE_PROTOS
+set_ext( set *a, unsigned int n )
+#else
+set_ext( a, n )
+set *a;
+unsigned int n;
+#endif
+{
+	register unsigned *p;
+	register unsigned *endp;
+	unsigned int size;
+	
+	CHK((*a));
+    if ( a->n == 0 )
+    {
+		if ( n == 0 ) return;
+		if (a->setword != NULL) {
+			free (a->setword);	/* MR20 */
+		}
+        a->setword = (unsigned *) calloc(n, BytesPerWord);
+        if ( a->setword == NULL )
+        {
+            fprintf(stderr, "set_ext(%d words): cannot allocate set\n", n);
+            exit(-1);
+        }
+        a->n = n;
+        return;
+    }
+	if ( n < min ) n = min;
+	if ( a->n == n || n == 0 ) return;
+	size = a->n;
+	a->n = n;
+	a->setword = (unsigned *) realloc( (char *)a->setword, (n*BytesPerWord) );
+	if ( a->setword == NULL )
+	{
+		fprintf(stderr, "set_ext(%d words): cannot allocate set\n", n);
+		exit(-1);
+	}
+
+	p    = &(a->setword[size]);		/* clear from old size to new size */
+	endp = &(a->setword[a->n]);
+	do {
+		*p++ = 0;
+	} while ( p < endp );
+}
+
+set
+#ifdef __USE_PROTOS
+set_not( set a )
+#else
+set_not( a )
+set a;
+#endif
+{
+	/* Fast not of set a (assumes all bits used) */
+	/* size of resultant set is size(a) */
+	/* ~empty = empty cause we don't know how bit to make set */
+	set t;
+	register unsigned *r;
+	register unsigned *p = a.setword;
+	register unsigned *endp = &(a.setword[a.n]);
+
+	CHK(a);
+	t = empty;
+	if ( a.n == 0 ) return( empty );
+	set_ext(&t, a.n);
+	r = t.setword;
+	
+	do {
+		*r++ = (~ *p++);
+	} while ( p < endp );
+
+	return(t);
+}
+
+int
+#ifdef __USE_PROTOS
+set_equ( set a, set b )
+#else
+set_equ( a, b )
+set a;
+set b;
+#endif
+{
+/* 8-Nov-97     Make it work with sets of different sizes       */
+/*              Easy to understand, too.  Probably faster.      */
+/*              Check for a equal to b                          */
+
+    unsigned int    count;      /* MR11 */
+    unsigned int    i;          /* MR11 */
+
+	CHK(a); CHK(b);
+
+    count=MIN(a.n,b.n);
+    if (count == 0) return 1;
+    for (i=0; i < count; i++) {
+      if (a.setword[i] != b.setword[i]) return 0;
+    };
+    if (a.n < b.n) {
+      for (i=count; i < b.n; i++) {
+        if (b.setword[i] != 0) return 0;
+      }
+      return 1;
+    } else if (a.n > b.n) {
+      for (i=count; i < a.n; i++) {
+        if (a.setword[i] != 0) return 0;
+      }
+      return 1;
+    } else {
+      return 1;
+    };
+}
+
+int
+#ifdef __USE_PROTOS
+set_sub( set a, set b )
+#else
+set_sub( a, b )
+set a;
+set b;
+#endif
+{
+
+/* 8-Nov-97     Make it work with sets of different sizes       */
+/*              Easy to understand, too.  Probably faster.      */
+/*              Check for a is a PROPER subset of b             */
+
+    unsigned int    count;
+    unsigned int    i;
+
+	CHK(a); CHK(b);
+
+    if (a.n == 0) return 1;
+    count=MIN(a.n,b.n);
+    for (i=0; i < count; i++) {
+      if (a.setword[i] & ~b.setword[i]) return 0;
+    };
+    if (a.n <= b.n) {
+      return 1;
+    } else {
+      for (i=count; i<a.n ; i++) {
+        if (a.setword[i]) return 0;
+      };
+    };
+    return 1;
+}
+
+unsigned
+#ifdef __USE_PROTOS
+set_int( set b )
+#else
+set_int( b )
+set b;
+#endif
+{
+	/* Fast pick any element of the set b */
+	register unsigned *p = b.setword;
+	register unsigned *endp = &(b.setword[b.n]);
+
+	CHK(b);
+	if ( b.n == 0 ) return( nil );
+
+	do {
+		if (*p) {
+			/* Found a non-empty word of the set */
+			register unsigned i = ((p - b.setword) << LogWordSize);
+			register unsigned t = *p;
+			p = &(bitmask[0]);
+			while (!(*p & t)) {
+				++i; ++p;
+			}
+			return(i);
+		}
+	} while (++p < endp);
+
+	/* Empty -- only element it contains is nil */
+	return(nil);
+}
+
+int
+#ifdef __USE_PROTOS
+set_el( unsigned b, set a )
+#else
+set_el( b, a )
+unsigned b;
+set a;
+#endif
+{
+	CHK(a);
+	/* nil is an element of every set */
+	if (b == nil) return(1);
+	if ( a.n == 0 || NumWords(b) > a.n ) return(0);
+	
+	/* Otherwise, we have to check */
+	return( a.setword[DIVWORD(b)] & bitmask[MODWORD(b)] );
+}
+
+int
+#ifdef __USE_PROTOS
+set_nil( set a )
+#else
+set_nil( a )
+set a;
+#endif
+{
+	/* Fast check for nil set */
+	register unsigned *p = a.setword;
+	register unsigned *endp;
+
+	CHK(a);
+	if ( a.n == 0 ) return(1);
+	endp = &(a.setword[a.n]);
+	
+	/* The set is not empty if any word used to store
+	   the set is non-zero.  This means one must be a
+	   bit careful about doing things like negation.
+	*/
+	do {
+		if (*p) return(0);
+	} while (++p < endp);
+	
+	return(1);
+}
+
+char *
+#ifdef __USE_PROTOS
+set_str( set a )
+#else
+set_str( a )
+set a;
+#endif
+{
+	/* Fast convert set a into ASCII char string...
+	   assumes that all word bits are used in the set
+	   and that SETSIZE is a multiple of WORDSIZE.
+	   Trailing 0 bits are removed from the string.
+	   if no bits are on or set is empty, "" is returned.
+	*/
+	register unsigned *p = a.setword;
+	register unsigned *endp = &(a.setword[a.n]);
+	static char str_tmp[StrSize+1];
+	register char *q = &(str_tmp[0]);
+
+	CHK(a);
+	if ( a.n==0 ) {*q=0; return( &(str_tmp[0]) );}
+	do {
+		register unsigned t = *p;
+		register unsigned *b = &(bitmask[0]);
+		do {
+			*(q++) = (char) ((t & *b) ? '1' : '0');
+		} while (++b < &(bitmask[WORDSIZE]));
+	} while (++p < endp);
+
+	/* Trim trailing 0s & NULL terminate the string */
+	while ((q > &(str_tmp[0])) && (*(q-1) != '1')) --q;
+	*q = 0;
+
+	return(&(str_tmp[0]));
+}
+
+set
+#ifdef __USE_PROTOS
+set_val( register char *s )
+#else
+set_val( s )
+register char *s;
+#endif
+{
+	/* Fast convert set ASCII char string into a set.
+	   If the string ends early, the remaining set bits
+	   are all made zero.
+	   The resulting set size is just big enough to hold all elements.
+	*/
+	static set a;
+	register unsigned *p, *endp;
+
+	set_new(a, strlen(s));
+	p = a.setword;
+	endp = &(a.setword[a.n]);
+	do {
+		register unsigned *b = &(bitmask[0]);
+		/* Start with a word with no bits on */
+		*p = 0;
+		do {
+			if (*s) {
+				if (*s == '1') {
+					/* Turn-on this bit */
+					*p |= *b;
+				}
+				++s;
+			}
+		} while (++b < &(bitmask[WORDSIZE]));
+	} while (++p < endp);
+
+	return(a);
+}
+
+/*
+ * Or element e into set a.  a can be empty.
+ */
+void
+#ifdef __USE_PROTOS
+set_orel( unsigned e, set *a )
+#else
+set_orel( e, a )
+unsigned e;
+set *a;
+#endif
+{
+	CHK((*a));
+	if ( e == nil ) return;
+	if ( NumWords(e) > a->n ) set_ext(a, NumWords(e));
+	a->setword[DIVWORD(e)] |= bitmask[MODWORD(e)];
+}
+
+/*
+ * Or set b into set a.  a can be empty. does nothing if b empty.
+ */
+void
+#ifdef __USE_PROTOS
+set_orin( set *a, set b )
+#else
+set_orin( a, b )
+set *a;
+set b;
+#endif
+{
+	/* Fast set union operation */
+	/* size(a) is max(a, b); */
+	unsigned int m;
+	register unsigned *p,
+					  *q    = b.setword,
+					  *endq; /* MR20 */
+
+	CHK((*a)); CHK(b);
+	if ( b.n == 0 ) return;
+	endq = &(b.setword[b.n]); /* MR20 */
+	m = (a->n > b.n) ? a->n : b.n;
+	set_ext(a, m);
+	p = a->setword;
+	do {
+		*p++ |= *q++;
+	} while ( q < endq );
+}
+
+/*
+ * And set b into set a.  a can be empty. does nothing if b empty.
+ */
+void
+#ifdef __USE_PROTOS
+set_andin( set *a, set b )
+#else
+set_andin( a, b )
+set *a;
+set b;
+#endif
+{
+	/* Fast set intersection operation */
+	/* size(a) is max(a, b); */
+	unsigned int m;
+	register unsigned *p,
+					  *q    = b.setword,
+					  *endq = &(b.setword[b.n]);
+
+	CHK((*a)); CHK(b);
+	if ( b.n == 0 ) return;
+	m = (a->n > b.n) ? a->n : b.n;
+	set_ext(a, m);
+	p = a->setword;
+	do {
+		*p++ &= *q++;
+	} while ( q < endq );
+}
+
+void
+#ifdef __USE_PROTOS
+set_rm( unsigned e, set a )
+#else
+set_rm( e, a )
+unsigned e;
+set a;
+#endif
+{
+	/* Does not effect size of set */
+	CHK(a);
+	if ( (e == nil) || (NumWords(e) > a.n) ) return;
+	a.setword[DIVWORD(e)] ^= (a.setword[DIVWORD(e)]&bitmask[MODWORD(e)]);
+}
+
+void
+#ifdef __USE_PROTOS
+set_clr( set a )
+#else
+set_clr( a )
+set a;
+#endif
+{
+	/* Does not effect size of set */
+	register unsigned *p = a.setword;
+	register unsigned *endp;
+	
+	CHK(a);
+	if ( a.n == 0 ) return;
+	endp = &(a.setword[a.n]);
+	do {
+		*p++ = 0;
+	} while ( p < endp );
+}
+
+set
+#ifdef __USE_PROTOS
+set_dup( set a )
+#else
+set_dup( a )
+set a;
+#endif
+{
+	set b;
+	register unsigned *p,
+					  *q    = a.setword,
+					  *endq; /* MR20 */
+	
+	CHK(a);
+	b = empty;
+	if ( a.n == 0 ) return( empty );
+	endq = &(a.setword[a.n]);	/* MR20 */
+	set_ext(&b, a.n);
+	p = b.setword;
+	do {
+		*p++ = *q++;
+	} while ( q < endq );
+	
+	return(b);
+}
+
+/*
+ * Return a nil terminated list of unsigned ints that represents all
+ * "on" bits in the bit set.
+ *
+ * e.g. {011011} --> {1, 2, 4, 5, nil}
+ *
+ * _set_pdq and set_pdq are useful when an operation is required on each element
+ * of a set.  Normally, the sequence is:
+ *
+ *		while ( set_deg(a) > 0 ) {
+ *			e = set_int(a);
+ *			set_rm(e, a);
+ *			...process e...
+ *		}
+ * Now,
+ *
+ *		t = e = set_pdq(a);
+ *		while ( *e != nil ) {
+ *			...process *e...
+ *			e++;
+ *		}
+ *		free( t );
+ *
+ * We have saved many set calls and have not destroyed set a.
+ */
+void
+#ifdef __USE_PROTOS
+_set_pdq( set a, register unsigned *q )
+#else
+_set_pdq( a, q )
+set a;
+register unsigned *q;
+#endif
+{
+	register unsigned *p = a.setword,
+					  *endp = &(a.setword[a.n]);
+	register unsigned e=0;
+
+	CHK(a);
+	/* are there any space (possibility of elements)? */
+	if ( a.n == 0 ) return;
+	do {
+		register unsigned t = *p;
+		register unsigned *b = &(bitmask[0]);
+		do {
+			if ( t & *b ) *q++ = e;
+			++e;
+		} while (++b < &(bitmask[WORDSIZE]));
+	} while (++p < endp);
+	*q = nil;
+}
+
+/*
+ * Same as _set_pdq except allocate memory.  set_pdq is the natural function
+ * to use.
+ */
+unsigned *
+#ifdef __USE_PROTOS
+set_pdq( set a )
+#else
+set_pdq( a )
+set a;
+#endif
+{
+	unsigned *q;
+	int max_deg;
+	
+	CHK(a);
+	max_deg = WORDSIZE*a.n;
+	/* assume a.n!=0 & no elements is rare, but still ok */
+	if ( a.n == 0 ) return(NULL);
+	q = (unsigned *) malloc((max_deg+1)*BytesPerWord);
+	if ( q == NULL ) return( NULL );
+	_set_pdq(a, q);
+	return( q );
+}
+
+/* a function that produces a hash number for the set
+ */
+unsigned int
+#ifdef __USE_PROTOS
+set_hash( set a, register unsigned int mod )
+#else
+set_hash( a, mod )
+set a;
+register unsigned int mod;
+#endif
+{
+	/* Fast hash of set a (assumes all bits used) */
+	register unsigned *p = &(a.setword[0]);
+	register unsigned *endp = &(a.setword[a.n]);
+	register unsigned i = 0;
+
+	CHK(a);
+	while (p<endp){
+		i += (*p);
+		++p;
+	}
+
+	return(i % mod);
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/set/set.h b/Tools/Source/TianoTools/Pccts/support/set/set.h
new file mode 100644
index 0000000000..5d68152df4
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/set/set.h
@@ -0,0 +1,121 @@
+#ifndef __GATE_SET_H
+#define __GATE_SET_H
+
+/*	set.h
+
+	The following is a general-purpose set library originally developed
+	by Hank Dietz and enhanced by Terence Parr to allow dynamic sets.
+	
+	Sets are now structs containing the #words in the set and
+	a pointer to the actual set words.
+
+	1987 by Hank Dietz
+	
+	Modified by:
+		Terence Parr
+		Purdue University
+		October 1989
+
+		Added ANSI prototyping Dec. 1992 -- TJP
+*/
+
+#include "pcctscfg.h"
+
+#ifdef NOT_USED /* SEE config.h */
+/* Define usable bits per unsigned int word */
+#ifdef PC
+#define WORDSIZE 16
+#define LogWordSize	4
+#else
+#define	WORDSIZE 32
+#define LogWordSize 5
+#endif
+#define BytesPerWord	sizeof(unsigned)
+#endif
+
+#define	SETSIZE(a) ((a).n<<LogWordSize)		/* Maximum items per set */
+#define	MODWORD(x) ((x) & (WORDSIZE-1))		/* x % WORDSIZE */
+#define	DIVWORD(x) ((x) >> LogWordSize)		/* x / WORDSIZE */
+#define	nil	(~((unsigned) 0))	/* An impossible set member all bits on (big!) */
+
+typedef struct _set {
+			unsigned int n;		/* Number of words in set */
+			unsigned *setword;
+		} set;
+
+#define set_init	{0, NULL}
+#define set_null(a)	((a).setword==NULL)
+
+#define	NumBytes(x)		(((x)>>3)+1)						/* Num bytes to hold x */
+#define	NumWords(x)		((((unsigned)(x))>>LogWordSize)+1)	/* Num words to hold x */
+
+
+/* M a c r o s */
+
+/* make arg1 a set big enough to hold max elem # of arg2 */
+#define set_new(a,_max) \
+if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
+        fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
+        (a).n = NumWords(_max);
+
+#define set_free(a)									\
+	{if ( (a).setword != NULL ) free((char *)((a).setword));	\
+	(a) = empty;}
+
+#ifdef __USE_PROTOS
+extern void set_size( unsigned );
+extern unsigned int set_deg( set );
+extern set set_or( set, set );
+extern set set_and( set, set );
+extern set set_dif( set, set );
+extern set set_of( unsigned );
+extern void set_ext( set *, unsigned int );
+extern set set_not( set );
+extern int set_equ( set, set );
+extern int set_sub( set, set );
+extern unsigned set_int( set );
+extern int set_el( unsigned, set );
+extern int set_nil( set );
+extern char * set_str( set );
+extern set set_val( register char * );
+extern void set_orel( unsigned, set * );
+extern void set_orin( set *, set );
+extern void set_andin( set *, set );
+extern void set_rm( unsigned, set );
+extern void set_clr( set );
+extern set set_dup( set );
+extern void set_PDQ( set, register unsigned * );
+extern unsigned *set_pdq( set );
+extern void _set_pdq( set a, register unsigned *q );
+extern unsigned int set_hash( set, register unsigned int );
+#else
+extern void set_size();
+extern unsigned int set_deg();
+extern set set_or();
+extern set set_and();
+extern set set_dif();
+extern set set_of();
+extern void set_ext();
+extern set set_not();
+extern int set_equ();
+extern int set_sub();
+extern unsigned set_int();
+extern int set_el();
+extern int set_nil();
+extern char * set_str();
+extern set set_val();
+extern void set_orel();
+extern void set_orin();
+extern void set_andin();
+extern void set_rm();
+extern void set_clr();
+extern set set_dup();
+extern void set_PDQ();
+extern unsigned *set_pdq();
+extern void _set_pdq();
+extern unsigned int set_hash();
+#endif
+
+extern set empty;
+
+#endif
diff --git a/Tools/Source/TianoTools/Pccts/support/sym/sym.c b/Tools/Source/TianoTools/Pccts/support/sym/sym.c
new file mode 100644
index 0000000000..eccce059bb
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/sym/sym.c
@@ -0,0 +1,402 @@
+/*
+ * Simple symbol table manager using coalesced chaining to resolve collisions
+ *
+ * Doubly-linked lists are used for fast removal of entries.
+ *
+ * 'sym.h' must have a definition for typedef "Sym".  Sym must include at
+ * minimum the following fields:
+ *
+ *		...
+ *		char *symbol;
+ *		struct ... *next, *prev, **head, *scope;
+ *		unsigned int hash;
+ *		...
+ *
+ * 'template.h' can be used as a template to create a 'sym.h'.
+ *
+ * 'head' is &(table[hash(itself)]).
+ * The hash table is not resizable at run-time.
+ * The scope field is used to link all symbols of a current scope together.
+ * Scope() sets the current scope (linked list) to add symbols to.
+ * Any number of scopes can be handled.  The user passes the address of
+ * a pointer to a symbol table
+ * entry (INITIALIZED TO NULL first time).
+ *
+ * Available Functions:
+ *
+ *	zzs_init(s1,s2)	--	Create hash table with size s1, string table size s2.
+ *	zzs_done()		--	Free hash and string table created with zzs_init().
+ *	zzs_add(key,rec)--	Add 'rec' with key 'key' to the symbol table.
+ *	zzs_newadd(key)	--	create entry; add using 'key' to the symbol table.
+ *	zzs_get(key)	--	Return pointer to last record entered under 'key'
+ *						Else return NULL
+ *	zzs_del(p)		--	Unlink the entry associated with p.  This does
+ *						NOT free 'p' and DOES NOT remove it from a scope
+ *						list.  If it was a part of your intermediate code
+ *						tree or another structure.  It will still be there.
+ *			  			It is only removed from further consideration
+ *						by the symbol table.
+ *	zzs_keydel(s)	--	Unlink the entry associated with key s.
+ *						Calls zzs_del(p) to unlink.
+ *	zzs_scope(sc)	--	Specifies that everything added to the symbol
+ *			   			table with zzs_add() is added to the list (scope)
+ *						'sc'.  'sc' is of 'Sym **sc' type and must be
+ *						initialized to NULL before trying to add anything
+ *						to it (passing it to zzs_scope()).  Scopes can be
+ *					    switched at any time and merely links a set of
+ *						symbol table entries.  If a NULL pointer is
+ *						passed, the current scope is returned.
+ *	zzs_rmscope(sc)	--	Remove (zzs_del()) all elements of scope 'sc'
+ *						from the symbol table.  The entries are NOT
+ *						free()'d.  A pointer to the first
+ *			   			element in the "scope" is returned.  The user
+ *			   			can then manipulate the list as he/she chooses
+ *			   			(such as freeing them all). NOTE that this
+ *			   			function sets your scope pointer to NULL,
+ *			   			but returns a pointer to the list for you to use.
+ *	zzs_stat()		--	Print out the symbol table and some relevant stats.
+ *	zzs_new(key)	--	Create a new record with calloc() of type Sym.
+ *			   			Add 'key' to the string table and make the new
+ *			   			records 'symbol' pointer point to it.
+ *	zzs_strdup(s)	--	Add s to the string table and return a pointer
+ *			   			to it.  Very fast allocation routine
+ *						and does not require strlen() nor calloc().
+ *
+ * Example:
+ *
+ *	#include <stdio.h>
+ *	#include "sym.h"
+ *
+ *	main()
+ *	{
+ *	    Sym *scope1=NULL, *scope2=NULL, *a, *p;
+ *	
+ *	    zzs_init(101, 100);
+ *	
+ *	    a = zzs_new("Apple");	zzs_add(a->symbol, a);	-- No scope
+ *	    zzs_scope( &scope1 );	-- enter scope 1
+ *	    a = zzs_new("Plum");	zzs_add(a->symbol, a);
+ *	    zzs_scope( &scope2 );	-- enter scope 2
+ *	    a = zzs_new("Truck");	zzs_add(a->symbol, a);
+ *	
+ *    	p = zzs_get("Plum");
+ *    	if ( p == NULL ) fprintf(stderr, "Hmmm...Can't find 'Plum'\n");
+ *	
+ *    	p = zzs_rmscope(&scope1)
+ *    	for (; p!=NULL; p=p->scope) {printf("Scope1:  %s\n", p->symbol);}
+ *    	p = zzs_rmscope(&scope2)
+ *    	for (; p!=NULL; p=p->scope) {printf("Scope2:  %s\n", p->symbol);}
+ * }
+ *
+ * Terence Parr
+ * Purdue University
+ * February 1990
+ *
+ * CHANGES
+ *
+ *	Terence Parr
+ *	May 1991
+ *		Renamed functions to be consistent with ANTLR
+ *		Made HASH macro
+ *		Added zzs_keydel()
+ *		Added zzs_newadd()
+ *		Fixed up zzs_stat()
+ *
+ *	July 1991
+ *		Made symbol table entry save its hash code for fast comparison
+ *			during searching etc...
+ */
+
+#include <stdio.h>
+#if defined(__STDC__) || defined(__USE_PROTOS)
+#include <string.h>
+#include <stdlib.h>
+#else
+#include <malloc.h>
+#endif
+#include "sym.h"
+
+#define StrSame		0
+
+static Sym **CurScope = NULL;
+static unsigned size = 0;
+static Sym **table=NULL;
+static char *strings;
+static char *strp;
+static int strsize = 0;
+
+#ifdef __USE_PROTOS
+void zzs_init(int sz,int strs)
+#else
+void zzs_init(sz, strs)
+int sz, strs;
+#endif
+{
+	if ( sz <= 0 || strs <= 0 ) return;
+	table = (Sym **) calloc(sz, sizeof(Sym *));
+	if ( table == NULL )
+	{
+		fprintf(stderr, "Cannot allocate table of size %d\n", sz);
+		exit(1);
+	}
+	strings = (char *) calloc(strs, sizeof(char));
+	if ( strings == NULL )
+	{
+		fprintf(stderr, "Cannot allocate string table of size %d\n", strs);
+		exit(1);
+	}
+	size = sz;
+	strsize = strs;
+	strp = strings;
+}
+
+#ifdef __USE_PROTOS
+void zzs_done(void)
+#else
+void zzs_done()
+#endif
+{
+	if ( table != NULL ) free( table );
+	if ( strings != NULL ) free( strings );
+}
+
+#ifdef __USE_PROTOS
+void zzs_add(char *key,Sym rec)
+#else
+void zzs_add(key, rec)
+char *key;
+register Sym *rec;
+#endif
+{
+	register unsigned int h=0;
+	register char *p=key;
+	
+	HASH(p, h);
+	rec->hash = h;					/* save hash code for fast comp later */
+	h %= size;
+	
+	if ( CurScope != NULL ) {rec->scope = *CurScope; *CurScope = rec;}
+	rec->next = table[h];			/* Add to doubly-linked list */
+	rec->prev = NULL;
+	if ( rec->next != NULL ) (rec->next)->prev = rec;
+	table[h] = rec;
+	rec->head = &(table[h]);
+}
+
+#ifdef __USE_PROTOS
+Sym * zzs_get(char *key)
+#else
+Sym * zzs_get(key)
+char *key;
+#endif
+{
+	register unsigned int h=0;
+	register char *p=key;
+	register Sym *q;
+	
+	HASH(p, h);
+	
+	for (q = table[h%size]; q != NULL; q = q->next)
+	{
+		if ( q->hash == h )		/* do we even have a chance of matching? */
+			if ( strcmp(key, q->symbol) == StrSame ) return( q );
+	}
+	return( NULL );
+}
+
+/*
+ * Unlink p from the symbol table.  Hopefully, it's actually in the
+ * symbol table.
+ *
+ * If p is not part of a bucket chain of the symbol table, bad things
+ * will happen.
+ *
+ * Will do nothing if all list pointers are NULL
+ */
+#ifdef __USE_PROTOS
+void zzs_del(Sym *p)
+#else
+void zzs_del(p)
+register Sym *p;
+#endif
+{
+	if ( p == NULL ) {fprintf(stderr, "zzs_del(NULL)\n"); exit(1);}
+	if ( p->prev == NULL )	/* Head of list */
+	{
+		register Sym **t = p->head;
+		
+		if ( t == NULL ) return;	/* not part of symbol table */
+		(*t) = p->next;
+		if ( (*t) != NULL ) (*t)->prev = NULL;
+	}
+	else
+	{
+		(p->prev)->next = p->next;
+		if ( p->next != NULL ) (p->next)->prev = p->prev;
+	}
+	p->next = p->prev = NULL;	/* not part of symbol table anymore */
+	p->head = NULL;
+}
+
+#ifdef __USE_PROTOS
+void zzs_keydel(char *key)
+#else
+void zzs_keydel(key)
+char *key;
+#endif
+{
+	Sym *p = zzs_get(key);
+
+	if ( p != NULL ) zzs_del( p );
+}
+
+/* S c o p e  S t u f f */
+
+/* Set current scope to 'scope'; return current scope if 'scope' == NULL */
+
+#ifdef __USE_PROTOS
+Sym ** zzs_scope(Sym **scope)
+#else
+Sym ** zzs_scope(scope)
+Sym **scope;
+#endif
+{
+	if ( scope == NULL ) return( CurScope );
+	CurScope = scope;
+	return( scope );
+}
+
+/* Remove a scope described by 'scope'.  Return pointer to 1st element in scope */
+
+#ifdef __USE_PROTOS
+Sym * zzs_rmscope(Sym **scope)
+#else
+Sym * zzs_rmscope(scope)
+register Sym **scope;
+#endif
+{
+	register Sym *p;
+	Sym *start;
+
+	if ( scope == NULL ) return(NULL);
+	start = p = *scope;
+	for (; p != NULL; p=p->scope) { zzs_del( p ); }
+	*scope = NULL;
+	return( start );
+}
+
+#ifdef __USE_PROTOS
+void zzs_stat(void)
+#else
+void zzs_stat()
+#endif
+{
+	static unsigned short count[20];
+	unsigned int i,n=0,low=0, hi=0;
+	register Sym **p;
+	float avg=0.0;
+	
+	for (i=0; i<20; i++) count[i] = 0;
+	for (p=table; p<&(table[size]); p++)
+	{
+		register Sym *q = *p;
+		unsigned int len;
+		
+		if ( q != NULL && low==0 ) low = p-table;
+		len = 0;
+		if ( q != NULL ) printf("[%d]", p-table);
+		while ( q != NULL )
+		{
+			len++;
+			n++;
+			printf(" %s", q->symbol);
+			q = q->next;
+			if ( q == NULL ) printf("\n");
+		}
+		if ( len>=20 ) printf("zzs_stat: count table too small\n");
+		else count[len]++;
+		if ( *p != NULL ) hi = p-table;
+	}
+
+	printf("Storing %d recs used %d hash positions out of %d\n",
+			n, size-count[0], size);
+	printf("%f %% utilization\n",
+			((float)(size-count[0]))/((float)size));
+	for (i=0; i<20; i++)
+	{
+		if ( count[i] != 0 )
+		{
+			avg += (((float)(i*count[i]))/((float)n)) * i;
+			printf("Buckets of len %d == %d (%f %% of recs)\n",
+					i, count[i], 100.0*((float)(i*count[i]))/((float)n));
+		}
+	}
+	printf("Avg bucket length %f\n", avg);
+	printf("Range of hash function: %d..%d\n", low, hi);
+}
+
+/*
+ * Given a string, this function allocates and returns a pointer to a
+ * symbol table record whose "symbol" pointer is reset to a position
+ * in the string table.
+ */
+
+#ifdef __USE_PROTOS
+Sym * zzs_new(char *text)
+#else
+Sym * zzs_new(text)
+char *text;
+#endif
+{
+	Sym *p;
+	
+	if ( (p = (Sym *) calloc(1,sizeof(Sym))) == 0 )
+	{
+		fprintf(stderr,"Out of memory\n");
+		exit(1);
+	}
+	p->symbol = zzs_strdup(text);
+	
+	return p;
+}
+
+/* create a new symbol table entry and add it to the symbol table */
+
+#ifdef __USE_PROTOS
+Sym * zzs_newadd(char *text)
+#else
+Sym * zzs_newadd(text)
+char *text;
+#endif
+{
+	Sym *p = zzs_new(text);
+	if ( p != NULL ) zzs_add(text, p);
+	return p;
+}
+
+/* Add a string to the string table and return a pointer to it.
+ * Bump the pointer into the string table to next avail position.
+ */
+
+#ifdef __USE_PROTOS
+char * zzs_strdup(char *s)
+#else
+char * zzs_strdup(s)
+register char *s;
+#endif
+{
+	register char *start=strp;
+
+	while ( *s != '\0' )
+	{
+		if ( strp >= &(strings[strsize-2]) )
+		{
+			fprintf(stderr, "sym: string table overflow (%d chars)\n", strsize);
+			exit(-1);
+		}
+		*strp++ = *s++;
+	}
+	*strp++ = '\0';
+
+	return( start );
+}
diff --git a/Tools/Source/TianoTools/Pccts/support/sym/template.h b/Tools/Source/TianoTools/Pccts/support/sym/template.h
new file mode 100644
index 0000000000..ee6e665e34
--- /dev/null
+++ b/Tools/Source/TianoTools/Pccts/support/sym/template.h
@@ -0,0 +1,41 @@
+/* T e m p l a t e  F o r  S y m b o l  T a b l e  M a n a g e r */
+
+/* define some hash function */
+#ifndef HASH
+#define HASH(p, h) while ( *p != '\0' ) h = (h<<1) + *p++;
+#endif
+
+/* minimum symbol table record */
+typedef struct _sym {
+			char *symbol;
+			struct _sym *next, *prev, **head, *scope;
+			unsigned int hash;
+		} Sym, *SymPtr;
+
+#ifdef __USE_PROTOS
+void zzs_init(int, int);
+void zzs_done(void);
+void zzs_add(char *, Sym *);
+Sym *zzs_get(char *);
+void zzs_del(Sym *);
+void zzs_keydel(char *);
+Sym **zzs_scope(Sym **);
+Sym *zzs_rmscope(Sym **);
+void zzs_stat(void);
+Sym *zzs_new(char *);
+Sym *zzs_newadd(char *);
+char *zzs_strdup(char *);
+#else
+void zzs_init();
+void zzs_done();
+void zzs_add();
+Sym *zzs_get();
+void zzs_del();
+void zzs_keydel();
+Sym **zzs_scope();
+Sym *zzs_rmscope();
+void zzs_stat();
+Sym *zzs_new();
+Sym *zzs_newadd();
+char *zzs_strdup();
+#endif
diff --git a/Tools/Source/TianoTools/SetStamp/SetStamp.c b/Tools/Source/TianoTools/SetStamp/SetStamp.c
new file mode 100644
index 0000000000..539aced1d9
--- /dev/null
+++ b/Tools/Source/TianoTools/SetStamp/SetStamp.c
@@ -0,0 +1,475 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+  SetStamp.c
+
+Abstract:
+  Set Date/Time Stamp of Portable Executable (PE) format file
+
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#define LINE_MAXLEN 80
+
+void
+PrintUsage (
+  void
+  )
+/*++
+Routine Description:
+  print usage of setstamp command
+
+Arguments:
+  void
+
+Returns:
+  None
+--*/
+{
+  //
+  // print usage of command
+  //
+  printf ("Usage: SetStamp <PE-File> <TIME-File>\n");
+}
+
+int
+GetDateTime (
+  FILE      *fp,
+  time_t    *ltime
+  )
+/*++
+Routine Description:
+  Read the date and time from TIME file. If the date/time string is
+"NOW NOW", write the current date and time to TIME file and set it to
+ltime. Else, set the date and time of TIME file to ltime.
+
+Arguments:
+  fp              - The pointer of TIME file
+  ltime           - Date and time
+
+Returns:
+  =  0            - Success
+  = -1            - Failed
+--*/
+{
+  char      buffer[LINE_MAXLEN];
+  struct tm stime;
+  struct tm *now;
+
+  if (fgets (buffer, LINE_MAXLEN, fp) == NULL) {
+    printf ("Error: Cannot read TIME file.\n");
+    return -1;
+  }
+  //
+  // compare the value with "NOW NOW", write TIME file if equal
+  //
+  if (strncmp (buffer, "NOW NOW", 7) == 0) {
+    //
+    // get system current time and date
+    //
+    time (ltime);
+
+    now = localtime (ltime);
+    if (now == NULL) {
+      printf ("Error: Cannot get local time.\n");
+      return -1;
+    }
+
+    if (strftime (buffer, LINE_MAXLEN, "%Y-%m-%d %H:%M:%S", now) == 0) {
+      printf ("Error: Cannot format time string.\n");
+      return -1;
+    }
+    //
+    // write TIME file
+    //
+    if (fseek (fp, 0, SEEK_SET) != 0) {
+      printf ("Error: Cannot move location of TIME file.\n");
+      return -1;
+    }
+
+    if (fputs (buffer, fp) == EOF) {
+      printf ("Error: Cannot write time string to TIME file.\n");
+      return -1;
+    }
+    //
+    // ltime has been set as current time and date, return
+    //
+    return 0;
+  }
+  //
+  // get the date and time from buffer
+  //
+  if (6 != sscanf (
+            buffer,
+            "%d-%d-%d %d:%d:%d",
+            &stime.tm_year,
+            &stime.tm_mon,
+            &stime.tm_mday,
+            &stime.tm_hour,
+            &stime.tm_min,
+            &stime.tm_sec
+            )) {
+    printf ("Error: Invaild date or time!\n");
+    return -1;
+  }
+  //
+  // in struct, Month (0 - 11; Jan = 0). So decrease 1 from it
+  //
+  stime.tm_mon -= 1;
+
+  //
+  // in struct, Year (current year minus 1900)
+  // and only the dates can be handled from Jan 1, 1970 to Jan 18, 2038
+  //
+  //
+  // convert 0 -> 100 (2000), 1 -> 101 (2001), ..., 38 -> 138 (2038)
+  //
+  if (stime.tm_year <= 38) {
+    stime.tm_year += 100;
+  }
+  //
+  // convert 1970 -> 70, 2000 -> 100, ...
+  //
+  else if (stime.tm_year >= 1970) {
+    stime.tm_year -= 1900;
+  }
+  //
+  // convert the date and time to time_t format
+  //
+  *ltime = mktime (&stime);
+  if (*ltime == (time_t) - 1) {
+    printf ("Error: Invalid date or time!\n");
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+ReadFromFile (
+  FILE      *fp,
+  long      offset,
+  void      *buffer,
+  int       size
+  )
+/*++
+Routine Description:
+  read data from a specified location of file
+
+Arguments:
+  fp              - file pointer
+  offset          - number of bytes from beginning of file
+  buffer          - buffer used to store data
+  size            - size of buffer
+
+Returns:
+  =  0            - Success
+  = -1            - Failed
+--*/
+{
+  //
+  // set file pointer to the specified location of file
+  //
+  if (fseek (fp, offset, SEEK_SET) != 0) {
+    printf ("Error: Cannot move the current location of the file.\n");
+    return -1;
+  }
+  //
+  // read data from the file
+  //
+  if (fread (buffer, size, 1, fp) != 1) {
+    printf ("Error: Cannot read data from the file.\n");
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+WriteToFile (
+  FILE      *fp,
+  long      offset,
+  void      *buffer,
+  int       size
+  )
+/*++
+Routine Description:
+  write data to a specified location of file
+
+Arguments:
+  fp              - file pointer
+  offset          - number of bytes from beginning of file
+  buffer          - buffer used to store data
+  size            - size of buffer
+
+Returns:
+  =  0            - Success
+  = -1            - Failed
+--*/
+{
+  //
+  // set file pointer to the specified location of file
+  //
+  if (fseek (fp, offset, SEEK_SET) != 0) {
+    printf ("Error: Cannot move the current location of the file.\n");
+    return -1;
+  }
+  //
+  // write data to the file
+  //
+  if (fwrite (buffer, size, 1, fp) != 1) {
+    perror ("Error: Cannot write data to the file.\n");
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+SetStamp (
+  FILE      *fp,
+  time_t    ltime
+  )
+/*++
+Routine Description:
+  set Date/Time Stamp of the file
+
+Arguments:
+  fp              - file pointer
+  ltime           - time and date
+
+Returns:
+  =  0            - Success
+  = -1            - Failed
+--*/
+{
+  unsigned char header[4];
+  unsigned long offset;
+  unsigned long NumberOfRvaAndSizes;
+  unsigned int  nvalue;
+  unsigned long lvalue;
+
+  //
+  // read the header of file
+  //
+  if (ReadFromFile (fp, 0, header, 2) != 0) {
+    return -1;
+  }
+  //
+  // "MZ" -- the header of image file (PE)
+  //
+  if (strncmp ((char *) header, "MZ", 2) != 0) {
+    printf ("Error: Invalid Image file.\n");
+    return -1;
+  }
+  //
+  // At location 0x3C, the stub has the file offset to the
+  // PE signature.
+  //
+  if (ReadFromFile (fp, 0x3C, &offset, 4) != 0) {
+    return -1;
+  }
+  //
+  // read the header of optional
+  //
+  if (ReadFromFile (fp, offset, header, 4) != 0) {
+    return -1;
+  }
+  //
+  // "PE\0\0" -- the signature of optional header
+  //
+  if (strncmp ((char *) header, "PE\0\0", 4) != 0) {
+    printf ("Error: Invalid PE format file.\n");
+    return -1;
+  }
+  //
+  // Add 8 to skip PE signature (4-byte), Machine (2-byte) and
+  // NumberOfSection (2-byte)
+  //
+  offset += 8;
+
+  if (WriteToFile (fp, offset, &ltime, 4) != 0) {
+    return -1;
+  }
+  //
+  // Add 16 to skip COFF file header, and get to optional header.
+  //
+  offset += 16;
+
+  //
+  // Check the magic field, 0x10B for PE32 and 0x20B for PE32+
+  //
+  if (ReadFromFile (fp, offset, &nvalue, 2) != 0) {
+    return -1;
+  }
+  //
+  // If this is PE32 image file, offset of NumberOfRvaAndSizes is 92.
+  // Else it is 108.
+  //
+  switch (nvalue & 0xFFFF) {
+  case 0x10B:
+    offset += 92;
+    break;
+
+  case 0x20B:
+    offset += 108;
+    break;
+
+  default:
+    printf ("Error: Sorry! The Magic value is unknown.\n");
+    return -1;
+  }
+  //
+  // get the value of NumberOfRvaAndSizes
+  //
+  if (ReadFromFile (fp, offset, &NumberOfRvaAndSizes, 4) != 0) {
+    return -1;
+  }
+  //
+  // Date/time stamp exists in Export Table, Import Table, Resource Table,
+  // Debug Table and Delay Import Table. And in Import Table and Delay Import
+  // Table, it will be set when bound. So here only set the date/time stamp
+  // of Export Table, Resource Table and Debug Table.
+  //
+  //
+  // change date/time stamp of Export Table, the offset of Export Table
+  // is 4 + 0 * 8 = 4. And the offset of stamp is 4.
+  //
+  if (NumberOfRvaAndSizes >= 1) {
+    if (ReadFromFile (fp, offset + 4, &lvalue, 4) != 0) {
+      return -1;
+    }
+
+    if (lvalue != 0) {
+      if (WriteToFile (fp, lvalue + 4, &ltime, 4) != 0) {
+        return -1;
+      }
+    }
+  }
+  //
+  // change date/time stamp of Resource Table, the offset of Resource Table
+  // is 4 + 2 * 8 = 20. And the offset of stamp is 4.
+  //
+  if (NumberOfRvaAndSizes >= 3) {
+    if (ReadFromFile (fp, offset + 20, &lvalue, 4) != 0) {
+      return -1;
+    }
+
+    if (lvalue != 0) {
+      if (WriteToFile (fp, lvalue + 4, &ltime, 4) != 0) {
+        return -1;
+      }
+    }
+  }
+  //
+  // change date/time stamp of Debug Table, offset of Debug Table
+  // is 4 + 6 * 8 = 52. And the offset of stamp is 4.
+  //
+  if (NumberOfRvaAndSizes >= 7) {
+    if (ReadFromFile (fp, offset + 52, &lvalue, 4) != 0) {
+      return -1;
+    }
+
+    if (lvalue != 0) {
+      if (WriteToFile (fp, lvalue + 4, &ltime, 4) != 0) {
+        return -1;
+      }
+    }
+    //
+    // change the date/time stamp of Debug Data
+    //
+    if (ReadFromFile (fp, lvalue + 24, &lvalue, 4) != 0) {
+      return -1;
+    }
+    //
+    // get the signature of debug data
+    //
+    if (ReadFromFile (fp, lvalue, header, 2) != 0) {
+      return -1;
+    }
+    //
+    // "NB" - the signature of Debug Data
+    // Need Review: (From Spec. is "NB05", From .dll is "NB10")
+    //
+    if (strncmp ((char *) header, "NB", 2) == 0) {
+      if (WriteToFile (fp, lvalue + 8, &ltime, 4) != 0) {
+        return -1;
+      }
+    }
+  }
+
+  return 0;
+}
+
+int
+main (
+  int       argc,
+  char      *argv[]
+  )
+{
+  FILE    *fp;
+  time_t  ltime;
+
+  //
+  // check the number of parameters
+  //
+  if (argc != 3) {
+    PrintUsage ();
+    return -1;
+  }
+  //
+  // open the TIME file, if not exists, return
+  //
+  fp = fopen (argv[2], "r+");
+  if (fp == NULL) {
+    return 0;
+  }
+  //
+  // get time and date from file
+  //
+  if (GetDateTime (fp, &ltime) != 0) {
+    fclose (fp);
+    return -1;
+  }
+  //
+  // close the TIME file
+  //
+  fclose (fp);
+
+  //
+  // open the PE file
+  //
+  fp = fopen (argv[1], "r+b");
+  if (fp == NULL) {
+    printf ("Error: Cannot open the PE file!\n");
+    return -1;
+  }
+  //
+  // set time and date stamp to the PE file
+  //
+  if (SetStamp (fp, ltime) != 0) {
+    fclose (fp);
+    return -1;
+  }
+
+  printf ("Set Date/Time Stamp to %s", ctime (&ltime));
+
+  //
+  // close the PE file
+  //
+  fclose (fp);
+
+  return 0;
+}
diff --git a/Tools/Source/TianoTools/SetStamp/build.gcc b/Tools/Source/TianoTools/SetStamp/build.gcc
new file mode 100644
index 0000000000..4e234ea84d
--- /dev/null
+++ b/Tools/Source/TianoTools/SetStamp/build.gcc
@@ -0,0 +1,2 @@
+gcc -mno-cygwin -c -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. SetStamp.c 
+gcc -mno-cygwin -o SetStamp SetStamp.o
diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/Source/TianoTools/SetStamp/build.xml
new file mode 100644
index 0000000000..95cb4a0490
--- /dev/null
+++ b/Tools/Source/TianoTools/SetStamp/build.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK SetStamp Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="SetStamp"/>
+  <property name="FileSet" value="SetStamp.c"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/StrGather/StrGather.c b/Tools/Source/TianoTools/StrGather/StrGather.c
new file mode 100644
index 0000000000..3ad77247ae
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/StrGather.c
@@ -0,0 +1,2531 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  StrGather.c  
+
+Abstract:
+
+  Parse a strings file and create or add to a string database file.
+
+--*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <CommonLib.h>
+#include "EfiUtilityMsgs.h"
+#include "StrGather.h"
+#include "StringDB.h"
+
+#define TOOL_VERSION  "0.31"
+
+#ifndef MAX_PATH
+#define MAX_PATH                    255
+#endif
+#define MAX_NEST_DEPTH              20  // just in case we get in an endless loop.
+#define MAX_STRING_IDENTIFIER_NAME  100 // number of wchars
+#define MAX_LINE_LEN                200
+#define STRING_TOKEN                "STRING_TOKEN"
+#define DEFAULT_BASE_NAME           "BaseName"
+//
+// Operational modes for this utility
+//
+#define MODE_UNKNOWN  0
+#define MODE_PARSE    1
+#define MODE_SCAN     2
+#define MODE_DUMP     3
+
+//
+// We keep a linked list of these for the source files we process
+//
+typedef struct _SOURCE_FILE {
+  FILE                *Fptr;
+  WCHAR               *FileBuffer;
+  WCHAR               *FileBufferPtr;
+  UINT32              FileSize;
+  INT8                FileName[MAX_PATH];
+  UINT32              LineNum;
+  BOOLEAN             EndOfFile;
+  BOOLEAN             SkipToHash;
+  struct _SOURCE_FILE *Previous;
+  struct _SOURCE_FILE *Next;
+  WCHAR               ControlCharacter;
+} SOURCE_FILE;
+
+#define DEFAULT_CONTROL_CHARACTER UNICODE_SLASH
+
+//
+// Here's all our globals. We need a linked list of include paths, a linked
+// list of source files, a linked list of subdirectories (appended to each
+// include path when searching), and a couple other fields.
+//
+static struct {
+  SOURCE_FILE                 SourceFiles;
+  TEXT_STRING_LIST            *IncludePaths;                    // all include paths to search
+  TEXT_STRING_LIST            *LastIncludePath;
+  TEXT_STRING_LIST            *ScanFileName;
+  TEXT_STRING_LIST            *LastScanFileName;
+  TEXT_STRING_LIST            *SkipExt;                         // if -skipext .uni
+  TEXT_STRING_LIST            *LastSkipExt;
+  TEXT_STRING_LIST            *IndirectionFileName;
+  TEXT_STRING_LIST            *LastIndirectionFileName;
+  TEXT_STRING_LIST            *DatabaseFileName;
+  TEXT_STRING_LIST            *LastDatabaseFileName;
+  WCHAR_STRING_LIST           *Language;
+  WCHAR_STRING_LIST           *LastLanguage;
+  WCHAR_MATCHING_STRING_LIST  *IndirectionList;                 // from indirection file(s)
+  WCHAR_MATCHING_STRING_LIST  *LastIndirectionList;
+  BOOLEAN                     Verbose;                          // for more detailed output
+  BOOLEAN                     VerboseDatabaseWrite;             // for more detailed output when writing database
+  BOOLEAN                     VerboseDatabaseRead;              // for more detailed output when reading database
+  BOOLEAN                     NewDatabase;                      // to start from scratch
+  BOOLEAN                     IgnoreNotFound;                   // when scanning
+  BOOLEAN                     VerboseScan;
+  BOOLEAN                     UnquotedStrings;                  // -uqs option
+  INT8                        OutputDatabaseFileName[MAX_PATH];
+  INT8                        StringHFileName[MAX_PATH];
+  INT8                        StringCFileName[MAX_PATH];        // output .C filename
+  INT8                        DumpUFileName[MAX_PATH];          // output unicode dump file name
+  INT8                        HiiExportPackFileName[MAX_PATH];  // HII export pack file name
+  INT8                        BaseName[MAX_PATH];               // base filename of the strings file
+  UINT32                      Mode;
+} mGlobals;
+
+static
+BOOLEAN
+IsValidIdentifierChar (
+  INT8      Char,
+  BOOLEAN   FirstChar
+  );
+
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+SkipTo (
+  SOURCE_FILE *SourceFile,
+  WCHAR       WChar,
+  BOOLEAN     StopAfterNewline
+  );
+
+static
+UINT32
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+UINT32
+GetStringIdentifierName (
+  IN SOURCE_FILE  *SourceFile,
+  IN OUT WCHAR    *StringIdentifierName,
+  IN UINT32       StringIdentifierNameLen
+  );
+
+static
+UINT32
+GetLanguageIdentifierName (
+  IN SOURCE_FILE  *SourceFile,
+  IN OUT WCHAR    *LanguageIdentifierName,
+  IN UINT32       LanguageIdentifierNameLen,
+  IN BOOLEAN      Optional
+  );
+
+static
+WCHAR *
+GetPrintableLanguageName (
+  IN SOURCE_FILE  *SourceFile
+  );
+
+static
+STATUS
+AddCommandLineLanguage (
+  IN INT8          *Language
+  );
+
+static
+WCHAR *
+GetQuotedString (
+  SOURCE_FILE *SourceFile,
+  BOOLEAN     Optional
+  );
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  );
+
+static
+STATUS
+ParseFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+FILE  *
+FindFile (
+  IN INT8     *FileName,
+  OUT INT8    *FoundFileName,
+  IN UINT32   FoundFileNameLen
+  );
+
+static
+STATUS
+ProcessArgs (
+  int   Argc,
+  char  *Argv[]
+  );
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+UINT32
+wstrcmp (
+  WCHAR *Buffer,
+  WCHAR *Str
+  );
+
+static
+void
+Usage (
+  VOID
+  );
+
+static
+void
+FreeLists (
+  VOID
+  );
+
+static
+void
+ProcessTokenString (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+ProcessTokenInclude (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+ProcessTokenScope (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+ProcessTokenLanguage (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+void
+ProcessTokenLangDef (
+  SOURCE_FILE *SourceFile
+  );
+
+static
+STATUS
+ScanFiles (
+  TEXT_STRING_LIST *ScanFiles
+  );
+
+static
+STATUS
+ParseIndirectionFiles (
+  TEXT_STRING_LIST    *Files
+  );
+
+STATUS
+StringDBCreateHiiExportPack (
+  INT8                *OutputFileName
+  );
+
+int
+main (
+  int   Argc,
+  char  *Argv[]
+  )
+/*++
+
+Routine Description:
+
+  Call the routine to parse the command-line options, then process the file.
+  
+Arguments:
+
+  Argc - Standard C main() argc and argv.
+  Argv - Standard C main() argc and argv.
+
+Returns:
+
+  0       if successful
+  nonzero otherwise
+  
+--*/
+{
+  STATUS  Status;
+
+  SetUtilityName (PROGRAM_NAME);
+  //
+  // Process the command-line arguments
+  //
+  Status = ProcessArgs (Argc, Argv);
+  if (Status != STATUS_SUCCESS) {
+    return Status;
+  }
+  //
+  // Initialize the database manager
+  //
+  StringDBConstructor ();
+  //
+  // We always try to read in an existing database file. It may not
+  // exist, which is ok usually.
+  //
+  if (mGlobals.NewDatabase == 0) {
+    //
+    // Read all databases specified.
+    //
+    for (mGlobals.LastDatabaseFileName = mGlobals.DatabaseFileName;
+         mGlobals.LastDatabaseFileName != NULL;
+         mGlobals.LastDatabaseFileName = mGlobals.LastDatabaseFileName->Next
+        ) {
+      Status = StringDBReadDatabase (mGlobals.LastDatabaseFileName->Str, TRUE, mGlobals.VerboseDatabaseRead);
+      if (Status != STATUS_SUCCESS) {
+        return Status;
+      }
+    }
+  }
+  //
+  // Read indirection file(s) if specified
+  //
+  if (ParseIndirectionFiles (mGlobals.IndirectionFileName) != STATUS_SUCCESS) {
+    goto Finish;
+  }
+  //
+  // If scanning source files, do that now
+  //
+  if (mGlobals.Mode == MODE_SCAN) {
+    ScanFiles (mGlobals.ScanFileName);
+  } else if (mGlobals.Mode == MODE_PARSE) {
+    //
+    // Parsing a unicode strings file
+    //
+    mGlobals.SourceFiles.ControlCharacter = DEFAULT_CONTROL_CHARACTER;
+    Status = ProcessIncludeFile (&mGlobals.SourceFiles, NULL);
+    if (Status != STATUS_SUCCESS) {
+      goto Finish;
+    }
+  }
+  //
+  // Create the string defines header file if there have been no errors.
+  //
+  ParserSetPosition (NULL, 0);
+  if ((mGlobals.StringHFileName[0] != 0) && (GetUtilityStatus () < STATUS_ERROR)) {
+    Status = StringDBDumpStringDefines (mGlobals.StringHFileName, mGlobals.BaseName);
+    if (Status != EFI_SUCCESS) {
+      goto Finish;
+    }
+  }
+  //
+  // Dump the strings to a .c file if there have still been no errors.
+  //
+  if ((mGlobals.StringCFileName[0] != 0) && (GetUtilityStatus () < STATUS_ERROR)) {
+    Status = StringDBDumpCStrings (
+              mGlobals.StringCFileName,
+              mGlobals.BaseName,
+              mGlobals.Language,
+              mGlobals.IndirectionList
+              );
+    if (Status != EFI_SUCCESS) {
+      goto Finish;
+    }
+  }
+  //
+  // Dump the database if requested
+  //
+  if ((mGlobals.DumpUFileName[0] != 0) && (GetUtilityStatus () < STATUS_ERROR)) {
+    StringDBDumpDatabase (NULL, mGlobals.DumpUFileName, FALSE);
+  }
+  //
+  // Dump the string data as HII binary string pack if requested
+  //
+  if ((mGlobals.HiiExportPackFileName[0] != 0) && (GetUtilityStatus () < STATUS_ERROR)) {
+    StringDBCreateHiiExportPack (mGlobals.HiiExportPackFileName);
+  }
+  //
+  // Always update the database if no errors and not in dump mode. If they specified -od
+  // for an output database file name, then use that name. Otherwise use the name of
+  // the first database file specified with -db
+  //
+  if ((mGlobals.Mode != MODE_DUMP) && (GetUtilityStatus () < STATUS_ERROR)) {
+    if (mGlobals.OutputDatabaseFileName[0]) {
+      Status = StringDBWriteDatabase (mGlobals.OutputDatabaseFileName, mGlobals.VerboseDatabaseWrite);
+    } else {
+      Status = StringDBWriteDatabase (mGlobals.DatabaseFileName->Str, mGlobals.VerboseDatabaseWrite);
+    }
+
+    if (Status != EFI_SUCCESS) {
+      goto Finish;
+    }
+  }
+
+Finish:
+  //
+  // Free up memory
+  //
+  FreeLists ();
+  StringDBDestructor ();
+  return GetUtilityStatus ();
+}
+
+static
+STATUS
+ProcessIncludeFile (
+  SOURCE_FILE *SourceFile,
+  SOURCE_FILE *ParentSourceFile
+  )
+/*++
+
+Routine Description:
+
+  Given a source file, open the file and parse it
+  
+Arguments:
+
+  SourceFile        - name of file to parse
+  ParentSourceFile  - for error reporting purposes, the file that #included SourceFile.
+
+Returns:
+
+  Standard status.
+  
+--*/
+{
+  static UINT32 NestDepth = 0;
+  INT8          FoundFileName[MAX_PATH];
+  STATUS        Status;
+
+  Status = STATUS_SUCCESS;
+  NestDepth++;
+  //
+  // Print the file being processed. Indent so you can tell the include nesting
+  // depth.
+  //
+  if (mGlobals.Verbose) {
+    fprintf (stdout, "%*cProcessing file '%s'\n", NestDepth * 2, ' ', SourceFile->FileName);
+  }
+
+  //
+  // Make sure we didn't exceed our maximum nesting depth
+  //
+  if (NestDepth > MAX_NEST_DEPTH) {
+    Error (NULL, 0, 0, SourceFile->FileName, "max nesting depth (%d) exceeded", NestDepth);
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+  //
+  // Try to open the file locally, and if that fails try along our include paths.
+  //
+  strcpy (FoundFileName, SourceFile->FileName);
+  if ((SourceFile->Fptr = fopen (FoundFileName, "rb")) == NULL) {
+    //
+    // Try to find it among the paths if it has a parent (that is, it is included
+    // by someone else).
+    //
+    if (ParentSourceFile == NULL) {
+      Error (NULL, 0, 0, SourceFile->FileName, "file not found");
+      return STATUS_ERROR;
+    }
+
+    SourceFile->Fptr = FindFile (SourceFile->FileName, FoundFileName, sizeof (FoundFileName));
+    if (SourceFile->Fptr == NULL) {
+      Error (ParentSourceFile->FileName, ParentSourceFile->LineNum, 0, SourceFile->FileName, "include file not found");
+      return STATUS_ERROR;
+    }
+  }
+  //
+  // Process the file found
+  //
+  ProcessFile (SourceFile);
+Finish:
+  //
+  // Close open files and return status
+  //
+  if (SourceFile->Fptr != NULL) {
+    fclose (SourceFile->Fptr);
+  }
+
+  return Status;
+}
+
+static
+STATUS
+ProcessFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  //
+  // Get the file size, and then read the entire thing into memory.
+  // Allocate space for a terminator character.
+  //
+  fseek (SourceFile->Fptr, 0, SEEK_END);
+  SourceFile->FileSize = ftell (SourceFile->Fptr);
+  fseek (SourceFile->Fptr, 0, SEEK_SET);
+  SourceFile->FileBuffer = (WCHAR *) malloc (SourceFile->FileSize + sizeof (WCHAR));
+  if (SourceFile->FileBuffer == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return STATUS_ERROR;
+  }
+
+  fread ((VOID *) SourceFile->FileBuffer, SourceFile->FileSize, 1, SourceFile->Fptr);
+  SourceFile->FileBuffer[(SourceFile->FileSize / sizeof (WCHAR))] = UNICODE_NULL;
+  //
+  // Pre-process the file to replace comments with spaces
+  //
+  PreprocessFile (SourceFile);
+  //
+  // Parse the file
+  //
+  ParseFile (SourceFile);
+  free (SourceFile->FileBuffer);
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+ParseFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  BOOLEAN InComment;
+  UINT32  Len;
+
+  //
+  // First character of a unicode file is special. Make sure
+  //
+  if (SourceFile->FileBufferPtr[0] != UNICODE_FILE_START) {
+    Error (SourceFile->FileName, 1, 0, SourceFile->FileName, "file does not appear to be a unicode file");
+    return STATUS_ERROR;
+  }
+
+  SourceFile->FileBufferPtr++;
+  InComment = FALSE;
+  //
+  // Print the first line if in verbose mode
+  //
+  if (mGlobals.Verbose) {
+    printf ("%d: %S\n", SourceFile->LineNum, SourceFile->FileBufferPtr);
+  }
+  //
+  // Since the syntax is relatively straightforward, just switch on the next char
+  //
+  while (!EndOfFile (SourceFile)) {
+    //
+    // Check for whitespace
+    //
+    if (SourceFile->FileBufferPtr[0] == UNICODE_SPACE) {
+      SourceFile->FileBufferPtr++;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_TAB) {
+      SourceFile->FileBufferPtr++;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_CR) {
+      SourceFile->FileBufferPtr++;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_LF) {
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      if (mGlobals.Verbose) {
+        printf ("%d: %S\n", SourceFile->LineNum, SourceFile->FileBufferPtr);
+      }
+
+      InComment = FALSE;
+    } else if (SourceFile->FileBufferPtr[0] == 0) {
+      SourceFile->FileBufferPtr++;
+    } else if (InComment) {
+      SourceFile->FileBufferPtr++;
+    } else if ((SourceFile->FileBufferPtr[0] == UNICODE_SLASH) && (SourceFile->FileBufferPtr[1] == UNICODE_SLASH)) {
+      SourceFile->FileBufferPtr += 2;
+      InComment = TRUE;
+    } else if (SourceFile->SkipToHash && (SourceFile->FileBufferPtr[0] != SourceFile->ControlCharacter)) {
+      SourceFile->FileBufferPtr++;
+    } else {
+      SourceFile->SkipToHash = FALSE;
+      if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+          ((Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"include")) > 0)
+          ) {
+        SourceFile->FileBufferPtr += Len + 1;
+        ProcessTokenInclude (SourceFile);
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"scope")) > 0
+              ) {
+        SourceFile->FileBufferPtr += Len + 1;
+        ProcessTokenScope (SourceFile);
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"language")) > 0
+              ) {
+        SourceFile->FileBufferPtr += Len + 1;
+        ProcessTokenLanguage (SourceFile);
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"langdef")) > 0
+              ) {
+        SourceFile->FileBufferPtr += Len + 1;
+        ProcessTokenLangDef (SourceFile);
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"string")) > 0
+              ) {
+        SourceFile->FileBufferPtr += Len + 1;
+        ProcessTokenString (SourceFile);
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (Len = wstrcmp (SourceFile->FileBufferPtr + 1, L"EFI_BREAKPOINT()")) > 0
+              ) {
+        SourceFile->FileBufferPtr += Len;
+        //
+        // BUGBUG: Caling EFI_BREAKOINT() is breaking the link.  What is the proper action for this tool
+        // in this condition?
+        //
+//        EFI_BREAKPOINT ();
+      } else if ((SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter) &&
+               (SourceFile->FileBufferPtr[1] == UNICODE_EQUAL_SIGN)
+              ) {
+        SourceFile->ControlCharacter = SourceFile->FileBufferPtr[2];
+        SourceFile->FileBufferPtr += 3;
+      } else {
+        Error (SourceFile->FileName, SourceFile->LineNum, 0, "unrecognized token", "%S", SourceFile->FileBufferPtr);
+        //
+        // Treat rest of line as a comment.
+        //
+        InComment = TRUE;
+      }
+    }
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+void
+PreprocessFile (
+  SOURCE_FILE *SourceFile
+  )
+/*++
+
+Routine Description:
+  Preprocess a file to replace all carriage returns with NULLs so
+  we can print lines from the file to the screen.
+  
+Arguments:
+  SourceFile - structure that we use to keep track of an input file.
+
+Returns:
+  Nothing.
+  
+--*/
+{
+  BOOLEAN InComment;
+
+  RewindFile (SourceFile);
+  InComment = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    //
+    // If a line-feed, then no longer in a comment
+    //
+    if (SourceFile->FileBufferPtr[0] == UNICODE_LF) {
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      InComment = 0;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_CR) {
+      //
+      // Replace all carriage returns with a NULL so we can print stuff
+      //
+      SourceFile->FileBufferPtr[0] = 0;
+      SourceFile->FileBufferPtr++;
+    } else if (InComment) {
+      SourceFile->FileBufferPtr[0] = UNICODE_SPACE;
+      SourceFile->FileBufferPtr++;
+    } else if ((SourceFile->FileBufferPtr[0] == UNICODE_SLASH) && (SourceFile->FileBufferPtr[1] == UNICODE_SLASH)) {
+      SourceFile->FileBufferPtr += 2;
+      InComment = TRUE;
+    } else {
+      SourceFile->FileBufferPtr++;
+    }
+  }
+  //
+  // Could check for end-of-file and still in a comment, but
+  // should not be necessary. So just restore the file pointers.
+  //
+  RewindFile (SourceFile);
+}
+
+static
+WCHAR *
+GetPrintableLanguageName (
+  IN SOURCE_FILE  *SourceFile
+  )
+{
+  WCHAR   *String;
+  WCHAR   *Start;
+  WCHAR   *Ptr;
+  UINT32  Len;
+
+  SkipWhiteSpace (SourceFile);
+  if (SourceFile->FileBufferPtr[0] != UNICODE_DOUBLE_QUOTE) {
+    Error (
+      SourceFile->FileName,
+      SourceFile->LineNum,
+      0,
+      "expected quoted printable language name",
+      "%S",
+      SourceFile->FileBufferPtr
+      );
+    SourceFile->SkipToHash = TRUE;
+    return NULL;
+  }
+
+  Len = 0;
+  SourceFile->FileBufferPtr++;
+  Start = Ptr = SourceFile->FileBufferPtr;
+  while (!EndOfFile (SourceFile)) {
+    if (SourceFile->FileBufferPtr[0] == UNICODE_CR) {
+      Warning (SourceFile->FileName, SourceFile->LineNum, 0, "carriage return found in quoted string", "%S", Start);
+      break;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_DOUBLE_QUOTE) {
+      break;
+    }
+
+    SourceFile->FileBufferPtr++;
+    Len++;
+  }
+
+  if (SourceFile->FileBufferPtr[0] != UNICODE_DOUBLE_QUOTE) {
+    Warning (
+      SourceFile->FileName,
+      SourceFile->LineNum,
+      0,
+      "missing closing quote on printable language name string",
+      "%S",
+      Start
+      );
+  } else {
+    SourceFile->FileBufferPtr++;
+  }
+  //
+  // Now allocate memory for the string and save it off
+  //
+  String = (WCHAR *) malloc ((Len + 1) * sizeof (WCHAR));
+  if (String == NULL) {
+    Error (NULL, 0, 0, "memory allocation failed", NULL);
+    return NULL;
+  }
+  //
+  // Copy the string from the file buffer to the local copy.
+  // We do no reformatting of it whatsoever at this point.
+  //
+  Ptr = String;
+  while (Len > 0) {
+    *Ptr = *Start;
+    Start++;
+    Ptr++;
+    Len--;
+  }
+
+  *Ptr = 0;
+  //
+  // Now format the string to convert \wide and \narrow controls
+  //
+  StringDBFormatString (String);
+  return String;
+}
+
+static
+WCHAR *
+GetQuotedString (
+  SOURCE_FILE *SourceFile,
+  BOOLEAN     Optional
+  )
+{
+  WCHAR   *String;
+  WCHAR   *Start;
+  WCHAR   *Ptr;
+  UINT32  Len;
+  BOOLEAN PreviousBackslash;
+
+  if (SourceFile->FileBufferPtr[0] != UNICODE_DOUBLE_QUOTE) {
+    if (!Optional) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted string", "%S", SourceFile->FileBufferPtr);
+    }
+
+    return NULL;
+  }
+
+  Len = 0;
+  SourceFile->FileBufferPtr++;
+  Start             = Ptr = SourceFile->FileBufferPtr;
+  PreviousBackslash = FALSE;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == UNICODE_DOUBLE_QUOTE) && (!PreviousBackslash)) {
+      break;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_CR) {
+      Warning (SourceFile->FileName, SourceFile->LineNum, 0, "carriage return found in quoted string", "%S", Start);
+      PreviousBackslash = FALSE;
+    } else if (SourceFile->FileBufferPtr[0] == UNICODE_BACKSLASH) {
+      PreviousBackslash = TRUE;
+    } else {
+      PreviousBackslash = FALSE;
+    }
+
+    SourceFile->FileBufferPtr++;
+    Len++;
+  }
+
+  if (SourceFile->FileBufferPtr[0] != UNICODE_DOUBLE_QUOTE) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "missing closing quote on string", "%S", Start);
+  } else {
+    SourceFile->FileBufferPtr++;
+  }
+  //
+  // Now allocate memory for the string and save it off
+  //
+  String = (WCHAR *) malloc ((Len + 1) * sizeof (WCHAR));
+  if (String == NULL) {
+    Error (NULL, 0, 0, "memory allocation failed", NULL);
+    return NULL;
+  }
+  //
+  // Copy the string from the file buffer to the local copy.
+  // We do no reformatting of it whatsoever at this point.
+  //
+  Ptr = String;
+  while (Len > 0) {
+    *Ptr = *Start;
+    Start++;
+    Ptr++;
+    Len--;
+  }
+
+  *Ptr = 0;
+  return String;
+}
+//
+// Parse:
+//    #string STR_ID_NAME
+//
+// All we can do is call the string database to add the string identifier. Unfortunately
+// he'll have to keep track of the last identifier we added.
+//
+static
+void
+ProcessTokenString (
+  SOURCE_FILE *SourceFile
+  )
+{
+  WCHAR   StringIdentifier[MAX_STRING_IDENTIFIER_NAME];
+  UINT16  StringId;
+  //
+  // Extract the string identifier name and add it to the database.
+  //
+  if (GetStringIdentifierName (SourceFile, StringIdentifier, sizeof (StringIdentifier)) > 0) {
+    StringId = STRING_ID_INVALID;
+    StringDBAddStringIdentifier (StringIdentifier, &StringId, 0);
+  } else {
+    //
+    // Error recovery -- skip to the next #
+    //
+    SourceFile->SkipToHash = TRUE;
+  }
+}
+
+static
+BOOLEAN
+EndOfFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  //
+  // The file buffer pointer will typically get updated before the End-of-file flag in the
+  // source file structure, so check it first.
+  //
+  if (SourceFile->FileBufferPtr >= SourceFile->FileBuffer + SourceFile->FileSize / sizeof (WCHAR)) {
+    SourceFile->EndOfFile = TRUE;
+    return TRUE;
+  }
+
+  if (SourceFile->EndOfFile) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
+static
+UINT32
+GetStringIdentifierName (
+  IN SOURCE_FILE  *SourceFile,
+  IN OUT WCHAR    *StringIdentifierName,
+  IN UINT32       StringIdentifierNameLen
+  )
+{
+  UINT32  Len;
+  WCHAR   *From;
+  WCHAR   *Start;
+
+  //
+  // Skip whitespace
+  //
+  SkipWhiteSpace (SourceFile);
+  if (SourceFile->EndOfFile) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "end-of-file encountered", "expected string identifier");
+    return 0;
+  }
+  //
+  // Verify first character of name is [A-Za-z]
+  //
+  Len = 0;
+  StringIdentifierNameLen /= 2;
+  From  = SourceFile->FileBufferPtr;
+  Start = SourceFile->FileBufferPtr;
+  if (((SourceFile->FileBufferPtr[0] >= UNICODE_A) && (SourceFile->FileBufferPtr[0] <= UNICODE_Z)) ||
+      ((SourceFile->FileBufferPtr[0] >= UNICODE_z) && (SourceFile->FileBufferPtr[0] <= UNICODE_z))
+      ) {
+    //
+    // Do nothing
+    //
+  } else {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "invalid character in string identifier name", "%S", Start);
+    return 0;
+  }
+
+  while (!EndOfFile (SourceFile)) {
+    if (((SourceFile->FileBufferPtr[0] >= UNICODE_A) && (SourceFile->FileBufferPtr[0] <= UNICODE_Z)) ||
+        ((SourceFile->FileBufferPtr[0] >= UNICODE_z) && (SourceFile->FileBufferPtr[0] <= UNICODE_z)) ||
+        ((SourceFile->FileBufferPtr[0] >= UNICODE_0) && (SourceFile->FileBufferPtr[0] <= UNICODE_9)) ||
+        (SourceFile->FileBufferPtr[0] == UNICODE_UNDERSCORE)
+        ) {
+      Len++;
+      if (Len >= StringIdentifierNameLen) {
+        Error (SourceFile->FileName, SourceFile->LineNum, 0, "string identifier name too long", "%S", Start);
+        return 0;
+      }
+
+      *StringIdentifierName = SourceFile->FileBufferPtr[0];
+      StringIdentifierName++;
+      SourceFile->FileBufferPtr++;
+    } else if (SkipWhiteSpace (SourceFile) == 0) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "invalid string identifier name", "%S", Start);
+      return 0;
+    } else {
+      break;
+    }
+  }
+  //
+  // Terminate the copy of the string.
+  //
+  *StringIdentifierName = 0;
+  return Len;
+}
+
+static
+UINT32
+GetLanguageIdentifierName (
+  IN SOURCE_FILE  *SourceFile,
+  IN OUT WCHAR    *LanguageIdentifierName,
+  IN UINT32       LanguageIdentifierNameLen,
+  IN BOOLEAN      Optional
+  )
+{
+  UINT32  Len;
+  WCHAR   *From;
+  WCHAR   *Start;
+  //
+  // Skip whitespace
+  //
+  SkipWhiteSpace (SourceFile);
+  if (SourceFile->EndOfFile) {
+    if (!Optional) {
+      Error (
+        SourceFile->FileName,
+        SourceFile->LineNum,
+        0,
+        "end-of-file encountered",
+        "expected language identifier"
+        );
+    }
+
+    return 0;
+  }
+  //
+  // This function is called to optionally get a language identifier name in:
+  //   #string STR_ID eng "the string"
+  // If it's optional, and we find a double-quote, then return now.
+  //
+  if (Optional) {
+    if (*SourceFile->FileBufferPtr == UNICODE_DOUBLE_QUOTE) {
+      return 0;
+    }
+  }
+
+  Len = 0;
+  LanguageIdentifierNameLen /= 2;
+  //
+  // Internal error if we weren't given at least 4 WCHAR's to work with.
+  //
+  if (LanguageIdentifierNameLen < LANGUAGE_IDENTIFIER_NAME_LEN + 1) {
+    Error (
+      SourceFile->FileName,
+      SourceFile->LineNum,
+      0,
+      "app error -- language identifier name length is invalid",
+      NULL
+      );
+  }
+
+  From  = SourceFile->FileBufferPtr;
+  Start = SourceFile->FileBufferPtr;
+  while (!EndOfFile (SourceFile)) {
+    if (((SourceFile->FileBufferPtr[0] >= UNICODE_a) && (SourceFile->FileBufferPtr[0] <= UNICODE_z))) {
+      Len++;
+      if (Len > LANGUAGE_IDENTIFIER_NAME_LEN) {
+        Error (SourceFile->FileName, SourceFile->LineNum, 0, "language identifier name too long", "%S", Start);
+        return 0;
+      }
+
+      *LanguageIdentifierName = SourceFile->FileBufferPtr[0];
+      SourceFile->FileBufferPtr++;
+      LanguageIdentifierName++;
+    } else if (!IsWhiteSpace (SourceFile)) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "invalid language identifier name", "%S", Start);
+      return 0;
+    } else {
+      break;
+    }
+  }
+  //
+  // Terminate the copy of the string.
+  //
+  *LanguageIdentifierName = 0;
+  return Len;
+}
+
+static
+void
+ProcessTokenInclude (
+  SOURCE_FILE *SourceFile
+  )
+{
+  INT8        IncludeFileName[MAX_PATH];
+  INT8        *To;
+  UINT32      Len;
+  BOOLEAN     ReportedError;
+  SOURCE_FILE IncludedSourceFile;
+
+  ReportedError = FALSE;
+  if (SkipWhiteSpace (SourceFile) == 0) {
+    Warning (SourceFile->FileName, SourceFile->LineNum, 0, "expected whitespace following #include keyword", NULL);
+  }
+  //
+  // Should be quoted file name
+  //
+  if (SourceFile->FileBufferPtr[0] != UNICODE_DOUBLE_QUOTE) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "expected quoted include file name", NULL);
+    goto FailDone;
+  }
+
+  SourceFile->FileBufferPtr++;
+  //
+  // Copy the filename as ascii to our local string
+  //
+  To  = IncludeFileName;
+  Len = 0;
+  while (!EndOfFile (SourceFile)) {
+    if ((SourceFile->FileBufferPtr[0] == UNICODE_CR) || (SourceFile->FileBufferPtr[0] == UNICODE_LF)) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "end-of-line found in quoted include file name", NULL);
+      goto FailDone;
+    }
+
+    if (SourceFile->FileBufferPtr[0] == UNICODE_DOUBLE_QUOTE) {
+      SourceFile->FileBufferPtr++;
+      break;
+    }
+    //
+    // If too long, then report the error once and process until the closing quote
+    //
+    Len++;
+    if (!ReportedError && (Len >= sizeof (IncludeFileName))) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "length of include file name exceeds limit", NULL);
+      ReportedError = TRUE;
+    }
+
+    if (!ReportedError) {
+      *To = UNICODE_TO_ASCII (SourceFile->FileBufferPtr[0]);
+      To++;
+    }
+
+    SourceFile->FileBufferPtr++;
+  }
+
+  if (!ReportedError) {
+    *To = 0;
+    memset ((char *) &IncludedSourceFile, 0, sizeof (SOURCE_FILE));
+    strcpy (IncludedSourceFile.FileName, IncludeFileName);
+    IncludedSourceFile.ControlCharacter = DEFAULT_CONTROL_CHARACTER;
+    ProcessIncludeFile (&IncludedSourceFile, SourceFile);
+    //
+    // printf ("including file '%s'\n", IncludeFileName);
+    //
+  }
+
+  return ;
+FailDone:
+  //
+  // Error recovery -- skip to next #
+  //
+  SourceFile->SkipToHash = TRUE;
+}
+
+static
+void
+ProcessTokenScope (
+  SOURCE_FILE *SourceFile
+  )
+{
+  WCHAR StringIdentifier[MAX_STRING_IDENTIFIER_NAME];
+  //
+  // Extract the scope name
+  //
+  if (GetStringIdentifierName (SourceFile, StringIdentifier, sizeof (StringIdentifier)) > 0) {
+    StringDBSetScope (StringIdentifier);
+  }
+}
+//
+// Parse:  #langdef eng "English"
+//         #langdef chn "\wideChinese"
+//
+static
+void
+ProcessTokenLangDef (
+  SOURCE_FILE *SourceFile
+  )
+{
+  WCHAR   LanguageIdentifier[MAX_STRING_IDENTIFIER_NAME];
+  UINT32  Len;
+  WCHAR   *PrintableName;
+  //
+  // Extract the 3-character language identifier
+  //
+  Len = GetLanguageIdentifierName (SourceFile, LanguageIdentifier, sizeof (LanguageIdentifier), FALSE);
+  if (Len != LANGUAGE_IDENTIFIER_NAME_LEN) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "invalid or missing language identifier", NULL);
+  } else {
+    //
+    // Extract the printable name
+    //
+    PrintableName = GetPrintableLanguageName (SourceFile);
+    if (PrintableName != NULL) {
+      ParserSetPosition (SourceFile->FileName, SourceFile->LineNum);
+      StringDBAddLanguage (LanguageIdentifier, PrintableName);
+      free (PrintableName);
+      return ;
+    }
+  }
+  //
+  // Error recovery -- skip to next #
+  //
+  SourceFile->SkipToHash = TRUE;
+}
+
+static
+BOOLEAN
+ApparentQuotedString (
+  SOURCE_FILE *SourceFile
+  )
+{
+  WCHAR *Ptr;
+  //
+  // See if the first and last nonblank characters on the line are double quotes
+  //
+  for (Ptr = SourceFile->FileBufferPtr; *Ptr && (*Ptr == UNICODE_SPACE); Ptr++)
+    ;
+  if (*Ptr != UNICODE_DOUBLE_QUOTE) {
+    return FALSE;
+  }
+
+  while (*Ptr) {
+    Ptr++;
+  }
+
+  Ptr--;
+  for (; *Ptr && (*Ptr == UNICODE_SPACE); Ptr--)
+    ;
+  if (*Ptr != UNICODE_DOUBLE_QUOTE) {
+    return FALSE;
+  }
+
+  return TRUE;
+}
+//
+// Parse:
+//   #language eng "some string " "more string"
+//
+static
+void
+ProcessTokenLanguage (
+  SOURCE_FILE *SourceFile
+  )
+{
+  WCHAR   *String;
+  WCHAR   *SecondString;
+  WCHAR   *TempString;
+  WCHAR   *From;
+  WCHAR   *To;
+  WCHAR   Language[LANGUAGE_IDENTIFIER_NAME_LEN + 1];
+  UINT32  Len;
+  BOOLEAN PreviousNewline;
+  //
+  // Get the language identifier
+  //
+  Language[0] = 0;
+  Len         = GetLanguageIdentifierName (SourceFile, Language, sizeof (Language), TRUE);
+  if (Len != LANGUAGE_IDENTIFIER_NAME_LEN) {
+    Error (SourceFile->FileName, SourceFile->LineNum, 0, "invalid or missing language identifier", "%S", Language);
+    SourceFile->SkipToHash = TRUE;
+    return ;
+  }
+  //
+  // Extract the string value. It's either a quoted string that starts on the current line, or
+  // an unquoted string that starts on the following line and continues until the next control
+  // character in column 1.
+  // Look ahead to find a quote or a newline
+  //
+  if (SkipTo (SourceFile, UNICODE_DOUBLE_QUOTE, TRUE)) {
+    String = GetQuotedString (SourceFile, FALSE);
+    if (String != NULL) {
+      //
+      // Set the position in the file of where we are parsing for error
+      // reporting purposes. Then start looking ahead for additional
+      // quoted strings, and concatenate them until we get a failure
+      // back from the string parser.
+      //
+      Len = wcslen (String) + 1;
+      ParserSetPosition (SourceFile->FileName, SourceFile->LineNum);
+      do {
+        SkipWhiteSpace (SourceFile);
+        SecondString = GetQuotedString (SourceFile, TRUE);
+        if (SecondString != NULL) {
+          Len += wcslen (SecondString);
+          TempString = (WCHAR *) malloc (Len * sizeof (WCHAR));
+          if (TempString == NULL) {
+            Error (NULL, 0, 0, "application error", "failed to allocate memory");
+            return ;
+          }
+
+          wcscpy (TempString, String);
+          wcscat (TempString, SecondString);
+          free (String);
+          free (SecondString);
+          String = TempString;
+        }
+      } while (SecondString != NULL);
+      StringDBAddString (Language, NULL, NULL, String, TRUE, 0);
+      free (String);
+    } else {
+      //
+      // Error was reported at lower level. Error recovery mode.
+      //
+      SourceFile->SkipToHash = TRUE;
+    }
+  } else {
+    if (!mGlobals.UnquotedStrings) {
+      //
+      // They're using unquoted strings. If the next non-blank character is a double quote, and the
+      // last non-blank character on the line is a double quote, then more than likely they're using
+      // quotes, so they need to put the quoted string on the end of the previous line
+      //
+      if (ApparentQuotedString (SourceFile)) {
+        Warning (
+          SourceFile->FileName,
+          SourceFile->LineNum,
+          0,
+          "unexpected quoted string on line",
+          "specify -uqs option if necessary"
+          );
+      }
+    }
+    //
+    // Found end-of-line (hopefully). Skip over it and start taking in characters
+    // until we find a control character at the start of a line.
+    //
+    Len             = 0;
+    From            = SourceFile->FileBufferPtr;
+    PreviousNewline = FALSE;
+    while (!EndOfFile (SourceFile)) {
+      if (SourceFile->FileBufferPtr[0] == UNICODE_LF) {
+        PreviousNewline = TRUE;
+        SourceFile->LineNum++;
+      } else {
+        Len++;
+        if (PreviousNewline && (SourceFile->FileBufferPtr[0] == SourceFile->ControlCharacter)) {
+          break;
+        }
+
+        PreviousNewline = FALSE;
+      }
+
+      SourceFile->FileBufferPtr++;
+    }
+
+    if ((Len == 0) && EndOfFile (SourceFile)) {
+      Error (SourceFile->FileName, SourceFile->LineNum, 0, "unexpected end of file", NULL);
+      SourceFile->SkipToHash = TRUE;
+      return ;
+    }
+    //
+    // Now allocate a buffer, copy the characters, and add the string.
+    //
+    String = (WCHAR *) malloc ((Len + 1) * sizeof (WCHAR));
+    if (String == NULL) {
+      Error (NULL, 0, 0, "application error", "failed to allocate memory");
+      return ;
+    }
+
+    To = String;
+    while (From < SourceFile->FileBufferPtr) {
+      switch (*From) {
+      case UNICODE_LF:
+      case 0:
+        break;
+
+      default:
+        *To = *From;
+        To++;
+        break;
+      }
+
+      From++;
+    }
+
+    //
+    // String[Len] = 0;
+    //
+    *To = 0;
+    StringDBAddString (Language, NULL, NULL, String, TRUE, 0);
+  }
+}
+
+static
+BOOLEAN
+IsWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  switch (SourceFile->FileBufferPtr[0]) {
+  case UNICODE_NULL:
+  case UNICODE_CR:
+  case UNICODE_SPACE:
+  case UNICODE_TAB:
+  case UNICODE_LF:
+    return TRUE;
+
+  default:
+    return FALSE;
+  }
+}
+
+static
+UINT32
+SkipWhiteSpace (
+  SOURCE_FILE *SourceFile
+  )
+{
+  UINT32  Count;
+
+  Count = 0;
+  while (!EndOfFile (SourceFile)) {
+    Count++;
+    switch (*SourceFile->FileBufferPtr) {
+    case UNICODE_NULL:
+    case UNICODE_CR:
+    case UNICODE_SPACE:
+    case UNICODE_TAB:
+      SourceFile->FileBufferPtr++;
+      break;
+
+    case UNICODE_LF:
+      SourceFile->FileBufferPtr++;
+      SourceFile->LineNum++;
+      if (mGlobals.Verbose) {
+        printf ("%d: %S\n", SourceFile->LineNum, SourceFile->FileBufferPtr);
+      }
+      break;
+
+    default:
+      return Count - 1;
+    }
+  }
+  //
+  // Some tokens require trailing whitespace. If we're at the end of the
+  // file, then we count that as well.
+  //
+  if ((Count == 0) && (EndOfFile (SourceFile))) {
+    Count++;
+  }
+
+  return Count;
+}
+
+static
+UINT32
+wstrcmp (
+  WCHAR *Buffer,
+  WCHAR *Str
+  )
+{
+  UINT32  Len;
+
+  Len = 0;
+  while (*Str == *Buffer) {
+    Buffer++;
+    Str++;
+    Len++;
+  }
+
+  if (*Str) {
+    return 0;
+  }
+
+  return Len;
+}
+//
+// Given a filename, try to find it along the include paths.
+//
+static
+FILE *
+FindFile (
+  IN INT8    *FileName,
+  OUT INT8   *FoundFileName,
+  IN UINT32  FoundFileNameLen
+  )
+{
+  FILE              *Fptr;
+  TEXT_STRING_LIST  *List;
+
+  //
+  // Traverse the list of paths and try to find the file
+  //
+  List = mGlobals.IncludePaths;
+  while (List != NULL) {
+    //
+    // Put the path and filename together
+    //
+    if (strlen (List->Str) + strlen (FileName) + 1 > FoundFileNameLen) {
+      Error (PROGRAM_NAME, 0, 0, NULL, "internal error - cannot concatenate path+filename");
+      return NULL;
+    }
+    //
+    // Append the filename to this include path and try to open the file.
+    //
+    strcpy (FoundFileName, List->Str);
+    strcat (FoundFileName, FileName);
+    if ((Fptr = fopen (FoundFileName, "rb")) != NULL) {
+      //
+      // Return the file pointer
+      //
+      return Fptr;
+    }
+
+    List = List->Next;
+  }
+  //
+  // Not found
+  //
+  FoundFileName[0] = 0;
+  return NULL;
+}
+//
+// Process the command-line arguments
+//
+static
+STATUS
+ProcessArgs (
+  int   Argc,
+  char  *Argv[]
+  )
+{
+  TEXT_STRING_LIST  *NewList;
+  //
+  // Clear our globals
+  //
+  memset ((char *) &mGlobals, 0, sizeof (mGlobals));
+  strcpy (mGlobals.BaseName, DEFAULT_BASE_NAME);
+  //
+  // Skip program name
+  //
+  Argc--;
+  Argv++;
+
+  if (Argc == 0) {
+    Usage ();
+    return STATUS_ERROR;
+  }
+
+  mGlobals.Mode = MODE_UNKNOWN;
+  //
+  // Process until no more -args.
+  //
+  while ((Argc > 0) && (Argv[0][0] == '-')) {
+    //
+    // -parse option
+    //
+    if (stricmp (Argv[0], "-parse") == 0) {
+      if (mGlobals.Mode != MODE_UNKNOWN) {
+        Error (NULL, 0, 0, "only one of -parse/-scan/-dump allowed", NULL);
+        return STATUS_ERROR;
+      }
+
+      mGlobals.Mode = MODE_PARSE;
+      //
+      // -scan option
+      //
+    } else if (stricmp (Argv[0], "-scan") == 0) {
+      if (mGlobals.Mode != MODE_UNKNOWN) {
+        Error (NULL, 0, 0, "only one of -parse/-scan/-dump allowed", NULL);
+        return STATUS_ERROR;
+      }
+
+      mGlobals.Mode = MODE_SCAN;
+      //
+      // -vscan verbose scanning option
+      //
+    } else if (stricmp (Argv[0], "-vscan") == 0) {
+      mGlobals.VerboseScan = TRUE;
+      //
+      // -dump option
+      //
+    } else if (stricmp (Argv[0], "-dump") == 0) {
+      if (mGlobals.Mode != MODE_UNKNOWN) {
+        Error (NULL, 0, 0, "only one of -parse/-scan/-dump allowed", NULL);
+        return STATUS_ERROR;
+      }
+
+      mGlobals.Mode = MODE_DUMP;
+    } else if (stricmp (Argv[0], "-uqs") == 0) {
+      mGlobals.UnquotedStrings = TRUE;
+      //
+      // -i path    add include search path when parsing
+      //
+    } else if (stricmp (Argv[0], "-i") == 0) {
+      //
+      // check for one more arg
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing include path");
+        return STATUS_ERROR;
+      }
+      //
+      // Allocate memory for a new list element, fill it in, and
+      // add it to our list of include paths. Always make sure it
+      // has a "\" on the end of it.
+      //
+      NewList = malloc (sizeof (TEXT_STRING_LIST));
+      if (NewList == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      memset ((char *) NewList, 0, sizeof (TEXT_STRING_LIST));
+      NewList->Str = malloc (strlen (Argv[1]) + 2);
+      if (NewList->Str == NULL) {
+        free (NewList);
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      strcpy (NewList->Str, Argv[1]);
+      if (NewList->Str[strlen (NewList->Str) - 1] != '\\') {
+        strcat (NewList->Str, "\\");
+      }
+      //
+      // Add it to our linked list
+      //
+      if (mGlobals.IncludePaths == NULL) {
+        mGlobals.IncludePaths = NewList;
+      } else {
+        mGlobals.LastIncludePath->Next = NewList;
+      }
+
+      mGlobals.LastIncludePath = NewList;
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-if") == 0) {
+      //
+      // Indirection file -- check for one more arg
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing indirection file name");
+        return STATUS_ERROR;
+      }
+      //
+      // Allocate memory for a new list element, fill it in, and
+      // add it to our list of include paths. Always make sure it
+      // has a "\" on the end of it.
+      //
+      NewList = malloc (sizeof (TEXT_STRING_LIST));
+      if (NewList == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      memset ((char *) NewList, 0, sizeof (TEXT_STRING_LIST));
+      NewList->Str = malloc (strlen (Argv[1]) + 1);
+      if (NewList->Str == NULL) {
+        free (NewList);
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      strcpy (NewList->Str, Argv[1]);
+      //
+      // Add it to our linked list
+      //
+      if (mGlobals.IndirectionFileName == NULL) {
+        mGlobals.IndirectionFileName = NewList;
+      } else {
+        mGlobals.LastIndirectionFileName->Next = NewList;
+      }
+
+      mGlobals.LastIndirectionFileName = NewList;
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-db") == 0) {
+      //
+      // -db option to specify a database file.
+      // Check for one more arg (the database file name)
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing database file name");
+        return STATUS_ERROR;
+      }
+
+      NewList = malloc (sizeof (TEXT_STRING_LIST));
+      if (NewList == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      memset ((char *) NewList, 0, sizeof (TEXT_STRING_LIST));
+      NewList->Str = malloc (strlen (Argv[1]) + 1);
+      if (NewList->Str == NULL) {
+        free (NewList);
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      strcpy (NewList->Str, Argv[1]);
+      //
+      // Add it to our linked list
+      //
+      if (mGlobals.DatabaseFileName == NULL) {
+        mGlobals.DatabaseFileName = NewList;
+      } else {
+        mGlobals.LastDatabaseFileName->Next = NewList;
+      }
+
+      mGlobals.LastDatabaseFileName = NewList;
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-ou") == 0) {
+      //
+      // -ou option to specify an output unicode file to
+      // which we can dump our database.
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing database dump output file name");
+        return STATUS_ERROR;
+      }
+
+      if (mGlobals.DumpUFileName[0] == 0) {
+        strcpy (mGlobals.DumpUFileName, Argv[1]);
+      } else {
+        Error (PROGRAM_NAME, 0, 0, Argv[1], "-ou option already specified with '%s'", mGlobals.DumpUFileName);
+        return STATUS_ERROR;
+      }
+
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-hpk") == 0) {
+      //
+      // -hpk option to create an HII export pack of the input database file
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing raw string data dump output file name");
+        return STATUS_ERROR;
+      }
+
+      if (mGlobals.HiiExportPackFileName[0] == 0) {
+        strcpy (mGlobals.HiiExportPackFileName, Argv[1]);
+      } else {
+        Error (PROGRAM_NAME, 0, 0, Argv[1], "-or option already specified with '%s'", mGlobals.HiiExportPackFileName);
+        return STATUS_ERROR;
+      }
+
+      Argc--;
+      Argv++;
+    } else if ((stricmp (Argv[0], "-?") == 0) || (stricmp (Argv[0], "-h") == 0)) {
+      Usage ();
+      return STATUS_ERROR;
+    } else if (stricmp (Argv[0], "-v") == 0) {
+      mGlobals.Verbose = 1;
+    } else if (stricmp (Argv[0], "-vdbw") == 0) {
+      mGlobals.VerboseDatabaseWrite = 1;
+    } else if (stricmp (Argv[0], "-vdbr") == 0) {
+      mGlobals.VerboseDatabaseRead = 1;
+    } else if (stricmp (Argv[0], "-newdb") == 0) {
+      mGlobals.NewDatabase = 1;
+    } else if (stricmp (Argv[0], "-ignorenotfound") == 0) {
+      mGlobals.IgnoreNotFound = 1;
+    } else if (stricmp (Argv[0], "-oc") == 0) {
+      //
+      // check for one more arg
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing output C filename");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.StringCFileName, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-bn") == 0) {
+      //
+      // check for one more arg
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing base name");
+        Usage ();
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.BaseName, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-oh") == 0) {
+      //
+      // -oh to specify output .h defines file name
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing output .h filename");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.StringHFileName, Argv[1]);
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-skipext") == 0) {
+      //
+      // -skipext to skip scanning of files with certain filename extensions
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing filename extension");
+        return STATUS_ERROR;
+      }
+      //
+      // Allocate memory for a new list element, fill it in, and
+      // add it to our list of excluded extensions. Always make sure it
+      // has a "." as the first character.
+      //
+      NewList = malloc (sizeof (TEXT_STRING_LIST));
+      if (NewList == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      memset ((char *) NewList, 0, sizeof (TEXT_STRING_LIST));
+      NewList->Str = malloc (strlen (Argv[1]) + 2);
+      if (NewList->Str == NULL) {
+        free (NewList);
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+
+      if (Argv[1][0] == '.') {
+        strcpy (NewList->Str, Argv[1]);
+      } else {
+        NewList->Str[0] = '.';
+        strcpy (NewList->Str + 1, Argv[1]);
+      }
+      //
+      // Add it to our linked list
+      //
+      if (mGlobals.SkipExt == NULL) {
+        mGlobals.SkipExt = NewList;
+      } else {
+        mGlobals.LastSkipExt->Next = NewList;
+      }
+
+      mGlobals.LastSkipExt = NewList;
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-lang") == 0) {
+      //
+      // "-lang eng" or "-lang spa+cat" to only output certain languages
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing language name");
+        Usage ();
+        return STATUS_ERROR;
+      }
+
+      if (AddCommandLineLanguage (Argv[1]) != STATUS_SUCCESS) {
+        return STATUS_ERROR;
+      }
+
+      Argc--;
+      Argv++;
+    } else if (stricmp (Argv[0], "-od") == 0) {
+      //
+      // Output database file name -- check for another arg
+      //
+      if ((Argc <= 1) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing output database file name");
+        return STATUS_ERROR;
+      }
+
+      strcpy (mGlobals.OutputDatabaseFileName, Argv[1]);
+      Argv++;
+      Argc--;
+    } else {
+      //
+      // Unrecognized arg
+      //
+      Error (PROGRAM_NAME, 0, 0, Argv[0], "unrecognized option");
+      Usage ();
+      return STATUS_ERROR;
+    }
+
+    Argv++;
+    Argc--;
+  }
+  //
+  // Make sure they specified the mode parse/scan/dump
+  //
+  if (mGlobals.Mode == MODE_UNKNOWN) {
+    Error (NULL, 0, 0, "must specify one of -parse/-scan/-dump", NULL);
+    return STATUS_ERROR;
+  }
+  //
+  // All modes require a database filename
+  //
+  if (mGlobals.DatabaseFileName == 0) {
+    Error (NULL, 0, 0, "must specify a database filename using -db DbFileName", NULL);
+    Usage ();
+    return STATUS_ERROR;
+  }
+  //
+  // If dumping the database file, then return immediately if all
+  // parameters check out.
+  //
+  if (mGlobals.Mode == MODE_DUMP) {
+    //
+    // Not much use if they didn't specify -oh or -oc or -ou or -hpk
+    //
+    if ((mGlobals.DumpUFileName[0] == 0) &&
+        (mGlobals.StringHFileName[0] == 0) &&
+        (mGlobals.StringCFileName[0] == 0) &&
+        (mGlobals.HiiExportPackFileName[0] == 0)
+        ) {
+      Error (NULL, 0, 0, "-dump without -oc/-oh/-ou/-hpk is a NOP", NULL);
+      return STATUS_ERROR;
+    }
+
+    return STATUS_SUCCESS;
+  }
+  //
+  // Had to specify source string file and output string defines header filename.
+  //
+  if (mGlobals.Mode == MODE_SCAN) {
+    if (Argc < 1) {
+      Error (PROGRAM_NAME, 0, 0, NULL, "must specify at least one source file to scan with -scan");
+      Usage ();
+      return STATUS_ERROR;
+    }
+    //
+    // Get the list of filenames
+    //
+    while (Argc > 0) {
+      NewList = malloc (sizeof (TEXT_STRING_LIST));
+      if (NewList == NULL) {
+        Error (PROGRAM_NAME, 0, 0, "memory allocation failure", NULL);
+        return STATUS_ERROR;
+      }
+
+      memset (NewList, 0, sizeof (TEXT_STRING_LIST));
+      NewList->Str = (UINT8 *) malloc (strlen (Argv[0]) + 1);
+      if (NewList->Str == NULL) {
+        Error (PROGRAM_NAME, 0, 0, "memory allocation failure", NULL);
+        return STATUS_ERROR;
+      }
+
+      strcpy (NewList->Str, Argv[0]);
+      if (mGlobals.ScanFileName == NULL) {
+        mGlobals.ScanFileName = NewList;
+      } else {
+        mGlobals.LastScanFileName->Next = NewList;
+      }
+
+      mGlobals.LastScanFileName = NewList;
+      Argc--;
+      Argv++;
+    }
+  } else {
+    //
+    // Parse mode -- must specify an input unicode file name
+    //
+    if (Argc < 1) {
+      Error (PROGRAM_NAME, 0, 0, NULL, "must specify input unicode string file name with -parse");
+      Usage ();
+      return STATUS_ERROR;
+    }
+
+    strcpy (mGlobals.SourceFiles.FileName, Argv[0]);
+  }
+
+  return STATUS_SUCCESS;
+}
+//
+// Found "-lang eng,spa+cat" on the command line. Parse the
+// language list and save the setting for later processing.
+//
+static
+STATUS
+AddCommandLineLanguage (
+  IN INT8          *Language
+  )
+{
+  WCHAR_STRING_LIST *WNewList;
+  WCHAR             *From;
+  WCHAR             *To;
+  //
+  // Keep processing the input string until we find the end.
+  //
+  while (*Language) {
+    //
+    // Allocate memory for a new list element, fill it in, and
+    // add it to our list.
+    //
+    WNewList = MALLOC (sizeof (WCHAR_STRING_LIST));
+    if (WNewList == NULL) {
+      Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+      return STATUS_ERROR;
+    }
+
+    memset ((char *) WNewList, 0, sizeof (WCHAR_STRING_LIST));
+    WNewList->Str = malloc ((strlen (Language) + 1) * sizeof (WCHAR));
+    if (WNewList->Str == NULL) {
+      free (WNewList);
+      Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+      return STATUS_ERROR;
+    }
+    //
+    // Copy it as unicode to our new structure. Then remove the
+    // plus signs in it, and verify each language name is 3 characters
+    // long. If we find a comma, then we're done with this group, so
+    // break out.
+    //
+    swprintf (WNewList->Str, L"%S", Language);
+    From = To = WNewList->Str;
+    while (*From) {
+      if (*From == L',') {
+        break;
+      }
+
+      if ((wcslen (From) < LANGUAGE_IDENTIFIER_NAME_LEN) ||
+            (
+              (From[LANGUAGE_IDENTIFIER_NAME_LEN] != 0) &&
+              (From[LANGUAGE_IDENTIFIER_NAME_LEN] != UNICODE_PLUS_SIGN) &&
+              (From[LANGUAGE_IDENTIFIER_NAME_LEN] != L',')
+            )
+          ) {
+        Error (PROGRAM_NAME, 0, 0, Language, "invalid format for language name on command line");
+        FREE (WNewList->Str);
+        FREE (WNewList);
+        return STATUS_ERROR;
+      }
+
+      wcsncpy (To, From, LANGUAGE_IDENTIFIER_NAME_LEN);
+      To += LANGUAGE_IDENTIFIER_NAME_LEN;
+      From += LANGUAGE_IDENTIFIER_NAME_LEN;
+      if (*From == L'+') {
+        From++;
+      }
+    }
+
+    *To = 0;
+    //
+    // Add it to our linked list
+    //
+    if (mGlobals.Language == NULL) {
+      mGlobals.Language = WNewList;
+    } else {
+      mGlobals.LastLanguage->Next = WNewList;
+    }
+
+    mGlobals.LastLanguage = WNewList;
+    //
+    // Skip to next entry (comma-separated list)
+    //
+    while (*Language) {
+      if (*Language == L',') {
+        Language++;
+        break;
+      }
+
+      Language++;
+    }
+  }
+
+  return STATUS_SUCCESS;
+}
+//
+// The contents of the text file are expected to be (one per line)
+//   STRING_IDENTIFIER_NAME   ScopeName
+// For example:
+//   STR_ID_MY_FAVORITE_STRING   IBM
+//
+static
+STATUS
+ParseIndirectionFiles (
+  TEXT_STRING_LIST    *Files
+  )
+{
+  FILE                        *Fptr;
+  INT8                        Line[200];
+  INT8                        *StringName;
+  INT8                        *ScopeName;
+  INT8                        *End;
+  UINT32                      LineCount;
+  WCHAR_MATCHING_STRING_LIST  *NewList;
+
+  Line[sizeof (Line) - 1] = 0;
+  Fptr                    = NULL;
+  while (Files != NULL) {
+    Fptr      = fopen (Files->Str, "r");
+    LineCount = 0;
+    if (Fptr == NULL) {
+      Error (NULL, 0, 0, Files->Str, "failed to open input indirection file for reading");
+      return STATUS_ERROR;
+    }
+
+    while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+      //
+      // remove terminating newline for error printing purposes.
+      //
+      if (Line[strlen (Line) - 1] == '\n') {
+        Line[strlen (Line) - 1] = 0;
+      }
+
+      LineCount++;
+      if (Line[sizeof (Line) - 1] != 0) {
+        Error (Files->Str, LineCount, 0, "line length exceeds maximum supported", NULL);
+        goto Done;
+      }
+
+      StringName = Line;
+      while (*StringName && (isspace (*StringName))) {
+        StringName++;
+      }
+
+      if (*StringName) {
+        if ((*StringName == '_') || isalpha (*StringName)) {
+          End = StringName;
+          while ((*End) && (*End == '_') || (isalnum (*End))) {
+            End++;
+          }
+
+          if (isspace (*End)) {
+            *End = 0;
+            End++;
+            while (isspace (*End)) {
+              End++;
+            }
+
+            if (*End) {
+              ScopeName = End;
+              while (*End && !isspace (*End)) {
+                End++;
+              }
+
+              *End = 0;
+              //
+              // Add the string name/scope pair
+              //
+              NewList = malloc (sizeof (WCHAR_MATCHING_STRING_LIST));
+              if (NewList == NULL) {
+                Error (NULL, 0, 0, "memory allocation error", NULL);
+                goto Done;
+              }
+
+              memset (NewList, 0, sizeof (WCHAR_MATCHING_STRING_LIST));
+              NewList->Str1 = (WCHAR *) malloc ((strlen (StringName) + 1) * sizeof (WCHAR));
+              NewList->Str2 = (WCHAR *) malloc ((strlen (ScopeName) + 1) * sizeof (WCHAR));
+              if ((NewList->Str1 == NULL) || (NewList->Str2 == NULL)) {
+                Error (NULL, 0, 0, "memory allocation error", NULL);
+                goto Done;
+              }
+
+              swprintf (NewList->Str1, L"%S", StringName);
+              swprintf (NewList->Str2, L"%S", ScopeName);
+              if (mGlobals.IndirectionList == NULL) {
+                mGlobals.IndirectionList = NewList;
+              } else {
+                mGlobals.LastIndirectionList->Next = NewList;
+              }
+
+              mGlobals.LastIndirectionList = NewList;
+            } else {
+              Error (Files->Str, LineCount, 0, StringName, "invalid line : expected 'StringIdentifier Scope'");
+              goto Done;
+            }
+          } else {
+            Error (Files->Str, LineCount, 0, StringName, "invalid line : expected 'StringIdentifier Scope'");
+            goto Done;
+          }
+        } else {
+          Error (Files->Str, LineCount, 0, StringName, "invalid string identifier");
+          goto Done;
+        }
+      }
+    }
+
+    fclose (Fptr);
+    Fptr  = NULL;
+    Files = Files->Next;
+  }
+
+Done:
+  if (Fptr != NULL) {
+    fclose (Fptr);
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+ScanFiles (
+  TEXT_STRING_LIST *ScanFiles
+  )
+{
+  char              Line[MAX_LINE_LEN];
+  FILE              *Fptr;
+  UINT32            LineNum;
+  char              *Cptr;
+  char              *SavePtr;
+  char              *TermPtr;
+  char              *StringTokenPos;
+  TEXT_STRING_LIST  *SList;
+  BOOLEAN           SkipIt;
+
+  //
+  // Put a null-terminator at the end of the line. If we read in
+  // a line longer than we support, then we can catch it.
+  //
+  Line[MAX_LINE_LEN - 1] = 0;
+  //
+  // Process each file. If they gave us a skip extension list, then
+  // skip it if the extension matches.
+  //
+  while (ScanFiles != NULL) {
+    SkipIt = FALSE;
+    for (SList = mGlobals.SkipExt; SList != NULL; SList = SList->Next) {
+      if ((strlen (ScanFiles->Str) > strlen (SList->Str)) &&
+          (strcmp (ScanFiles->Str + strlen (ScanFiles->Str) - strlen (SList->Str), SList->Str) == 0)
+          ) {
+        SkipIt = TRUE;
+        //
+        // printf ("Match: %s : %s\n", ScanFiles->Str, SList->Str);
+        //
+        break;
+      }
+    }
+
+    if (!SkipIt) {
+      if (mGlobals.VerboseScan) {
+        printf ("Scanning %s\n", ScanFiles->Str);
+      }
+
+      Fptr = fopen (ScanFiles->Str, "r");
+      if (Fptr == NULL) {
+        Error (NULL, 0, 0, ScanFiles->Str, "failed to open input file for scanning");
+        return STATUS_ERROR;
+      }
+
+      LineNum = 0;
+      while (fgets (Line, sizeof (Line), Fptr) != NULL) {
+        LineNum++;
+        if (Line[MAX_LINE_LEN - 1] != 0) {
+          Error (ScanFiles->Str, LineNum, 0, "line length exceeds maximum supported by tool", NULL);
+          fclose (Fptr);
+          return STATUS_ERROR;
+        }
+        //
+        // Remove the newline from the input line so we can print a warning message
+        //
+        if (Line[strlen (Line) - 1] == '\n') {
+          Line[strlen (Line) - 1] = 0;
+        }
+        //
+        // Terminate the line at // comments
+        //
+        Cptr = strstr (Line, "//");
+        if (Cptr != NULL) {
+          *Cptr = 0;
+        }
+
+        Cptr = Line;
+        while ((Cptr = strstr (Cptr, STRING_TOKEN)) != NULL) {
+          //
+          // Found "STRING_TOKEN". Make sure we don't have NUM_STRING_TOKENS or
+          // something like that. Then make sure it's followed by
+          // an open parenthesis, a string identifier, and then a closing
+          // parenthesis.
+          //
+          if (mGlobals.VerboseScan) {
+            printf (" %d: %s", LineNum, Cptr);
+          }
+
+          if (((Cptr == Line) || (!IsValidIdentifierChar (*(Cptr - 1), FALSE))) &&
+              (!IsValidIdentifierChar (*(Cptr + sizeof (STRING_TOKEN) - 1), FALSE))
+              ) {
+            StringTokenPos  = Cptr;
+            SavePtr         = Cptr;
+            Cptr += strlen (STRING_TOKEN);
+            while (*Cptr && isspace (*Cptr) && (*Cptr != '(')) {
+              Cptr++;
+            }
+
+            if (*Cptr != '(') {
+              Warning (ScanFiles->Str, LineNum, 0, StringTokenPos, "expected "STRING_TOKEN "(identifier)");
+            } else {
+              //
+              // Skip over the open-parenthesis and find the next non-blank character
+              //
+              Cptr++;
+              while (isspace (*Cptr)) {
+                Cptr++;
+              }
+
+              SavePtr = Cptr;
+              if ((*Cptr == '_') || isalpha (*Cptr)) {
+                while ((*Cptr == '_') || (isalnum (*Cptr))) {
+                  Cptr++;
+                }
+
+                TermPtr = Cptr;
+                while (*Cptr && isspace (*Cptr)) {
+                  Cptr++;
+                }
+
+                if (*Cptr != ')') {
+                  Warning (ScanFiles->Str, LineNum, 0, StringTokenPos, "expected "STRING_TOKEN "(identifier)");
+                }
+
+                if (*TermPtr) {
+                  *TermPtr  = 0;
+                  Cptr      = TermPtr + 1;
+                } else {
+                  Cptr = TermPtr;
+                }
+                //
+                // Add the string identifier to the list of used strings
+                //
+                ParserSetPosition (ScanFiles->Str, LineNum);
+                StringDBSetStringReferenced (SavePtr, mGlobals.IgnoreNotFound);
+                if (mGlobals.VerboseScan) {
+                  printf ("...referenced %s", SavePtr);
+                }
+              } else {
+                Warning (ScanFiles->Str, LineNum, 0, StringTokenPos, "expected valid string identifier name");
+              }
+            }
+          } else {
+            //
+            // Found it, but it's a substring of something else. Advance our pointer.
+            //
+            Cptr++;
+          }
+
+          if (mGlobals.VerboseScan) {
+            printf ("\n");
+          }
+        }
+      }
+
+      fclose (Fptr);
+    } else {
+      //
+      // Skipping this file type
+      //
+      if (mGlobals.VerboseScan) {
+        printf ("Skip scanning of %s\n", ScanFiles->Str);
+      }
+    }
+
+    ScanFiles = ScanFiles->Next;
+  }
+
+  return STATUS_SUCCESS;
+}
+//
+// Free the global string lists we allocated memory for
+//
+static
+void
+FreeLists (
+  VOID
+  )
+{
+  TEXT_STRING_LIST  *Temp;
+  WCHAR_STRING_LIST *WTemp;
+
+  //
+  // Traverse the include paths, freeing each
+  //
+  while (mGlobals.IncludePaths != NULL) {
+    Temp = mGlobals.IncludePaths->Next;
+    free (mGlobals.IncludePaths->Str);
+    free (mGlobals.IncludePaths);
+    mGlobals.IncludePaths = Temp;
+  }
+  //
+  // If we did a scan, then free up our
+  // list of files to scan.
+  //
+  while (mGlobals.ScanFileName != NULL) {
+    Temp = mGlobals.ScanFileName->Next;
+    free (mGlobals.ScanFileName->Str);
+    free (mGlobals.ScanFileName);
+    mGlobals.ScanFileName = Temp;
+  }
+  //
+  // If they gave us a list of filename extensions to
+  // skip on scan, then free them up.
+  //
+  while (mGlobals.SkipExt != NULL) {
+    Temp = mGlobals.SkipExt->Next;
+    free (mGlobals.SkipExt->Str);
+    free (mGlobals.SkipExt);
+    mGlobals.SkipExt = Temp;
+  }
+  //
+  // Free up any languages specified
+  //
+  while (mGlobals.Language != NULL) {
+    WTemp = mGlobals.Language->Next;
+    free (mGlobals.Language->Str);
+    free (mGlobals.Language);
+    mGlobals.Language = WTemp;
+  }
+  //
+  // Free up our indirection list
+  //
+  while (mGlobals.IndirectionList != NULL) {
+    mGlobals.LastIndirectionList = mGlobals.IndirectionList->Next;
+    free (mGlobals.IndirectionList->Str1);
+    free (mGlobals.IndirectionList->Str2);
+    free (mGlobals.IndirectionList);
+    mGlobals.IndirectionList = mGlobals.LastIndirectionList;
+  }
+
+  while (mGlobals.IndirectionFileName != NULL) {
+    mGlobals.LastIndirectionFileName = mGlobals.IndirectionFileName->Next;
+    free (mGlobals.IndirectionFileName->Str);
+    free (mGlobals.IndirectionFileName);
+    mGlobals.IndirectionFileName = mGlobals.LastIndirectionFileName;
+  }
+}
+
+static
+BOOLEAN
+IsValidIdentifierChar (
+  INT8      Char,
+  BOOLEAN   FirstChar
+  )
+{
+  //
+  // If it's the first character of an identifier, then
+  // it must be one of [A-Za-z_].
+  //
+  if (FirstChar) {
+    if (isalpha (Char) || (Char == '_')) {
+      return TRUE;
+    }
+  } else {
+    //
+    // If it's not the first character, then it can
+    // be one of [A-Za-z_0-9]
+    //
+    if (isalnum (Char) || (Char == '_')) {
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+static
+void
+RewindFile (
+  SOURCE_FILE *SourceFile
+  )
+{
+  SourceFile->LineNum       = 1;
+  SourceFile->FileBufferPtr = SourceFile->FileBuffer;
+  SourceFile->EndOfFile     = 0;
+}
+
+static
+BOOLEAN
+SkipTo (
+  SOURCE_FILE *SourceFile,
+  WCHAR       WChar,
+  BOOLEAN     StopAfterNewline
+  )
+{
+  while (!EndOfFile (SourceFile)) {
+    //
+    // Check for the character of interest
+    //
+    if (SourceFile->FileBufferPtr[0] == WChar) {
+      return TRUE;
+    } else {
+      if (SourceFile->FileBufferPtr[0] == UNICODE_LF) {
+        SourceFile->LineNum++;
+        if (StopAfterNewline) {
+          SourceFile->FileBufferPtr++;
+          if (SourceFile->FileBufferPtr[0] == 0) {
+            SourceFile->FileBufferPtr++;
+          }
+
+          return FALSE;
+        }
+      }
+
+      SourceFile->FileBufferPtr++;
+    }
+  }
+
+  return FALSE;
+}
+
+static
+void
+Usage (
+  VOID
+  )
+/*++
+
+Routine Description:
+
+  Print usage information for this utility.
+  
+Arguments:
+
+  None.
+
+Returns:
+
+  Nothing.
+  
+--*/
+{
+  int               Index;
+  static const char *Str[] = {
+    "",
+    PROGRAM_NAME " version "TOOL_VERSION " -- process unicode strings file",
+    "  Usage: "PROGRAM_NAME " -parse {parse options} [FileNames]",
+    "         "PROGRAM_NAME " -scan {scan options} [FileName]",
+    "         "PROGRAM_NAME " -dump {dump options}",
+    "    Common options include:",
+    "      -h or -?         for this help information",
+    "      -db Database     required name of output/input database file",
+    "      -bn BaseName     for use in the .h and .c output files",
+    "                       Default = "DEFAULT_BASE_NAME,
+    "      -v               for verbose output",
+    "      -vdbw            for verbose output when writing database",
+    "      -vdbr            for verbose output when reading database",
+    "      -od FileName     to specify an output database file name",
+    "    Parse options include:",
+    "      -i IncludePath   add IncludePath to list of search paths",
+    "      -newdb           to not read in existing database file",
+    "      -uqs             to indicate that unquoted strings are used",
+    "      FileNames        name of one or more unicode files to parse",
+    "    Scan options include:",
+    "      -scan            scan text file(s) for STRING_TOKEN() usage",
+    "      -skipext .ext    to skip scan of files with .ext filename extension",
+    "      -ignorenotfound  ignore if a given STRING_TOKEN(STR) is not ",
+    "                       found in the database",
+    "      FileNames        one or more files to scan",
+    "    Dump options include:",
+    "      -oc FileName     write string data to FileName",
+    "      -oh FileName     write string defines to FileName",
+    "      -ou FileName     dump database to unicode file FileName",
+    "      -lang Lang       only dump for the language 'Lang'",
+    "      -if FileName     to specify an indirection file",
+    "      -hpk FileName    to create an HII export pack of the strings",
+    "",
+    "  The expected process is to parse a unicode string file to create an initial",
+    "  database of string identifier names and string definitions. Then text files",
+    "  should be scanned for STRING_TOKEN() usages, and the referenced",
+    "  strings will be tagged as used in the database. After all files have been",
+    "  scanned, then the database should be dumped to create the necessary output",
+    "  files.",
+    "",
+    NULL
+  };
+  for (Index = 0; Str[Index] != NULL; Index++) {
+    fprintf (stdout, "%s\n", Str[Index]);
+  }
+}
diff --git a/Tools/Source/TianoTools/StrGather/StrGather.h b/Tools/Source/TianoTools/StrGather/StrGather.h
new file mode 100644
index 0000000000..df175c2db6
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/StrGather.h
@@ -0,0 +1,84 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  StrGather.h
+
+Abstract:
+
+  Common defines and prototypes for StrGather.
+  
+--*/
+
+#ifndef _STR_GATHER_H_
+#define _STR_GATHER_H_
+
+#define MALLOC(size)  malloc (size)
+#define FREE(ptr)     free (ptr)
+
+#define PROGRAM_NAME  "StrGather"
+
+typedef CHAR16  WCHAR;
+
+#define UNICODE_TO_ASCII(w)   (INT8) ((w) & 0xFF)
+#define ASCII_TO_UNICODE(a)   (WCHAR) ((UINT8) (a))
+
+#define UNICODE_HASH          L'#'
+#define UNICODE_BACKSLASH     L'\\'
+#define UNICODE_SLASH         L'/'
+#define UNICODE_EQUAL_SIGN    L'='
+#define UNICODE_PLUS_SIGN     L'+'
+
+#define UNICODE_FILE_START    0xFEFF
+#define UNICODE_CR            0x000D
+#define UNICODE_LF            0x000A
+#define UNICODE_NULL          0x0000
+#define UNICODE_SPACE         L' '
+#define UNICODE_SLASH         L'/'
+#define UNICODE_DOUBLE_QUOTE  L'"'
+#define UNICODE_Z             L'Z'
+#define UNICODE_z             L'z'
+#define UNICODE_A             L'A'
+#define UNICODE_a             L'a'
+#define UNICODE_F             L'F'
+#define UNICODE_f             L'f'
+#define UNICODE_UNDERSCORE    L'_'
+#define UNICODE_0             L'0'
+#define UNICODE_9             L'9'
+#define UNICODE_TAB           L'\t'
+#define UNICODE_NBR_STRING    L"\\nbr"
+#define UNICODE_BR_STRING     L"\\br"
+#define UNICODE_WIDE_STRING   L"\\wide"
+#define UNICODE_NARROW_STRING L"\\narrow"
+
+//
+// This is the length of a valid string identifier
+//
+#define LANGUAGE_IDENTIFIER_NAME_LEN  3
+
+typedef struct _TEXT_STRING_LIST {
+  struct _TEXT_STRING_LIST  *Next;
+  UINT8                     *Str;
+} TEXT_STRING_LIST;
+
+typedef struct _WCHAR_STRING_LIST {
+  struct _WCHAR_STRING_LIST *Next;
+  WCHAR                     *Str;
+} WCHAR_STRING_LIST;
+
+typedef struct _WCHAR_MATCHING_STRING_LIST {
+  struct _WCHAR_MATCHING_STRING_LIST  *Next;
+  WCHAR                               *Str1;
+  WCHAR                               *Str2;
+} WCHAR_MATCHING_STRING_LIST;
+
+#endif // #ifndef _STR_GATHER_H_
diff --git a/Tools/Source/TianoTools/StrGather/StringDB.c b/Tools/Source/TianoTools/StrGather/StringDB.c
new file mode 100644
index 0000000000..f452bbc86b
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/StringDB.c
@@ -0,0 +1,2751 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  StringDB.c
+
+Abstract:
+
+  String database implementation
+  
+--*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>  // for tolower()
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <MultiPhase.h>
+#include "EfiUtilityMsgs.h"
+#include "StrGather.h"
+#include "StringDB.h"
+#include "InternalFormRepresentation.h"
+
+// #include EFI_PROTOCOL_DEFINITION (Hii)
+#include <UgaDraw.h>
+#include <Hii.h>
+
+#define STRING_OFFSET RELOFST
+
+#define STRING_DB_KEY (('S' << 24) | ('D' << 16) | ('B' << 8) | 'K')
+//
+// Version supported by this tool
+//
+#define STRING_DB_VERSION             0x00010000
+
+#define STRING_DB_MAJOR_VERSION_MASK  0xFFFF0000
+#define STRING_DB_MINOR_VERSION_MASK  0x0000FFFF
+
+#define DEFINE_STR                    L"// #define"
+
+#define LANGUAGE_CODE_WIDTH           4
+//
+// This is the header that gets written to the top of the
+// output binary database file.
+//
+typedef struct {
+  UINT32  Key;
+  UINT32  HeaderSize;
+  UINT32  Version;
+  UINT32  NumStringIdenfiers;
+  UINT32  StringIdentifiersSize;
+  UINT32  NumLanguages;
+} STRING_DB_HEADER;
+
+//
+// When we write out data to the database, we have a UINT16 identifier, which
+// indicates what follows, followed by the data. Here's the structure.
+//
+typedef struct {
+  UINT16  DataType;
+  UINT16  Reserved;
+} DB_DATA_ITEM_HEADER;
+
+#define DB_DATA_TYPE_INVALID              0x0000
+#define DB_DATA_TYPE_STRING_IDENTIFIER    0x0001
+#define DB_DATA_TYPE_LANGUAGE_DEFINITION  0x0002
+#define DB_DATA_TYPE_STRING_DEFINITION    0x0003
+#define DB_DATA_TYPE_LAST                 DB_DATA_TYPE_STRING_DEFINITION
+
+//
+// We have to keep track of a list of languages, each of which has its own
+// list of strings. Define a structure to keep track of all languages and
+// their list of strings.
+//
+typedef struct _STRING_LIST {
+  struct _STRING_LIST *Next;
+  UINT32              Size;         // number of bytes in string, including null terminator
+  WCHAR               *LanguageName;
+  WCHAR               *StringName;  // for example STR_ID_TEXT1
+  WCHAR               *Scope;       //
+  WCHAR               *Str;         // the actual string
+  UINT16              Flags;        // properties of this string (used, undefined)
+} STRING_LIST;
+
+typedef struct _LANGUAGE_LIST {
+  struct _LANGUAGE_LIST *Next;
+  WCHAR                 LanguageName[4];
+  WCHAR                 *PrintableLanguageName;
+  STRING_LIST           *String;
+  STRING_LIST           *LastString;
+} LANGUAGE_LIST;
+
+//
+// We also keep track of all the string identifier names, which we assign unique
+// values to. Create a structure to keep track of them all.
+//
+typedef struct _STRING_IDENTIFIER {
+  struct _STRING_IDENTIFIER *Next;
+  UINT32                    Index;  // only need 16 bits, but makes it easier with UINT32
+  WCHAR                     *StringName;
+  UINT16                    Flags;  // if someone referenced it via STRING_TOKEN()
+} STRING_IDENTIFIER;
+//
+// Keep our globals in this structure to be as modular as possible.
+//
+typedef struct {
+  FILE              *StringDBFptr;
+  LANGUAGE_LIST     *LanguageList;
+  LANGUAGE_LIST     *LastLanguageList;
+  LANGUAGE_LIST     *CurrentLanguage;         // keep track of the last language they used
+  STRING_IDENTIFIER *StringIdentifier;
+  STRING_IDENTIFIER *LastStringIdentifier;
+  UINT8             *StringDBFileName;
+  UINT32            NumStringIdentifiers;
+  UINT32            NumStringIdentifiersReferenced;
+  STRING_IDENTIFIER *CurrentStringIdentifier; // keep track of the last string identifier they added
+  WCHAR             *CurrentScope;
+} STRING_DB_DATA;
+
+static STRING_DB_DATA mDBData;
+
+static const char     *mSourceFileHeader[] = {
+  "//",
+  "//  DO NOT EDIT -- auto-generated file",
+  "//",
+  "//  This file is generated by the string gather utility",
+  "//",
+  NULL
+};
+
+static
+STRING_LIST           *
+StringDBFindString (
+  WCHAR                       *LanguageName,
+  WCHAR                       *StringName,
+  WCHAR                       *Scope,
+  WCHAR_STRING_LIST           *LanguagesOfInterest,
+  WCHAR_MATCHING_STRING_LIST  *IndirectionList
+  );
+
+static
+STRING_IDENTIFIER     *
+StringDBFindStringIdentifierByName (
+  WCHAR *Name
+  );
+
+static
+STRING_IDENTIFIER     *
+StringDBFindStringIdentifierByIndex (
+  UINT32    Index
+  );
+
+static
+LANGUAGE_LIST         *
+StringDBFindLanguageList (
+  WCHAR *LanguageName
+  );
+
+static
+void
+StringDBWriteStandardFileHeader (
+  FILE *OutFptr
+  );
+
+static
+WCHAR                 *
+AsciiToWchar (
+  INT8 *Str
+  );
+
+static
+WCHAR                 *
+DuplicateString (
+  WCHAR   *Str
+  );
+
+static
+STATUS
+StringDBWriteStringIdentifier (
+  FILE                *DBFptr,
+  UINT16              StringId,
+  UINT16              Flags,
+  WCHAR               *IdentifierName
+  );
+
+static
+STATUS
+StringDBReadStringIdentifier (
+  FILE                *DBFptr
+  );
+
+static
+STATUS
+StringDBWriteLanguageDefinition (
+  FILE            *DBFptr,
+  WCHAR           *LanguageName,
+  WCHAR           *PrintableLanguageName
+  );
+
+static
+STATUS
+StringDBReadLanguageDefinition (
+  FILE            *DBFptr
+  );
+
+static
+STATUS
+StringDBWriteString (
+  FILE            *DBFptr,
+  UINT16          Flags,
+  WCHAR           *Language,
+  WCHAR           *StringName,
+  WCHAR           *Scope,
+  WCHAR           *Str
+  );
+
+static
+STATUS
+StringDBReadString (
+  FILE            *DBFptr
+  );
+
+static
+STATUS
+StringDBReadGenericString (
+  FILE      *DBFptr,
+  UINT16    *Size,
+  WCHAR     **Str
+  );
+
+static
+STATUS
+StringDBWriteGenericString (
+  FILE      *DBFptr,
+  WCHAR     *Str
+  );
+
+static
+void
+StringDBAssignStringIndexes (
+  VOID
+  );
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+  Constructor function for the string database handler.
+
+Arguments:
+  None.
+
+Returns:
+  None.
+
+--*/
+void
+StringDBConstructor (
+  VOID
+  )
+{
+  memset ((char *) &mDBData, 0, sizeof (STRING_DB_DATA));
+  mDBData.CurrentScope = DuplicateString (L"NULL");
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+  Destructor function for the string database handler.
+
+Arguments:
+  None.
+
+Returns:
+  None.
+
+--*/
+void
+StringDBDestructor (
+  VOID
+  )
+{
+  LANGUAGE_LIST     *NextLang;
+  STRING_LIST       *NextStr;
+  STRING_IDENTIFIER *NextIdentifier;
+  //
+  // Close the database file if it's open
+  //
+  if (mDBData.StringDBFptr != NULL) {
+    fclose (mDBData.StringDBFptr);
+    mDBData.StringDBFptr = NULL;
+  }
+  //
+  // If we've allocated any strings/languages, free them up
+  //
+  while (mDBData.LanguageList != NULL) {
+    NextLang = mDBData.LanguageList->Next;
+    //
+    // Free up all strings for this language
+    //
+    while (mDBData.LanguageList->String != NULL) {
+      NextStr = mDBData.LanguageList->String->Next;
+      FREE (mDBData.LanguageList->String->Str);
+      FREE (mDBData.LanguageList->String);
+      mDBData.LanguageList->String = NextStr;
+    }
+
+    FREE (mDBData.LanguageList->PrintableLanguageName);
+    FREE (mDBData.LanguageList);
+    mDBData.LanguageList = NextLang;
+  }
+  //
+  // Free up string identifiers
+  //
+  while (mDBData.StringIdentifier != NULL) {
+    NextIdentifier = mDBData.StringIdentifier->Next;
+    FREE (mDBData.StringIdentifier->StringName);
+    FREE (mDBData.StringIdentifier);
+    mDBData.StringIdentifier = NextIdentifier;
+  }
+  //
+  // Free the filename
+  //
+  if (mDBData.StringDBFileName != NULL) {
+    FREE (mDBData.StringDBFileName);
+    mDBData.StringDBFileName = NULL;
+  }
+  //
+  // We save a copy of the scope, so free it up if we
+  // have one.
+  //
+  if (mDBData.CurrentScope != NULL) {
+    FREE (mDBData.CurrentScope);
+    mDBData.CurrentScope = NULL;
+  }
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Dump the contents of a database to an output C file.
+
+Arguments:
+
+  FileName        - name of the output file to write 
+  BaseName        - used for the name of the C array defined
+  Languages       - list of languages of interest
+
+Returns:
+
+  STATUS
+
+Notes:
+
+  Languages is a pointer to a linked list of languages specified on
+  the command line. Format is "eng" and "spa+cat". For this, print
+  the strings for eng. Print the strings for spa too, but if one is
+  missing look for a cat string and print if it it exists.
+
+--*/
+STATUS
+StringDBDumpCStrings (
+  INT8                        *FileName,
+  INT8                        *BaseName,
+  WCHAR_STRING_LIST           *LanguagesOfInterest,
+  WCHAR_MATCHING_STRING_LIST  *IndirectionList
+  )
+{
+  FILE                        *Fptr;
+  LANGUAGE_LIST               *Lang;
+  STRING_LIST                 *CurrString;
+  STRING_LIST                 EmptyString;
+  UINT32                      Offset;
+  UINT32                      StringIndex;
+  UINT32                      TempIndex;
+  UINT32                      BytesThisLine;
+  EFI_HII_STRING_PACK         StringPack;
+  UINT8                       *Ptr;
+  UINT32                      Len;
+  WCHAR                       ZeroString[1];
+  WCHAR_STRING_LIST           *LOIPtr;
+  BOOLEAN                     LanguageOk;
+  WCHAR                       *TempStringPtr;
+  WCHAR                       *LangName;
+  STRING_IDENTIFIER           *StringIdentifier;
+
+  if ((Fptr = fopen (FileName, "w")) == NULL) {
+    Error (NULL, 0, 0, FileName, "failed to open output C string file");
+    return STATUS_ERROR;
+  }
+  //
+  // Assign index values to the string identifiers
+  //
+  StringDBAssignStringIndexes ();
+  //
+  // Write the standard header to the output file, then the structure
+  // definition header.
+  //
+  StringDBWriteStandardFileHeader (Fptr);
+  fprintf (Fptr, "\nunsigned char %s[] = {\n", BaseName);
+  //
+  // If a given string is not defined, then we'll use this one.
+  //
+  memset (&EmptyString, 0, sizeof (EmptyString));
+  EmptyString.Size  = sizeof (ZeroString);
+  EmptyString.Str   = ZeroString;
+  //
+  // Process each language, then each string for each langage
+  //
+  ZeroString[0] = 0;
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    //
+    // If we have a language list, then make sure this language is in that
+    // list.
+    //
+    LanguageOk  = TRUE;
+    LangName    = Lang->LanguageName;
+    if (LanguagesOfInterest != NULL) {
+      LanguageOk = FALSE;
+      for (LOIPtr = LanguagesOfInterest; LOIPtr != NULL; LOIPtr = LOIPtr->Next) {
+        if (wcsncmp (LOIPtr->Str, Lang->LanguageName, LANGUAGE_IDENTIFIER_NAME_LEN) == 0) {
+          LangName    = LOIPtr->Str;
+          LanguageOk  = TRUE;
+          break;
+        }
+      }
+    }
+
+    if (!LanguageOk) {
+      continue;
+    }
+    //
+    // Process each string for this language. We have to make 3 passes on the strings:
+    //   Pass1: computes sizes and fill in the string pack header
+    //   Pass2: write the array of offsets
+    //   Pass3: write the strings
+    //
+    //
+    // PASS 1: Fill in and print the HII string pack header
+    //
+    // Compute the size for this language package and write
+    // the header out. Each string package contains:
+    //   Header
+    //   Offset[]  -- an array of offsets to strings, of type RELOFST each
+    //   String[]  -- the actual strings themselves
+    //
+    fprintf (
+      Fptr,
+      "\n//******************************************************************************"
+      "\n// Start of string definitions for %S/%S",
+      Lang->LanguageName,
+      Lang->PrintableLanguageName
+      );
+    memset ((char *) &StringPack, 0, sizeof (EFI_HII_STRING_PACK));
+    StringPack.Header.Type        = EFI_HII_STRING;
+    StringPack.NumStringPointers  = (UINT16) mDBData.NumStringIdentifiersReferenced;
+    //
+    // First string is the language name. If we're printing all languages, then
+    // it's just the "spa". If we were given a list of languages to print, then it's
+    // the "spacat" string. Compute its offset and fill in
+    // the info in the header. Since we know the language name string's length,
+    // and the printable language name follows it, use that info to fill in the
+    // entry for the printable language name as well.
+    //
+    StringPack.LanguageNameString = (STRING_OFFSET) (sizeof (EFI_HII_STRING_PACK) + (mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET)));
+    StringPack.PrintableLanguageName = (STRING_OFFSET) (StringPack.LanguageNameString + (wcslen (LangName) + 1) * sizeof (WCHAR));
+    //
+    // Add up the size of all strings so we can fill in our header.
+    //
+    Len = 0;
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        Len += (wcslen (LangName) + 1) * sizeof (WCHAR);
+      } else {
+        //
+        // Find a string with this language.stringname
+        //
+        StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+        if (StringIdentifier == NULL) {
+          Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+          return STATUS_ERROR;
+        }
+        //
+        // Find a matching string if this string identifier was referenced
+        //
+        EmptyString.Flags = STRING_FLAGS_UNDEFINED;
+        CurrString        = NULL;
+        if (StringIdentifier->Flags & STRING_FLAGS_REFERENCED) {
+          CurrString = StringDBFindString (
+                        Lang->LanguageName,
+                        StringIdentifier->StringName,
+                        NULL,
+                        LanguagesOfInterest,
+                        IndirectionList
+                        );
+          if (NULL == CurrString) {
+            //
+            // If string for Lang->LanguageName is not found, try to get an English version
+            //
+            CurrString = StringDBFindString (
+                          L"eng",
+                          StringIdentifier->StringName,
+                          NULL,
+                          LanguagesOfInterest,
+                          IndirectionList
+                          );
+          }
+        }
+
+        if (CurrString == NULL) {
+          CurrString = &EmptyString;
+          EmptyString.Flags |= StringIdentifier->Flags;
+        }
+
+        Len += CurrString->Size;
+      }
+    }
+    StringPack.Header.Length =    sizeof (EFI_HII_STRING_PACK) 
+                                + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET) 
+                                + Len;
+    //
+    // Write out the header one byte at a time
+    //
+    Ptr = (UINT8 *) &StringPack;
+    for (TempIndex = 0; TempIndex < sizeof (EFI_HII_STRING_PACK); TempIndex++, Ptr++) {
+      if ((TempIndex & 0x07) == 0) {
+        fprintf (Fptr, "\n  ");
+      }
+
+      fprintf (Fptr, "0x%02X, ", (UINT32) *Ptr);
+    }
+
+    fprintf (Fptr, "\n  // offset 0x%X\n", sizeof (StringPack));
+    //
+    // PASS2 : write the offsets
+    //
+    // Traverse the list of strings again and write the array of offsets. The
+    // offset to the first string is the size of the string pack header
+    // plus the size of the offsets array. The other strings follow it.
+    //
+    StringIndex = 0;
+    Offset      = sizeof (StringPack) + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET);
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      //
+      // Write the offset, followed by a useful comment
+      //
+      fprintf (Fptr, "  ");
+      Ptr = (UINT8 *) &Offset;
+      for (TempIndex = 0; TempIndex < sizeof (STRING_OFFSET); TempIndex++) {
+        fprintf (Fptr, "0x%02X, ", (UINT32) Ptr[TempIndex]);
+      }
+      //
+      // Find the string name
+      //
+      StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+      if (StringIdentifier == NULL) {
+        Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+        return STATUS_ERROR;
+      }
+
+      fprintf (Fptr, " // offset to string %S (0x%04X)", StringIdentifier->StringName, StringIndex);
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        Offset += (wcslen (LangName) + 1) * sizeof (WCHAR);
+        CurrString = StringDBFindString (
+                      Lang->LanguageName,
+                      StringIdentifier->StringName,
+                      NULL, // scope
+                      NULL,
+                      NULL
+                      );
+      } else {
+        //
+        // Find a matching string
+        //
+        CurrString = StringDBFindString (
+                      Lang->LanguageName,
+                      StringIdentifier->StringName,
+                      NULL,   // scope
+                      LanguagesOfInterest,
+                      IndirectionList
+                      );
+
+        if (NULL == CurrString) {
+          CurrString = StringDBFindString (
+                        L"eng",
+                        StringIdentifier->StringName,
+                        NULL, // scope
+                        LanguagesOfInterest,
+                        IndirectionList
+                        );
+        }
+
+        EmptyString.LanguageName = Lang->LanguageName;
+        if (CurrString == NULL) {
+          CurrString        = &EmptyString;
+          EmptyString.Flags = STRING_FLAGS_UNDEFINED;
+        } else if ((StringIdentifier->Flags & STRING_FLAGS_REFERENCED) == 0) {
+          CurrString        = &EmptyString;
+          EmptyString.Flags = 0;
+        }
+
+        Offset += CurrString->Size;
+      }
+      //
+      // Print useful info about this string
+      //
+      if ((StringIdentifier->Flags & STRING_FLAGS_REFERENCED) == 0) {
+        fprintf (Fptr, " - not referenced");
+      }
+
+      if (CurrString->Flags & STRING_FLAGS_UNDEFINED) {
+        fprintf (Fptr, " - not defined for this language");
+      } else if (wcscmp (CurrString->LanguageName, Lang->LanguageName) != 0) {
+        fprintf (
+          Fptr,
+          " - not defined for this language -- using secondary language %S definition",
+          CurrString->LanguageName
+          );
+      }
+
+      fprintf (Fptr, "\n");
+    }
+    //
+    // For unreferenced string identifiers, print a message that they are not referenced anywhere
+    //
+    while (StringIndex < mDBData.NumStringIdentifiers) {
+      StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+      if (StringIdentifier != NULL) {
+        fprintf (Fptr, "  // %S not referenced\n", StringIdentifier->StringName);
+      }
+
+      StringIndex++;
+    }
+
+    //
+    // PASS 3: write the strings themselves.
+    // Keep track of how many bytes we write per line because some editors
+    // (Visual Studio for instance) can't handle too long of lines.
+    //
+    Offset = sizeof (StringPack) + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET);
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+      if (StringIdentifier == NULL) {
+        Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+        return STATUS_ERROR;
+      }
+
+      fprintf (Fptr, "  // string %S offset 0x%08X\n  ", StringIdentifier->StringName, Offset);
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        TempStringPtr = LangName;
+      } else {
+        //
+        // Find a matching string if this string identifier was referenced
+        //
+        CurrString = NULL;
+        if (StringIdentifier->Flags & STRING_FLAGS_REFERENCED) {
+          CurrString = StringDBFindString (
+                        Lang->LanguageName,
+                        StringIdentifier->StringName,
+                        NULL,   // scope
+                        LanguagesOfInterest,
+                        IndirectionList
+                        );
+          if (NULL == CurrString) {
+            CurrString = StringDBFindString (
+                          L"eng",
+                          StringIdentifier->StringName,
+                          NULL, // scope
+                          LanguagesOfInterest,
+                          IndirectionList
+                          );
+          }
+        }
+
+        if (CurrString == NULL) {
+          CurrString = &EmptyString;
+        }
+
+        TempStringPtr = CurrString->Str;
+      }
+
+      BytesThisLine = 0;
+      for (TempIndex = 0; TempStringPtr[TempIndex] != 0; TempIndex++) {
+        fprintf (
+          Fptr,
+          "0x%02X, 0x%02X, ",
+          (UINT32) TempStringPtr[TempIndex] & 0xFF,
+          (UINT32) ((TempStringPtr[TempIndex] >> 8) & 0xFF)
+          );
+        BytesThisLine += 2;
+        Offset += 2;
+        //
+        // Let's say we only allow 14 per line
+        //
+        if (BytesThisLine > 14) {
+          fprintf (Fptr, "\n  ");
+          BytesThisLine = 0;
+        }
+      }
+      //
+      // Print NULL WCHAR at the end of this string.
+      //
+      fprintf (Fptr, "0x00, 0x00,\n");
+      Offset += 2;
+    }
+    //
+    // Sanity check the offset. Make sure our running offset is what we put in the
+    // string pack header.
+    //
+    if (StringPack.Header.Length != Offset) {
+      Error (
+        __FILE__,
+        __LINE__,
+        0,
+        "application error",
+        "stringpack size 0x%X does not match final size 0x%X",
+        StringPack.Header.Length,
+        Offset
+        );
+    }
+  }
+  //
+  // Print terminator string pack, closing brace and close the file.
+  // The size of 0 triggers to the consumer that this is the end.
+  //
+  memset ((char *) &StringPack, 0, sizeof (EFI_HII_STRING_PACK));
+  StringPack.Header.Type  = EFI_HII_STRING;
+  Ptr                     = (UINT8 *) &StringPack;
+  fprintf (Fptr, "\n  // strings terminator pack");
+  for (TempIndex = 0; TempIndex < sizeof (StringPack); TempIndex++, Ptr++) {
+    if ((TempIndex & 0x0F) == 0) {
+      fprintf (Fptr, "\n  ");
+    }
+
+    fprintf (Fptr, "0x%02X, ", (UINT32) *Ptr);
+  }
+
+  fprintf (Fptr, "\n};\n");
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Dump the #define string names
+
+Arguments:
+
+  FileName        - name of the output file to write 
+  BaseName        - used for the protection #ifndef/#endif 
+
+Returns:
+
+  STATUS
+
+--*/
+STATUS
+StringDBDumpStringDefines (
+  INT8 *FileName,
+  INT8 *BaseName
+  )
+{
+  FILE              *Fptr;
+  STRING_IDENTIFIER *Identifier;
+  INT8              CopyBaseName[100];
+  UINT32            Index;
+  const INT8        *StrDefHeader[] = {
+    "#ifndef _%s_STRINGS_DEFINE_H_\n",
+    "#define _%s_STRINGS_DEFINE_H_\n\n",
+    NULL
+  };
+
+  if ((Fptr = fopen (FileName, "w")) == NULL) {
+    Error (NULL, 0, 0, FileName, "failed to open output string defines file");
+    return STATUS_ERROR;
+  }
+  //
+  // Get the base source filename and convert to uppercase.
+  //
+  if (sizeof (CopyBaseName) <= strlen (BaseName) + 1) {
+    Error (NULL, 0, 0, "application error", "StringDBDumpStringDefines() string length insufficient");
+    return STATUS_ERROR;
+  }
+
+  strcpy (CopyBaseName, BaseName);
+  for (Index = 0; CopyBaseName[Index] != 0; Index++) {
+    if (islower (CopyBaseName[Index])) {
+      CopyBaseName[Index] = (INT8) toupper (CopyBaseName[Index]);
+    }
+  }
+  //
+  // Assign index values to the string identifiers
+  //
+  StringDBAssignStringIndexes ();
+  //
+  // Write the standard header to the output file, and then the
+  // protective #ifndef.
+  //
+  StringDBWriteStandardFileHeader (Fptr);
+  for (Index = 0; StrDefHeader[Index] != NULL; Index++) {
+    fprintf (Fptr, StrDefHeader[Index], CopyBaseName);
+  }
+  //
+  // Print all the #defines for the string identifiers. Print identifiers
+  // whose names start with '$' as comments. Add comments for string
+  // identifiers not used as well.
+  //
+  Identifier = mDBData.StringIdentifier;
+  while (Identifier != NULL) {
+    if (Identifier->StringName[0] == L'$') {
+      fprintf (Fptr, "// ");
+    }
+
+    if (Identifier->Flags & STRING_FLAGS_REFERENCED) {
+      fprintf (Fptr, "#define %-40S 0x%04X\n", Identifier->StringName, Identifier->Index);
+    } else {
+      fprintf (Fptr, "//#define %-40S 0x%04X // not referenced\n", Identifier->StringName, Identifier->Index);
+    }
+
+    Identifier = Identifier->Next;
+  }
+
+  fprintf (Fptr, "\n#endif\n");
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Add a string identifier to the database.
+
+Arguments:
+
+  StringName      - name of the string identifier. For example "STR_MY_STRING"
+  NewId           - if an ID has been assigned
+  Flags           - characteristics for the identifier
+
+Returns:
+
+  STATUS
+
+--*/
+STATUS
+StringDBAddStringIdentifier (
+  WCHAR     *StringName,
+  UINT16    *NewId,
+  UINT16    Flags
+  )
+{
+  STRING_IDENTIFIER *StringIdentifier;
+  STATUS            Status;
+  //
+  // If it was already used for some other language, then we don't
+  // need to add it. But set it to the current string identifier.
+  // The referenced bit is sticky.
+  //
+  Status            = STATUS_SUCCESS;
+  StringIdentifier  = StringDBFindStringIdentifierByName (StringName);
+  if (StringIdentifier != NULL) {
+    if (Flags & STRING_FLAGS_REFERENCED) {
+      StringIdentifier->Flags |= STRING_FLAGS_REFERENCED;
+    }
+
+    mDBData.CurrentStringIdentifier = StringIdentifier;
+    *NewId                          = (UINT16) StringIdentifier->Index;
+    return Status;
+  }
+
+  StringIdentifier = (STRING_IDENTIFIER *) MALLOC (sizeof (STRING_IDENTIFIER));
+  if (StringIdentifier == NULL) {
+    Error (NULL, 0, 0, NULL, "memory allocation error");
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) StringIdentifier, 0, sizeof (STRING_IDENTIFIER));
+  StringIdentifier->StringName = (WCHAR *) malloc ((wcslen (StringName) + 1) * sizeof (WCHAR));
+  if (StringIdentifier->StringName == NULL) {
+    Error (NULL, 0, 0, NULL, "memory allocation error");
+    return STATUS_ERROR;
+  }
+
+  wcscpy (StringIdentifier->StringName, StringName);
+  if (*NewId != STRING_ID_INVALID) {
+    StringIdentifier->Index = *NewId;
+    StringIdentifier->Flags |= STRING_FLAGS_INDEX_ASSIGNED;
+    if (mDBData.NumStringIdentifiers <= StringIdentifier->Index) {
+      mDBData.NumStringIdentifiers = StringIdentifier->Index + 1;
+    }
+  } else {
+    StringIdentifier->Index = mDBData.NumStringIdentifiers++;
+  }
+
+  StringIdentifier->Flags |= Flags;
+  //
+  // Add it to our list of string identifiers
+  //
+  if (mDBData.StringIdentifier == NULL) {
+    mDBData.StringIdentifier = StringIdentifier;
+  } else {
+    mDBData.LastStringIdentifier->Next = StringIdentifier;
+  }
+
+  mDBData.LastStringIdentifier    = StringIdentifier;
+  mDBData.CurrentStringIdentifier = StringIdentifier;
+  *NewId                          = (UINT16) StringIdentifier->Index;
+  return Status;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Add a new string to the database.
+
+Arguments:
+
+  LanguageName    - "eng" or "spa" language name
+  StringName      - "STR_MY_TEXT" string name
+  Scope           - from the #scope statements in the string file
+  Format          - if we should format the string
+  Flags           - characteristic flags for the string
+
+Returns:
+
+  STATUS
+
+Notes:
+
+  Several of the fields can be "inherited" from the previous calls to
+  our database functions. For example, if scope is NULL here, then
+  we'll use the previous setting.
+
+--*/
+STATUS
+StringDBAddString (
+  WCHAR   *LanguageName,
+  WCHAR   *StringName,
+  WCHAR   *Scope,
+  WCHAR   *String,
+  BOOLEAN Format,
+  UINT16  Flags
+  )
+{
+  LANGUAGE_LIST     *Lang;
+  UINT32            Size;
+  STRING_LIST       *Str;
+  UINT16            StringIndex;
+  WCHAR             TempLangName[4];
+  STRING_IDENTIFIER *StringIdentifier;
+
+  //
+  // Check that language name is exactly 3 characters, or emit an error.
+  // Truncate at 3 if it's longer, or make it 3 if it's shorter.
+  //
+  if (LanguageName != NULL) {
+    Size = wcslen (LanguageName);
+    if (Size != 3) {
+      ParserError (0, "invalid length for language name", "%S", LanguageName);
+      if (Size > 3) {
+        LanguageName[3] = 0;
+      } else {
+        //
+        // Make a local copy of the language name string, and extend to
+        // 3 characters since we make assumptions elsewhere in this program
+        // on the length.
+        //
+        wcscpy (TempLangName, LanguageName);
+        for (; Size < 3; Size++) {
+          TempLangName[Size] = L'?';
+        }
+
+        TempLangName[4] = 0;
+        LanguageName    = TempLangName;
+      }
+    }
+  }
+  //
+  // If they specified a language, make sure they've defined it already
+  // via a #langdef statement. Otherwise use the current default language.
+  //
+  if (LanguageName != NULL) {
+    Lang = StringDBFindLanguageList (LanguageName);
+    if (Lang == NULL) {
+      ParserError (0, "language not defined", "%S", LanguageName);
+      return STATUS_ERROR;
+    } else {
+      StringDBSetCurrentLanguage (LanguageName);
+    }
+  } else {
+    Lang = mDBData.CurrentLanguage;
+    if (Lang == NULL) {
+      //
+      // Have to call SetLanguage() first
+      //
+      ParserError (0, "no language defined", "%S", StringName);
+      return STATUS_ERROR;
+    }
+  }
+  //
+  // If they didn't define a string identifier, use the last string identifier
+  // added.
+  //
+  if (StringName == NULL) {
+    StringName = mDBData.CurrentStringIdentifier->StringName;
+    if (StringName == NULL) {
+      ParserError (0, "no string identifier previously specified", NULL);
+      return STATUS_ERROR;
+    }
+  }
+  //
+  // If scope was not specified, use the default setting
+  //
+  if (Scope != NULL) {
+    Scope = DuplicateString (Scope);
+  } else {
+    Scope = DuplicateString (mDBData.CurrentScope);
+  }
+  //
+  // printf ("Adding string: %S.%S.%S\n", Lang->LanguageName, StringName, Scope);
+  //
+  // Check for duplicates for this Language.StringName.Scope. Allow multiple
+  // definitions of the language name and printable language name, since the
+  // user does not specifically define them.
+  //
+  if (StringDBFindString (Lang->LanguageName, StringName, Scope, NULL, NULL) != NULL) {
+    if ((wcscmp (StringName, LANGUAGE_NAME_STRING_NAME) == 0) &&
+        (wcscmp (StringName, PRINTABLE_LANGUAGE_NAME_STRING_NAME) == 0)
+        ) {
+      ParserError (
+        0,
+        "string multiply defined",
+        "Language.Name.Scope = %S.%S.%S",
+        Lang->LanguageName,
+        StringName,
+        Scope
+        );
+      return STATUS_ERROR;
+    }
+  }
+
+  StringIndex = STRING_ID_INVALID;
+  if (StringDBAddStringIdentifier (StringName, &StringIndex, Flags) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  StringIdentifier = StringDBFindStringIdentifierByName (StringName);
+  //
+  // Add this string to the end of the strings for this language.
+  //
+  Str = (STRING_LIST *) malloc (sizeof (STRING_LIST));
+  if (Str == NULL) {
+    Error (NULL, 0, 0, NULL, "memory allocation error");
+    return STATUS_ERROR;
+  }
+
+  memset ((char *) Str, 0, sizeof (STRING_LIST));
+  Size              = (wcslen (String) + 1) * sizeof (WCHAR);
+  Str->Flags        = Flags;
+  Str->Scope        = Scope;
+  Str->StringName   = StringIdentifier->StringName;
+  Str->LanguageName = DuplicateString (LanguageName);
+  Str->Str          = (WCHAR *) MALLOC (Size);
+  if (Str->Str == NULL) {
+    Error (NULL, 0, 0, NULL, "memory allocation error");
+    return STATUS_ERROR;
+  }
+  //
+  // If not formatting, just copy the string.
+  //
+  wcscpy (Str->Str, String);
+  if (Format) {
+    StringDBFormatString (Str->Str);
+  }
+  //
+  // Size may change after formatting. We set the size to
+  // the actual size of the string, including the null for
+  // easier processing later.
+  //
+  Str->Size = (wcslen (Str->Str) + 1) * sizeof (WCHAR);
+  if (Lang->String == NULL) {
+    Lang->String = Str;
+  } else {
+    Lang->LastString->Next = Str;
+  }
+
+  Lang->LastString = Str;
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Given a language name, see if a language list for it has been defined
+
+Arguments:
+
+  LanguageName    - like "eng"
+
+Returns:
+
+  A pointer to the language list
+
+--*/
+static
+LANGUAGE_LIST *
+StringDBFindLanguageList (
+  WCHAR *LanguageName
+  )
+{
+  LANGUAGE_LIST *Lang;
+
+  Lang = mDBData.LanguageList;
+  while (Lang != NULL) {
+    if (wcscmp (LanguageName, Lang->LanguageName) == 0) {
+      break;
+    }
+
+    Lang = Lang->Next;
+  }
+
+  return Lang;
+}
+
+/*****************************************************************************/
+STATUS
+StringDBSetCurrentLanguage (
+  WCHAR *LanguageName
+  )
+{
+  LANGUAGE_LIST *Lang;
+
+  Lang = StringDBFindLanguageList (LanguageName);
+  if (Lang == NULL) {
+    ParserError (0, "language not previously defined", "%S", LanguageName);
+    return STATUS_ERROR;
+  }
+
+  mDBData.CurrentLanguage = Lang;
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+STATUS
+StringDBAddLanguage (
+  WCHAR *LanguageName,
+  WCHAR *PrintableLanguageName
+  )
+{
+  LANGUAGE_LIST *Lang;
+  //
+  // Check for redefinitions
+  //
+  Lang = StringDBFindLanguageList (LanguageName);
+  if (Lang != NULL) {
+    //
+    // Better be the same printable name
+    //
+    if (wcscmp (PrintableLanguageName, Lang->PrintableLanguageName) != 0) {
+      ParserError (
+        0,
+        "language redefinition",
+        "%S:%S != %S:%S",
+        Lang->LanguageName,
+        Lang->PrintableLanguageName,
+        LanguageName,
+        PrintableLanguageName
+        );
+      return STATUS_ERROR;
+      //
+      //    } else {
+      //      ParserWarning (0, "benign language redefinition", "%S", PrintableLanguageName);
+      //      return STATUS_WARNING;
+      //
+    }
+  } else {
+    //
+    // Allocate memory to keep track of this new language
+    //
+    Lang = (LANGUAGE_LIST *) malloc (sizeof (LANGUAGE_LIST));
+    if (Lang == NULL) {
+      Error (NULL, 0, 0, NULL, "memory allocation error");
+      return STATUS_ERROR;
+    }
+
+    memset ((char *) Lang, 0, sizeof (LANGUAGE_LIST));
+    //
+    // Save the language name, then allocate memory to save the
+    // printable language name
+    //
+    wcscpy (Lang->LanguageName, LanguageName);
+    Lang->PrintableLanguageName = (WCHAR *) malloc ((wcslen (PrintableLanguageName) + 1) * sizeof (WCHAR));
+    if (Lang->PrintableLanguageName == NULL) {
+      Error (NULL, 0, 0, NULL, "memory allocation error");
+      return STATUS_ERROR;
+    }
+
+    wcscpy (Lang->PrintableLanguageName, PrintableLanguageName);
+
+    if (mDBData.LanguageList == NULL) {
+      mDBData.LanguageList = Lang;
+    } else {
+      mDBData.LastLanguageList->Next = Lang;
+    }
+
+    mDBData.LastLanguageList = Lang;
+  }
+  //
+  // Default is to make our active language this new one
+  //
+  StringDBSetCurrentLanguage (LanguageName);
+  //
+  // The first two strings for any language are the language name,
+  // followed by the printable language name. Add them and set them
+  // to referenced so they never get stripped out.
+  //
+  StringDBAddString (
+    LanguageName,
+    LANGUAGE_NAME_STRING_NAME,
+    NULL,
+    LanguageName,
+    FALSE,
+    STRING_FLAGS_REFERENCED
+    );
+  StringDBAddString (
+    LanguageName,
+    PRINTABLE_LANGUAGE_NAME_STRING_NAME,
+    NULL,
+    PrintableLanguageName,
+    FALSE,
+    STRING_FLAGS_REFERENCED
+    );
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+static
+STRING_IDENTIFIER *
+StringDBFindStringIdentifierByName (
+  WCHAR *StringName
+  )
+{
+  STRING_IDENTIFIER *Identifier;
+
+  Identifier = mDBData.StringIdentifier;
+  while (Identifier != NULL) {
+    if (wcscmp (StringName, Identifier->StringName) == 0) {
+      return Identifier;
+    }
+
+    Identifier = Identifier->Next;
+  }
+
+  return NULL;
+}
+
+static
+STRING_IDENTIFIER *
+StringDBFindStringIdentifierByIndex (
+  UINT32    StringIndex
+  )
+{
+  STRING_IDENTIFIER *Identifier;
+
+  Identifier = mDBData.StringIdentifier;
+  while (Identifier != NULL) {
+    if (Identifier->Index == StringIndex) {
+      return Identifier;
+    }
+
+    Identifier = Identifier->Next;
+  }
+
+  return NULL;
+}
+
+/*****************************************************************************/
+static
+void
+StringDBWriteStandardFileHeader (
+  FILE *OutFptr
+  )
+{
+  UINT32  TempIndex;
+  for (TempIndex = 0; mSourceFileHeader[TempIndex] != NULL; TempIndex++) {
+    fprintf (OutFptr, "%s\n", mSourceFileHeader[TempIndex]);
+  }
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+  
+  Given a Unicode string from an input file, reformat the string to replace
+  backslash control sequences with the appropriate encoding.
+
+Arguments:
+
+  String        - pointer to string to reformat
+
+Returns:
+
+  Nothing
+
+--*/
+void
+StringDBFormatString (
+  WCHAR   *String
+  )
+{
+  WCHAR *From;
+  WCHAR *To;
+  int   HexNibbles;
+  WCHAR HexValue;
+  //
+  // Go through the string and process any formatting characters
+  //
+  From  = String;
+  To    = String;
+  while (*From) {
+    if (*From == UNICODE_BACKSLASH) {
+      //
+      // First look for \wide and replace with the appropriate control character. Note that
+      // when you have "define STR L"ABC"", then sizeof(ABC) is 8 because the null char is
+      // counted. Make adjustments for this. We advance From below, so subtract 2 each time.
+      //
+      if (wcsncmp (From, UNICODE_WIDE_STRING, sizeof (UNICODE_WIDE_STRING) / sizeof (WCHAR) - 1) == 0) {
+        *To = WIDE_CHAR;
+        From += sizeof (UNICODE_WIDE_STRING) / sizeof (WCHAR) - 2;
+      } else if (wcsncmp (From, UNICODE_NARROW_STRING, sizeof (UNICODE_NARROW_STRING) / sizeof (WCHAR) - 1) == 0) {
+        //
+        // Found: \narrow
+        //
+        *To = NARROW_CHAR;
+        From += sizeof (UNICODE_NARROW_STRING) / sizeof (WCHAR) - 2;
+      } else if (wcsncmp (From, UNICODE_NBR_STRING, sizeof (UNICODE_NBR_STRING) / sizeof (WCHAR) - 1) == 0) {
+        //
+        // Found: \nbr
+        //
+        *To = NON_BREAKING_CHAR;
+        From += sizeof (UNICODE_NBR_STRING) / sizeof (WCHAR) - 2;
+      } else if (wcsncmp (From, UNICODE_BR_STRING, sizeof (UNICODE_BR_STRING) / sizeof (WCHAR) - 1) == 0) {
+        //
+        // Found: \br -- pass through untouched
+        //
+        *To = *From;
+      } else {
+        //
+        // Standard one-character control sequences such as \n, \r, \\, or \x
+        //
+        From++;
+        switch (*From) {
+        case ASCII_TO_UNICODE ('n'):
+          *To = UNICODE_CR;
+          To++;
+          *To = UNICODE_LF;
+          break;
+
+        //
+        // carriage return
+        //
+        case ASCII_TO_UNICODE ('r'):
+          *To = UNICODE_CR;
+          break;
+
+        //
+        // backslash
+        //
+        case UNICODE_BACKSLASH:
+          *To = UNICODE_BACKSLASH;
+          break;
+
+        //
+        // Tab
+        //
+        case ASCII_TO_UNICODE ('t'):
+          *To = UNICODE_TAB;
+          break;
+
+        //
+        // embedded double-quote
+        //
+        case UNICODE_DOUBLE_QUOTE:
+          *To = UNICODE_DOUBLE_QUOTE;
+          break;
+
+        //
+        // Hex Unicode character \x1234. We'll process up to 4 hex characters
+        //
+        case ASCII_TO_UNICODE ('x'):
+          HexValue = 0;
+          for (HexNibbles = 0; HexNibbles < 4; HexNibbles++) {
+            if ((From[1] >= UNICODE_0) && (From[1] <= UNICODE_9)) {
+              HexValue = (HexValue << 4) | (From[1] - UNICODE_0);
+            } else if ((From[1] >= UNICODE_a) && (From[1] <= UNICODE_f)) {
+              HexValue = (HexValue << 4) | (10 + From[1] - UNICODE_a);
+            } else if ((From[1] >= UNICODE_A) && (From[1] <= UNICODE_F)) {
+              HexValue = (HexValue << 4) | (10 + From[1] - UNICODE_A);
+            } else {
+              break;
+            }
+
+            From++;
+          }
+
+          if (HexNibbles == 0) {
+            ParserWarning (
+              0,
+              "expected at least one valid hex digit with \\x escaped character in string",
+              "\\%C",
+              *From
+              );
+          } else {
+            *To = HexValue;
+          }
+          break;
+
+        default:
+          *To = UNICODE_SPACE;
+          ParserWarning (0, "invalid escaped character in string", "\\%C", *From);
+          break;
+        }
+      }
+    } else {
+      *To = *From;
+    }
+
+    From++;
+    To++;
+  }
+
+  *To = 0;
+}
+
+/*****************************************************************************/
+STATUS
+StringDBReadDatabase (
+  INT8    *DBFileName,
+  BOOLEAN IgnoreIfNotExist,
+  BOOLEAN Verbose
+  )
+{
+  STRING_DB_HEADER    DbHeader;
+  STATUS              Status;
+  FILE                *DBFptr;
+  DB_DATA_ITEM_HEADER DataItemHeader;
+
+  Status  = STATUS_SUCCESS;
+  DBFptr  = NULL;
+  //
+  //  if (Verbose) {
+  //    fprintf (stdout, "Reading database file %s\n", DBFileName);
+  //  }
+  //
+  // Try to open the input file
+  //
+  if ((DBFptr = fopen (DBFileName, "rb")) == NULL) {
+    if (IgnoreIfNotExist) {
+      return STATUS_SUCCESS;
+    }
+
+    Error (NULL, 0, 0, DBFileName, "failed to open input database file for reading");
+    return STATUS_ERROR;
+  }
+  //
+  // Read and verify the database header
+  //
+  if (fread ((void *) &DbHeader, sizeof (STRING_DB_HEADER), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, DBFileName, "failed to read header from database file");
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+
+  if (DbHeader.Key != STRING_DB_KEY) {
+    Error (NULL, 0, 0, DBFileName, "invalid header in database file");
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+
+  if ((DbHeader.Version & STRING_DB_MAJOR_VERSION_MASK) != (STRING_DB_VERSION & STRING_DB_MAJOR_VERSION_MASK)) {
+    Error (NULL, 0, 0, DBFileName, "incompatible database file version -- rebuild clean");
+    Status = STATUS_ERROR;
+    goto Finish;
+  }
+  //
+  // Read remaining items
+  //
+  while (fread (&DataItemHeader, sizeof (DataItemHeader), 1, DBFptr) == 1) {
+    switch (DataItemHeader.DataType) {
+    case DB_DATA_TYPE_STRING_IDENTIFIER:
+      StringDBReadStringIdentifier (DBFptr);
+      break;
+
+    case DB_DATA_TYPE_LANGUAGE_DEFINITION:
+      StringDBReadLanguageDefinition (DBFptr);
+      break;
+
+    case DB_DATA_TYPE_STRING_DEFINITION:
+      StringDBReadString (DBFptr);
+      break;
+
+    default:
+      Error (
+        NULL,
+        0,
+        0,
+        "database corrupted",
+        "invalid data item type 0x%X at offset 0x%X",
+        (UINT32) DataItemHeader.DataType,
+        ftell (DBFptr) - sizeof (DataItemHeader)
+        );
+      Status = STATUS_ERROR;
+      goto Finish;
+    }
+  }
+
+Finish:
+  if (DBFptr != NULL) {
+    fclose (DBFptr);
+  }
+
+  return Status;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+  
+  Write everything we know to the output database file. Write:
+
+  Database header
+  String identifiers[]
+  StringPacks[]
+
+Arguments:
+
+  DBFileName    - name of the file to write to
+  Verbose       - for debug purposes, print info messages along the way.
+
+Returns:
+
+  STATUS
+
+--*/
+STATUS
+StringDBWriteDatabase (
+  INT8    *DBFileName,
+  BOOLEAN Verbose
+  )
+{
+  STRING_DB_HEADER  DbHeader;
+  UINT32            Counter;
+  UINT32            StrLen;
+  LANGUAGE_LIST     *Lang;
+  STRING_IDENTIFIER *StringIdentifier;
+  STRING_LIST       *StrList;
+  FILE              *DBFptr;
+
+  if (Verbose) {
+    fprintf (stdout, "Writing database %s\n", DBFileName);
+  }
+
+  if ((DBFptr = fopen (DBFileName, "wb")) == NULL) {
+    Error (NULL, 0, 0, DBFileName, "failed to open output database file for writing");
+    return STATUS_ERROR;
+  }
+  //
+  // Fill in and write the database header
+  //
+  memset (&DbHeader, 0, sizeof (STRING_DB_HEADER));
+  DbHeader.HeaderSize = sizeof (STRING_DB_HEADER);
+  DbHeader.Key        = STRING_DB_KEY;
+  DbHeader.Version    = STRING_DB_VERSION;
+  //
+  // Count the number of languages we have
+  //
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    DbHeader.NumLanguages++;
+  }
+  //
+  // Count up how many string identifiers we have, and total up the
+  // size of the names plus the size of the flags field we will
+  // write out too.
+  //
+  DbHeader.NumStringIdenfiers = mDBData.NumStringIdentifiers;
+  StringIdentifier            = mDBData.StringIdentifier;
+  for (Counter = 0; Counter < mDBData.NumStringIdentifiers; Counter++) {
+    StrLen = wcslen (StringIdentifier->StringName) + 1;
+    DbHeader.StringIdentifiersSize += StrLen * sizeof (WCHAR) + sizeof (StringIdentifier->Flags);
+    StringIdentifier = StringIdentifier->Next;
+  }
+
+  //
+  // Write the header
+  //
+  fwrite (&DbHeader, sizeof (STRING_DB_HEADER), 1, DBFptr);
+  if (Verbose) {
+    fprintf (stdout, "  Number of string identifiers  0x%04X\n", DbHeader.NumStringIdenfiers);
+    fprintf (stdout, "  Number of languages           %d\n", DbHeader.NumLanguages);
+  }
+  //
+  // Write the string identifiers
+  //
+  for (StringIdentifier = mDBData.StringIdentifier; StringIdentifier != NULL; StringIdentifier = StringIdentifier->Next) {
+    StringDBWriteStringIdentifier (
+      DBFptr,
+      (UINT16) StringIdentifier->Index,
+      StringIdentifier->Flags,
+      StringIdentifier->StringName
+      );
+  }
+  //
+  // Now write all the strings for each language
+  //
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    StringDBWriteLanguageDefinition (DBFptr, Lang->LanguageName, Lang->PrintableLanguageName);
+    for (StrList = Lang->String; StrList != NULL; StrList = StrList->Next) {
+      StringDBWriteString (
+        DBFptr,
+        StrList->Flags,
+        Lang->LanguageName,
+        StrList->StringName,
+        StrList->Scope,
+        StrList->Str
+        );
+    }
+  }
+
+  fclose (DBFptr);
+  return STATUS_SUCCESS;
+}
+
+STATUS
+StringDBSetStringReferenced (
+  INT8      *StringIdentifierName,
+  BOOLEAN   IgnoreNotFound
+  )
+{
+  STRING_IDENTIFIER *Id;
+  WCHAR             *WName;
+  STATUS            Status;
+  //
+  // See if it's already been defined.
+  //
+  Status  = STATUS_SUCCESS;
+  WName   = (WCHAR *) malloc ((strlen (StringIdentifierName) + 1) * sizeof (WCHAR));
+  swprintf (WName, L"%S", StringIdentifierName);
+  Id = StringDBFindStringIdentifierByName (WName);
+  if (Id != NULL) {
+    Id->Flags |= STRING_FLAGS_REFERENCED;
+  } else {
+    if (IgnoreNotFound == 0) {
+      ParserWarning (0, StringIdentifierName, "string identifier not found in database");
+      Status = STATUS_WARNING;
+    }
+  }
+
+  free (WName);
+  return Status;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Dump the contents of a database to an output unicode file.
+
+Arguments:
+
+  DBFileName        - name of the pre-existing database file to read
+  OutputFileName    - name of the file to dump the database contents to
+  Verbose           - for printing of additional info useful for debugging
+
+Returns:
+
+  STATUS
+
+Notes:
+
+  There's some issue with the unicode printing routines. Therefore to 
+  write to the output file properly, open it as binary and use fwrite.
+  Ideally we could open it with just L"w" and use fwprintf().
+
+--*/
+STATUS
+StringDBDumpDatabase (
+  INT8                *DBFileName,
+  INT8                *OutputFileName,
+  BOOLEAN             Verbose
+  )
+{
+  LANGUAGE_LIST     *Lang;
+  STRING_IDENTIFIER *StringIdentifier;
+  STRING_LIST       *StrList;
+  FILE              *OutFptr;
+  WCHAR             WChar;
+  WCHAR             CrLf[2];
+  WCHAR             Line[200];
+  WCHAR             *Scope;
+  //
+  // This function assumes the database has already been read, and
+  // we're just dumping our internal data structures to a unicode file.
+  //
+  if (Verbose) {
+    fprintf (stdout, "Dumping database file %s\n", DBFileName);
+  }
+
+  OutFptr         = fopen (OutputFileName, "wb");
+  if (OutFptr == NULL) {
+    Error (NULL, 0, 0, OutputFileName, "failed to open output file for writing");
+    return STATUS_ERROR;
+  }
+
+  WChar = UNICODE_FILE_START;
+  fwrite (&WChar, sizeof (WCHAR), 1, OutFptr);
+  CrLf[1] = UNICODE_LF;
+  CrLf[0] = UNICODE_CR;
+  //
+  // The default control character is '/'. Make it '#' by writing
+  // "/=#" to the output file.
+  //
+  swprintf (Line, L"/=#");
+  fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+  fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+  fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+  //
+  // Dump all the string identifiers and their values
+  //
+  StringDBAssignStringIndexes ();
+  for (StringIdentifier = mDBData.StringIdentifier; StringIdentifier != NULL; StringIdentifier = StringIdentifier->Next) {
+    //
+    // Write the "#define " string
+    //
+    if (StringIdentifier->Flags & STRING_FLAGS_REFERENCED) {
+      swprintf (
+        Line,
+        L"%s %-60.60s 0x%04X",
+        DEFINE_STR,
+        StringIdentifier->StringName,
+        StringIdentifier->Index
+        );
+    } else {
+      swprintf (
+        Line,
+        L"%s %-60.60s 0x%04X  // NOT REFERENCED",
+        DEFINE_STR,
+        StringIdentifier->StringName,
+        StringIdentifier->Index
+        );
+    }
+
+    fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+    fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+  }
+
+  fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+  //
+  // Now write all the strings for each language.
+  //
+  WChar = UNICODE_DOUBLE_QUOTE;
+  Scope = NULL;
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+    swprintf (Line, L"#langdef %s \"%s\"", Lang->LanguageName, Lang->PrintableLanguageName);
+    fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+    fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+    fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+    //
+    // Now the strings (in double-quotes) for this language. Write
+    // #string STR_NAME  #language eng "string"
+    //
+    for (StrList = Lang->String; StrList != NULL; StrList = StrList->Next) {
+      //
+      // Print the internal flags for debug
+      //
+      swprintf (Line, L"// flags=0x%02X", (UINT32) StrList->Flags);
+      fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+      fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+      //
+      // Print the scope if changed
+      //
+      if ((Scope == NULL) || (wcscmp (Scope, StrList->Scope) != 0)) {
+        swprintf (Line, L"#scope %s", StrList->Scope);
+        fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+        fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+        Scope = StrList->Scope;
+      }
+
+      swprintf (
+        Line,
+        L"#string %-50.50s #language %s \"",
+        StrList->StringName,
+        Lang->LanguageName
+        );
+      fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+      fwrite (StrList->Str, StrList->Size - sizeof (WCHAR), 1, OutFptr);
+      swprintf (Line, L"\"");
+      fwrite (Line, wcslen (Line) * sizeof (WCHAR), 1, OutFptr);
+      fwrite (&CrLf, sizeof (CrLf), 1, OutFptr);
+    }
+  }
+
+  fclose (OutFptr);
+  return STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Given a primary language, a string identifier number, and a list of
+  languages, find a secondary string.
+
+Arguments:
+
+  LanguageName      - primary language, like "spa"
+  StringId          - string index value
+  LanguageList      - linked list of "eng", "spa+cat",...
+
+Returns:
+
+  Pointer to a secondary string if found. NULL otherwise.
+
+Notes:
+ 
+  Given: LanguageName "spa"   and  LanguageList "spa+cat", match the
+  "spa" and extract the "cat" and see if there is a string defined
+  for "cat".StringId.
+
+--*/
+static
+STATUS
+StringDBWriteStringIdentifier (
+  FILE                *DBFptr,
+  UINT16              StringId,
+  UINT16              Flags,
+  WCHAR               *IdentifierName
+  )
+{
+  DB_DATA_ITEM_HEADER Hdr;
+  memset (&Hdr, 0, sizeof (DB_DATA_ITEM_HEADER));
+  Hdr.DataType = DB_DATA_TYPE_STRING_IDENTIFIER;
+  if (fwrite (&Hdr, sizeof (DB_DATA_ITEM_HEADER), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string to output database file", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fwrite (&StringId, sizeof (StringId), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write StringId to output database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fwrite (&Flags, sizeof (Flags), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write StringId flags to output database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, IdentifierName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBReadStringIdentifier (
+  FILE                *DBFptr
+  )
+{
+  WCHAR   *IdentifierName;
+  UINT16  Flags;
+  UINT16  StringId;
+  UINT16  Size;
+
+  if (fread (&StringId, sizeof (StringId), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to read StringId from database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fread (&Flags, sizeof (Flags), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to read StringId flags from database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &IdentifierName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  StringDBAddStringIdentifier (IdentifierName, &StringId, Flags);
+  //
+  // printf ("STRID:  0x%04X %S\n", (UINT32)StringId, IdentifierName);
+  //
+  FREE (IdentifierName);
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBWriteString (
+  FILE            *DBFptr,
+  UINT16          Flags,
+  WCHAR           *Language,
+  WCHAR           *StringName,
+  WCHAR           *Scope,
+  WCHAR           *Str
+  )
+{
+  DB_DATA_ITEM_HEADER Hdr;
+  memset (&Hdr, 0, sizeof (DB_DATA_ITEM_HEADER));
+  Hdr.DataType = DB_DATA_TYPE_STRING_DEFINITION;
+  if (fwrite (&Hdr, sizeof (DB_DATA_ITEM_HEADER), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string header to output database file", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fwrite (&Flags, sizeof (Flags), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string flags to output database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, Language) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, StringName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, Scope) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, Str) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+  //
+  // printf ("DBWriteString: %S.%S.%S\n", Language, StringName, Scope);
+  //
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBReadString (
+  FILE            *DBFptr
+  )
+{
+  UINT16  Flags;
+  UINT16  Size;
+  WCHAR   *Language;
+  WCHAR   *StringName;
+  WCHAR   *Scope;
+  WCHAR   *Str;
+
+  if (fread (&Flags, sizeof (Flags), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to read string flags from database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &Language) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &StringName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &Scope) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &Str) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+  //
+  // If the first or second string (language name and printable language name),
+  // then skip them. They're added via language definitions data items in
+  // the database.
+  //
+  if (StringName[0] != L'$') {
+    StringDBAddString (Language, StringName, Scope, Str, FALSE, Flags);
+  }
+  //
+  // printf ("DBReadString: %S.%S.%S\n", Language, StringName, Scope);
+  //
+  FREE (Language);
+  FREE (StringName);
+  if (Str != NULL) {
+    FREE (Str);
+  }
+
+  if (Scope != NULL) {
+    FREE (Scope);
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBWriteLanguageDefinition (
+  FILE            *DBFptr,
+  WCHAR           *LanguageName,
+  WCHAR           *PrintableLanguageName
+  )
+{
+  DB_DATA_ITEM_HEADER Hdr;
+  memset (&Hdr, 0, sizeof (DB_DATA_ITEM_HEADER));
+  Hdr.DataType = DB_DATA_TYPE_LANGUAGE_DEFINITION;
+  if (fwrite (&Hdr, sizeof (DB_DATA_ITEM_HEADER), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string to output database file", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, LanguageName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBWriteGenericString (DBFptr, PrintableLanguageName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBReadLanguageDefinition (
+  FILE            *DBFptr
+  )
+{
+  WCHAR   *LanguageName;
+  WCHAR   *PrintableLanguageName;
+  UINT16  Size;
+  STATUS  Status;
+
+  if (StringDBReadGenericString (DBFptr, &Size, &LanguageName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+
+  if (StringDBReadGenericString (DBFptr, &Size, &PrintableLanguageName) != STATUS_SUCCESS) {
+    return STATUS_ERROR;
+  }
+  //
+  // printf("LANG: %S %S\n", LanguageName, PrintableLanguageName);
+  //
+  Status = StringDBAddLanguage (LanguageName, PrintableLanguageName);
+  FREE (LanguageName);
+  FREE (PrintableLanguageName);
+  return Status;
+}
+//
+// All unicode strings in the database consist of a UINT16 length
+// field, followed by the string itself. This routine reads one
+// of those and returns the info.
+//
+static
+STATUS
+StringDBReadGenericString (
+  FILE      *DBFptr,
+  UINT16    *Size,
+  WCHAR     **Str
+  )
+{
+  UINT16  LSize;
+  UINT16  Flags;
+  WCHAR   *LStr;
+
+  if (fread (&LSize, sizeof (UINT16), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to read a string length field from the database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fread (&Flags, sizeof (UINT16), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to read a string flags field from the database", NULL);
+    return STATUS_ERROR;
+  }
+
+  LStr = MALLOC (LSize);
+  if (LStr == NULL) {
+    Error (__FILE__, __LINE__, 0, "memory allocation failed reading the database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fread (LStr, sizeof (WCHAR), (UINT32) LSize / sizeof (WCHAR), DBFptr) != (UINT32) LSize / sizeof (WCHAR)) {
+    Error (NULL, 0, 0, "failed to read string from database", NULL);
+    Error (NULL, 0, 0, "database read failure", "offset 0x%X", ftell (DBFptr));
+    free (LStr);
+    return STATUS_ERROR;
+  }
+  //
+  // printf ("DBR: %S\n", LStr);
+  //
+  // If the flags field indicated we were asked to write a NULL string, then
+  // return them a NULL pointer.
+  //
+  if (Flags & STRING_FLAGS_UNDEFINED) {
+    *Size = 0;
+    *Str  = NULL;
+  } else {
+    *Size = LSize;
+    *Str  = LStr;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STATUS
+StringDBWriteGenericString (
+  FILE      *DBFptr,
+  WCHAR     *Str
+  )
+{
+  UINT16  Size;
+  UINT16  Flags;
+  WCHAR   ZeroString[1];
+  //
+  // Strings in the database consist of a size UINT16 followed
+  // by the string itself.
+  //
+  if (Str == NULL) {
+    ZeroString[0] = 0;
+    Str           = ZeroString;
+    Size          = sizeof (ZeroString);
+    Flags         = STRING_FLAGS_UNDEFINED;
+  } else {
+    Flags = 0;
+    Size  = (UINT16) ((wcslen (Str) + 1) * sizeof (WCHAR));
+  }
+
+  if (fwrite (&Size, sizeof (UINT16), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string size to database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fwrite (&Flags, sizeof (UINT16), 1, DBFptr) != 1) {
+    Error (NULL, 0, 0, "failed to write string flags to database", NULL);
+    return STATUS_ERROR;
+  }
+
+  if (fwrite (Str, sizeof (WCHAR), Size / sizeof (WCHAR), DBFptr) != Size / sizeof (WCHAR)) {
+    Error (NULL, 0, 0, "failed to write string to database", NULL);
+    return STATUS_ERROR;
+  }
+
+  return STATUS_SUCCESS;
+}
+
+static
+STRING_LIST *
+StringDBFindString (
+  WCHAR                       *LanguageName,
+  WCHAR                       *StringName,
+  WCHAR                       *Scope,
+  WCHAR_STRING_LIST           *LanguagesOfInterest,
+  WCHAR_MATCHING_STRING_LIST  *IndirectionList
+  )
+{
+  LANGUAGE_LIST               *Lang;
+  STRING_LIST                 *CurrString;
+  WCHAR_MATCHING_STRING_LIST  *IndListPtr;
+  WCHAR                       TempLangName[LANGUAGE_IDENTIFIER_NAME_LEN + 1];
+  WCHAR                       *WCharPtr;
+
+  //
+  // If we were given an indirection list, then see if one was specified for this
+  // string identifier. That is to say, if the indirection says "STR_ID_MY_FAVORITE MyScope",
+  // then if this string name matches one in the list, then do a lookup with the
+  // specified scope and return that value.
+  //
+  if (IndirectionList != NULL) {
+    for (IndListPtr = IndirectionList; IndListPtr != NULL; IndListPtr = IndListPtr->Next) {
+      if (wcscmp (StringName, IndListPtr->Str1) == 0) {
+        CurrString = StringDBFindString (LanguageName, StringName, IndListPtr->Str2, LanguagesOfInterest, NULL);
+        if (CurrString != NULL) {
+          return CurrString;
+        }
+      }
+    }
+  }
+  //
+  // First look for exact match language.stringname
+  //
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    if (wcscmp (LanguageName, Lang->LanguageName) == 0) {
+      //
+      // Found language match. Try to find string name match
+      //
+      for (CurrString = Lang->String; CurrString != NULL; CurrString = CurrString->Next) {
+        if (wcscmp (StringName, CurrString->StringName) == 0) {
+          //
+          // Found a string name match. See if we're supposed to find
+          // a scope match.
+          //
+          if (Scope != NULL) {
+            if (wcscmp (CurrString->Scope, Scope) == 0) {
+              return CurrString;
+            }
+          } else {
+            return CurrString;
+          }
+        }
+      }
+    }
+  }
+  //
+  // If we got here, then we didn't find a match. Look for secondary string
+  // matches. That is to say, if we're processing "spa", and they requested
+  // "spa+cat", then recursively call with "cat"
+  //
+  while (LanguagesOfInterest != NULL) {
+    //
+    // If this is the language we're looking for, then process the
+    // languages of interest list for it.
+    //
+    if (wcsncmp (LanguageName, LanguagesOfInterest->Str, LANGUAGE_IDENTIFIER_NAME_LEN) == 0) {
+      WCharPtr = LanguagesOfInterest->Str + LANGUAGE_IDENTIFIER_NAME_LEN;
+      while (*WCharPtr) {
+        //
+        // Double-check the length, though it should have been checked on the
+        // command line.
+        //
+        if (wcslen (WCharPtr) < LANGUAGE_IDENTIFIER_NAME_LEN) {
+          Error (NULL, 0, 0, "malformed alternate language list", "%S", LanguagesOfInterest->Str);
+          return NULL;
+        }
+
+        wcsncpy (TempLangName, WCharPtr, LANGUAGE_IDENTIFIER_NAME_LEN);
+        TempLangName[LANGUAGE_IDENTIFIER_NAME_LEN]  = 0;
+        CurrString = StringDBFindString (TempLangName, StringName, NULL, NULL, IndirectionList);
+        if (CurrString != NULL) {
+          return CurrString;
+        }
+
+        WCharPtr += LANGUAGE_IDENTIFIER_NAME_LEN;
+      }
+    }
+
+    LanguagesOfInterest = LanguagesOfInterest->Next;
+  }
+
+  return NULL;
+}
+
+STATUS
+StringDBSetScope (
+  WCHAR   *Scope
+  )
+{
+  //
+  // Free up existing scope memory.
+  //
+  if (mDBData.CurrentScope != NULL) {
+    FREE (mDBData.CurrentScope);
+  }
+
+  mDBData.CurrentScope = DuplicateString (Scope);
+  return STATUS_SUCCESS;
+}
+//
+// We typically don't assign index values to string identifiers
+// until we're ready to write out files. To reduce the size of
+// the output file, re-order the string identifiers to move any
+// unreferenced ones to the end. Then we'll walk the list
+// again to assign string indexes, keeping track of the last
+// one referenced.
+//
+static
+void
+StringDBAssignStringIndexes (
+  VOID
+  )
+{
+  STRING_IDENTIFIER *StrId;
+  STRING_IDENTIFIER *FirstUsed;
+  STRING_IDENTIFIER *LastUsed;
+  STRING_IDENTIFIER *FirstUnused;
+  STRING_IDENTIFIER *LastUnused;
+  UINT32            Index;
+  UINT32            MaxReferenced;
+
+  //
+  // Create two lists -- used and unused. Then put them together with
+  // the unused ones on the end.
+  //
+  FirstUsed   = NULL;
+  LastUsed    = NULL;
+  FirstUnused = NULL;
+  LastUnused  = NULL;
+  StrId       = mDBData.StringIdentifier;
+  while (StrId != NULL) {
+    if ((StrId->Flags & STRING_FLAGS_REFERENCED) == 0) {
+      //
+      // Put it on the unused list
+      //
+      if (FirstUnused == NULL) {
+        FirstUnused = StrId;
+      } else {
+        LastUnused->Next = StrId;
+      }
+
+      LastUnused        = StrId;
+      StrId             = StrId->Next;
+      LastUnused->Next  = NULL;
+    } else {
+      //
+      // Put it on the used list
+      //
+      if (FirstUsed == NULL) {
+        FirstUsed = StrId;
+      } else {
+        LastUsed->Next = StrId;
+      }
+
+      LastUsed        = StrId;
+      StrId           = StrId->Next;
+      LastUsed->Next  = NULL;
+    }
+  }
+  //
+  // Join the lists
+  //
+  if (FirstUsed != NULL) {
+    mDBData.StringIdentifier  = FirstUsed;
+    LastUsed->Next            = FirstUnused;
+  } else {
+    mDBData.StringIdentifier = FirstUnused;
+  }
+
+  MaxReferenced = 0;
+  Index         = 0;
+  for (StrId = mDBData.StringIdentifier; StrId != NULL; StrId = StrId->Next) {
+    StrId->Index = Index;
+    Index++;
+    if (StrId->Flags & STRING_FLAGS_REFERENCED) {
+      mDBData.NumStringIdentifiersReferenced = Index;
+    }
+  }
+
+  mDBData.NumStringIdentifiers = Index;
+}
+
+static
+WCHAR *
+DuplicateString (
+  WCHAR   *Str
+  )
+{
+  WCHAR *NewStr;
+  if (Str == NULL) {
+    return NULL;
+  }
+
+  NewStr = MALLOC ((wcslen (Str) + 1) * sizeof (WCHAR));
+  if (NewStr == NULL) {
+    Error (NULL, 0, 0, "memory allocation failure", NULL);
+    return NULL;
+  }
+
+  wcscpy (NewStr, Str);
+  return NewStr;
+}
+
+static
+WCHAR *
+AsciiToWchar (
+  INT8 *Str
+  )
+{
+  UINT32  Len;
+  WCHAR   *NewStr;
+  WCHAR   *Ptr;
+
+  Len     = strlen (Str) + 1;
+  NewStr  = (WCHAR *) malloc (Len * sizeof (WCHAR));
+  for (Ptr = NewStr; *Str != 0; Str++, Ptr++) {
+    *Ptr = (UINT16) (UINT8) *Str;
+  }
+
+  *Ptr = 0;
+  return NewStr;
+}
+
+/*****************************************************************************/
+
+/*++
+
+Routine Description:
+
+  Create an HII export string pack for the strings in our database.
+
+Arguments:
+
+  FileName        - name of the output file to write 
+
+Returns:
+
+  STATUS
+
+
+--*/
+STATUS
+StringDBCreateHiiExportPack (
+  INT8                        *FileName
+  )
+{
+  FILE                        *Fptr;
+  LANGUAGE_LIST               *Lang;
+  STRING_LIST                 *CurrString;
+  STRING_LIST                 EmptyString;
+  UINT32                      Offset;
+  UINT32                      StringIndex;
+  UINT32                      TempIndex;
+  EFI_HII_STRING_PACK         StringPack;
+  UINT32                      Len;
+  WCHAR                       ZeroString[1];
+  WCHAR                       *TempStringPtr;
+  WCHAR                       *LangName;
+  STRING_IDENTIFIER           *StringIdentifier;
+
+  if ((Fptr = fopen (FileName, "wb")) == NULL) {
+    Error (NULL, 0, 0, FileName, "failed to open output HII export file");
+    return STATUS_ERROR;
+  }
+  //
+  // Assign index values to the string identifiers
+  //
+  StringDBAssignStringIndexes ();
+  //
+  // If a given string is not defined, then we'll use this one.
+  //
+  memset (&EmptyString, 0, sizeof (EmptyString));
+  EmptyString.Size  = sizeof (ZeroString);
+  EmptyString.Str   = ZeroString;
+  //
+  // Process each language, then each string for each langage
+  //
+  ZeroString[0] = 0;
+  for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {
+    //
+    // Process each string for this language. We have to make 3 passes on the strings:
+    //   Pass1: computes sizes and fill in the string pack header
+    //   Pass2: write the array of offsets
+    //   Pass3: write the strings
+    //
+    //
+    // PASS 1: Fill in and print the HII string pack header
+    //
+    // Compute the size for this language package and write
+    // the header out. Each string package contains:
+    //   Header
+    //   Offset[]  -- an array of offsets to strings, of type RELOFST each
+    //   String[]  -- the actual strings themselves
+    //
+    memset ((char *) &StringPack, 0, sizeof (EFI_HII_STRING_PACK));
+    StringPack.Header.Type        = EFI_HII_STRING;
+    StringPack.NumStringPointers  = (UINT16) mDBData.NumStringIdentifiersReferenced;
+    LangName                      = Lang->LanguageName;
+    //
+    // First string is the language name. If we're printing all languages, then
+    // it's just the "spa". If we were given a list of languages to print, then it's
+    // the "spacat" string. Compute its offset and fill in
+    // the info in the header. Since we know the language name string's length,
+    // and the printable language name follows it, use that info to fill in the
+    // entry for the printable language name as well.
+    //
+    StringPack.LanguageNameString = (STRING_OFFSET) (sizeof (EFI_HII_STRING_PACK) + (mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET)));
+    StringPack.PrintableLanguageName = (STRING_OFFSET) (StringPack.LanguageNameString + (wcslen (LangName) + 1) * sizeof (WCHAR));
+    //
+    // Add up the size of all strings so we can fill in our header.
+    //
+    Len = 0;
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        Len += (wcslen (LangName) + 1) * sizeof (WCHAR);
+      } else {
+        //
+        // Find a string with this language.stringname
+        //
+        StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+        if (StringIdentifier == NULL) {
+          Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+          return STATUS_ERROR;
+        }
+        //
+        // Find a matching string if this string identifier was referenced
+        //
+        EmptyString.Flags = STRING_FLAGS_UNDEFINED;
+        CurrString        = NULL;
+        if (StringIdentifier->Flags & STRING_FLAGS_REFERENCED) {
+          CurrString = StringDBFindString (
+                        Lang->LanguageName,
+                        StringIdentifier->StringName,
+                        NULL,
+                        NULL, // LanguagesOfInterest,
+                        NULL
+                        );
+          //
+          // IndirectionList);
+          //
+          if (NULL == CurrString) {
+            //
+            // If string for Lang->LanguageName is not found, try to get an English version
+            //
+            CurrString = StringDBFindString (
+                          L"eng",
+                          StringIdentifier->StringName,
+                          NULL,
+                          NULL, // LanguagesOfInterest,
+                          NULL
+                          );
+            //
+            // IndirectionList);
+            //
+          }
+        }
+
+        if (CurrString == NULL) {
+          CurrString = &EmptyString;
+          EmptyString.Flags |= StringIdentifier->Flags;
+        }
+
+        Len += CurrString->Size;
+      }
+    }
+    StringPack.Header.Length =    sizeof (EFI_HII_STRING_PACK) 
+                                + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET) 
+                                + Len;
+    //
+    // Write out the string pack header
+    //
+    fwrite ((void *) &StringPack, sizeof (StringPack), 1, Fptr);
+    //
+    // PASS2 : write the offsets
+    //
+    // Traverse the list of strings again and write the array of offsets. The
+    // offset to the first string is the size of the string pack header
+    // plus the size of the offsets array. The other strings follow it.
+    //
+    StringIndex = 0;
+    Offset      = sizeof (StringPack) + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET);
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      //
+      // Write the offset
+      //
+      fwrite (&Offset, sizeof (STRING_OFFSET), 1, Fptr);
+      //
+      // Find the string name
+      //
+      StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+      if (StringIdentifier == NULL) {
+        Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+        return STATUS_ERROR;
+      }
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        Offset += (wcslen (LangName) + 1) * sizeof (WCHAR);
+        CurrString = StringDBFindString (
+                      Lang->LanguageName,
+                      StringIdentifier->StringName,
+                      NULL, // scope
+                      NULL,
+                      NULL
+                      );
+      } else {
+        //
+        // Find a matching string
+        //
+        CurrString = StringDBFindString (
+                      Lang->LanguageName,
+                      StringIdentifier->StringName,
+                      NULL, // scope
+                      NULL, // LanguagesOfInterest,
+                      NULL
+                      );
+        //
+        // IndirectionList);
+        //
+        if (NULL == CurrString) {
+          CurrString = StringDBFindString (
+                        L"eng",
+                        StringIdentifier->StringName,
+                        NULL, // scope
+                        NULL, // LanguagesOfInterest,
+                        NULL
+                        );
+          //
+          // IndirectionList);
+          //
+        }
+
+        EmptyString.LanguageName = Lang->LanguageName;
+        if (CurrString == NULL) {
+          CurrString        = &EmptyString;
+          EmptyString.Flags = STRING_FLAGS_UNDEFINED;
+        } else if ((StringIdentifier->Flags & STRING_FLAGS_REFERENCED) == 0) {
+          CurrString        = &EmptyString;
+          EmptyString.Flags = 0;
+        }
+
+        Offset += CurrString->Size;
+      }
+    }
+
+    //
+    // PASS 3: write the strings themselves.
+    //
+    Offset = sizeof (StringPack) + mDBData.NumStringIdentifiersReferenced * sizeof (STRING_OFFSET);
+    for (StringIndex = 0; StringIndex < mDBData.NumStringIdentifiersReferenced; StringIndex++) {
+      StringIdentifier = StringDBFindStringIdentifierByIndex (StringIndex);
+      if (StringIdentifier == NULL) {
+        Error (NULL, 0, 0, "internal error", "invalid string index 0x%X", StringIndex);
+        return STATUS_ERROR;
+      }
+      //
+      // For the first string (language name), we print out the "spacat" if they
+      // requested it. We set LangName to point to the proper language name string above.
+      //
+      if (StringIndex == STRING_ID_LANGUAGE_NAME) {
+        TempStringPtr = LangName;
+      } else {
+        //
+        // Find a matching string if this string identifier was referenced
+        //
+        CurrString = NULL;
+        if (StringIdentifier->Flags & STRING_FLAGS_REFERENCED) {
+          CurrString = StringDBFindString (
+                        Lang->LanguageName,
+                        StringIdentifier->StringName,
+                        NULL, // scope
+                        NULL, // LanguagesOfInterest,
+                        NULL
+                        );
+          //
+          // IndirectionList);
+          //
+          if (NULL == CurrString) {
+            CurrString = StringDBFindString (
+                          L"eng",
+                          StringIdentifier->StringName,
+                          NULL, // scope
+                          NULL, // LanguagesOfInterest,
+                          NULL
+                          );
+            //
+            // IndirectionList);
+            //
+          }
+        }
+
+        if (CurrString == NULL) {
+          CurrString = &EmptyString;
+        }
+
+        TempStringPtr = CurrString->Str;
+      }
+
+      for (TempIndex = 0; TempStringPtr[TempIndex] != 0; TempIndex++) {
+        fwrite (&TempStringPtr[TempIndex], sizeof (CHAR16), 1, Fptr);
+        Offset += 2;
+      }
+      //
+      // Print NULL WCHAR at the end of this string.
+      //
+      TempIndex = 0;
+      fwrite (&TempIndex, sizeof (CHAR16), 1, Fptr);
+      Offset += 2;
+    }
+    //
+    // Sanity check the offset. Make sure our running offset is what we put in the
+    // string pack header.
+    //
+    if (StringPack.Header.Length != Offset) {
+      Error (
+        __FILE__,
+        __LINE__,
+        0,
+        "application error",
+        "stringpack size 0x%X does not match final size 0x%X",
+        StringPack.Header.Length,
+        Offset
+        );
+    }
+  }
+  //
+  // Print terminator string pack, closing brace and close the file.
+  // The size of 0 triggers to the consumer that this is the end.
+  //
+  memset ((char *) &StringPack, 0, sizeof (EFI_HII_STRING_PACK));
+  StringPack.Header.Type = EFI_HII_STRING;
+  fwrite ((void *) &StringPack, sizeof (StringPack), 1, Fptr);
+  fclose (Fptr);
+  return STATUS_SUCCESS;
+}
diff --git a/Tools/Source/TianoTools/StrGather/StringDB.h b/Tools/Source/TianoTools/StrGather/StringDB.h
new file mode 100644
index 0000000000..4dc05a3642
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/StringDB.h
@@ -0,0 +1,136 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  StringDB.h
+
+Abstract:
+
+  Common defines and prototypes for string database management
+  
+--*/
+
+#ifndef _STRING_DB_H_
+#define _STRING_DB_H_
+
+#define LANGUAGE_NAME_STRING_NAME           L"$LANGUAGE_NAME"
+#define PRINTABLE_LANGUAGE_NAME_STRING_NAME L"$PRINTABLE_LANGUAGE_NAME"
+
+void
+StringDBConstructor (
+  void
+  )
+;
+void
+StringDBDestructor (
+  void
+  )
+;
+
+STATUS
+StringDBAddString (
+  WCHAR   *LanguageName,
+  WCHAR   *StringIdentifier,
+  WCHAR   *Scope,
+  WCHAR   *String,
+  BOOLEAN Format,
+  UINT16  Flags
+  )
+;
+
+STATUS
+StringDBSetScope (
+  WCHAR   *Scope
+  )
+;
+
+#define STRING_FLAGS_REFERENCED           0x0001  // if referenced somewhere
+#define STRING_FLAGS_UNDEFINED            0x0002  // if we added it for padding purposes
+#define STRING_FLAGS_INDEX_ASSIGNED       0x0004  // so don't change the index value
+#define STRING_ID_INVALID                 0xFFFF
+#define STRING_ID_LANGUAGE_NAME           0x0000
+#define STRING_ID_PRINTABLE_LANGUAGE_NAME 0x0001
+
+STATUS
+StringDBAddStringIdentifier (
+  WCHAR     *StringIdentifier,
+  UINT16    *NewId,
+  UINT16    Flags
+  )
+;
+
+STATUS
+StringDBReadDatabase (
+  INT8    *DBFileName,
+  BOOLEAN IgnoreIfNotExist,
+  BOOLEAN Verbose
+  )
+;
+
+STATUS
+StringDBWriteDatabase (
+  INT8    *DBFileName,
+  BOOLEAN Verbose
+  )
+;
+
+STATUS
+StringDBDumpDatabase (
+  INT8                *DBFileName,
+  INT8                *OutputFileName,
+  BOOLEAN             Verbose
+  )
+;
+
+STATUS
+StringDBAddLanguage (
+  WCHAR *LanguageName,
+  WCHAR *PrintableLanguageName
+  )
+;
+
+STATUS
+StringDBDumpCStrings (
+  INT8                        *FileName,
+  INT8                        *BaseName,
+  WCHAR_STRING_LIST           *LanguagesOfInterest,
+  WCHAR_MATCHING_STRING_LIST  *IndirectionList
+  )
+;
+
+STATUS
+StringDBDumpStringDefines (
+  INT8                *FileName,
+  INT8                *BaseName
+  )
+;
+
+STATUS
+StringDBSetCurrentLanguage (
+  WCHAR *LanguageName
+  )
+;
+
+STATUS
+StringDBSetStringReferenced (
+  INT8      *StringIdentifierName,
+  BOOLEAN   IgnoreNotFound
+  )
+;
+
+void
+StringDBFormatString (
+  WCHAR   *String
+  )
+;
+
+#endif // #ifndef _STRING_DB_H_
diff --git a/Tools/Source/TianoTools/StrGather/build.gcc b/Tools/Source/TianoTools/StrGather/build.gcc
new file mode 100644
index 0000000000..c7c6af7003
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/build.gcc
@@ -0,0 +1 @@
+gcc -mno-cygwin -mno-cygwin -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  StrGather.c StringDB.c -o StrGather -L../Library-mingw -lCommon
diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
new file mode 100644
index 0000000000..e7a47dc49d
--- /dev/null
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK StrGather Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="StrGather"/>
+  <property name="FileSet" value="*.c *.h"/>
+
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+		<if>
+		  <equals arg1="${ToolChain}" arg2="msvc"/>
+			<then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+			</then>
+			<elseif>
+			  <equals arg1="${ToolChain}" arg2="gcc"/>
+				<then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+				</then>
+			</elseif>
+		</if>
+  </target>
+
+  <target name="Tool" depends="init">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+			<linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+			<linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/VfrCompile/EfiVfr.h b/Tools/Source/TianoTools/VfrCompile/EfiVfr.h
new file mode 100644
index 0000000000..f7c534d336
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/EfiVfr.h
@@ -0,0 +1,181 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EfiVfr.h
+
+Abstract:
+
+  Defines and prototypes for the EFI internal forms representation
+  setup protocol and drivers
+  
+--*/
+
+#ifndef _EFI_VFR_H_
+#define _EFI_VFR_H_
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include "InternalFormRepresentation.h"
+#include <string.h>
+
+//
+// This number should be incremented with each change to the VFR compiler.
+// We write the version to the output list file for debug purposes.
+//
+#define VFR_COMPILER_VERSION  "1.88"
+
+//
+// Maximum file path for filenames
+//
+#ifndef MAX_PATH
+#define MAX_PATH        255
+#endif
+#define MAX_QUEUE_COUNT 255
+#define MAX_LINE_LEN    1024
+#define PROGRAM_NAME    "VfrCompile"
+
+//
+// We parse C-style structure definitions which can then be referenced
+// in VFR statements.
+// We need to define an internal structure that can be used to
+// track the fields in a structure definition, and another structure
+// to keep track of the structure name and subfields.
+//
+typedef struct _STRUCT_FIELD_DEFINITION {
+  struct _STRUCT_FIELD_DEFINITION *Next;
+  int                             DataSize;
+  int                             Offset;     // from the start of the structure
+  int                             ArrayLength;
+  char                            IsArray;
+  char                            *Name;
+} STRUCT_FIELD_DEFINITION;
+
+typedef struct _STRUCT_DEFINITION {
+  struct _STRUCT_DEFINITION *Next;
+  int                       Size;
+  int                       LineNum;          // line number where the structure was defined
+  int                       IsNonNV;          // if this is the non-NV data structure definition
+  int                       Referenced;       // if it's referenced anywhere in the VFR
+  int                       VarStoreIdValid;  // found a 'varstore' statement for it in the VFR
+  unsigned short            VarStoreId;       // key from a varstore IFR statement
+  int                       VarStoreLineNum;  // line number where VARSTORE was defined
+  char                      *Name;
+  STRUCT_FIELD_DEFINITION   *Field;
+  STRUCT_FIELD_DEFINITION   *LastField;
+} STRUCT_DEFINITION;
+
+//
+// For the IdEqValList variable list of UINT16's, keep track of them using
+// a linked list until we know how many there are.
+// We also use a linked list of these to keep track of labels used in
+// the VFR script so we can catch duplicates.
+// We'll also use it to keep track of defined varstore id's so we can
+// detect duplicate definitions.
+//
+typedef struct _UINT16_LIST {
+  struct _UINT16_LIST *Next;
+  UINT16              Value;
+  UINT32              LineNum;
+} UINT16_LIST;
+
+typedef struct _GOTO_REFERENCE {
+  struct _GOTO_REFERENCE  *Next;
+  UINT32                  RefLineNum; // line number of source file where referenced
+  UINT16                  Value;
+} GOTO_REFERENCE;
+
+typedef struct _FORM_ID_VALUE {
+  struct _FORM_ID_VALUE *Next;
+  UINT32                LineNum;
+  UINT16                Value;
+} FORM_ID_VALUE;
+
+//
+// We keep track in the parser of all "#line 4 "x.y"" strings so we
+// can cross-reference the line numbers in the preprocessor output .i file
+// to the original input files.
+//
+typedef struct _PARSER_LINE_DEFINITION {
+  struct _PARSER_LINE_DEFINITION  *Next;
+  UINT32                          HashLineNum;  // from the #line stmt
+  UINT32                          TokenLineNum; // line number in the .i file
+  CHAR8                           *FileName;    // from the #line stmt
+} PARSER_LINE_DEFINITION;
+
+extern PARSER_LINE_DEFINITION *gLineDefinition;
+extern PARSER_LINE_DEFINITION *gLastLineDefinition;
+
+extern
+char                          *
+ConvertLineNumber (
+  UINT32 *LineNum
+  )
+/*++
+
+Routine Description:
+  Given the line number in the preprocessor-output file, use the line number
+  information we've saved to determine the source file name and line number
+  where the code originally came from. This is required for error reporting.
+
+Arguments:
+  LineNum - the line number in the preprocessor-output file.
+
+Returns:
+  Returns a pointer to the source file name. Also returns the line number 
+  in the provided LineNum argument
+
+--*/
+;
+
+typedef struct _IFR_BYTE {
+  struct _IFR_BYTE  *Next;
+  UINT32            LineNum;
+  UINT8             OpcodeByte;
+  UINT8             KeyByte;
+} IFR_BYTE;
+
+typedef struct {
+  CHAR8 VfrFileName[MAX_PATH];
+  CHAR8 VfrListFileName[MAX_PATH];
+  INT8  CreateListFile;
+  INT8  CreateIfrBinFile;
+  CHAR8 IfrOutputFileName[MAX_PATH];
+  CHAR8 OutputDirectory[MAX_PATH];
+  CHAR8 PreprocessorOutputFileName[MAX_PATH];
+  CHAR8 VfrBaseFileName[MAX_PATH];  // name of input VFR file with no path or extension
+  CHAR8 *IncludePaths;
+  CHAR8 *CPreprocessorOptions;
+} OPTIONS;
+
+extern OPTIONS  gOptions;
+
+VOID
+WriteStandardFileHeader (
+  FILE *OutFptr
+  )
+/*++
+
+Routine Description:
+  This function is invoked to emit a standard header to an
+  output text file.
+  
+Arguments:
+  OutFptr - file to write the header to
+
+Returns:
+  None
+
+--*/
+;
+
+#endif // #ifndef _EFI_VFR_H_
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
new file mode 100644
index 0000000000..3646c5d1cd
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
@@ -0,0 +1,3527 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  VfrCompile.g
+
+Abstract:
+
+  PCCTS parser and lexer definitions for the EFI VFR forms compiler
+  
+--*/  
+
+#header<<
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <CommonLib.h>
+#include <MultiPhase.h>
+#include "EfiUtilityMsgs.h"
+#include "EfiVfr.h"
+#include "VfrServices.h"
+#include <UgaDraw.h>
+#include <Hii.h>
+
+#include <ctype.h>
+#ifndef __GNUC__
+#include <direct.h>
+#include <process.h> // for spawn functions
+#else
+#include <unistd.h>
+#endif
+
+>>
+
+<<
+
+//
+// Base info for DLG-generated scanner
+//
+#include "DLexerBase.h"    
+
+//
+// Include the scanner file generated by DLG
+//
+#include "DLGLexer.h"    
+
+class DLGLexerVfr : public DLGLexer
+{
+public:
+  DLGLexerVfr (DLGFileInput *F) : DLGLexer (F) {};
+  INT32 errstd (char *Text) 
+  { 
+    printf ("unrecognized input '%s'\n", Text); 
+  }
+};
+
+//
+// Base token definitions for ANTLR
+//
+#include "AToken.h"
+
+//
+// This is how we invoke the C preprocessor on the VFR source file
+// to resolve #defines, #includes, etc. To make C source files
+// shareable between VFR and drivers, define VFRCOMPILE so that
+// #ifdefs can be used in shared .h files.
+//
+#ifdef __GNUC__
+#define PREPROCESSOR_COMMAND        "gcc "
+#define PREPROCESSOR_OPTIONS        "-x c -E -P -DVFRCOMPILE "
+#define FILE_SEP_CHAR '/'
+#define FILE_SEP_STRING "/"
+#else
+#define PREPROCESSOR_COMMAND        "cl.exe "
+#define PREPROCESSOR_OPTIONS        "/nologo /P /TC /DVFRCOMPILE "
+#define FILE_SEP_CHAR '/'
+#define FILE_SEP_STRING "/"
+#endif
+
+typedef ANTLRCommonToken ANTLRToken;
+
+//
+// Specify the filename extensions for the files we generate.
+//
+#define VFR_BINARY_FILENAME_EXTENSION       ".c"
+#define VFR_LIST_FILENAME_EXTENSION         ".lst"
+
+static 
+VOID 
+Usage ();
+
+static 
+STATUS 
+ProcessArgs (
+  int         Argc, 
+  char        *Argv[]
+  );
+
+static 
+VOID 
+Cleanup ();
+
+//
+// Globals
+//
+OPTIONS gOptions;
+
+int 
+main (
+  int   argc, 
+  char  **argv
+  )
+/*++
+
+Routine Description:
+  Application entry point function. Parse command-line arguments, 
+  invoke the parser, clean up, and return.
+
+Arguments:
+  argc - standard argc passed to main() per C conventions
+  argv - standard argv passed to main() per C conventions
+
+Returns:
+  STATUS_SUCCESS - program executed with no errors or warnings
+  STATUS_WARNING - program executed with warnings
+  STATUS_ERROR   - non-recoverable errors encountered while processing
+
+--*/
+{
+  FILE      *VfrFptr;
+  char      *Cmd;
+  char      *Cptr;
+  int       Len;
+  STATUS    Status;
+    
+  //
+  // Set our program name for the error printing routines.
+  // Then set printing limits.
+  //
+  SetUtilityName (PROGRAM_NAME);
+  SetPrintLimits (20, 20, 30);
+  //
+  // Process the command-line arguments
+  //
+  if (ProcessArgs (argc, argv) != STATUS_SUCCESS) {
+    Usage ();
+    Cleanup();
+    return STATUS_ERROR;
+  }
+  VfrFptr = NULL;
+  //
+  // Verify the VFR script file exists
+  //
+  if ((VfrFptr = fopen (gOptions.VfrFileName, "r")) == NULL) {
+    Error (PROGRAM_NAME, 0, 0, gOptions.VfrFileName, "could not open input VFR file");
+    Cleanup();
+    return STATUS_ERROR;
+  }
+  //
+  // Now close the file and make a system call to run the preprocessor
+  // on it.
+  //
+  fclose (VfrFptr);
+  Len = strlen (PREPROCESSOR_OPTIONS) + strlen (gOptions.VfrFileName) + 10;
+  if (gOptions.CPreprocessorOptions != NULL) {
+    Len += strlen (gOptions.CPreprocessorOptions) + 1;
+  }
+  if (gOptions.IncludePaths != NULL) {
+    Len += strlen (gOptions.IncludePaths) + 1;
+  }
+  Cmd = (char *)malloc (Len);
+  if (Cmd == NULL) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "could not allocate memory");
+    Cleanup();
+    return STATUS_ERROR;
+  }  
+  strcpy (Cmd, PREPROCESSOR_OPTIONS);
+  if (gOptions.IncludePaths != NULL) {
+    strcat (Cmd, gOptions.IncludePaths);
+    strcat (Cmd, " ");
+  }
+  if (gOptions.CPreprocessorOptions != NULL) {
+    strcat (Cmd, gOptions.CPreprocessorOptions);
+    strcat (Cmd, " ");
+  }
+  strcat (Cmd, gOptions.VfrFileName);
+#ifndef __GNUC__
+  Status = _spawnlp (_P_WAIT, PREPROCESSOR_COMMAND, Cmd, NULL);
+#else
+  {
+    char CommandLine[1000];
+    char *p;
+
+    //
+    // Lean the slashes forward.
+    //
+    for (p = gOptions.PreprocessorOutputFileName; *p; p++) {
+      if (*p=='\\') {
+        *p=FILE_SEP_CHAR;
+      }
+    }
+ 
+    //
+    // Lean the slashes forward.
+    //
+    for (p = Cmd; *p; p++) {
+      if (*p=='\\') {
+        *p=FILE_SEP_CHAR;
+      }
+    }
+ 
+    sprintf(CommandLine, "%s %s > %s", PREPROCESSOR_COMMAND, Cmd, gOptions.PreprocessorOutputFileName);
+    Status = system (CommandLine);
+  }
+#endif
+  if (Status != 0) {
+    Error (PROGRAM_NAME, 0, 0, gOptions.VfrFileName, "failed to spawn C preprocessor on VFR file");
+    printf ("Command: '%s %s'\n", PREPROCESSOR_COMMAND, Cmd);
+    Cleanup();
+    return STATUS_ERROR;
+  }
+  free (Cmd);
+  //
+  // Open the preprocessor output file
+  //
+  if ((VfrFptr = fopen (gOptions.PreprocessorOutputFileName, "r")) == NULL) {
+    Error (PROGRAM_NAME, 0, 0, "failed to open input VFR preprocessor output file", 
+      gOptions.PreprocessorOutputFileName);
+    Cleanup();
+    return STATUS_ERROR;
+  }
+  //
+  // Define input VFR file
+  //
+  DLGFileInput InputFile (VfrFptr);
+  //
+  // Define an instance of the scanner    
+  //
+  DLGLexerVfr Scanner (&InputFile);
+  //
+  // Define token buffer between scanner and parser
+  //
+  ANTLRTokenBuffer Pipe (&Scanner);    
+  //
+  // Create a token to use as a model
+  //
+  ANTLRToken Tok;     
+  //
+  // Tell the scanner what type the token is
+  //
+  Scanner.setToken (&Tok);    
+  //
+  // Create an instance of our parser
+  //
+  EfiVfrParser Parser (&Pipe);    
+  //
+  // Initialize the parser    
+  //
+  Parser.init ();
+  Status = GetUtilityStatus ();
+  if (Status != STATUS_SUCCESS) {
+    Cleanup();
+    return Status;
+  }  
+  //
+  // Start the first rule    
+  //
+  Parser.program ();
+  //
+  // Close the input script file
+  //
+  fclose (VfrFptr);
+  Parser.WriteIfrBytes ();
+  //
+  // Call cleanup, which does some extra checking of the script
+  //
+  Parser.Cleanup ();
+  Cleanup();
+  //
+  // If we had an error somewhere, delete our output files so that
+  // a subsequent build will rebuild them.
+  //
+  Status = GetUtilityStatus ();
+  if (Status == STATUS_ERROR) {
+    remove (gOptions.IfrOutputFileName);
+  }
+  return Status;
+}
+static
+VOID
+Cleanup ()
+/*++
+
+Routine Description:
+  Free up memory allocated during parsing.
+
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{
+  //
+  // Free up our string we allocated to track the include paths
+  //
+  if (gOptions.IncludePaths != NULL) {
+    free (gOptions.IncludePaths);
+    gOptions.IncludePaths = NULL;
+  }
+  //
+  // Free up our string we allocated to track preprocessor options
+  //
+  if (gOptions.CPreprocessorOptions != NULL) {
+    free (gOptions.CPreprocessorOptions);
+    gOptions.CPreprocessorOptions = NULL;
+  }
+}  
+
+static
+STATUS
+ProcessArgs (
+  int         Argc, 
+  char        *Argv[]
+  )
+/*++
+
+Routine Description:
+  Process the command-line arguments.
+
+Arguments:
+  Argc - standard argc passed to main()
+  Argv - standard argv passed to main()
+
+Returns:
+  STATUS_SUCCESS - program should continue (all args ok)
+
+--*/
+{
+  char    *IncludePaths;
+  char    *CPreprocessorOptions;
+  int     Len;  
+  char    CopyStr[MAX_PATH];
+  char    *Cptr;
+
+  //
+  // Put options in known state.
+  //
+  memset ((char *)&gOptions, 0, sizeof (OPTIONS));
+  //
+  // Go through all the arguments that start with '-'
+  //
+  Argc--;
+  Argv++;
+  while ((Argc > 0) && (Argv[0][0] == '-')) {
+    //
+    // -? or -h help option -- return an error for printing usage
+    //
+    if ((stricmp (Argv[0], "-?") == 0) || (stricmp (Argv[0], "-h") == 0)) {
+      return STATUS_ERROR;
+      break;
+    //
+    // -l to create a listing output file
+    //
+    } else if (stricmp (Argv[0], "-l") == 0) {
+      gOptions.CreateListFile = 1;
+    //
+    // -I include_path option for finding include files. We'll pass this
+    // to the preprocessor. Turn them all into a single include string.
+    //
+    } else if (stricmp (Argv[0], "-i") == 0) {
+      if ((Argc < 2) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing path argument");
+        return STATUS_ERROR;
+      }
+      Argc--;
+      Argv++;
+      Len = strlen (" -I ");
+      Len += strlen (Argv[0]) + 2;
+      if (gOptions.IncludePaths != NULL) {
+        Len += strlen (gOptions.IncludePaths);
+      }
+      IncludePaths = (CHAR8 *)malloc (Len);
+      if (IncludePaths == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+      IncludePaths[0] = 0;
+      if (gOptions.IncludePaths != NULL) {
+        strcpy (IncludePaths, gOptions.IncludePaths);
+        free (gOptions.IncludePaths);
+      }
+      strcat (IncludePaths, " -I ");
+      strcat (IncludePaths, Argv[0]);
+      gOptions.IncludePaths = IncludePaths;
+    //
+    // -od OutputDirectory to define a common directory for output files
+    //
+    } else if (stricmp (Argv[0], "-od") == 0) {
+      if ((Argc < 2) || (Argv[1][0] == '-')) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing output directory name");
+        return STATUS_ERROR;
+      }
+      Argc--;
+      Argv++;
+      strcpy (gOptions.OutputDirectory, Argv[0]);
+    } else if (stricmp (Argv[0], "-ibin") == 0) {
+      gOptions.CreateIfrBinFile = 1;
+    } else if (stricmp (Argv[0], "-nostrings") == 0) {
+      // deprecated option
+    //
+    // -ppflag C-preprocessor-flag option for passing options to the C preprocessor.
+    // Turn them all into a single string.
+    //
+    } else if (stricmp (Argv[0], "-ppflag") == 0) {
+      if (Argc < 2) {
+        Error (PROGRAM_NAME, 0, 0, Argv[0], "missing C-preprocessor argument");
+        return STATUS_ERROR;
+      }
+      Argc--;
+      Argv++;
+      Len = strlen (Argv[0]) + 2;
+      if (gOptions.CPreprocessorOptions != NULL) {
+        Len += strlen (gOptions.CPreprocessorOptions);
+      }
+      CPreprocessorOptions = (CHAR8 *)malloc (Len);
+      if (CPreprocessorOptions == NULL) {
+        Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+        return STATUS_ERROR;
+      }
+      CPreprocessorOptions[0] = 0;
+      if (gOptions.CPreprocessorOptions != NULL) {
+        strcpy (CPreprocessorOptions, gOptions.CPreprocessorOptions);
+        free (gOptions.CPreprocessorOptions);
+      }
+      strcat (CPreprocessorOptions, " ");
+      strcat (CPreprocessorOptions, Argv[0]);
+      gOptions.CPreprocessorOptions = CPreprocessorOptions;
+    } else {
+      Error (PROGRAM_NAME, 0, 0, Argv[0], "unrecognized option");
+      return STATUS_ERROR;
+    }
+    Argc--;
+    Argv++;
+  }
+  //
+  // Must specify at least the vfr file name
+  //
+  if (Argc > 1) {
+    Error (PROGRAM_NAME, 0, 0, Argv[1], "unrecognized argument after VFR file name");
+    return STATUS_ERROR;
+  } else if (Argc < 1) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "must specify VFR file name");
+    return STATUS_ERROR;
+  }
+  strcpy (gOptions.VfrFileName, Argv[0]);
+  //
+  // We run the preprocessor on the VFR file to manage #include statements.
+  // Unfortunately the preprocessor does not allow you to specify the
+  // output name or path of the resultant .i file, so we have to do
+  // some work. Here we'll extract the basename of the VFR file, then
+  // append .i on the end. 
+  //
+  strcpy (CopyStr, gOptions.VfrFileName);
+  Cptr = CopyStr + strlen (CopyStr) - 1;
+  for (;(Cptr > CopyStr) && (*Cptr != '\\') && (*Cptr != ':') && (*Cptr != '/'); Cptr--);
+  if (Cptr == CopyStr) {
+    strcpy (gOptions.PreprocessorOutputFileName, Cptr);
+    strcpy (gOptions.VfrBaseFileName, Cptr);
+  } else {
+    strcpy (gOptions.PreprocessorOutputFileName, Cptr+1);
+    strcpy (gOptions.VfrBaseFileName, Cptr+1);
+  }
+  for (Cptr = gOptions.PreprocessorOutputFileName; *Cptr && (*Cptr != '.'); Cptr++);
+  strcpy (Cptr, ".i");
+  //
+  // Terminate the vfr file basename at the extension
+  //
+  for (Cptr = gOptions.VfrBaseFileName; *Cptr && (*Cptr != '.'); Cptr++) {
+  }
+  *Cptr = 0; 
+  //
+  // If they defined an output directory, prepend all output files
+  // with the working directory. Output files of interest:
+  //    VfrListFileName             -- list file
+  //    IfrOutputFileName           -- IFR bytes 
+  //    StringOutputFileName        -- string bytes
+  //    StringListFileName          -- not used
+  //    StringDefineFileName        -- #defines of string identifiers
+  //
+  // We have two cases:
+  //   1. Output directory (-od) not specified, in which case output files
+  //      go to the current working directory.
+  //   2. Output directory specified, in which case the output files
+  //      go directly to the specified directory.
+  //
+  if (gOptions.OutputDirectory[0] == 0) {
+    CopyStr[0] = 0;
+#ifndef __GNUC__
+    _getcwd (CopyStr, sizeof (CopyStr));
+#else
+    getcwd (CopyStr, sizeof (CopyStr));
+#endif
+    strcpy (gOptions.OutputDirectory, CopyStr);
+  }
+  //
+  // Make sure output directory has a trailing backslash
+  //
+  if (gOptions.OutputDirectory[strlen (gOptions.OutputDirectory) - 1] != '\\' ||
+      gOptions.OutputDirectory[strlen (gOptions.OutputDirectory) - 1] != '/') {
+    strcat (gOptions.OutputDirectory, FILE_SEP_STRING);
+  }
+  //
+  // Create the base output file name as: path\base, copy it to all the output
+  // filenames, and then add the appropriate extension to each.
+  //
+  strcpy (gOptions.VfrListFileName, gOptions.OutputDirectory);
+  strcat (gOptions.VfrListFileName, gOptions.VfrBaseFileName);
+  strcpy (gOptions.IfrOutputFileName, gOptions.VfrListFileName);
+  strcat (gOptions.VfrListFileName, VFR_LIST_FILENAME_EXTENSION);
+  strcat (gOptions.IfrOutputFileName, VFR_BINARY_FILENAME_EXTENSION);
+  //
+  // We set a default list file name, so if they do not
+  // want a list file, null out the name now.
+  //
+  if (gOptions.CreateListFile == 0) {
+    gOptions.VfrListFileName[0] = 0;
+  }
+  return STATUS_SUCCESS;
+}
+static 
+VOID 
+Usage ()
+/*++
+
+Routine Description:
+  Print utility usage instructions
+
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{
+  int Index;
+  const char *Help[] = {
+    " ", 
+    "VfrCompile version " VFR_COMPILER_VERSION,
+    " ",
+    "  Usage: VfrCompile {options} [VfrFile]",
+    " ",
+    "    where options include:",
+    "      -? or -h       prints this help",
+    "      -l             create an output IFR listing file",
+    "      -i IncPath     add IncPath to the search path for VFR included files",
+    "      -od OutputDir  deposit all output files to directory OutputDir (default=cwd)",
+    "      -ibin          create an IFR HII pack file",
+    "    where parameters include:",
+    "      VfrFile        name of the input VFR script file",
+    " ",
+    NULL
+    };
+  for (Index = 0; Help[Index] != NULL; Index++) {
+    fprintf (stdout, "%s\n", Help[Index]);
+  }
+}
+    
+>>
+
+
+#lexaction
+<<
+
+#include "EfiVfr.h"
+
+PARSER_LINE_DEFINITION  *gLineDefinition = NULL;
+PARSER_LINE_DEFINITION  *gLastLineDefinition = NULL;
+
+VOID
+AddFileLine (
+  char      *TokenString,
+  UINT32    TokenLine
+  )
+/*++
+
+Routine Description:
+  During the lexer phase, if we encounter a #line statement output by
+  the preprocessor, this function gets called. We'll save off the info 
+  for error reporting purposes. The preprocessor line information has the
+  form:
+    
+    #line 3 "FileName.c"  
+
+Arguments:
+  TokenString - the parsed string as shown above
+  TokenLine   - the line number in the preprocessed output file 
+  
+Returns:
+  NA
+
+--*/
+{
+  PARSER_LINE_DEFINITION  *LineDef;
+  CHAR8                   *Cptr;
+  
+  //
+  // Allocate a structure in which we can keep track of this line information.
+  //
+  LineDef = (PARSER_LINE_DEFINITION *)malloc (sizeof (PARSER_LINE_DEFINITION));
+  memset ((char *)LineDef, 0, sizeof (PARSER_LINE_DEFINITION));
+  LineDef->TokenLineNum = TokenLine;
+  LineDef->HashLineNum = atoi (TokenString + 6);
+  //
+  // Find the quotes in the filename, then allocate space in the line
+  // def structure for a copy of the filename. Finally, copy it without
+  // quotes to the line def.
+  //
+  for (Cptr = TokenString + 7; *Cptr && (*Cptr != '"'); Cptr++);
+  if (*Cptr == '"') {
+    LineDef->FileName = (CHAR8 *)malloc (strlen (Cptr));
+    Cptr++;
+    strcpy (LineDef->FileName, Cptr);
+    for (Cptr = LineDef->FileName; *Cptr && (*Cptr != '"'); Cptr++);
+    *Cptr = 0;   
+    //
+    // Now add this new one to the list
+    //
+    if (gLineDefinition == NULL) {
+      gLineDefinition = LineDef;
+    } else {
+      gLastLineDefinition->Next = LineDef;
+    }
+    gLastLineDefinition = LineDef;
+  } else {
+    Error (PROGRAM_NAME, 0, 0, "invalid line definition in preprocessor output file", TokenString);
+    free (LineDef);
+    return;
+  }
+}
+char *
+ConvertLineNumber (
+  UINT32 *LineNum
+  )
+/*++
+
+Routine Description:
+  Given the line number in the preprocessor-output file, use the line number
+  information we've saved to determine the source file name and line number
+  where the code originally came from. This is required for error reporting.
+
+Arguments:
+  LineNum - the line number in the preprocessor-output file.
+
+Returns:
+  Returns a pointer to the source file name. Also returns the line number 
+  in the provided LineNum argument
+
+--*/
+{
+  PARSER_LINE_DEFINITION  *LineDef;
+  //
+  // Step through our linked list of #line information we saved off. 
+  // For each one, look at its line number, and the line number of the
+  // next record, and see if the passed-in line number is in the range.
+  // If it is, then convert the line number to the appropriate line number
+  // of the original source file.
+  //
+  for (LineDef = gLineDefinition; LineDef != NULL; LineDef = LineDef->Next) {
+    //
+    // The given LineNum is the line number from the .i file.
+    // Find a line definition whose range includes this line number,
+    // convert the line number, and return the filename.
+    //
+    if (LineDef->TokenLineNum <= *LineNum) {
+      if (LineDef->Next != NULL) {
+        if (LineDef->Next->TokenLineNum > *LineNum) {
+          *LineNum = *LineNum - LineDef->TokenLineNum + LineDef->HashLineNum;
+          return LineDef->FileName;
+        }
+      } else {
+        //
+        // Last one in the list of line definitions, so has to be right
+        //
+        *LineNum = *LineNum - LineDef->TokenLineNum + LineDef->HashLineNum;
+        return LineDef->FileName;
+      }
+    }
+  }
+  return NULL;
+}
+
+>>
+
+//
+// Define a lexical class for parsing quoted strings. Basically
+// starts with a double quote, and ends with a double quote that
+// is not preceeded with a backslash.
+//
+#lexclass QUOTED_STRING
+#token TheString            "~[\"]*\"" << mode (START); >>     
+
+//
+// Define a lexical class for parsing "#pragma pack" statements. 
+// We do this just for convenience (since we skip them here) so
+// that users can include some minimal .h files.
+//
+#lexclass PRAGMA_PACK
+#token "pack"     << skip (); >>
+#token "[\ \t]"   << skip (); >> 
+#token "\("       << skip (); >>
+#token "[0-9]*"   << skip (); >>
+#token "\)"       << skip (); mode (START); >>
+
+//
+// Define a lexclass for skipping over C++ style comments
+//
+#lexclass CPP_COMMENT
+#token "~[\n]*"       << skip (); >>
+#token "\n"           << skip (); mode (START); newline (); >>
+
+//
+// Standard lexclass is START
+//
+#lexclass START
+
+//
+// Find start of C++ style comments
+//
+#token "//"     << skip (); mode (CPP_COMMENT); >>
+
+//
+// Skip whitespace
+//
+#token "[\ \t]"   << skip (); >> 
+
+//
+// Skip over newlines, but count them
+//
+#token "\n"       << skip (); newline (); >>
+
+//
+// Skip pragma pack statements
+//
+#token "\#pragma" << skip (); mode(PRAGMA_PACK); >>
+
+//
+// Skip over 'extern' in any included .H file
+//
+#token "extern"   << skip (); >>
+
+//
+// Tokens for the different keywords. Syntax is:
+// TokenName("ErrorMessageText")    "TokenString"
+//   where:
+//     TokenName is the token name (must be capitalized) that is used in the rules
+//     ErrorMessageText is the string the compiler emits when it detects a syntax error
+//     TokenString is the actual matching string used in the user script
+//
+#token LineDefinition                           "#line\ [0-9]+\ \"~[\"]+\"[\ \t]*\n" << AddFileLine (begexpr (), line ()); skip (); >>
+#token FormSet("formset")                       "formset"
+#token EndFormSet("endformset")                 "endformset"
+#token Title("title")                           "title"
+#token FormId("formid")                         "formid"
+#token OneOf("oneof")                           "oneof"
+#token Prompt("prompt")                         "prompt"
+#token OrderedList("orderedlist")               "orderedlist"
+#token EndList("endlist")                       "endlist"
+#token EndForm("endform")                       "endform"
+#token EndOneOf("endoneof")                     "endoneof"
+#token Form("form")                             "form"
+#token Subtitle("subtitle")                     "subtitle"
+#token Help("help")                             "help"
+#token VarId("varid")                           "varid"
+#token Text("text")                             "text"
+#token Option("option")                         "option"
+#token Value("value")                           "value"
+#token Flags("flags")                           "flags"
+#token Date("date")                             "date"
+#token EndDate("enddate")                       "enddate"
+#token Year("year")                             "year"
+#token Month("month")                           "month"
+#token Day("day")                               "day"
+#token Time("time")                             "time"
+#token EndTime("endtime")                       "endtime"
+#token Hour("hour")                             "hour"
+#token Minute("minute")                         "minute"
+#token Second("second")                         "second"
+#token AND("AND")                               "AND"
+#token OR("OR")                                 "OR"
+#token GrayOutIf("grayoutif")                   "grayoutif"
+#token NOT("NOT")                               "NOT"
+#token Label("label")                           "label"
+#token Timeout("timeout")                       "timeout"
+#token Inventory("inventory")                   "inventory"
+#token StringToken("STRING_TOKEN")              "STRING_TOKEN"
+#token NonNvDataMap("_NON_NV_DATA_MAP")         "_NON_NV_DATA_MAP"
+#token Struct("struct")                         "struct"
+#token Uint64("UINT64")                         "UINT64"
+#token Uint32("UINT32")                         "UINT32"
+#token Uint16("UINT16")                         "UINT16"
+#token Char16("CHAR16")                         "CHAR16"
+#token Uint8("UINT8")                           "UINT8"
+#token Guid("guid")                             "guid"
+#token CheckBox("checkbox")                     "checkbox"
+#token EndCheckBox("endcheckbox")               "endcheckbox"
+#token Numeric("numeric")                       "numeric"
+#token EndNumeric("endnumeric")                 "endnumeric"            
+#token Minimum("minimum")                       "minimum"         
+#token Maximum("maximum")                       "maximum"         
+#token Step("step")                             "step"      
+#token Default("default")                       "default"         
+#token Password("password")                     "password"          
+#token EndPassword("endpassword")               "endpassword"             
+#token String("string")                         "string"        
+#token EndString("endstring")                   "endstring"           
+#token MinSize("minsize")                       "minsize"         
+#token MaxSize("maxsize")                       "maxsize"         
+#token Encoding("encoding")                     "encoding"
+#token SuppressIf("suppressif")                 "suppressif"
+#token Hidden("hidden")                         "hidden"
+#token Goto("goto")                             "goto"
+#token InconsistentIf                           "inconsistentif"
+#token EndIf("endif")                           "endif"
+#token IdEqId("ideqid")                         "ideqid"
+#token IdEqVal("ideqval")                       "ideqval"
+#token VarEqVal("vareqval")                     "vareqval"
+#token Var("var")                               "var"
+#token IdEqValList("ideqvallist")               "ideqvallist"
+#token Length("length")                         "length"
+#token Values("values")                         "values"
+#token Key("key")                               "key"
+#token DefaultFlag("DEFAULT")                   "DEFAULT"
+#token ManufacturingFlag("MANUFACTURING")       "MANUFACTURING"
+#token InteractiveFlag("INTERACTIVE")           "INTERACTIVE"
+#token NVAccessFlag("NV_ACCESS")                "NV_ACCESS"
+#token ResetRequiredFlag("RESET_REQUIRED")      "RESET_REQUIRED"
+#token LateCheckFlag("LATE_CHECK")              "LATE_CHECK"
+#token Class("class")                           "class"
+#token Subclass("subclass")                     "subclass"
+#token TypeDef("typedef")                       "typedef"
+#token Restore("restore")                       "restore"
+#token Save("save")                             "save"
+#token Defaults("defaults")                     "defaults"
+#token Banner("banner")                         "banner"
+#token Align("align")                           "align"
+#token Left("left")                             "left"
+#token Right("right")                           "right"
+#token Center("center")                         "center"
+#token Line("line")                             "line"
+#token VarStore("varstore")                     "varstore"
+#token Name("name")                             "name"
+#token Oem("oem")                               "oem"
+#token True("TRUE")                             "TRUE"
+#token False("FALSE")                           "FALSE"
+#token GreaterThan(">")                         ">"
+#token GreaterEqual(">=")                       ">="
+#token LessThan("<")                          "<"
+#token LessEqual("<=")                        "<="
+
+//
+// Define the class and subclass tokens
+//
+#token ClassNonDevice("NONDEVICE")                        "NON_DEVICE"
+#token ClassDiskDevice("DISK_DEVICE")                     "DISK_DEVICE"
+#token ClassVideoDevice("VIDEO_DEVICE")                   "VIDEO_DEVICE"
+#token ClassNetworkDevice("NETWORK_DEVICE")               "NETWORK_DEVICE"
+#token ClassInputDevice("INPUT_DEVICE")                   "INPUT_DEVICE"
+#token ClassOnBoardDevice("ONBOARD_DEVICE")               "ONBOARD_DEVICE"
+#token ClassOtherDevice("OTHER_DEVICE")                   "OTHER_DEVICE"
+
+#token SubclassSetupApplication("SETUP_APPLICATION")      "SETUP_APPLICATION"
+#token SubclassGeneralApplication("GENERAL_APPLICATION")  "GENERAL_APPLICATION"
+#token SubclassFrontPage("FRONT_PAGE")                    "FRONT_PAGE"
+#token SubclassSingleUse("SINGLE_USE")                    "SINGLE_USE"
+
+#token LanguageIdentifier("language identifier") "[a-z][a-z][a-z]"   // 3 lowercase characters
+#token StringIdentifier("string identifier")    "[A-Za-z_][A-Za-z_0-9]*"
+#token Number("numeric value")                  "(0x[0-9A-Fa-f]+) | [0-9]+"
+#token OpenBrace("{")                           "\{"
+#token CloseBrace("}")                          "\}"
+#token OpenParen("(")                           "\("
+#token CloseParen(")")                          "\)"
+#token OpenBracket("[")                         "\["
+#token CloseBracket("]")                        "\]"
+
+//
+// Define all other invalid characters so that they get through the lexical phase
+// and we can catch them during the parse phase. We get much better error
+// messages then. 
+//
+#token InvalidCharacters("invalid characters")  "~[;:=,\.\|]"  
+
+//
+// This is the overall definition of a VFR form definition script.
+//
+program :
+  ( dataStructDefinition )*
+  formSetStatement   
+  ( vfrStatementVarStore )*
+  ( formDefinition )*
+  EFS:EndFormSet  ";"                   << WriteOpByte (EFS->getLine(), EFI_IFR_END_FORM_SET_OP); >>
+  "@" // end of file
+  ;
+    
+formSetStatement :
+  FS:FormSet                            << WriteOpByte (FS->getLine(), EFI_IFR_FORM_SET_OP); >>
+  Guid "=" 
+  OpenBrace 
+  G1:Number ","
+  G2:Number ","
+  G3:Number ","
+  OpenBrace
+  G4:Number ","
+  G5:Number ","
+  G6:Number ","
+  G7:Number ","
+  G8:Number ","
+  G9:Number ","
+  G10:Number ","
+  G11:Number 
+  CloseBrace
+  CloseBrace                            << WriteGuidValue (G1->getLine (), G1->getText (), G2->getText (), G3->getText (),
+                                                           G4->getText (), G5->getText (), G6->getText (), G7->getText (),
+                                                           G8->getText (), G9->getText (), G10->getText (), G11->getText ()
+                                                          );
+                                         >>
+  ","
+  Title "=" getStringId ","
+  Help  "=" getStringId ","
+  //
+  // insert padding for an EFI_PHYSICAL_ADDRESS (UINT64)
+  //
+                                            << WriteDWord (0, 0); WriteDWord (0, 0); >>
+  Class "=" CVAL:classDefinition ","        << WriteClass (); >>
+  Subclass "=" SVAL:subclassDefinition ","  << WriteSubclass (); >>
+                                            << WriteWord (mNvDataStructSize); >>
+  ;  
+
+//
+// A form can be of multiple classes, thus allow CLASS_A | CLASS_B | CLASS_C
+//
+classDefinition :
+  validClassNames ( "\|" validClassNames )*
+  ;
+  
+validClassNames :
+    CND:ClassNonDevice          << SetClass (CND->getLine(), EFI_NON_DEVICE_CLASS); >>
+  | CDD:ClassDiskDevice         << SetClass (CDD->getLine(), EFI_DISK_DEVICE_CLASS); >>
+  | CVD:ClassVideoDevice        << SetClass (CVD->getLine(), EFI_VIDEO_DEVICE_CLASS); >>
+  | CNW:ClassNetworkDevice      << SetClass (CNW->getLine(), EFI_NETWORK_DEVICE_CLASS); >>
+  | CID:ClassInputDevice        << SetClass (CID->getLine(), EFI_INPUT_DEVICE_CLASS); >>
+  | COB:ClassOnBoardDevice      << SetClass (COB->getLine(), EFI_ON_BOARD_DEVICE_CLASS); >>
+  | COD:ClassOtherDevice        << SetClass (COD->getLine(), EFI_OTHER_DEVICE_CLASS); >>
+  | CNUM:Number                 << SetClass (CNUM->getLine(), GetNumber (CNUM->getText(), CNUM->getLine(), 4)); >>
+  ; << PrintErrorMessage (LT(1)->getLine(), LT(1)->getText(), "invalid class"); >>
+
+//
+// A form can only be of one subclass type.
+//
+subclassDefinition :
+    SSA:SubclassSetupApplication    << SetSubclass (SSA->getLine(), EFI_SETUP_APPLICATION_SUBCLASS); >>
+  | SGA:SubclassGeneralApplication  << SetSubclass (SGA->getLine(), EFI_GENERAL_APPLICATION_SUBCLASS); >>
+  | SFP:SubclassFrontPage           << SetSubclass (SFP->getLine(), EFI_FRONT_PAGE_SUBCLASS); >>
+  | SSU:SubclassSingleUse           << SetSubclass (SSU->getLine(), EFI_SINGLE_USE_SUBCLASS); >>
+  | SNUM:Number                     << SetSubclass (SNUM->getLine(), GetNumber (SNUM->getText(), SNUM->getLine(), 4)); >>
+  ; << PrintErrorMessage (LT(1)->getLine(), LT(1)->getText(), "invalid subclass"); >>
+
+//
+// Parse a C type data structure for storing VFR setup data. Allow:
+//  typedef struct _XXX_ {
+//     (fields)
+//  } MY_NV_DATA;
+//
+dataStructDefinition :
+  << int IsNonNV = 0; >>
+  { TypeDef } 
+  S:Struct                          
+  (
+    NonNvDataMap                    << IsNonNV = 1; >>
+  |
+    { StringIdentifier }
+  )                                 << StartStructDefinition (IsNonNV, S->getLine()); >>
+  OpenBrace 
+  dataStructFields 
+  CloseBrace NAME:StringIdentifier  << EndStructDefinition (NAME->getText(), NAME->getLine()); >>
+  ";"
+  ;
+
+//
+// Parse a C type data structure for defining data that is not stored in NV.
+//  typedef struct _NON_NV_DATA_MAP {
+//     (fields)
+//  } NON_NV_DATA_MAP;
+//
+nonNvDataStructDefinition :
+  { TypeDef } 
+  Struct NonNvDataMap
+  { StringIdentifier }
+  OpenBrace 
+  dataStructFields 
+  CloseBrace NAME:StringIdentifier        << AddStructField (NAME->getText(), NAME->getLine(), 0, 0, 0); >>
+  ";"                                             
+  ;
+
+dataStructFields :
+  ( dataStructField64 | dataStructField32 | dataStructField16 | dataStructField8 ) *
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   UINT64 Name[4];
+//   UINT64 Name;
+//
+// Used while parsing the NV data map structures.
+//
+dataStructField64 :
+  << int ArrayLength = 1; char IsArray = 0; >>
+  "UINT64" 
+  NAME:StringIdentifier 
+  ( ";" | OpenBracket IVal:Number CloseBracket ";"  << ArrayLength = GetNumber (IVal->getText(), IVal->getLine(), 4); IsArray = 1; >> ) 
+                                                    << AddStructField (NAME->getText(), NAME->getLine(), 8, ArrayLength, IsArray); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   UINT32 Name[4];
+//   UINT32 Name;
+//
+// Used while parsing the NV data map structures.
+//
+dataStructField32 :
+  << int ArrayLength = 1; char IsArray = 0; >>
+  "UINT32" 
+  NAME:StringIdentifier 
+  ( ";" | OpenBracket IVal:Number CloseBracket ";"  << ArrayLength = GetNumber (IVal->getText(), IVal->getLine(), 4); IsArray = 1; >> )  
+                                                    << AddStructField (NAME->getText(), NAME->getLine(), 4, ArrayLength, IsArray); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   UINT16 Name[4];
+//   UINT16 Name;
+//
+// Used while parsing the NV data map structures.
+//
+dataStructField16 :
+  << int ArrayLength = 1; char IsArray = 0; >>
+  ( "UINT16" | "CHAR16" )
+  NAME:StringIdentifier 
+  ( ";" | OpenBracket IVal:Number CloseBracket ";"  << ArrayLength = GetNumber (IVal->getText(), IVal->getLine(), 4); IsArray = 1; >> ) 
+                                                    << AddStructField (NAME->getText(), NAME->getLine(), 2, ArrayLength, IsArray); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   UINT8 Name[4];
+//   UINT8 Name;
+//
+// Used while parsing the NV data map structures.
+//
+dataStructField8 :
+  << int ArrayLength = 1; char IsArray = 0; >>
+  "UINT8" 
+  NAME:StringIdentifier 
+  ( ";" | OpenBracket IVal:Number CloseBracket ";"  << ArrayLength = GetNumber (IVal->getText(), IVal->getLine(), 4); IsArray = 1; >> ) 
+                                                    << AddStructField (NAME->getText(), NAME->getLine(), 1, ArrayLength, IsArray); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//    form formid = 1,
+//      title  = STRING_TOKEN(STR_FORM_TITLE);
+//      -- form statements --
+//    endform;
+//
+//  The Form ID cannot be 0
+//
+formDefinition :
+  FRM:Form FormId                << WriteOpByte (FRM->getLine(), EFI_IFR_FORM_OP); >> 
+  "=" 
+  VAL:Number                     << WriteWord (GetNumber (VAL->getText(), VAL->getLine(), 2)); AddFormId (GetNumber (VAL->getText(), VAL->getLine(), 2), VAL->getLine()); >>
+  ","
+  Title "=" getStringId ";"      // writes string identifier
+  ( vfrStatements )*
+  ENDF:EndForm  ";"              << WriteOpByte (ENDF->getLine(), EFI_IFR_END_FORM_OP); >>
+  ;
+
+//
+// VFR statements in a formset
+//
+vfrStatements :
+  vfrStatementSubTitle        | 
+  vfrStatementOneOf           |
+  vfrStatementTextText        |
+  vfrStatementCheckBox        |
+  vfrStatementNumeric         |
+  vfrStatementDate            |
+  vfrStatementTime            |
+  vfrStatementPassword        |
+  vfrStatementString          |
+  vfrStatementSuppressIf      |
+  vfrStatementHidden          |
+  vfrStatementGoto            | 
+  vfrStatementGrayOutIf       |
+  vfrStatementInconsistentIf  |
+  vfrStatementLabel           |
+  vfrStatementBanner          |
+  vfrStatementInventory       |
+  vfrStatementOrderedList     |
+  vfrStatementOem             |
+  vfrStatementSaveRestoreDefaults
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   label 100;
+//
+vfrStatementLabel :
+  OPID:Label                              << WriteOpByte (OPID->getLine(), EFI_IFR_LABEL_OP); >>
+  VAL:Number                              << 
+                                              WriteWord (GetNumber (VAL->getText(), VAL->getLine(), 2)); 
+                                              AddLabel (GetNumber (VAL->getText(), VAL->getLine(), 2), VAL->getLine());
+                                          >>
+  ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   oem 0x12, 0x34, 0x56;
+//
+vfrStatementOem :
+  OPID:Oem                              << WriteOpByte (OPID->getLine(), EFI_IFR_OEM_DEFINED_OP); >>
+  ( VAL1:Number << WriteByte (GetNumber (VAL1->getText(), VAL1->getLine(), 1), 0); >> )
+  ( "," VAL2:Number << WriteByte (GetNumber (VAL2->getText(), VAL2->getLine(), 1), 0); >> )*
+  ";"
+  ;
+  
+//*****************************************************************************
+//
+// PARSE:
+//   inconsistentif NOT .... AND NOT .... OR ... endif;
+//
+vfrStatementInconsistentIf : 
+  << ResetFlags (); >>
+  IIFOP:InconsistentIf                  << WriteOpByte (IIFOP->getLine(), EFI_IFR_INCONSISTENT_IF_OP); >>
+  Prompt "=" getStringId ","
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* "," 
+  }
+  << WriteFlags (); >> //  write the flags field
+  vfrBooleanExpression
+  EOP:EndIf ";"                         << WriteOpByte (EOP->getLine(), EFI_IFR_END_IF_OP); >>
+  ;
+
+//*****************************************************************************
+// 
+// PARSE:
+//   TRUE AND (ideqval SomeStruct.SomeMember >= 0x10 OR 
+//               ideqid SomeStruct.SomeMember < SomeStruct.SomeOtherMember) AND
+//            (ideqlist SomeStruct.SomeOtherMember == 0x10, 0x20, 0x30 OR
+//               vareqval var(VAR_EQ_TEST_NAME) == 0x1)
+//
+// For supporting complex express, divide the vfrBooleanExpression to two parts
+// so that pred-LL(k) parser can parse incrementally.
+//
+vfrBooleanExpression :
+  leftPartVfrBooleanExp { rightPartVfrBooleanExp }
+  ;
+  
+leftPartVfrBooleanExp :
+  OpenParen vfrBooleanExpression CloseParen                                                        |
+  (ideqval | ideqid | ideqvallist | vareqval | truefalse)                                          |
+  NOPID:NOT leftPartVfrBooleanExp           << WriteOpByte (NOPID->getLine(), EFI_IFR_NOT_OP); >>
+  ;
+
+rightPartVfrBooleanExp :
+  AOPID:AND vfrBooleanExpression            << WriteOpByte (AOPID->getLine(), EFI_IFR_AND_OP); >>  |
+  OOPID:OR vfrBooleanExpression             << WriteOpByte (OOPID->getLine(), EFI_IFR_OR_OP); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   TRUE
+//
+truefalse :
+  TOPID:True                                << WriteOpByte (TOPID->getLine(), EFI_IFR_TRUE_OP); >> |
+  FOPID:False                               << WriteOpByte (FOPID->getLine(), EFI_IFR_FALSE_OP); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   varstore MY_STRUCT_NAME, key = 0x1234, name = "MyVariableName", guid = {...};
+//
+vfrStatementVarStore : 
+  OP:VarStore                           << WriteOpByte (OP->getLine(), EFI_IFR_VARSTORE_OP); >>
+  STRUCT_NAME:StringIdentifier ","
+  Key   "=" KNUM:Number ","
+  Name  "=" VAR_NAME:StringIdentifier ","  
+  Guid "=" 
+  OpenBrace 
+  G1:Number ","
+  G2:Number ","
+  G3:Number ","
+  OpenBrace
+  G4:Number ","
+  G5:Number ","
+  G6:Number ","
+  G7:Number ","
+  G8:Number ","
+  G9:Number ","
+  G10:Number ","
+  G11:Number 
+  CloseBrace
+  CloseBrace                            << WriteGuidValue (G1->getLine (), G1->getText (), G2->getText (), G3->getText (),
+                                                           G4->getText (), G5->getText (), G6->getText (), G7->getText (),
+                                                           G8->getText (), G9->getText (), G10->getText (), G11->getText ()
+                                                          );
+                                           WriteWord (GetNumber (KNUM->getText(), KNUM->getLine(), 2)); 
+                                           AddVarStore (STRUCT_NAME->getText(), VAR_NAME->getText(), GetNumber (KNUM->getText(), KNUM->getLine(), 2), STRUCT_NAME->getLine());
+                                         >>
+  
+  ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:  
+//   vareqval var(0x100) == 0x20
+//
+vareqval : 
+  OPID:VarEqVal                           << WriteOpByte (OPID->getLine(), EFI_IFR_EQ_VAR_VAL_OP); >>
+  Var OpenParen 
+  VAR:Number                              << WriteWord (GetNumber (VAR->getText(), VAR->getLine(), 2)); >>
+  CloseParen
+  compareNumber
+  ;
+
+ideqval : 
+  OPID:IdEqVal                            << WriteOpByte (OPID->getLine(), EFI_IFR_EQ_ID_VAL_OP); >>
+  vfrStructFieldName[0]
+  compareNumber
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   ideqid MyNVData3.Field16A == MyNVData3.Field16B
+//
+// NOTE: Before processing the second variable store in the ideqid statement, set a global flag
+//       so that when we parse the second variable we set the secondary variable store id.
+//
+ideqid : 
+  OPID:IdEqId                             << WriteOpByte (OPID->getLine(), EFI_IFR_EQ_ID_ID_OP);  >>
+  vfrStructFieldName[0]
+  compareVfrStructFieldNameNL0
+  ;
+
+//*****************************************************************************
+//
+// compareNumber is the combination of compare operation and Number
+//
+compareNumber :
+  (
+  "=="
+  VAL1:Number                             << WriteWord (GetNumber (VAL1->getText(), VAL1->getLine(), 2)); >>
+  ) |
+  (
+  GTOPID:GreaterThan
+  VAL2:Number                             << WriteWord (GetNumber (VAL2->getText(), VAL2->getLine(), 2));
+                                             WriteOpByte (GTOPID->getLine(), EFI_IFR_GT_OP); >>
+  ) |
+  (
+  GEOPID:GreaterEqual
+  VAL3:Number                             << WriteWord (GetNumber (VAL3->getText(), VAL3->getLine(), 2));
+                                             WriteOpByte (GEOPID->getLine(), EFI_IFR_GE_OP); >>
+  ) |
+  (
+  LTOPID:LessThan
+  VAL4:Number                             << WriteWord (GetNumber (VAL4->getText(), VAL4->getLine(), 2));
+                                             WriteOpByte (LTOPID->getLine(), EFI_IFR_GE_OP);
+                                             WriteOpByte (LTOPID->getLine(), EFI_IFR_NOT_OP); >>
+  ) |
+  (
+  LEOPID:LessEqual
+  VAL5:Number                             << WriteWord (GetNumber (VAL5->getText(), VAL5->getLine(), 2));
+                                             WriteOpByte (LEOPID->getLine(), EFI_IFR_GT_OP);
+                                             WriteOpByte (LEOPID->getLine(), EFI_IFR_NOT_OP); >>
+  )
+  ;
+
+//*****************************************************************************
+//
+// compareVfrStructFieldNameNL0 is the combination of compare operation and  vfrStructFieldNameNL[0]
+//
+compareVfrStructFieldNameNL0 :
+  (
+  "=="                                    << mIdEqIdStmt = 1; >>
+  vfrStructFieldNameNL[0]                 << mIdEqIdStmt = 0; >>
+  ) |
+  (
+  GTOPID:GreaterThan                      << mIdEqIdStmt = 1; >>
+  vfrStructFieldNameNL[0]                 << mIdEqIdStmt = 0;
+                                             WriteOpByte (GTOPID->getLine(), EFI_IFR_GT_OP); >>
+  ) |
+  (
+  GEOPID:GreaterEqual                     << mIdEqIdStmt = 1; >>
+  vfrStructFieldNameNL[0]                 << mIdEqIdStmt = 0;
+                                             WriteOpByte (GEOPID->getLine(), EFI_IFR_GE_OP); >>
+  ) |
+  (
+  LTOPID:LessThan                       << mIdEqIdStmt = 1; >>
+  vfrStructFieldNameNL[0]                 << mIdEqIdStmt = 0;
+                                             WriteOpByte (LTOPID->getLine(), EFI_IFR_GE_OP);
+                                             WriteOpByte (LTOPID->getLine(), EFI_IFR_NOT_OP); >>
+  ) |
+  (
+  LEOPID:LessEqual                      << mIdEqIdStmt = 1; >>
+  vfrStructFieldNameNL[0]                 << mIdEqIdStmt = 0;
+                                             WriteOpByte (LEOPID->getLine(), EFI_IFR_GT_OP);
+                                             WriteOpByte (LEOPID->getLine(), EFI_IFR_NOT_OP); >>
+  )
+  ;
+  
+
+ideqvallist : 
+  OPID:IdEqValList                        << WriteOpByte (OPID->getLine(), EFI_IFR_EQ_ID_LIST_OP); >>
+  vfrStructFieldName[0] 
+  "=="
+  ( VAL:Number                            << QueueIdEqValList (GetNumber (VAL->getText(), VAL->getLine(), 2)); >> ) +
+                                          << FlushQueueIdEqValList(); >>
+  ;
+    
+vfrStatementGoto : 
+  << UINT32 LineNum, KeyValue = 0; ResetFlags (); >>
+  IDG:Goto                          << WriteOpByte (IDG->getLine(), EFI_IFR_REF_OP); >>
+  VAL:Number  ","                   << WriteWord (GetNumber (VAL->getText(), VAL->getLine(), 2)); 
+                                       AddGotoReference (GetNumber (VAL->getText(), VAL->getLine(), 2), VAL->getLine());
+                                    >>
+  KP:Prompt   "=" getStringId ","   << LineNum = KP->getLine();  >>
+  Help        "=" getStringId
+  { 
+    "," 
+    FF:Flags  "=" flagsField ( "\|" flagsField )*  << LineNum = FF->getLine(); >>
+  }
+  {
+    "," Key   "=" KNUM:Number       << LineNum = KNUM->getLine(); KeyValue = GetNumber(KNUM->getText(), LineNum, 2); >>
+  }
+                                    << WriteFlagsKey (KeyValue, LineNum); >>
+  ";"
+  ;
+    
+vfrStatementHidden : 
+  IDH:Hidden                  << WriteOpByte (IDH->getLine(), EFI_IFR_HIDDEN_OP); >>
+  Value "="
+  VAL:Number ","              << WriteWord (GetNumber (VAL->getText(), VAL->getLine(), 2)); >>
+  Key "="
+  KVAL:Number                 << WriteWord (GetNumber (KVAL->getText(), KVAL->getLine(), 2)); >>
+  ";"
+  ;    
+
+//*****************************************************************************
+//
+// PARSE:
+//   suppressif <boolean_expression> { grayoutif } <statements>+ endif;
+// Note:
+//   You can have: suppressif:grayoutif:statements:endif
+//                 suppressif:grayoutif:endif                  -- serves no purpose
+//                 suppressif:statements:endif
+//                 suppressif:endif                            -- serves no purpose
+//
+vfrStatementSuppressIf : 
+  << ResetFlags (); >>
+  OPID:SuppressIf                     << WriteOpByte (OPID->getLine(), EFI_IFR_SUPPRESS_IF_OP); SetIfStart (OPID->getLine()); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* ","
+  }
+  << WriteFlags (); >> //  write the flags field 
+  vfrBooleanExpression
+  ";"
+  { suppressIfGrayOutIf } ( suppressIfAndGrayoutIfSubstatements )+
+  ENDOP:EndIf ";"                     << WriteOpByte (ENDOP->getLine(), EFI_IFR_END_IF_OP); SetIfStart (0); >>
+  ;
+
+//
+// This is the form for a grayoutif nested in a suppressif statement
+//
+suppressIfGrayOutIf :
+  << ResetFlags (); >>
+  OPID:GrayOutIf                      << WriteOpByte (OPID->getLine(), EFI_IFR_GRAYOUT_IF_OP); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* "," 
+  }
+  << WriteFlags (); >> //  write the flags field
+  vfrBooleanExpression
+  ";"
+  ; 
+
+//*****************************************************************************
+//
+// PARSE:
+//   grayoutif { flags = n, } <boolean_expression> endif;
+// Note:
+//   You can have: grayoutif:suppressif:statements:endif
+//                 grayoutif:statements:endif
+//
+//
+vfrStatementGrayOutIf :
+  << ResetFlags (); >>
+  OPID:GrayOutIf                      << WriteOpByte (OPID->getLine(), EFI_IFR_GRAYOUT_IF_OP); SetIfStart (OPID->getLine()); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* "," 
+  }
+  << WriteFlags (); >> //  write the flags field
+  vfrBooleanExpression
+  ";"
+  { grayoutIfSuppressIf } ( suppressIfAndGrayoutIfSubstatements )+ 
+  ENDOP:EndIf ";"                     << WriteOpByte (ENDOP->getLine(), EFI_IFR_END_IF_OP); SetIfStart (0); >>
+  ;
+
+//
+// This is the format for a suppressif nested in a grayoutif
+//
+grayoutIfSuppressIf : 
+  << ResetFlags (); >>
+  OPID:SuppressIf                     << WriteOpByte (OPID->getLine(), EFI_IFR_SUPPRESS_IF_OP); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* ","
+  }
+  << WriteFlags (); >> //  write the flags field
+  vfrBooleanExpression
+  ";"
+  ;
+
+//
+// These are the VFR statements that are valid inside a suppressif or grayoutif statement.
+//
+suppressIfAndGrayoutIfSubstatements :
+  vfrStatementOneOf           |
+  vfrStatementTextText        |
+  vfrStatementCheckBox        |
+  vfrStatementNumeric         |
+  vfrStatementDate            |
+  vfrStatementTime            |
+  vfrStatementPassword        |
+  vfrStatementString          |
+  vfrStatementHidden          |
+  vfrStatementGoto            | 
+  vfrStatementLabel           |
+  vfrStatementInventory       |
+  vfrStatementOrderedList     |
+  vfrStatementSaveRestoreDefaults
+  ; 
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//    password  varid    = MyNvData.Password,
+//              prompt   = STRING_TOKEN(STR_PASSWORD_PROMPT),
+//              help     = STRING_TOKEN(STR_PASSWORD_HELP),
+//              minsize  = 6,
+//              maxsize  = 20,
+//              encoding = 1,
+//    endpassword; 
+  
+vfrStatementPassword : 
+  << UINT32 KeyValue = 0; UINT32 LineNum; ResetFlags (); >>
+  IDPW:Password                       << WriteOpByte (IDPW->getLine(), EFI_IFR_PASSWORD_OP); >>
+  VarId       "=" vfrStructFieldNameArray[0] ","
+  Prompt      "=" getStringId ","
+  KH:Help     "=" getStringId ","    << LineNum = KH->getLine(); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* ","  << LineNum = FF->getLine(); >>
+  }
+  {
+    Key "=" KNUM:Number ","           << LineNum = KNUM->getLine(); KeyValue = GetNumber(KNUM->getText(), LineNum, 2); >>
+  }
+                                      << WriteFlagsKey (KeyValue, LineNum); >>
+  MinSize   "=" MIN:Number ","        << WriteByte (GetNumber (MIN->getText(), MIN->getLine(), 1), 0); >>
+  MaxSize   "=" MAX:Number ","        << WriteByte (GetNumber (MAX->getText(), MAX->getLine(), 1), 0); >>
+  Encoding  "=" ENC:Number ","        << WriteWord (GetNumber (ENC->getText(), ENC->getLine(), 2)); >>
+  EndPassword  ";"              
+  ;
+
+//*****************************************************************************
+//
+//  PARSE:
+//
+//    string    varid    = MyNv.String,
+//              prompt   = STRING_TOKEN(STR_STRING_PROMPT),
+//              help     = STRING_TOKEN(STR_STRING_HELP),
+//              flags    = INTERACTIVE,
+//              key      = 0x1234,
+//              minsize  = 6,
+//              maxsize  = 0x14,
+//    endstring; 
+//
+// Since flags and key are optional, we can't use Flags->getLine(). Therefore for error
+// reporting we save the line number of the "help" keyword.
+//
+vfrStatementString : 
+  << unsigned int KeyValue = 0; UINT32 LineNum; ResetFlags (); >>
+  IDS:String                                << WriteOpByte (IDS->getLine(), EFI_IFR_STRING_OP); >>
+  VarId     "=" vfrStructFieldNameArray[0] ","
+  Prompt    "=" getStringId ","
+  KH:Help   "=" getStringId ","             << LineNum = KH->getLine(); >>
+  { 
+    FF:Flags "=" 
+    flagsField ( "\|" flagsField )*         << LineNum = FF->getLine(); >>
+    "," 
+  }
+  {
+    Key "=" KNUM:Number ","                 << LineNum = KNUM->getLine(); KeyValue = GetNumber(KNUM->getText(), LineNum, 2); >>
+  }
+                                            << WriteFlagsKey (KeyValue, LineNum); >>
+  MinSize   "=" MIN:Number ","              << WriteByte (GetNumber (MIN->getText(), MIN->getLine(), 1), 0);  >>
+  MaxSize   "=" MAX:Number ","              << WriteByte (GetNumber (MAX->getText(), MAX->getLine(), 1), 0); >>
+  EndString  ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//    numeric varid   = MyIfrNVData.HowOldAreYouInYears, 
+//            prompt  = STRING_TOKEN(STR_NUMERIC_PROMPT),
+//            help    = STRING_TOKEN(STR_NUMERIC_HELP),
+//            flags   = INTERACTIVE,  // flags is optional
+//            key     = 0x1234,       // key is optional if (flags & INTERACTIVE = 0)
+//            minimum = 0x0,
+//            maximum = 0xf0,
+//            step    = 1,            // step is option, and step=1 if not specified
+//            default = 0;            // default is optional, and default=minimum if not specified
+//    endnumeric;
+//
+// Make flags and key optional. However if flags includes INTERACTIVE, then a key is required.
+// That check is done in WriteFlagsKey() function.
+//
+vfrStatementNumeric :  
+  << UINT32 LineNum, KeyValue = 0; ResetFlags (); >>
+  IDN:Numeric                         << WriteOpByte (IDN->getLine(), EFI_IFR_NUMERIC_OP); >>
+  VarId     "=" vfrStructFieldName[2] ","
+  Prompt    "=" getStringId ","
+  KH:Help   "=" getStringId ","       << LineNum = KH->getLine(); >>
+  { 
+    FF:Flags "=" flagsField ( "\|" flagsField )* ","     << LineNum = FF->getLine (); >>
+  }
+  {
+    Key "=" KNUM:Number  ","          << LineNum = KNUM->getLine(); KeyValue = GetNumber(KNUM->getText(), LineNum, 2); >>
+  }
+                                      << WriteFlagsKey (KeyValue, LineNum); >>
+  minMaxStepDefault                   
+  EndNumeric ";"                      << WriteMinMaxStepDefault (); >>
+  ;
+
+//
+// Parse minimum/maximum/step/default statements. Special cases:
+//   - if step not specified, then the value is 1
+//   - if default not specified, then the value is the min value specified
+//   - if max < min, print a warning and swap the values (changes default too)
+//
+minMaxStepDefault :
+  << InitMinMaxStepDefault (); >>
+  Minimum   "=" MIN:Number ","        << SetMinMaxStepDefault (GetNumber (MIN->getText(),  MIN->getLine(), 2), 0, MIN->getLine()); >>
+  Maximum   "=" MAX:Number ","        << SetMinMaxStepDefault (GetNumber (MAX->getText(),  MAX->getLine(), 2), 1, MAX->getLine()); >>
+  { Step    "=" STEP:Number ","       << SetMinMaxStepDefault (GetNumber (STEP->getText(), STEP->getLine(), 2), 2, STEP->getLine()); >> }
+  { Default "=" DEF:Number ","        << SetMinMaxStepDefault (GetNumber (DEF->getText(),  DEF->getLine(), 2), 3, DEF->getLine()); >> }
+  ;
+
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//    date    year varid  = Date.Year,                        // "Date.Year" is a special case we recognize
+//            prompt      = STRING_TOKEN(STR_DATE_PROMPT),
+//            help        = STRING_TOKEN(STR_DATE_YEAR_HELP),
+//            minimum     = 1939,
+//            maximum     = 2101,
+//            step        = 1,
+//            default     = 1964,
+//
+//            month varid = Date.Month,    
+//            prompt      = STRING_TOKEN(STR_DATE_PROMPT),
+//            help        = STRING_TOKEN(STR_DATE_MONTH_HELP),
+//            minimum     = 1,
+//            maximum     = 12,
+//            step        = 1,
+//            default     = 1,
+//
+//            day varid   = Date.Day,
+//            prompt      = STRING_TOKEN(STR_DATE_PROMPT),
+//            help        = STRING_TOKEN(STR_DATE_DAY_HELP),
+//            minimum     = 1,
+//            maximum     = 31,
+//            step        = 0x1,
+//            default     = 1,
+//
+//    enddate;
+//  
+vfrStatementDate :  
+  Date                            
+  IDY:Year VarId "="                  << WriteOpByte (IDY->getLine(), EFI_IFR_DATE_OP); >>
+  vfrStructFieldName[2] "," 
+  dateTimeSubStatement                    
+  IDM:Month VarId "="                 << WriteOpByte (IDM->getLine(), EFI_IFR_DATE_OP); >>
+  vfrStructFieldName[2] "," 
+  dateTimeSubStatement                    
+  IDD:Day VarId "="                   << WriteOpByte (IDD->getLine(), EFI_IFR_DATE_OP); >> 
+  vfrStructFieldName[2] ","  
+  dateTimeSubStatement    
+  EndDate ";"
+  ;
+  
+vfrStatementTime :  
+  Time                            
+  IDH:Hour VarId "="                  << WriteOpByte (IDH->getLine(), EFI_IFR_TIME_OP); >>
+  vfrStructFieldName[2] ","  
+  dateTimeSubStatement                    
+  IDM:Minute VarId "="                << WriteOpByte (IDM->getLine(), EFI_IFR_TIME_OP); >>
+  vfrStructFieldName[2] "," 
+  dateTimeSubStatement                    
+  IDS:Second VarId "="                << WriteOpByte (IDS->getLine(), EFI_IFR_TIME_OP); >>
+  vfrStructFieldName[2] "," 
+  dateTimeSubStatement
+  EndTime ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   text  text = STRING_ID;
+//   text  text = STRING_ID, text = STRING_ID;
+//   text  text = STRING_ID, text = STRING_ID, flags = x, key = y;
+//
+vfrStatementTextText :
+  << ResetFlags (); >>
+  IDT:Text                            << WriteOpByte (IDT->getLine(), EFI_IFR_TEXT_OP); >>
+  Help "=" getStringId ","
+  Text "=" 
+  getStringId                         // writes string identifier
+  { "," Text "=" getStringId
+    "," Flags "=" flagsField ( "\|" flagsField )*  << WriteFlags (); >>
+    "," 
+    Key "=" KNUM:Number               << WriteWord (GetNumber(KNUM->getText(), KNUM->getLine(), 2)); >>
+  }
+  ";" 
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   inventory help = ID, text = ID;
+//   inventory help = ID, text = id, text = ID;
+//
+vfrStatementInventory :
+  IDI:Inventory                        << WriteOpByte (IDI->getLine(), EFI_IFR_INVENTORY_OP); >>
+  Help        "=" getStringId ","
+  Text        "=" getStringId                 // writes string identifier
+  { "," Text  "=" getStringId
+  }
+  ";" 
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//    restore defaults,
+//      formid  = 4,
+//      prompt  = STRING_TOKEN(STR_RESTORE_DEFAULTS_PROMPT),
+//      help    = STRING_TOKEN(STR_RESTORE_DEFAULTS_HELP),
+//      flags   = 0,
+//      key     = 0;
+//
+//    save defaults,
+//      formid  = 4,
+//      prompt  = STRING_TOKEN(STR_SAVE_DEFAULTS_PROMPT),
+//      help    = STRING_TOKEN(STR_SAVE_DEFAULTS_HELP),
+//      flags   = 0,
+//      key     = 0;
+//
+vfrStatementSaveRestoreDefaults : 
+  << unsigned int KeyValue = 0; UINT32 LineNum; ResetFlags (); >>
+  ( IDS:Save                            << WriteOpByte (IDS->getLine(), EFI_IFR_SAVE_DEFAULTS_OP); >>
+  | IDR:Restore                         << WriteOpByte (IDR->getLine(), EFI_IFR_RESTORE_DEFAULTS_OP); >>
+  )
+  Defaults ","
+  FormId    "=" FRMID:Number  ","       << WriteWord (GetNumber (FRMID->getText(), FRMID->getLine(), 2)); 
+                                           AddGotoReference (GetNumber (FRMID->getText(), FRMID->getLine(), 2), FRMID->getLine());
+                                        >>
+  Prompt    "=" getStringId ","
+  KH:Help   "=" getStringId             << LineNum = KH->getLine(); >>
+  { 
+    "," FF:Flags "=" flagsField ( "\|" flagsField )*  << LineNum = FF->getLine(); >>
+  }
+  {
+    "," Key "=" KNUM:Number             << LineNum = KNUM->getLine(); KeyValue = GetNumber(KNUM->getText(), LineNum, 2); >>
+  }
+                                        << WriteFlagsKey (KeyValue, LineNum); >>
+  ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   flags = 0x10 | DEFAULT | MANUFACTURING | INTERACTIVE | NV_ACCESS | RESET_REQUIRED | LATE_CHECK
+//
+// 
+flagsField :
+  VAL:Number                          << SetFlags (GetNumber(VAL->getText(), VAL->getLine(), 4), VAL->getLine()); >>
+  | IF:InteractiveFlag                << SetFlags (EFI_IFR_FLAG_INTERACTIVE, IF->getLine());    >>
+  | MF:ManufacturingFlag              << SetFlags (EFI_IFR_FLAG_MANUFACTURING, MF->getLine());  >>
+  | DF:DefaultFlag                    << SetFlags (EFI_IFR_FLAG_DEFAULT, DF->getLine());        >>
+  | NV:NVAccessFlag                   << SetFlags (EFI_IFR_FLAG_NV_ACCESS, NV->getLine());      >>
+  | RR:ResetRequiredFlag              << SetFlags (EFI_IFR_FLAG_RESET_REQUIRED, RR->getLine()); >>
+  | LC:LateCheckFlag                  << SetFlags (EFI_IFR_FLAG_LATE_CHECK, LC->getLine());     >>
+  ;
+
+dateTimeSubStatement :
+  Prompt  "=" getStringId ","
+  Help    "=" getStringId ","
+                                      << WriteByte (0, 0); WriteWord (0); >> // bogus flags and key
+  minMaxStepDefault                   << WriteMinMaxStepDefault (); >>
+  ;
+  
+vfrStatementCheckBox :  
+  << UINT32 LineNum, KeyValue = 0; ResetFlags (); >>
+  IDCB:CheckBox                       << WriteOpByte (IDCB->getLine(), EFI_IFR_CHECKBOX_OP); >>
+  VarId     "=" vfrStructFieldName[1] ","
+  Prompt    "=" getStringId ","
+  Help      "=" getStringId ","
+  FF:Flags  "=" flagsField ( "\|" flagsField )*  "," << LineNum = FF->getLine(); >>
+  { 
+    Key "=" KV:Number  ","           << LineNum = KV->getLine(); KeyValue = GetNumber(KV->getText(), LineNum, 2); >>
+  }
+                                     << WriteFlagsKey (KeyValue, LineNum); >>
+  EndCheckBox ";"
+  ;
+     
+vfrStatementSubTitle :
+  IDS:Subtitle Text "="               << WriteOpByte (IDS->getLine(), EFI_IFR_SUBTITLE_OP); >>
+  getStringId                         // writes string indentifier
+  ";"
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//    banner 
+//      title = STRING_TOKEN(STR_BANNER_TITLE),
+//      line  1,
+//      align center;     // or left or right
+//
+//    banner, 
+//      title = STRING_TOKEN(STR_BANNER_TITLE), timeout = 100;
+//
+vfrStatementBanner :
+  IDB:Banner { "," }                    << WriteOpByte (IDB->getLine(), EFI_IFR_BANNER_OP); >>
+  Title "=" getStringId ","
+  ( 
+    Line VAL:Number ","                 << WriteWord (GetNumber(VAL->getText(), VAL->getLine(), 2)); >>
+    Align 
+    ( Left                              << WriteByte (EFI_IFR_BANNER_ALIGN_LEFT, 0); >>
+    | Center                            << WriteByte (EFI_IFR_BANNER_ALIGN_CENTER, 0); >>
+    | Right                             << WriteByte (EFI_IFR_BANNER_ALIGN_RIGHT, 0); >>
+    ) ";"
+  |
+    Timeout "=" TO:Number ";"           << WriteWord (GetNumber(TO->getText(), TO->getLine(), 2)); >>
+                                        << WriteByte (EFI_IFR_BANNER_TIMEOUT, 0); >>
+  )
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   oneof  varid       = MyNv.OneOfData,
+//          prompt      = STRING_TOKEN(STR_ONE_OF_PROMPT),
+//          help        = STRING_TOKEN(STR_ONE_OF_HELP),
+//          option text = STRING_TOKEN(STR_ONE_OF_TEXT), 
+//          value       = 0, 
+//          flags       = DEFAULT | INTERACTIVE;
+//
+// supressif/grayoutif are supported inside oneof stmt.
+// We do not restrict the number of oneOfOptionText to >=2, but >=1.
+// The situation that all oneOfOptionText are suppressed is also possiable.
+//
+vfrStatementOneOf :
+  << ResetFlags (); >>
+  IDOO:OneOf                              << WriteOpByte (IDOO->getLine(), EFI_IFR_ONE_OF_OP); >>
+  VarId   "=" vfrStructFieldName[2] ","       
+  Prompt  "=" getStringId  ","           // writes string identifier
+  Help    "=" getStringId  ","           // writes string identifier
+  ( oneOfOptionText )+                   // there must be at least 1 option to be choosed, not 2.
+  IDEOO:EndOneOf   ";"                    << TestOneOfFlags (IDEOO->getLine()); WriteOpByte (IDEOO->getLine(), EFI_IFR_END_ONE_OF_OP); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//  
+//   orderedlist  varid       = MyNv.OrderedListData,
+//                prompt      = STRING_TOKEN(STR_ORDERED_LIST_PROMPT),
+//                help        = STRING_TOKEN(STR_ORDERED_LIST_HELP),  
+//                option text = STRING_TOKEN(STR_ORDERED_LIST_TEXT), value = 0, flags = INTERACTIVE;
+//                -- additional option text -- 
+//   endlist;
+//
+vfrStatementOrderedList :
+  << ResetFlags (); InitOrderedList(); >>
+  IDOL:OrderedList                       << WriteOpByte (IDOL->getLine(), EFI_IFR_ORDERED_LIST_OP); >>
+  VarId   "=" vfrStructFieldNameArray[1] ","       
+  Prompt  "=" getStringId  ","           // writes string identifier
+  Help    "=" getStringId  ","           // writes string identifier
+  orderedListOptionText ( orderedListOptionText )+
+  IDEOL:EndList   ";"                    << WriteOpByte (IDEOL->getLine(), EFI_IFR_END_OP); EndOrderedList(IDEOL->getLine()); >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   option text = STRING_TOKEN(STRING_ID), value = 0 flags = 99;
+//
+// Differs from the oneOfOptionText in that we don't allow the DEFAULT flag to
+// be set, and value cannot be 0.
+//
+orderedListOptionText :
+  << UINT32 KeyValue = 0; >>
+  IDO:Option                          << WriteOpByte (IDO->getLine(), EFI_IFR_ONE_OF_OPTION_OP); >>
+  Text      "=" getStringId ","       // writes string identifier
+  Value     "=" WVAL:Number ","       << 
+                                          if (GetNumber(WVAL->getText(), WVAL->getLine(), 2) == 0) {
+                                            PrintErrorMessage (WVAL->getLine(), "value=0 is invalid for ordered lists", NULL); 
+                                          } else {
+                                            WriteWord (GetNumber(WVAL->getText(), WVAL->getLine(), 2)); 
+                                          }
+                                      >>
+  FF:Flags  "=" orderedListFlagsField  
+                ("\|" orderedListFlagsField )*                   
+  { 
+    "," Key "=" KV:Number             << KeyValue = GetNumber (KV->getText(), KV->getLine(), 2); >> 
+  }
+                                      << WriteFlagsKey (KeyValue, FF->getLine()); >>
+  ";"                                 << mOptionCount++; >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   flags = 0x10 | DEFAULT | MANUFACTURING | INTERACTIVE | NV_ACCESS | RESET_REQUIRED | LATE_CHECK
+//
+// The ordered list flags field cannot have a default.
+//
+orderedListFlagsField :
+  VAL:Number                          << SetFlags (GetNumber(VAL->getText(), VAL->getLine(), 4), VAL->getLine()); >>
+  | IF:InteractiveFlag                << SetFlags (EFI_IFR_FLAG_INTERACTIVE, IF->getLine());    >>
+  | MF:ManufacturingFlag              << SetFlags (EFI_IFR_FLAG_MANUFACTURING, MF->getLine());  >>
+  | NV:NVAccessFlag                   << SetFlags (EFI_IFR_FLAG_NV_ACCESS, NV->getLine());      >>
+  | RR:ResetRequiredFlag              << SetFlags (EFI_IFR_FLAG_RESET_REQUIRED, RR->getLine()); >>
+  | LC:LateCheckFlag                  << SetFlags (EFI_IFR_FLAG_LATE_CHECK, LC->getLine());     >>
+  | DF:DefaultFlag                    << PrintWarningMessage (DF->getLine(), "DEFAULT flag not valid for ordered lists", NULL); >>
+  ;
+
+//
+// Parse references to VFR structure field names of form "MyNvStructure.Field". 
+// This implementation is specific to strings, passwords, and references in an 
+// ordered list statement because we want to specify the size of the entire 
+// field, rather than just one element. Then call a function to write out its 
+// offset and length.
+//
+vfrStructFieldNameArray[int FieldWidth] :
+  << int ArrayIndex = 1; char IsArrayIndex = 0; >>
+  SName:StringIdentifier 
+  "." 
+  SFieldName:StringIdentifier 
+  { OpenBracket AIndex:Number CloseBracket << ArrayIndex = GetNumber(AIndex->getText(), AIndex->getLine(), 4); IsArrayIndex = 1; >> }
+            << 
+                WriteFieldOffset (1, 
+                                  SName->getText(), 
+                                  SName->getLine(), 
+                                  SFieldName->getText(), 
+                                  SFieldName->getLine(),
+                                  ArrayIndex, 
+                                  IsArrayIndex,
+                                  FieldWidth,
+                                  1
+                                  ); 
+            >>
+  ;
+
+//
+// Parse references to VFR structure field names of form "MyNvStructure.Field",
+// then call a function to write out its offset and length.
+//
+vfrStructFieldName[int FieldWidth] :
+  << int ArrayIndex = 1; char IsArrayIndex = 0; >>
+  SName:StringIdentifier 
+  "." 
+  SFieldName:StringIdentifier 
+  { OpenBracket AIndex:Number CloseBracket << ArrayIndex = GetNumber(AIndex->getText(), AIndex->getLine(), 4); IsArrayIndex = 1; >> }
+            << 
+                WriteFieldOffset (1, 
+                                  SName->getText(), 
+                                  SName->getLine(), 
+                                  SFieldName->getText(), 
+                                  SFieldName->getLine(),
+                                  ArrayIndex, 
+                                  IsArrayIndex,
+                                  FieldWidth,
+                                  0
+                                  ); 
+            >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//
+//   MyNvStructure.FieldName[4]
+//
+// Parse references to VFR structure field names of form "MyNvStructure.Field",
+// then call a function to write out the offset with no length.
+//
+vfrStructFieldNameNL[int FieldWidth] :
+  << int ArrayIndex = 1; char IsArrayIndex = 0; >>
+  SName:StringIdentifier 
+  "." 
+  SFieldName:StringIdentifier 
+  { OpenBracket AIndex:Number CloseBracket   << ArrayIndex = GetNumber(AIndex->getText(), AIndex->getLine(), 4); IsArrayIndex = 1; >> }
+            << 
+                WriteFieldOffset (0, 
+                                  SName->getText(), 
+                                  SName->getLine(), 
+                                  SFieldName->getText(), 
+                                  SFieldName->getLine(),
+                                  ArrayIndex, 
+                                  IsArrayIndex,
+                                  FieldWidth,
+                                  0
+                                  ); 
+            >>
+  ;
+
+//*****************************************************************************
+//
+// PARSE:
+//   suppressif TRUE OR FALSE;
+//   grayoutif FALSE OR TRUE;
+//     option text = STRING_TOKEN(STRING_ID), value = 0 flags = 99;
+//     option text = STRING_TOKEN(STRING_ID2), value = 1 flags = 98;
+//   endif;
+//
+oneOfOptionText :
+  suppressIfOptionText    |
+  grayOutIfOptionText     |
+  commonOptionText
+  ;
+
+suppressIfOptionText : 
+  << ResetFlags (); >>
+  OPID:SuppressIf                     << WriteOpByte (OPID->getLine(), EFI_IFR_SUPPRESS_IF_OP); SetIfStart (OPID->getLine()); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* ","
+  }
+  << WriteFlags (); >> //  write the flags field 
+  vfrBooleanExpression
+  ";"
+  { suppressIfGrayOutIf } ( commonOptionText )+
+  ENDOP:EndIf ";"                     << WriteOpByte (ENDOP->getLine(), EFI_IFR_END_IF_OP); SetIfStart (0); >>
+  ;
+
+grayOutIfOptionText :
+  << ResetFlags (); >>
+  OPID:GrayOutIf                      << WriteOpByte (OPID->getLine(), EFI_IFR_GRAYOUT_IF_OP); SetIfStart (OPID->getLine()); >>
+  { 
+    FF:Flags  "=" flagsField ( "\|" flagsField )* "," 
+  }
+  << WriteFlags (); >> //  write the flags field
+  vfrBooleanExpression
+  ";"
+  { grayoutIfSuppressIf } ( commonOptionText )+ 
+  ENDOP:EndIf ";"                     << WriteOpByte (ENDOP->getLine(), EFI_IFR_END_IF_OP); SetIfStart (0); >>
+  ;
+
+commonOptionText : 
+  << UINT32 KeyValue = 0; >>
+  IDO:Option                      << WriteOpByte (IDO->getLine(), EFI_IFR_ONE_OF_OPTION_OP); >>
+  Text      "=" getStringId ","   // writes string identifier
+  Value     "=" WVal:Number ","   << WriteWord (GetNumber(WVal->getText(), WVal->getLine(), 2)); >>
+  FF:Flags  "=" flagsField  ("\|" flagsField )*                   
+  { 
+    "," Key "=" KV:Number         << KeyValue = GetNumber (KV->getText(), KV->getLine(), 2); >> 
+  }
+                                  << WriteFlagsKey (KeyValue, FF->getLine()); >>
+  ";"                             << mOptionCount++; >>
+  ;
+
+//
+// Gets a string identifier. It must be a numeric value of form:
+// 
+//   STRING_TOKEN(100)
+//
+getStringId :
+  << unsigned short StrId; >>
+  StringToken OpenParen
+  IdVal:Number             << StrId = GetNumber (IdVal->getText(), IdVal->getLine(), 2); WriteStringIdWord (StrId); >> 
+  CloseParen
+  ;
+
+//******************************************************************************
+//
+// Parser class definition. 
+//  
+class EfiVfrParser {
+<<
+//
+// Parser definitions go here    
+//
+private:
+  STRUCT_DEFINITION   *mFirstStructDefinition;
+  STRUCT_DEFINITION   *mLastStructDefinition;
+  INT32               mNvDataStructSize;                    
+  INT32               mNonNvDataStructSize;
+  //
+  // Flag to indicate that we're processing a ideqid VFR statement so that
+  // we can do late checks on the statement.
+  //
+  INT32               mIdEqIdStmt;
+  INT32               mLastNVVariableDataSize;
+  GOTO_REFERENCE      *mGotoReferences;
+  FORM_ID_VALUE       *mFormIdValues;
+  VfrOpcodeHandler    mOpcodeHandler;
+  UINT16_LIST         *mUint16List;
+  UINT16_LIST         *mLastUint16;
+  UINT16_LIST         *mDefinedLabels;
+  UINT16_LIST         *mDefinedVarStoreId;
+  UINT16_LIST         *mLastDefinedVarStoreId;
+  UINT32              mMinimumValue, mMaximumValue, mStepValue, mDefaultValue;
+  UINT32              mStmtFlags;
+  UINT32              mSubStmtFlags;
+  UINT32              mSubStmtFlagsLineNum;
+  EFI_GUID            mFormSetGuid;
+  UINT8               mNvDataStructDefined;
+  UINT16              mClass, mSubclass;
+  UINT32              mIfStart;
+  UINT32              mOptionCount;  // how many "option" fields in a given statement
+  UINT32              mLastVarIdSize;
+  UINT8               mOutput;
+public:        
+
+VOID 
+EfiVfrParser::SetIfStart (
+  UINT32 LineNum
+  )
+/*++
+
+Routine Description:
+  Invoked during VFR parsing when an "if" is encountered. Save the
+  source line number so we can point to it if we don't find a 
+  corresponding endif later.
+
+Arguments:
+  LineNum - source line number where the "if" was parsed.
+
+Returns:
+  None
+
+--*/
+{
+  mIfStart = LineNum;
+}
+VOID 
+EfiVfrParser::SetClass (
+  UINT32 LineNum, 
+  UINT32 Value
+  ) 
+/*++
+
+Routine Description:
+  Invoked during VFR parsing when a "class" statement is found. Check the
+  range on the class value and save it for later.
+
+Arguments:
+  LineNum - source line number where the class statement was parsed.
+  Value   - the class value
+
+Returns:
+  None
+
+--*/
+{
+  if (Value & 0xFFFF0000) {
+    PrintWarningMessage (LineNum, NULL, "class value exceeds maximum allowed");
+  }
+  mClass |= (UINT16)Value;
+}
+VOID 
+EfiVfrParser::SetSubclass (
+  UINT32 LineNum, 
+  UINT32 Value
+  ) 
+/*++
+
+Routine Description:
+  Invoked during VFR parsing when a subclass statement is found. Check the
+  range on the value and save it for later.
+
+Arguments:
+  LineNum - source line number where the class statement was parsed.
+  Value   - the subclass value from the VFR statement
+
+Returns:
+  None
+
+--*/
+{
+  if (Value & 0xFFFF0000) {
+    PrintWarningMessage (LineNum, NULL, "subclass value exceeds maximum allowed");
+  }
+  mSubclass |= (UINT16)Value;
+}
+VOID EfiVfrParser::WriteClass ()
+{
+  WriteWord (mClass);
+  mClass = 0;
+}
+VOID EfiVfrParser::WriteSubclass ()
+{
+  WriteWord (mSubclass);
+  mSubclass = 0;
+}
+VOID EfiVfrParser::WriteIfrBytes ()
+{
+  mOpcodeHandler.WriteIfrBytes ();
+}
+VOID 
+EfiVfrParser::WriteFlagsKey (
+  UINT32 KeyValue, 
+  UINT32 LineNum
+  ) 
+/*++
+
+Routine Description:
+  Write out the flags and key values from the previous VFR statement.
+  Many statements take a flags/key pair. If not specified, then 0
+  values are written out. However do not allow an interactive flags field
+  to be specified if no key value is specified. Also, if NV_ACCESS flag
+  is set but INTERACTIVE is not, then set interactive and issue a warning.
+
+Arguments:
+  KeyValue  - the key value from the VFR statement
+  LineNum   - source line number where the statement was parsed
+
+Returns:
+  None
+
+--*/
+{
+  if ((mSubStmtFlags & EFI_IFR_FLAG_INTERACTIVE) && (KeyValue == 0)) {
+    PrintErrorMessage (LineNum, NULL, "invalid or missing key value - required with INTERACTIVE");
+  }
+  if ((mSubStmtFlags & EFI_IFR_FLAG_NV_ACCESS) && !(mSubStmtFlags & EFI_IFR_FLAG_INTERACTIVE)) {
+    PrintWarningMessage (LineNum, NULL, "NV_ACCESS without INTERACTIVE has no effect -- setting INTERACTIVE");
+    mSubStmtFlags |= EFI_IFR_FLAG_INTERACTIVE;
+  }
+  WriteFlags ();
+  WriteWord (KeyValue);
+}
+VOID 
+EfiVfrParser::InitOrderedList ()
+{
+  mOptionCount = 0;
+}  
+VOID 
+EfiVfrParser::EndOrderedList (
+  UINT32 LineNum
+  )
+{
+  if (mLastVarIdSize < mOptionCount) {
+    PrintErrorMessage (LineNum, NULL, "number of options exceeds the variable store size");
+  }
+}
+VOID 
+EfiVfrParser::ResetFlags ()
+/*++
+
+Routine Description:
+
+  Flags are set for each substatement in a given one-of statement.
+  To make sure there are no conflicts, for example setting DEFAULT on
+  more than one substatement, we keep track of the flags at a statement
+  level and a substatement level. This function resets the flags so 
+  we get a fresh start.
+
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{
+  mStmtFlags = 0;
+  mSubStmtFlagsLineNum = 0;
+  mSubStmtFlags = 0;
+}
+//
+// Test validity of flags value for a one-of statement.
+//
+VOID 
+EfiVfrParser::TestOneOfFlags (
+  UINT32 LineNum
+  ) 
+{
+  //
+  // One of the fields must have had the default bit set
+  //
+  if ((mStmtFlags & EFI_IFR_FLAG_DEFAULT) == 0) {
+    PrintWarningMessage (LineNum, "default value must be specified", NULL);
+  }
+}
+VOID 
+EfiVfrParser::SetFlags (
+  UINT32 Flags, 
+  UINT32 LineNum
+  ) 
+{
+  //
+  // Check for redefinitions and invalid combinations
+  //
+  if (mStmtFlags & Flags & EFI_IFR_FLAG_MANUFACTURING) {
+    PrintErrorMessage (LineNum, "MANUFACTURING", "a field with this flag already defined");
+  }
+  if (mStmtFlags & Flags & EFI_IFR_FLAG_DEFAULT) {
+    PrintErrorMessage (LineNum, "DEFAULT", "a field with this flag already defined");
+  }
+  mSubStmtFlags |= Flags;
+  mSubStmtFlagsLineNum = LineNum;
+}
+VOID 
+EfiVfrParser::WriteFlags ()
+{
+  //
+  // Check value for validity
+  //
+  if (mSubStmtFlags & ~(EFI_IFR_FLAG_DEFAULT | 
+                        EFI_IFR_FLAG_MANUFACTURING | 
+                        EFI_IFR_FLAG_INTERACTIVE | 
+                        EFI_IFR_FLAG_NV_ACCESS | 
+                        EFI_IFR_FLAG_RESET_REQUIRED | 
+                        EFI_IFR_FLAG_LATE_CHECK )) {
+    PrintWarningMessage (mSubStmtFlagsLineNum, "invalid bits defined in flag", NULL);
+  }
+  WriteByte ((UINT8)mSubStmtFlags, 'F');
+  //
+  // We can now clear the substatement flags
+  //
+  mStmtFlags |= mSubStmtFlags;
+  mSubStmtFlags = 0;
+}
+//
+// When we parse a min/max/step/default sequence, save off the values for
+// later use. Call this first to init the values.
+//
+VOID 
+EfiVfrParser::InitMinMaxStepDefault ()
+{
+  mMinimumValue         = 0;
+  mMaximumValue         = 0;
+  mStepValue            = 1;
+  mDefaultValue         = 0;
+}  
+VOID 
+EfiVfrParser::WriteMinMaxStepDefault ()
+{
+  WriteWord (mMinimumValue);
+  WriteWord (mMaximumValue);
+  WriteWord (mStepValue);
+  WriteWord (mDefaultValue);
+}  
+VOID 
+EfiVfrParser::SetMinMaxStepDefault (
+  UINT16  Value, 
+  INT32   MMSD, 
+  INT32   LineNum
+  ) 
+{
+  UINT16 TempValue;
+  //
+  // Min specified
+  //
+  if (MMSD == 0) {
+    mMinimumValue = Value;
+    mDefaultValue = Value;
+  //
+  // Max specified
+  //
+  } else if (MMSD == 1) {
+    mMaximumValue = Value;
+    //
+    // If min > max, then swap the values. That includes resetting the default
+    // value as well.
+    //
+    if (mMinimumValue > mMaximumValue) {
+      PrintWarningMessage (LineNum, NULL, "maximum < minimum");      
+      TempValue = Value;
+      mMaximumValue = mMinimumValue;
+      mMinimumValue = TempValue;
+      mDefaultValue = mMinimumValue;
+    }
+  //
+  // Step specified
+  //
+  } else if (MMSD == 2) { 
+    mStepValue = Value;
+  //
+  // Default specified. Make sure min <= default <= max.
+  //
+  } else if (MMSD == 3) {
+    mDefaultValue = Value;
+    if (mMinimumValue > Value) {
+      PrintErrorMessage (LineNum, NULL, "default value < minimum value");
+    } else if (Value > mMaximumValue) {
+      PrintErrorMessage (LineNum, NULL, "default value > maximum value");
+    }
+  } else {
+    PrintErrorMessage (LineNum, "application error", "internal MMSD error");    
+  }
+}
+VOID 
+EfiVfrParser::AddLabel (
+  UINT32 LabelNumber, 
+  UINT32 LineNum
+  ) 
+{
+  UINT16_LIST *Label;
+
+  //
+  // Added a label from the user VFR script. Make sure they haven't already 
+  // defined the same label elsewhere
+  //
+  for (Label = mDefinedLabels; Label != NULL; Label = Label->Next) {
+    if (Label->Value == LabelNumber) {
+      PrintErrorMessage (LineNum, NULL, "label already defined");
+      PrintErrorMessage (Label->LineNum, NULL, "previous definition of redefined label");
+      break;
+    }
+  }
+  Label = (UINT16_LIST *)malloc (sizeof (UINT16_LIST));
+  if (Label == NULL) {
+    PrintErrorMessage (0, NULL, "memory allocation error");
+    return;
+  }
+  memset ((char *)Label, 0, sizeof (UINT16_LIST));
+  Label->Value = LabelNumber;
+  Label->LineNum = LineNum;
+  Label->Next = mDefinedLabels;
+  mDefinedLabels = Label;
+}
+VOID 
+EfiVfrParser::QueueIdEqValList (
+  UINT16 Value
+  )
+{
+  UINT16_LIST   *U16;
+  
+  U16 = (UINT16_LIST *)malloc (sizeof (UINT16_LIST));
+  if (U16 == NULL) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failed");
+  } else {
+    memset ((char *)U16, 0, sizeof (UINT16_LIST));
+    U16->Value = Value;
+    if (mUint16List == NULL) {
+      mUint16List = U16;
+    } else {
+      mLastUint16->Next = U16;
+    } 
+    mLastUint16 = U16;
+  }
+}    
+VOID 
+EfiVfrParser::FlushQueueIdEqValList ()
+{
+  UINT32 Count;
+  
+  //
+  // We queued up a list of IdEqValList items. The IFR requires a count
+  // followed by the actual values. Do it.
+  //
+  Count = 0;
+  mLastUint16 = mUint16List;
+  while (mLastUint16 != NULL) {
+    Count++;
+    mLastUint16 = mLastUint16->Next;
+  }
+  // BUGBUG -- check for more than 16K items?
+  WriteWord (Count);
+  //
+  // Now write the values.
+  //
+  mLastUint16 = mUint16List;
+  while (mLastUint16 != NULL) {
+    WriteWord ((UINT32)mLastUint16->Value);
+    mLastUint16 = mLastUint16->Next;
+  }
+  //
+  // Free up the list
+  //  
+  mLastUint16 = mUint16List;
+  while (mUint16List != NULL) {
+    mLastUint16 = mUint16List->Next;
+    free (mUint16List);
+    mUint16List = mLastUint16;
+  }
+}
+VOID 
+EfiVfrParser::PrintErrorMessage (
+  UINT32              LineNum,
+  CHAR8               *Msg1,
+  CHAR8               *Msg2
+  )
+{
+  char *FileName;
+  
+  if (LineNum != 0) {
+    FileName = ConvertLineNumber ((UINT32 *)&LineNum);
+    Error (FileName, LineNum, 0, Msg1, Msg2);
+  } else {
+    Error (PROGRAM_NAME, 0, 0, Msg1, Msg2);
+  }
+}
+VOID 
+EfiVfrParser::PrintWarningMessage (
+  UINT32              LineNum,
+  CHAR8               *Msg1,
+  CHAR8               *Msg2
+  )
+{
+  char *FileName;
+  
+  if (LineNum != 0) {
+    FileName = ConvertLineNumber ((UINT32 *)&LineNum);
+    Warning (FileName, LineNum, 0, Msg1, Msg2);
+  } else {
+    Warning (PROGRAM_NAME, 0, 0, Msg1, Msg2);
+  }
+}
+VOID 
+EfiVfrParser::syn (
+  ANTLRAbstractToken  *Tok, 
+  ANTLRChar           *Egroup, 
+  SetWordType         *Eset, 
+  ANTLRTokenType      ETok, 
+  INT32               Huh
+  )
+/*++
+
+Routine Description:
+  Called by the parser base class as a result of parse syntax errors.
+
+Arguments:
+  Tok     - token that caused the error
+  Egroup  - not sure
+  Eset    - index in token table of the expected token
+  Huh     - not sure
+
+Returns:
+  NA
+
+--*/
+{
+  char    *FileName;
+  UINT32  LineNum;
+  
+  LineNum = Tok->getLine ();
+  FileName = ConvertLineNumber ((UINT32 *)&LineNum);
+  //
+  // Sometimes the token number is 0, in which case I don't know what to
+  // print.
+  //
+  if (ETok == 0) {
+    Error (FileName, LineNum, 0, Tok->getText (), "unexpected token");
+  } else {
+    //
+    // If we were expecting an endif, then report the line where the corresponding
+    // IF began.
+    //
+    if ((strcmp (_token_tbl[ETok], "endif") == 0) && (mIfStart != 0)) {
+      LineNum = mIfStart;
+      FileName = ConvertLineNumber (&LineNum);
+      Error (FileName, LineNum, 0, "statement missing corresponding endif", NULL);
+    } else {
+      Error (FileName, LineNum, 0, Tok->getText (), "expected %s", _token_tbl[ETok]);
+    }
+  }
+}
+
+VOID 
+EfiVfrParser::init()        
+/*++
+
+Routine Description:
+  Initializations function for our parser.
+
+Arguments:
+  None.
+
+Returns:
+  None.
+
+--*/
+{
+  ANTLRParser::init();
+
+  //
+  // Used for queuing a variable list of UINT16's
+  //
+  mUint16List               = NULL;
+  mLastUint16               = NULL;
+  mFirstStructDefinition    = NULL;
+  mLastStructDefinition     = NULL;
+  mNvDataStructSize         = 0;
+  mNonNvDataStructSize      = 0;
+  mNvDataStructDefined      = 0;
+  mGotoReferences           = NULL;
+  mFormIdValues             = NULL;
+  mDefinedLabels            = NULL;
+  mClass                    = 0;
+  mSubclass                 = 0;
+  mIfStart                  = 0;
+  mDefinedVarStoreId        = NULL;
+  mLastDefinedVarStoreId    = NULL;
+  mIdEqIdStmt               = 0;
+  mLastNVVariableDataSize   = 0;
+    
+  memset ((char *)&mFormSetGuid, 0, sizeof (EFI_GUID));
+}
+//
+// Destructor for the parser.
+//
+EfiVfrParser::~EfiVfrParser(VOID)
+{
+  Cleanup();
+}
+VOID
+EfiVfrParser::Cleanup (VOID)
+/*++
+
+Routine Description:
+  Free memory allocated during parsing
+
+Arguments:
+  None.
+
+Returns:
+  None.
+
+--*/
+{
+  STRUCT_DEFINITION         *NextStruct;
+  STRUCT_FIELD_DEFINITION   *NextField;
+  UINT8                     Buff[6];
+  UINT16_LIST               *NextU16List;
+  
+  //
+  // Free up the structure definitions if any
+  //
+  while (mFirstStructDefinition != NULL) {
+    //
+    // Free up all the fields for this struct
+    //
+    while (mFirstStructDefinition->Field != NULL) {
+      NextField = mFirstStructDefinition->Field->Next;
+      free (mFirstStructDefinition->Field->Name);
+      free (mFirstStructDefinition->Field);
+      mFirstStructDefinition->Field = NextField;
+    }
+    NextStruct = mFirstStructDefinition->Next;
+    free (mFirstStructDefinition->Name);
+    free (mFirstStructDefinition);
+    mFirstStructDefinition = NextStruct;
+  }
+  //
+  // Free up the goto references and form id defines
+  //
+  FreeGotoReferences ();
+  //
+  // Free up label list
+  //
+  while (mDefinedLabels != NULL) {
+    NextU16List = mDefinedLabels->Next;
+    delete (mDefinedLabels);
+    mDefinedLabels = NextU16List;
+  }
+  //
+  // Free up the list of defined variable storage IDs
+  //
+  while (mDefinedVarStoreId != NULL) {
+    NextU16List = mDefinedVarStoreId->Next;
+    delete (mDefinedVarStoreId);
+    mDefinedVarStoreId = NextU16List;
+  }
+}
+
+INT32 
+EfiVfrParser::AtoX (
+  CHAR8   *HexString, 
+  INT32   NumBytes, 
+  UINT32  *HexValue
+  )
+/*++
+
+Routine Description:
+  Given a pointer to a ascii hex string, convert to a number with the given
+  number of bytes.
+
+Arguments:
+  HexString   - pointer to a string of format 30BCA
+  Size        - number of bytes to convert
+  HexValue    - return result
+
+Returns:
+  The number of bytes converted.
+
+--*/
+{
+  INT32 Count;
+  INT32 Value;
+
+  *HexValue = 0;
+  Count = 0;
+  while (Count < NumBytes) {
+    if ((*HexString >= '0') && (*HexString <= '9')) {
+      Value = *HexString - '0';
+    } else if ((*HexString >= 'a') && (*HexString <= 'f')) {
+      Value = *HexString - 'a' + 10;
+    } else if ((*HexString >= 'A') && (*HexString <= 'F')) {
+      Value = *HexString - 'A' + 10;
+    } else {
+      return Count;
+    }
+    HexString++;
+    *HexValue = (*HexValue << 4) | Value;
+    if ((*HexString >= '0') && (*HexString <= '9')) {
+      Value = *HexString - '0';
+    } else if ((*HexString >= 'a') && (*HexString <= 'f')) {
+      Value = *HexString - 'a' + 10;
+    } else if ((*HexString >= 'A') && (*HexString <= 'F')) {
+      Value = *HexString - 'A' + 10;
+    } else {
+      return Count;
+    }
+    *HexValue = (*HexValue << 4) | Value;
+    HexString++;
+    Count++;
+  }
+  return Count;
+}
+VOID 
+EfiVfrParser::WriteGuidValue (
+  UINT32       TokenLineNum,
+  CHAR8        *G1, 
+  CHAR8        *G2,
+  CHAR8        *G3,
+  CHAR8        *G4,
+  CHAR8        *G5,
+  CHAR8        *G6,
+  CHAR8        *G7,
+  CHAR8        *G8,
+  CHAR8        *G9,
+  CHAR8        *G10,
+  CHAR8        *G11
+  )
+/*++
+
+Routine Description:
+  A Guid was parsed, likely of format:
+  #define MY_GUID { 0x12345678, 0xAABB, 0xCCDD, 0xEE, 0xFF, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 }
+
+  Write out the value.
+
+Arguments:
+  TokenLineNum   - line number where the guid was used
+  G1-G11         - the 11 fields of the guid value
+
+Returns:
+  None.
+
+--*/
+{
+  UINT32        Value;
+  INT32         Loop;
+
+  mFormSetGuid.Data1 = GetNumber (G1, TokenLineNum, 4);
+  mFormSetGuid.Data2 = (UINT16)GetNumber (G2, TokenLineNum, 2);
+  mFormSetGuid.Data3 = (UINT16)GetNumber (G3, TokenLineNum, 2);
+  mFormSetGuid.Data4[0] = (UINT8)GetNumber (G4, TokenLineNum, 1);
+  mFormSetGuid.Data4[1] = (UINT8)GetNumber (G5, TokenLineNum, 1);
+  mFormSetGuid.Data4[2] = (UINT8)GetNumber (G6, TokenLineNum, 1);
+  mFormSetGuid.Data4[3] = (UINT8)GetNumber (G7, TokenLineNum, 1);
+  mFormSetGuid.Data4[4] = (UINT8)GetNumber (G8, TokenLineNum, 1);
+  mFormSetGuid.Data4[5] = (UINT8)GetNumber (G9, TokenLineNum, 1);
+  mFormSetGuid.Data4[6] = (UINT8)GetNumber (G10, TokenLineNum, 1);
+  mFormSetGuid.Data4[7] = (UINT8)GetNumber (G11, TokenLineNum, 1);
+  
+  WriteDWord (mFormSetGuid.Data1, 'G');
+  WriteWord (mFormSetGuid.Data2);
+  WriteWord (mFormSetGuid.Data3);
+  WriteByte (mFormSetGuid.Data4[0], 0);
+  WriteByte (mFormSetGuid.Data4[1], 0);
+  WriteByte (mFormSetGuid.Data4[2], 0);
+  WriteByte (mFormSetGuid.Data4[3], 0);
+  WriteByte (mFormSetGuid.Data4[4], 0);
+  WriteByte (mFormSetGuid.Data4[5], 0);
+  WriteByte (mFormSetGuid.Data4[6], 0);
+  WriteByte (mFormSetGuid.Data4[7], 0);
+}
+VOID 
+EfiVfrParser::WriteFieldOffset (
+  INT8    WriteLength,
+  CHAR8   *StructName, 
+  INT32   LineNum1, 
+  CHAR8   *FieldName, 
+  INT32   LineNum2,
+  INT32   ArrayIndex,
+  INT8    IsArrayIndex,
+  INT32   FieldWidth,
+  INT8    WriteArraySize
+  ) 
+/*++
+
+Routine Description:
+  A VFR script referenced the NV store structure. Given the structure's name
+  and the field's name, write the offset of the field to the output file.
+
+Arguments:
+  WriteLength     - write the field length byte out
+  StructName      - name of the NV store structure
+  LineNum1        - line number in the VFR where we are (for error printing)
+  FieldName       - the name of the field within the NV store structure
+  LineNum2        - line number in the VFR where FieldName is referenced 
+  ArrayIndex      - the index specified, for example NV_DATA.Field[ArrayIndex]
+  IsArrayIndex    - non-zero if an array index was specified
+  FieldWidth      - expected size for the Field (1 byte? 2 bytes?)
+  WriteArraySize  - write the size of the entire field, not the size of a single element
+
+Returns:
+  None.
+
+--*/
+{
+  STRUCT_DEFINITION         *StructDef;
+  STRUCT_FIELD_DEFINITION   *FieldDef;
+  UINT32                    Offset;
+  UINT32                    VarSize;
+  CHAR8                     Msg[100];
+  //
+  // If we're writing an array size, then they better have referenced the field without an
+  // index. 
+  //
+  if (WriteArraySize && IsArrayIndex) {
+    sprintf (Msg, "array index specified where an array is required");
+    PrintErrorMessage (LineNum2, FieldName, Msg);
+    return;
+  }
+  //
+  // Look through our list of known structures for a match
+  //
+  for (StructDef = mFirstStructDefinition; StructDef != NULL; StructDef = StructDef->Next) {
+    //
+    // Check for matching structure name
+    //
+    if (strcmp (StructDef->Name, StructName) == 0) {
+      //
+      // Mark it as referenced (for debug purposes only). Check the
+      // flag that indicates that we have already found a varstore VFR
+      // statement for it.
+      //
+      StructDef->Referenced++;
+      if (StructDef->VarStoreIdValid == 0) {
+        //
+        // Set it valid so we don't flag it multiple times, then emit the error
+        //
+        StructDef->VarStoreIdValid = 1;
+        PrintErrorMessage (LineNum1, StructName, "varstore statement missing for this variable store");
+      }
+      //
+      // Let the opcode-handler know which variable storage we're now using
+      //
+      if (mIdEqIdStmt) {
+        mOpcodeHandler.SetSecondaryVarStoreId (StructDef->VarStoreId);
+      } else {
+        mOpcodeHandler.SetVarStoreId (StructDef->VarStoreId);
+      }
+      //
+      // Found matching structure name. Now find the matching field name
+      //
+      for (FieldDef = StructDef->Field; FieldDef != NULL; FieldDef = FieldDef->Next) {
+        if (strcmp (FieldDef->Name, FieldName) == 0) {
+          //
+          // Make sure the variable size is valid
+          //
+          if ((FieldWidth != 0) && (FieldDef->DataSize > FieldWidth)) {
+            sprintf (Msg, "field width exceeds %d byte%c", FieldWidth, FieldWidth == 1 ? ' ' : 's');
+            PrintErrorMessage (LineNum2, FieldName, Msg);
+          }
+          //
+          // If they specified an index (MyVfrData.FieldX[10]), then make sure that the
+          // data structure was declared as an array, and that the index is in bounds.
+          // If they did not specify an index, then we'll assume 0. This is required for
+          // strings.
+          //
+          if (IsArrayIndex) {
+            VarSize = FieldDef->DataSize;
+            if (FieldDef->IsArray == 0) {
+              PrintErrorMessage (LineNum2, FieldName, "field is not declared as an array");
+              return;
+            }
+            if (FieldDef->ArrayLength < ArrayIndex) {
+              PrintErrorMessage (LineNum2, FieldName, "array index exceeds declared size of field");
+              return;
+            }
+          } else {
+            if (FieldDef->IsArray) {
+              VarSize = FieldDef->DataSize * FieldDef->ArrayLength;
+            } else {
+              VarSize = FieldDef->DataSize;
+            }
+          }
+          //
+          // If we're in the middle of a ideqid VFR statement, then this is the second
+          // variable ID that we're now processing. Make sure that its size is the same
+          // as the first variable.
+          // 
+          if (mIdEqIdStmt) {
+            if (mLastVarIdSize != VarSize) {
+              PrintErrorMessage (LineNum2, FieldName, "variables must have the same size");
+              return;
+            }
+          }
+          mLastVarIdSize = VarSize;
+          //
+          // If we're supposed to write an array size, then require it to be an array
+          //
+          if (WriteArraySize && !FieldDef->IsArray) {
+            PrintErrorMessage (LineNum2, FieldName, "array required");
+            return;
+          }
+          //
+          // Write the variable offset and size. If we're in the non-NV structure, then
+          // set the offset beyond the NV data structure size.
+          //
+          Offset = FieldDef->Offset + FieldDef->DataSize * (ArrayIndex - 1);
+          if (StructDef->IsNonNV) Offset += mNvDataStructSize; 
+          WriteWord (Offset);
+          if (WriteLength) {
+            if (WriteArraySize) {
+              if (FieldDef->DataSize * FieldDef->ArrayLength > 255) {
+                PrintErrorMessage (LineNum2, FieldName, "array size exceeds 255 maximum encoding limit");
+                return;
+              }
+              WriteByte (FieldDef->DataSize * FieldDef->ArrayLength, 0);
+            } else {
+              WriteByte (FieldDef->DataSize, 0);
+            }
+          }
+          return;
+        }
+      }
+      sprintf (Msg, "structure %s does not have a field named '%s'", StructName, FieldName);
+      PrintErrorMessage (LineNum2, Msg, NULL);
+      PrintErrorMessage (StructDef->LineNum, "see structure definition", NULL);
+      return;
+    }
+  }
+  //
+  // The structure was not found in the defined list. See if it's the "Date" structure
+  //
+  if (strcmp (StructName, "Date") == 0) {
+    //
+    // BUGBUG -- remove support for Date and Time as valid structure 
+    // names. They should use the NON_NV_DATA_MAP structure for this.
+    //
+    // Someone specified Date.Years|Months|Days
+    // BUGBUG -- define some constants for the IDs used here
+    // Length == 0 implies that this is not user NV data storage.
+    //
+    if (strcmp (FieldName, "Year") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 0);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else if (strcmp (FieldName, "Month") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 2);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else if (strcmp (FieldName, "Day") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 4);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else {
+      PrintErrorMessage (LineNum1, FieldName, "expected valid field name TheYear/TheMonth/TheDay");
+    }
+    return;
+  } else if (strcmp (StructName, "Time") == 0) {
+    //
+    // Someone specified Time.Hours|Minutes|Seconds
+    // BUGBUG -- define some constants for the IDs used here
+    //
+    if (strcmp (FieldName, "Hours") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 6);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else if (strcmp (FieldName, "Minutes") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 8);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else if (strcmp (FieldName, "Seconds") == 0) {
+      //
+      // Write ID (offset), ID, and size
+      //
+      WriteWord (mNvDataStructSize + mNonNvDataStructSize + 10);
+      if (WriteLength) {
+        WriteByte (0, 0);
+      }
+    } else {
+      PrintErrorMessage (LineNum1, FieldName, "expected valid field name Hours/Minutes/Seconds");
+    }
+    return;
+  } else {
+    PrintErrorMessage (LineNum1, StructName, "undefined structure");
+    return;
+  }
+}
+VOID
+EfiVfrParser::StartStructDefinition (
+  INT32  IsNonNV,
+  INT32  LineNum
+  )
+/*++
+
+Routine Description:
+  Called when we encounter a new "struct _MY_STRUCT..." statement while parsing. 
+  Initialize internal data and structures for parsing the fields of the structure.
+
+Arguments:
+  LineNum  - line number in the source file (for error reporting purposes)
+  IsNonNv  - flag indicating (if nonzero) that the variable referred to is not in
+             the standard NV store.
+Returns:
+  None
+
+--*/
+{
+  STRUCT_DEFINITION *StructDef;
+  //
+  // Allocate memory for the structure record
+  //
+  StructDef = (STRUCT_DEFINITION *)malloc (sizeof (STRUCT_DEFINITION));
+  memset (StructDef, 0, sizeof (STRUCT_DEFINITION));
+  StructDef->LineNum = LineNum;
+  //
+  // Set flag indicating non-NV data structure or not
+  //
+  StructDef->IsNonNV = IsNonNV;
+  //
+  // Add it to the end of our linked list. If it's the first one
+  // defined, then it's the default varstore ID, so set it valid.
+  //
+  if (mFirstStructDefinition == NULL) {
+    mFirstStructDefinition = StructDef;
+    StructDef->VarStoreIdValid = 1;
+  } else {
+    mLastStructDefinition->Next = StructDef;
+  }
+  mLastStructDefinition = StructDef;
+}
+VOID
+EfiVfrParser::EndStructDefinition (
+  CHAR8  *StructName,
+  INT32  LineNum
+  )
+{
+  STRUCT_DEFINITION         *StructDef;
+  STRUCT_FIELD_DEFINITION   *FieldDef;
+  UINT32                    Offset;
+  //
+  // Make sure they have not already defined a structure with this name
+  //
+  for (StructDef = mFirstStructDefinition; StructDef != NULL; StructDef = StructDef->Next) {
+    if ((StructDef->Name != NULL) && (strcmp (StructDef->Name, StructName) == 0)) {
+      PrintErrorMessage (LineNum, StructName, "structure with this name already defined");
+      //
+      // Fall through and fill in the rest of the structure information. We do
+      // this because the structure has already been added to our global list,
+      // so will be used elsewhere, so we want it to contain valid fields.
+      //
+    }
+  }    
+  //
+  // Allocate memory for the structure name 
+  //
+  mLastStructDefinition->Name = (char *)malloc (strlen (StructName) + 1);
+  strcpy (mLastStructDefinition->Name, StructName);
+  //
+  // Compute the structure size, and the offsets to each field
+  //
+  Offset = 0;
+  for (FieldDef = mLastStructDefinition->Field; FieldDef != NULL; FieldDef = FieldDef->Next) {
+    FieldDef->Offset = Offset;
+    Offset += FieldDef->ArrayLength * FieldDef->DataSize;
+  }
+  mLastStructDefinition->Size = Offset;
+  //
+  // Go through all the structure we have so far and figure out (if we can)
+  // the size of the non-NV storage. We also assume that the first structure
+  // definition is the primary/default storage for the VFR form.
+  //
+  if (mNonNvDataStructSize == 0) {
+    for (StructDef = mFirstStructDefinition; StructDef != NULL; StructDef = StructDef->Next) {
+      if (StructDef->IsNonNV) {
+        mNonNvDataStructSize = StructDef->Size;
+        break;
+      }
+    }
+  }
+  if (mNvDataStructSize == 0) {
+    for (StructDef = mFirstStructDefinition; StructDef != NULL; StructDef = StructDef->Next) {
+      if (StructDef->IsNonNV == 0) {
+        mNvDataStructSize = StructDef->Size;
+        break;
+      }
+    }
+  }
+}
+VOID 
+EfiVfrParser::AddStructField (
+  CHAR8   *FieldName, 
+  INT32   LineNum, 
+  INT32   DataSize,
+  INT32   ArrayLength,
+  INT8    IsArray
+  ) 
+/*++
+
+Routine Description:
+  We're parsing the VFR structure definition. Add another defined field to 
+  our definition.
+
+Arguments:
+  FieldName   - name of the field in the structure.
+  LineNum     - the line number from the input (preprocessor output) file
+  DataSize    - the size of the field (1, 2, or 4 bytes)
+  ArrayLength - the number of elements (for array)
+  IsArray     - non-zero if the field is an array
+
+Returns:
+  None.
+
+--*/
+{
+  STRUCT_FIELD_DEFINITION *FieldDef;
+  STRUCT_FIELD_DEFINITION *Temp;
+  //
+  // Make sure we don't already have a field of this name in our structure
+  //
+  for (FieldDef = mLastStructDefinition->Field; FieldDef != NULL; FieldDef = FieldDef->Next) {
+    if (strcmp (FieldDef->Name, FieldName) == 0) {
+      PrintErrorMessage (LineNum, FieldName, "field with this name already defined");
+      return;
+    }
+  } 
+  //
+  // If it's an array, then they better not have a size of 0. For example:
+  //   UINT8 MyBytes[0];
+  //
+  if (IsArray && (ArrayLength <= 0)) {
+    PrintErrorMessage (LineNum, FieldName, "invalid array size");
+    return;
+  }    
+  //
+  // Allocate memory for a new structure field definition
+  //    
+  FieldDef = (STRUCT_FIELD_DEFINITION *)malloc (sizeof (STRUCT_FIELD_DEFINITION));
+  memset ((char *)FieldDef, 0, sizeof (STRUCT_FIELD_DEFINITION));
+  FieldDef->ArrayLength  = ArrayLength;
+  FieldDef->DataSize     = DataSize;
+  FieldDef->IsArray      = IsArray;
+  FieldDef->Name = (char *)malloc (strlen (FieldName) + 1);
+  strcpy (FieldDef->Name, FieldName);
+  //
+  // Add it to the end of the field list for the currently active structure
+  //
+  if (mLastStructDefinition->Field == NULL) {
+    mLastStructDefinition->Field = FieldDef;
+  } else {
+    mLastStructDefinition->LastField->Next = FieldDef;
+  }
+  mLastStructDefinition->LastField = FieldDef;
+}
+VOID
+EfiVfrParser::AddVarStore (
+  CHAR8  *StructName,       // actual name of the structure
+  CHAR8  *VarName,          // actual NV variable name
+  UINT16 VarStoreId,        // key value
+  INT32  LineNum            // parse line number (for error reporting)
+  )
+/*++
+
+Routine Description:
+  Called while parsing a varstore statement. Add the variable store 
+  to our linked list.
+
+Arguments:
+  StructName    - the name of the typedef'ed structure to use
+  VarName       - the NV variable name as specified in the varstore statement
+  VarStoreId    - the variable store ID as specified in the varstore statememt
+  LineNum       - the line number from the input (preprocessor output) file
+
+Returns:
+  None.
+
+--*/
+{
+  STRUCT_DEFINITION *StructDef;
+  UINT16_LIST       *L16Ptr;
+  //
+  // Go through our list of previously-defined variable store IDs and
+  // make sure this one is not a duplicate in name or key value.
+  //
+  for (L16Ptr = mDefinedVarStoreId; L16Ptr != NULL; L16Ptr = L16Ptr->Next) {
+    if (L16Ptr->Value == VarStoreId) {
+      PrintErrorMessage (LineNum, "variable storage key already used", NULL);
+      PrintErrorMessage (L16Ptr->LineNum, "previous usage of storage key", NULL);
+    }
+  }
+  // 
+  // Key value of 0 is invalid since that's assigned by default to the default
+  // variable store (the first structure parsed).
+  //
+  if (VarStoreId == 0) {
+    PrintErrorMessage (LineNum, "variable storage key of 0 is invalid", NULL);
+  }
+  //
+  // Create a new element to add to the list
+  //
+  L16Ptr = (UINT16_LIST *)malloc(sizeof (UINT16_LIST));
+  memset (L16Ptr, 0, sizeof (UINT16_LIST));
+  L16Ptr->LineNum = LineNum;
+  L16Ptr->Value = VarStoreId;
+  if (mDefinedVarStoreId == NULL) {
+    mDefinedVarStoreId = L16Ptr;
+  } else {
+    mLastDefinedVarStoreId->Next = L16Ptr;
+  }
+  mLastDefinedVarStoreId = L16Ptr;
+  //
+  // Find the structure definition with this name
+  //
+  for (StructDef = mFirstStructDefinition; StructDef != NULL; StructDef = StructDef->Next) {
+    if (strcmp (StructDef->Name, StructName) == 0) {
+      //
+      // Make sure they did not already define a variable storage ID 
+      // for this structure.
+      //
+      if (StructDef->VarStoreId != 0) {
+        PrintErrorMessage (LineNum, StructName, "variable storage already defined for this structure");
+        PrintErrorMessage (StructDef->VarStoreLineNum, StructName, "previous definition for variable storage");
+      }
+      StructDef->VarStoreId       = VarStoreId;
+      StructDef->VarStoreIdValid  = 1;
+      StructDef->VarStoreLineNum  = LineNum;
+      WriteWord (StructDef->Size);
+      while (*VarName) {
+        WriteByte(*VarName, 0);
+        VarName++;
+      }
+      WriteByte(0,0);
+      return;
+    }
+  }    
+  PrintErrorMessage (LineNum, StructName, "structure with this name not defined");
+}
+VOID 
+EfiVfrParser::WriteDWord (
+  UINT32    Value, 
+  UINT8     KeyByte
+  )
+/*++
+
+Routine Description:
+  During parsing, we came upon some code that requires a 32-bit value be
+  written to the VFR binary file. Queue up the 4 bytes.
+
+Arguments:
+  Value   - the 32-bit value to write
+  KeyByte - a single character which gets written out beside the first byte.
+            This is used to tag the data in the output file so that during 
+            debug you have an idea what the value is.
+
+Returns:
+  None.
+
+--*/
+{
+  //
+  // Write 4 bytes, little endian. Specify a key byte only on the first one
+  //
+  mOpcodeHandler.AddByte ((UINT8)Value, KeyByte);
+  Value \>>= 8;
+  mOpcodeHandler.AddByte ((UINT8)Value, 0);
+  Value \>>= 8;
+  mOpcodeHandler.AddByte ((UINT8)Value, 0);
+  Value \>>= 8;
+  mOpcodeHandler.AddByte ((UINT8)Value, 0);
+}
+VOID 
+EfiVfrParser::WriteOpByte (
+  UINT32    LineNum,
+  UINT8     ByteValue
+  )
+/*++
+
+Routine Description:
+  
+  During parsing, we came upon a new VFR opcode. At this point we flush
+  the output queue and then queue up this byte (with 'O' for opcode tag).
+
+Arguments:
+
+  ByteValue   - opcode value
+
+Returns:
+
+  None.
+
+--*/
+{
+  mOpcodeHandler.AddOpcodeByte (ByteValue, LineNum);
+}
+VOID 
+EfiVfrParser::WriteByte (
+  UINT8   ByteValue, 
+  UINT8   Key
+  )
+/*++
+
+Routine Description:
+  
+  During parsing of the VFR we spoonfeed this function with bytes to write to
+  the output VFR binary file. This function simply queues up the bytes, and
+  the queue gets flushed each time a new VFR opcode is encountered.
+
+Arguments:
+
+  ByteValue   - raw byte to write
+  Key         - character to tag the byte with when we write ByteValue to the
+                output file.
+
+Returns:
+
+  None.
+
+--*/
+{
+  mOpcodeHandler.AddByte (ByteValue, Key);
+}
+VOID 
+EfiVfrParser::WriteWord (
+  UINT32  Value
+  )
+/*++
+
+Routine Description:
+  During VFR parsing we came upon a case where we need to write out a 
+  16-bit value. Queue it up.
+
+Arguments:
+  Value - value to write.
+
+Returns:
+  None.
+
+--*/
+{
+  mOpcodeHandler.AddByte ((UINT8)Value, 0);
+  mOpcodeHandler.AddByte ((UINT8)((Value \>> 8) & 0xFF), 0);
+}
+VOID 
+EfiVfrParser::WriteStringIdWord (
+  UINT16 WordValue
+  )
+{
+  mOpcodeHandler.AddByte ((UINT8)WordValue, 'S');
+  mOpcodeHandler.AddByte ((UINT8)((WordValue \>> 8) & 0xFF), 0);
+}
+VOID
+EfiVfrParser::FreeGotoReferences ()
+/*++
+
+Routine Description:
+  Called during cleanup to free up the memory we allocated when
+  keeping track of VFR goto statements.
+
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{
+  GOTO_REFERENCE  *CurrRef;
+  GOTO_REFERENCE  *NextRef;
+  FORM_ID_VALUE   *CurrFormId;
+  FORM_ID_VALUE   *NextFormId;
+  UINT8           Found;
+  CHAR8           Name[20];
+
+  //
+  // Go through all the "goto" references and make sure there was a 
+  // form ID of that value defined.
+  //
+  for (CurrRef = mGotoReferences; CurrRef != NULL; CurrRef = CurrRef->Next) {
+    Found = 0;
+    for (CurrFormId = mFormIdValues; CurrFormId != NULL; CurrFormId = CurrFormId->Next) {
+      if (CurrRef->Value == CurrFormId->Value) {
+        Found = 1;
+        break;
+      }
+    }
+    if (!Found) {
+      sprintf (Name, "%d", (UINT32)CurrRef->Value);
+      PrintErrorMessage (CurrRef->RefLineNum, Name, "undefined form ID");
+    }  
+  }  
+  //
+  // Now free up the form id and goto references
+  //
+  CurrFormId = mFormIdValues;
+  while (CurrFormId != NULL) {
+    NextFormId = CurrFormId->Next;
+    free (CurrFormId);
+    CurrFormId = NextFormId;
+  }
+  mFormIdValues = NULL;
+  CurrRef = mGotoReferences;
+  while (CurrRef != NULL) {
+    NextRef = CurrRef->Next;
+    free (CurrRef);
+    CurrRef = NextRef;
+  }  
+  mGotoReferences = NULL;
+}
+VOID
+EfiVfrParser::AddGotoReference (
+  UINT32  GotoNumber,
+  UINT32  LineNum
+  )
+/*++
+
+Routine Description:
+  During VFR parsing we came upon a goto statement. Since we support
+  forward references, save the referenced label and at the end of parsing
+  we'll check that the label was actually defined somewhere.
+
+Arguments:
+  GotoNumber  - the label number referenced
+  LineNum     - the line number where the reference was made (used for
+                error reporting)
+
+Returns:
+  None
+
+--*/
+{
+  GOTO_REFERENCE *NewRef;
+  
+  NewRef = (GOTO_REFERENCE *)malloc (sizeof (GOTO_REFERENCE));
+  if (NewRef == NULL) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+    return;
+  }
+  memset ((char *)NewRef, 0, sizeof (GOTO_REFERENCE));
+  NewRef->Value = (UINT16)GotoNumber;
+  NewRef->RefLineNum = LineNum;
+  NewRef->Next = mGotoReferences;
+  mGotoReferences = NewRef;
+}
+VOID
+EfiVfrParser::AddFormId (
+  INT32   FormIdValue,
+  UINT32  LineNum
+  )
+/*++
+
+Routine Description:
+  This function is called when we parse "form formid = 3" statements.
+  We save the form ID valud so we can verify that duplicates are not
+  defined. Also, these are the targets of goto statements, so when we're
+  done parsing the script we also go through all the goto statements to
+  check that there was a target FormId defined as referenced by each
+  goto statement.
+  
+  Note that formid = 0 is invalid.
+
+Arguments:
+  FormIdValue  - the parsed value for the Form ID
+  LineNum      - line number of the source file we're parsing
+
+Returns:
+  NA
+
+--*/
+{
+  FORM_ID_VALUE *NewFormId;
+  char          *FileName;
+  char          *FileName2;
+  UINT32        LineNum2;  
+  //
+  // Verify that FormId != 0
+  //
+  if (FormIdValue == 0) {
+    FileName = ConvertLineNumber (&LineNum);
+    Error (FileName, LineNum, 0, "form ID cannot be 0", NULL);
+    return;
+  }
+  //
+  // First go through all previously defined form IDs and make sure they have not defined
+  // duplicates.
+  //
+  for (NewFormId = mFormIdValues; NewFormId != NULL; NewFormId = NewFormId->Next) {
+    if ((UINT16)FormIdValue == NewFormId->Value) {
+      FileName = ConvertLineNumber (&LineNum);
+      LineNum2 = NewFormId->LineNum;
+      FileName2 = ConvertLineNumber (&LineNum2);
+      Error (FileName, LineNum, 0, NULL, "form ID %d already defined", FormIdValue);
+      Error (FileName2, LineNum2, 0, NULL, "form ID %d previous definition", FormIdValue);
+      return;
+    }
+  }
+  //
+  // Allocate memory for a new one 
+  //
+  NewFormId = (FORM_ID_VALUE *)malloc (sizeof (FORM_ID_VALUE));
+  if (NewFormId == NULL) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "memory allocation failure");
+    return;
+  }
+  memset ((char *)NewFormId, 0, sizeof (FORM_ID_VALUE));
+  NewFormId->LineNum = LineNum;
+  NewFormId->Next = mFormIdValues;
+  NewFormId->Value = (UINT16)FormIdValue;
+  mFormIdValues = NewFormId;
+}
+UINT32
+EfiVfrParser::GetNumber (
+  CHAR8   *NumStr,
+  UINT32  LineNum,
+  UINT32  NumBytes
+  )
+{
+  UINT32 Value;
+  
+  if ((NumStr[0] == '0') && (NumStr[1] == 'x')) {
+    AtoX (NumStr + 2, 4, &Value);
+  } else {
+    Value = (UINT32)atoi (NumStr);
+  }
+  //
+  // Check range
+  //
+  if ((NumBytes < 4) && (Value & ((UINT32)0xFFFFFFFF << (NumBytes * 8)))) {
+    PrintErrorMessage (LineNum, NumStr, "value out of range");
+    return 0;
+  }
+  return Value;
+}
+
+>>
+
+} // end grammar class
+
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp b/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
new file mode 100644
index 0000000000..c66d4dfa79
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/VfrServices.cpp
@@ -0,0 +1,757 @@
+/*++
+
+Copyright (c) 2004 - 2005, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  VfrServices.cpp
+
+Abstract:
+
+  Support routines for the VFR compiler
+  
+--*/  
+
+#include <stdio.h>    // for FILE routines
+#include <stdlib.h>   // for malloc() and free()
+
+#include <Base.h>
+#include <UefiBaseTypes.h>
+#include <MultiPhase.h>
+#include "EfiUtilityMsgs.h"
+#include "EfiVfr.h"
+#include "VfrServices.h"
+
+#include <UgaDraw.h>
+#include <Hii.h>
+
+static const char *mSourceFileHeader[] = {
+  "//",
+  "//  DO NOT EDIT -- auto-generated file",
+  "//",
+  "//  This file is generated by the VFR compiler.",
+  "//",
+  NULL
+};
+
+typedef struct {
+   CHAR8    *Name;
+   INT32    Size;
+} IFR_OPCODE_SIZES;
+
+//
+// Create a table that can be used to do internal checking on the IFR
+// bytes we emit.
+//
+static const IFR_OPCODE_SIZES mOpcodeSizes[] = {
+  { 0, 0 },     // invalid
+  { "EFI_IFR_FORM",                       sizeof (EFI_IFR_FORM) },
+  { "EFI_IFR_SUBTITLE",                   sizeof (EFI_IFR_SUBTITLE) }, 
+  { "EFI_IFR_TEXT",                       -6 }, //sizeof (EFI_IFR_TEXT) }, 
+  { "unused 0x04 opcode",                 0 }, // EFI_IFR_GRAPHIC_OP
+  { "EFI_IFR_ONE_OF",                     sizeof (EFI_IFR_ONE_OF) }, 
+  { "EFI_IFR_CHECKBOX",                   sizeof (EFI_IFR_CHECKBOX) }, 
+  { "EFI_IFR_NUMERIC",                    sizeof (EFI_IFR_NUMERIC) }, 
+  { "EFI_IFR_PASSWORD",                   sizeof (EFI_IFR_PASSWORD) }, 
+  { "EFI_IFR_ONE_OF_OPTION",              sizeof (EFI_IFR_ONE_OF_OPTION) }, 
+  { "EFI_IFR_SUPPRESS",                   sizeof (EFI_IFR_SUPPRESS) }, 
+  { "EFI_IFR_END_FORM",                   sizeof (EFI_IFR_END_FORM) }, 
+  { "EFI_IFR_HIDDEN",                     sizeof (EFI_IFR_HIDDEN) }, 
+  { "EFI_IFR_END_FORM_SET",               sizeof (EFI_IFR_END_FORM_SET) }, 
+  { "EFI_IFR_FORM_SET",                   sizeof (EFI_IFR_FORM_SET) }, 
+  { "EFI_IFR_REF",                        sizeof (EFI_IFR_REF) }, 
+  { "EFI_IFR_END_ONE_OF",                 sizeof (EFI_IFR_END_ONE_OF) }, 
+  { "EFI_IFR_INCONSISTENT",               sizeof (EFI_IFR_INCONSISTENT) }, 
+  { "EFI_IFR_EQ_ID_VAL",                  sizeof (EFI_IFR_EQ_ID_VAL) }, 
+  { "EFI_IFR_EQ_ID_ID",                   sizeof (EFI_IFR_EQ_ID_ID) }, 
+  { "EFI_IFR_EQ_ID_LIST",                 -sizeof (EFI_IFR_EQ_ID_LIST) }, 
+  { "EFI_IFR_AND",                        sizeof (EFI_IFR_AND) }, 
+  { "EFI_IFR_OR",                         sizeof (EFI_IFR_OR) }, 
+  { "EFI_IFR_NOT",                        sizeof (EFI_IFR_NOT) }, 
+  { "EFI_IFR_END_EXPR",                   sizeof (EFI_IFR_END_EXPR) }, 
+  { "EFI_IFR_GRAY_OUT",                   sizeof (EFI_IFR_GRAY_OUT) }, 
+  { "EFI_IFR_DATE",                       sizeof (EFI_IFR_DATE) / 3 }, 
+  { "EFI_IFR_TIME",                       sizeof (EFI_IFR_TIME) / 3 }, 
+  { "EFI_IFR_STRING",                     sizeof (EFI_IFR_STRING) }, 
+  { "EFI_IFR_LABEL",                      sizeof (EFI_IFR_LABEL) }, 
+  { "EFI_IFR_SAVE_DEFAULTS",              sizeof (EFI_IFR_SAVE_DEFAULTS) }, 
+  { "EFI_IFR_RESTORE_DEFAULTS",           sizeof (EFI_IFR_RESTORE_DEFAULTS) }, 
+  { "EFI_IFR_BANNER",                     sizeof (EFI_IFR_BANNER) },
+  { "EFI_IFR_INVENTORY",                  sizeof (EFI_IFR_INVENTORY) },
+  { "EFI_IFR_EQ_VAR_VAL_OP",              sizeof (EFI_IFR_EQ_VAR_VAL) },
+  { "EFI_IFR_ORDERED_LIST_OP",            sizeof (EFI_IFR_ORDERED_LIST) },
+  { "EFI_IFR_VARSTORE_OP",                -sizeof (EFI_IFR_VARSTORE) },
+  { "EFI_IFR_VARSTORE_SELECT_OP",         sizeof (EFI_IFR_VARSTORE_SELECT) },
+  { "EFI_IFR_VARSTORE_SELECT_PAIR_OP",    sizeof (EFI_IFR_VARSTORE_SELECT_PAIR) },
+  { "EFI_IFR_TRUE",                       sizeof (EFI_IFR_TRUE)},
+  { "EFI_IFR_FALSE",                      sizeof (EFI_IFR_FALSE)},
+  { "EFI_IFR_GT",                         sizeof (EFI_IFR_GT)},
+  { "EFI_IFR_GE",                         sizeof (EFI_IFR_GE)},
+  { "EFI_IFR_OEM_DEFINED_OP",             -2 },
+};
+
+
+VfrOpcodeHandler::VfrOpcodeHandler (
+  ) 
+/*++
+
+Routine Description:
+  Constructor for the VFR opcode handling class.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{ 
+  mIfrBytes                       = NULL; 
+  mLastIfrByte                    = NULL;
+  mBytesWritten                   = 0;
+  mQueuedByteCount                = 0;
+  mQueuedOpcodeByteValid          = 0;
+  mPrimaryVarStoreId              = 0;
+  mSecondaryVarStoreId            = 0;
+  mSecondaryVarStoreIdSet         = 0;
+  mPrimaryVarStoreIdSet           = 0;
+  mDefaultVarStoreId              = 0;
+}
+
+VOID 
+VfrOpcodeHandler::SetVarStoreId (
+  UINT16 VarStoreId
+  )
+/*++
+
+Routine Description:
+  This function is invoked by the parser when a variable is referenced in the 
+  VFR. Save the variable store (and set a flag) so that we can later determine 
+  if we need to emit a varstore-select or varstore-select-pair opcode.
+  
+Arguments:
+  VarStoreId - ID of the variable store referenced in the VFR
+
+Returns:
+  None
+
+--*/
+{
+  mPrimaryVarStoreId    = VarStoreId;
+  mPrimaryVarStoreIdSet = 1;
+}
+
+VOID 
+VfrOpcodeHandler::SetSecondaryVarStoreId (
+  UINT16 VarStoreId
+  )
+/*++
+
+Routine Description:
+  This function is invoked by the parser when a secondary variable is 
+  referenced in the VFR. Save the variable store (and set a flag) so 
+  that we can later determine if we need to emit a varstore-select or 
+  varstore-pair opcode.
+  
+Arguments:
+  VarStoreId - ID of the variable store referenced in the VFR
+
+Returns:
+  None
+
+--*/
+{
+  mSecondaryVarStoreId    = VarStoreId;
+  mSecondaryVarStoreIdSet = 1;
+}
+
+VOID 
+VfrOpcodeHandler::WriteIfrBytes (
+  ) 
+/*++
+
+Routine Description:
+  This function is invoked at the end of parsing. Its purpose
+  is to write out all the IFR bytes that were queued up while
+  parsing.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{ 
+  IFR_BYTE                  *Curr;
+  IFR_BYTE                  *Next;
+  UINT32                    Count;
+  UINT32                    LineCount;
+  UINT32                    PoundLines;
+  UINT32                    ByteCount;
+  CHAR8                     Line[MAX_LINE_LEN];
+  CHAR8                     *Cptr;
+  FILE                      *InFptr;
+  FILE                      *OutFptr;
+  UINT32                    ListFile;
+  EFI_HII_IFR_PACK_HEADER   IfrHeader;
+  UINT8                     *Ptr;
+  FILE                      *IfrBinFptr;
+  UINT32                    BytesLeftThisOpcode;
+  //
+  // If someone added a new opcode and didn't update our opcode sizes structure, error out.
+  //
+  if (sizeof(mOpcodeSizes) / sizeof (mOpcodeSizes[0]) != EFI_IFR_LAST_OPCODE + 1) {
+    Error (__FILE__, __LINE__, 0, "application error", "internal IFR binary table size is incorrect");
+    return;
+  }
+  //
+  // Flush the queue
+  //
+  FlushQueue ();    
+  //
+  // If there have been any errors to this point, then skip dumping the IFR
+  // binary data. This way doing an nmake again will try to build it again, and
+  // the build will fail if they did not fix the problem.
+  //
+  if (GetUtilityStatus () != STATUS_ERROR) {
+    if ((IfrBinFptr = fopen (gOptions.IfrOutputFileName, "w")) == NULL) {
+      Error (PROGRAM_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");
+      return;
+    }
+    //
+    // Write the standard file header to the output file
+    //
+    WriteStandardFileHeader (IfrBinFptr);
+    //
+    // Write the structure header
+    //
+    fprintf (IfrBinFptr, "\nunsigned char %sBin[] = {", gOptions.VfrBaseFileName);
+    //
+    // Write the header
+    //
+    memset ((char *)&IfrHeader, 0, sizeof (IfrHeader));
+    IfrHeader.Header.Type = EFI_HII_IFR;
+    IfrHeader.Header.Length = mBytesWritten + sizeof (IfrHeader);    
+    Ptr = (UINT8 *)&IfrHeader;
+    for (Count = 0; Count < sizeof (IfrHeader); Count++, Ptr++) {
+      if ((Count & 0x03) == 0) {
+        fprintf (IfrBinFptr, "\n  ");
+      }
+      fprintf (IfrBinFptr, "0x%02X, ", *Ptr);      
+    }
+    //
+    //
+    // Write all the IFR bytes
+    //
+    fprintf (IfrBinFptr, "\n  // start of IFR data");
+    Curr = mIfrBytes;
+    Count = 0;
+    while (Curr != NULL) {
+      if ((Count & 0x0F) == 0) {
+        fprintf (IfrBinFptr, "\n  ");
+      }
+      if (Curr->KeyByte != 0) {
+        fprintf (IfrBinFptr, "/*%c*/ ", Curr->KeyByte);
+      }
+      fprintf (IfrBinFptr, "0x%02X, ", Curr->OpcodeByte);
+      Count++;
+      Curr = Curr->Next;
+    }
+    fprintf (IfrBinFptr, "\n};\n\n");
+    //
+    //
+    // Close the file
+    //
+    fclose (IfrBinFptr); 
+    IfrBinFptr = NULL;
+  }
+  //
+  // Write the bytes as binary data if the user specified to do so
+  //
+  if ((GetUtilityStatus () != STATUS_ERROR) &&  (gOptions.CreateIfrBinFile != 0)) {
+    //
+    // Use the Ifr output file name with a ".hpk" extension.
+    //
+    for (Cptr = gOptions.IfrOutputFileName + strlen (gOptions.IfrOutputFileName) - 1;
+         (*Cptr != '.') && (Cptr > gOptions.IfrOutputFileName) && (*Cptr != '\\');
+         Cptr--) {
+      //
+      // do nothing
+      //
+    }
+    if (*Cptr == '.') {
+      strcpy (Cptr, ".hpk");
+    } else {
+      strcat (gOptions.IfrOutputFileName, ".hpk");
+    }
+    if ((IfrBinFptr = fopen (gOptions.IfrOutputFileName, "wb")) == NULL) {
+      Error (PROGRAM_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");
+      return;
+    }
+    //
+    // Write the structure header
+    //
+    memset ((char *)&IfrHeader, 0, sizeof (IfrHeader));
+    IfrHeader.Header.Type = EFI_HII_IFR;
+    IfrHeader.Header.Length = mBytesWritten + sizeof (IfrHeader);    
+    Ptr = (UINT8 *)&IfrHeader;
+    for (Count = 0; Count < sizeof (IfrHeader); Count++, Ptr++) {
+      fwrite (Ptr, 1, 1, IfrBinFptr);
+    }
+    //
+    //
+    // Write all the IFR bytes
+    //
+    Curr = mIfrBytes;
+    Count = 0;
+    while (Curr != NULL) {
+      fwrite (&Curr->OpcodeByte, 1, 1, IfrBinFptr);
+      Curr = Curr->Next;
+    }
+    //
+    //
+    // Close the file
+    //
+    fclose (IfrBinFptr); 
+    IfrBinFptr = NULL;
+  }
+  //
+  // If creating a listing file, then open the input and output files
+  //
+  ListFile = 0;
+  if (gOptions.CreateListFile) {
+    //
+    // Open the input VFR file and the output list file
+    //
+    if ((InFptr = fopen (gOptions.PreprocessorOutputFileName, "r")) == NULL) {
+      Warning (PROGRAM_NAME, 0, 0, gOptions.PreprocessorOutputFileName, "could not open file for creating a list file");
+    } else {
+      if ((OutFptr = fopen (gOptions.VfrListFileName, "w")) == NULL) {
+        Warning (PROGRAM_NAME, 0, 0, gOptions.VfrListFileName, "could not open output list file for writing");
+        fclose (InFptr);
+        InFptr = NULL;
+      } else {
+        LineCount   = 0;
+        ListFile    = 1;
+        PoundLines  = 0;
+        ByteCount   = 0;
+      }
+    }
+  }
+  //
+  // Write the list file
+  //
+  if (ListFile) {
+    //
+    // Write out the VFR compiler version
+    //
+    fprintf (OutFptr, "//\n//  VFR compiler version " VFR_COMPILER_VERSION "\n//\n");
+    Curr = mIfrBytes;
+    while (Curr != NULL) {
+      //
+      // Print lines until we reach the line of the current opcode
+      //
+      while (LineCount < PoundLines + Curr->LineNum) {
+        if (fgets (Line, sizeof (Line), InFptr) != NULL) {
+          //
+          // We should check for line length exceeded on the fgets(). Otherwise it
+          // throws the listing file output off. Future enhancement perhaps.
+          //
+          fprintf (OutFptr, "%s", Line);
+          if (strncmp (Line, "#line", 5) == 0) {
+            PoundLines++;
+          }
+        }
+        LineCount++;
+      }
+      //
+      // Print all opcodes with line numbers less than where we are now
+      //
+      BytesLeftThisOpcode = 0;
+      while ((Curr != NULL) && ((Curr->LineNum == 0) || (LineCount >= PoundLines + Curr->LineNum))) {
+        if (BytesLeftThisOpcode == 0) {
+          fprintf (OutFptr, ">%08X: ", ByteCount);
+          if (Curr->Next != NULL) {
+            BytesLeftThisOpcode = (UINT32)Curr->Next->OpcodeByte;
+          }
+        }
+        fprintf (OutFptr, "%02X ", (UINT32)Curr->OpcodeByte);
+        ByteCount++;
+        BytesLeftThisOpcode--;
+        if (BytesLeftThisOpcode == 0) {
+          fprintf (OutFptr, "\n");
+        }
+        Curr = Curr->Next;
+      }
+    }
+    //
+    // Dump any remaining lines from the input file
+    //
+    while (fgets (Line, sizeof (Line), InFptr) != NULL) {
+      fprintf (OutFptr, "%s", Line);
+    }
+    fclose (InFptr);
+    fclose (OutFptr);
+  }
+  //
+  // Debug code to make sure that each opcode we write out has as many
+  // bytes as the IFR structure requires. If there were errors, then
+  // don't do this step.
+  //
+  if (GetUtilityStatus () != STATUS_ERROR) {
+    Curr = mIfrBytes;
+    ByteCount = 0;
+    while (Curr != NULL) {
+      //
+      // First byte is the opcode, second byte is the length
+      //
+      if (Curr->Next == NULL) {
+        Error (__FILE__, __LINE__, 0, "application error", "last opcode written does not contain a length byte");
+        break;
+      }
+      Count = (UINT32)Curr->Next->OpcodeByte;
+      if (Count == 0) {
+        Error (
+          __FILE__, 
+          __LINE__, 
+          0, 
+          "application error", 
+          "opcode with 0 length specified in output at offset 0x%X", 
+          ByteCount
+          );
+        break;
+      }
+      //
+      // Check the length
+      //
+      if ((Curr->OpcodeByte > EFI_IFR_LAST_OPCODE) || (Curr->OpcodeByte == 0)) {
+        Error (
+          __FILE__, 
+          __LINE__, 
+          0, 
+          "application error", 
+          "invalid opcode 0x%X in output at offset 0x%X", 
+          (UINT32) Curr->OpcodeByte, ByteCount
+          );
+      } else if (mOpcodeSizes[Curr->OpcodeByte].Size < 0) {
+        //
+        // For those cases where the length is variable, the size is negative, and indicates
+        // the miniumum size.
+        //
+        if ((mOpcodeSizes[Curr->OpcodeByte].Size * -1) > Count) {
+          Error (
+            __FILE__, 
+            __LINE__, 
+            0, 
+            "application error", 
+            "insufficient number of bytes written for %s at offset 0x%X",
+            mOpcodeSizes[Curr->OpcodeByte].Name, 
+            ByteCount
+            );
+        }
+      } else {
+        //
+        // Check for gaps
+        //
+        if (mOpcodeSizes[Curr->OpcodeByte].Size == 0) {
+          Error (
+            __FILE__, 
+            __LINE__, 
+            0, 
+            "application error", 
+            "invalid opcode 0x%X in output at offset 0x%X", 
+            (UINT32)Curr->OpcodeByte, 
+            ByteCount
+            );
+        } else {
+          //
+          // Check size
+          //
+          if (mOpcodeSizes[Curr->OpcodeByte].Size != Count) {
+            Error (
+              __FILE__, 
+              __LINE__, 
+              0, 
+              "application error", 
+              "invalid number of bytes (%d written s/b %d) written for %s at offset 0x%X",
+              Count, 
+              mOpcodeSizes[Curr->OpcodeByte].Size, 
+              mOpcodeSizes[Curr->OpcodeByte].Name, 
+              ByteCount
+              );
+          }
+        }
+      }
+      //
+      // Skip to next opcode
+      //
+      while (Count > 0) {
+        ByteCount++;
+        if (Curr == NULL) {
+          Error (__FILE__, __LINE__, 0, "application error", "last opcode written has invalid length");
+          break;
+        }
+        Curr = Curr->Next;
+        Count--;
+      }
+    }
+  }
+}
+
+VfrOpcodeHandler::~VfrOpcodeHandler(
+  ) 
+/*++
+
+Routine Description:
+  Destructor for the VFR opcode handler. Free up memory allocated
+  while parsing the VFR script.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+{
+  IFR_BYTE    *Curr;
+  IFR_BYTE    *Next;
+  //
+  // Free up the IFR bytes
+  //
+  Curr = mIfrBytes;
+  while (Curr != NULL) {
+    Next = Curr->Next;
+    free (Curr);
+    Curr = Next;
+  }
+}
+
+int 
+VfrOpcodeHandler::AddOpcodeByte (
+  UINT8 OpcodeByte, 
+  UINT32 LineNum
+  ) 
+/*++
+
+Routine Description:
+  This function is invoked by the parser when a new IFR
+  opcode should be emitted.
+  
+Arguments:
+  OpcodeByte  - the IFR opcode
+  LineNum     - the line number from the source file that resulted
+                in the opcode being emitted.
+
+Returns:
+  0 always
+
+--*/
+{
+  UINT32 Count;
+
+  FlushQueue();
+  //
+  // Now add this new byte
+  //
+  mQueuedOpcodeByte       = OpcodeByte;
+  mQueuedLineNum          = LineNum;
+  mQueuedOpcodeByteValid  = 1;
+  return 0;
+}
+
+VOID 
+VfrOpcodeHandler::AddByte (
+  UINT8 ByteVal, 
+  UINT8 KeyByte
+  )
+/*++
+
+Routine Description:
+  This function is invoked by the parser when it determines
+  that more raw IFR bytes should be emitted to the output stream.
+  Here we just queue them up into an output buffer.
+  
+Arguments:
+  ByteVal   - the raw byte to emit to the output IFR stream
+  KeyByte   - a value that can be used for debug. 
+
+Returns:
+  None
+
+--*/
+{
+  //
+  // Check for buffer overflow
+  //
+  if (mQueuedByteCount > MAX_QUEUE_COUNT) {
+    Error (PROGRAM_NAME, 0, 0, NULL, "opcode queue overflow");
+  } else {
+    mQueuedBytes[mQueuedByteCount]    = ByteVal;
+    mQueuedKeyBytes[mQueuedByteCount] = KeyByte;
+    mQueuedByteCount++;
+  }
+}
+
+int 
+VfrOpcodeHandler::FlushQueue (
+  )
+/*++
+
+Routine Description:
+  This function is invoked to flush the internal IFR buffer.
+  
+Arguments:
+  None
+
+Returns:
+  0 always
+
+--*/
+{
+  UINT32 Count;
+  UINT32 EmitNoneOnePair;
+
+  EmitNoneOnePair = 0;
+  //
+  // If the secondary varstore was specified, then we have to emit
+  // a varstore-select-pair opcode, which only applies to the following
+  // statement. 
+  //
+  if (mSecondaryVarStoreIdSet) {
+    mSecondaryVarStoreIdSet = 0;
+    //
+    // If primary and secondary are the same as the current default
+    // varstore, then we don't have to do anything.
+    // Note that the varstore-select-pair only applies to the following
+    // opcode.
+    //
+    if ((mPrimaryVarStoreId != mSecondaryVarStoreId) || (mPrimaryVarStoreId != mDefaultVarStoreId)) {
+      IAddByte (EFI_IFR_VARSTORE_SELECT_PAIR_OP, 'O', mQueuedLineNum);
+      IAddByte ((UINT8)sizeof (EFI_IFR_VARSTORE_SELECT_PAIR), 'L', 0);
+      IAddByte ((UINT8)mPrimaryVarStoreId, 0, 0);
+      IAddByte ((UINT8)(mPrimaryVarStoreId >> 8), 0, 0);
+      IAddByte ((UINT8)mSecondaryVarStoreId, 0, 0);
+      IAddByte ((UINT8)(mSecondaryVarStoreId >> 8), 0, 0);
+    }
+  } else if (mPrimaryVarStoreIdSet != 0) {
+    mPrimaryVarStoreIdSet = 0;
+    if (mDefaultVarStoreId != mPrimaryVarStoreId) {
+      //
+      // The VFR statement referenced a different variable store 
+      // than the last one we reported. Insert a new varstore select 
+      // statement. 
+      //
+      IAddByte (EFI_IFR_VARSTORE_SELECT_OP, 'O', mQueuedLineNum);
+      IAddByte ((UINT8)sizeof (EFI_IFR_VARSTORE_SELECT), 'L', 0);
+      IAddByte ((UINT8)mPrimaryVarStoreId, 0, 0);
+      IAddByte ((UINT8)(mPrimaryVarStoreId >> 8), 0, 0);
+      mDefaultVarStoreId = mPrimaryVarStoreId;
+    }
+  }
+  //
+  // Likely a new opcode is being added. Since each opcode item in the IFR has 
+  // a header that specifies the size of the opcode item (which we don't
+  // know until we find the next opcode in the VFR), we queue up bytes
+  // until we know the size. Then we write them out. So flush the queue
+  // now.
+  //
+  if (mQueuedOpcodeByteValid != 0) {
+    // 
+    // Add the previous opcode byte, the length byte, and the binary
+    // data.
+    //
+    IAddByte (mQueuedOpcodeByte, 'O', mQueuedLineNum);
+    IAddByte ((UINT8)(mQueuedByteCount + 2), 'L', 0);
+    for (Count = 0; Count < mQueuedByteCount; Count++) {
+      IAddByte (mQueuedBytes[Count], mQueuedKeyBytes[Count], 0);          
+    }
+    mQueuedByteCount = 0;
+    mQueuedOpcodeByteValid = 0;
+  }    
+  return 0;
+}
+
+int 
+VfrOpcodeHandler::IAddByte (
+  UINT8   ByteVal, 
+  UINT8   KeyByte, 
+  UINT32  LineNum
+  )
+/*++
+
+Routine Description:
+  This internal function is used to add actual IFR bytes to
+  the output stream. Most other functions queue up the bytes
+  in an internal buffer. Once they come here, there's no
+  going back.
+
+  
+Arguments:
+  ByteVal   - value to write to output 
+  KeyByte   - key value tied to the byte -- useful for debug
+  LineNum   - line number from source file the byte resulted from
+
+Returns:
+  0 - if successful
+  1 - failed due to memory allocation failure
+
+--*/
+{
+  IFR_BYTE    *NewByte;
+  NewByte = (IFR_BYTE *)malloc (sizeof (IFR_BYTE));
+  if (NewByte == NULL) {
+    return 1;
+  }
+  memset ((char *)NewByte, 0, sizeof (IFR_BYTE));
+  NewByte->OpcodeByte = ByteVal;
+  NewByte->KeyByte = KeyByte;
+  NewByte->LineNum = LineNum;
+  //
+  // Add to the list
+  //
+  if (mIfrBytes == NULL) {
+    mIfrBytes = NewByte;
+  } else {
+    mLastIfrByte->Next = NewByte;
+  } 
+  mLastIfrByte = NewByte;
+  mBytesWritten++;
+  return 0;
+}
+
+VOID 
+WriteStandardFileHeader (
+  FILE *OutFptr
+  ) 
+/*++
+
+Routine Description:
+  This function is invoked to emit a standard header to an
+  output text file.
+  
+Arguments:
+  OutFptr - file to write the header to
+
+Returns:
+  None
+
+--*/
+{
+  UINT32 TempIndex;
+  for (TempIndex = 0; mSourceFileHeader[TempIndex] != NULL; TempIndex++) {
+    fprintf (OutFptr, "%s\n", mSourceFileHeader[TempIndex]);
+  }
+  //
+  // Write out the VFR compiler version
+  //
+  fprintf (OutFptr, "//  VFR compiler version " VFR_COMPILER_VERSION "\n//\n");
+}
diff --git a/Tools/Source/TianoTools/VfrCompile/VfrServices.h b/Tools/Source/TianoTools/VfrCompile/VfrServices.h
new file mode 100644
index 0000000000..6b8c560d63
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/VfrServices.h
@@ -0,0 +1,227 @@
+/*++
+
+Copyright (c) 2004, Intel Corporation                                                         
+All rights reserved. This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  VfrServices.h
+
+Abstract:
+
+  Prototypes and defines for routines and classes used by the
+  EFI VFR compiler.
+  
+--*/
+
+#ifndef _VFR_SERVICES_H_
+#define _VFR_SERVICES_H_
+
+class VfrOpcodeHandler
+{
+public:
+  VfrOpcodeHandler (
+    VOID
+    )
+  /*++
+
+Routine Description:
+  Constructor for the VFR opcode handling class.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+  ;
+  ~VfrOpcodeHandler (
+    VOID
+    )
+  /*++
+
+Routine Description:
+  Destructor for the VFR opcode handler. Free up memory allocated
+  while parsing the VFR script.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+  ;
+  void
+  WriteIfrBytes (
+    VOID
+    )
+  /*++
+
+Routine Description:
+  This function is invoked at the end of parsing. Its purpose
+  is to write out all the IFR bytes that were queued up while
+  parsing.
+  
+Arguments:
+  None
+
+Returns:
+  None
+
+--*/
+  ;
+  int
+  AddOpcodeByte (
+    UINT8  OpcodeByte,
+    UINT32 LineNum
+    )
+  /*++
+
+Routine Description:
+  This function is invoked by the parser when a new IFR
+  opcode should be emitted.
+  
+Arguments:
+  OpcodeByte  - the IFR opcode
+  LineNum     - the line number from the source file that resulted
+                in the opcode being emitted.
+
+Returns:
+  0 always
+
+--*/
+  ;
+  void
+  AddByte (
+    UINT8 ByteVal,
+    UINT8 KeyByte
+    )
+  /*++
+
+Routine Description:
+  This function is invoked by the parser when it determines
+  that more raw IFR bytes should be emitted to the output stream.
+  Here we just queue them up into an output buffer.
+  
+Arguments:
+  ByteVal   - the raw byte to emit to the output IFR stream
+  KeyByte   - a value that can be used for debug. 
+
+Returns:
+  None
+
+--*/
+  ;
+  void
+  SetVarStoreId (
+    UINT16 VarStoreId
+    )
+  /*++
+
+Routine Description:
+  This function is invoked by the parser when a variable is referenced in the 
+  VFR. Save the variable store (and set a flag) so that we can later determine 
+  if we need to emit a varstore-select or varstore-select-pair opcode.
+  
+Arguments:
+  VarStoreId - ID of the variable store referenced in the VFR
+
+Returns:
+  None
+
+--*/
+  ;
+  void
+  SetSecondaryVarStoreId (
+    UINT16 VarStoreId
+    )
+  /*++
+
+Routine Description:
+  This function is invoked by the parser when a secondary variable is 
+  referenced in the VFR. Save the variable store (and set a flag) so 
+  that we can later determine if we need to emit a varstore-select or 
+  varstore-pair opcode.
+  
+Arguments:
+  VarStoreId - ID of the variable store referenced in the VFR
+
+Returns:
+  None
+
+--*/
+  ;
+
+/* */
+private:
+  int
+  FlushQueue (
+    VOID
+    )
+  /*++
+
+Routine Description:
+  This function is invoked to flush the internal IFR buffer.
+  
+Arguments:
+  None
+
+Returns:
+  0 always
+
+--*/
+  ;
+  int
+  IAddByte (
+    UINT8  ByteVal,
+    UINT8  KeyByte,
+    UINT32 LineNum
+    )
+  /*++
+
+Routine Description:
+  This internal function is used to add actual IFR bytes to
+  the output stream. Most other functions queue up the bytes
+  in an internal buffer. Once they come here, there's no
+  going back.
+
+  
+Arguments:
+  ByteVal   - value to write to output 
+  KeyByte   - key value tied to the byte -- useful for debug
+  LineNum   - line number from source file the byte resulted from
+
+Returns:
+  0 - if successful
+  1 - failed due to memory allocation failure
+
+--*/
+  ;
+
+/* */
+private:
+  IFR_BYTE  *mIfrBytes;
+  IFR_BYTE  *mLastIfrByte;
+  UINT32    mQueuedByteCount;
+  UINT32    mBytesWritten;
+  UINT32    mQueuedLineNum;
+  UINT8     mQueuedBytes[MAX_QUEUE_COUNT];
+  UINT8     mQueuedKeyBytes[MAX_QUEUE_COUNT];
+  UINT8     mQueuedOpcodeByte;
+  UINT32    mQueuedOpcodeByteValid;
+  UINT16    mPrimaryVarStoreId;
+  UINT8     mPrimaryVarStoreIdSet;
+  UINT16    mSecondaryVarStoreId;
+  UINT8     mSecondaryVarStoreIdSet;
+  UINT16    mDefaultVarStoreId;
+};
+
+#endif // #ifndef _VFR_SERVICES_H_
diff --git a/Tools/Source/TianoTools/VfrCompile/build.gcc b/Tools/Source/TianoTools/VfrCompile/build.gcc
new file mode 100644
index 0000000000..b6641721f4
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/build.gcc
@@ -0,0 +1,10 @@
+../../../bin/antlr -CC -e3 -ck 3 -o . VfrCompile.g 
+../../../bin/dlg -C2 -i -CC -o . parser.dlg 
+g++ -mno-cygwin -c -I -I. -I../Pccts/h -g -O0 ../Pccts/h/AParser.cpp
+g++ -mno-cygwin -c -I. -I../Pccts/h -g -O0 ../Pccts/h/ATokenBuffer.cpp
+g++ -mno-cygwin -c -I. -I../Pccts/h -g -O0 ../Pccts/h/DLexerBase.cpp
+g++ -mno-cygwin -c -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. -I../Pccts/h -g -O0 VfrCompile.cpp
+g++ -mno-cygwin -c -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. -I../Pccts/h -g -O0 VfrServices.cpp
+g++ -mno-cygwin -c -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. -I../Pccts/h -g -O0 DLGLexer.cpp
+g++ -mno-cygwin -c -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/ -I../Common -I$WORKSPACE/MdePkg/Include/ -I$WORKSPACE/MdePkg/Include/Ia32 -I. -I../Pccts/h -g -O0 EfiVfrParser.cpp
+g++ -mno-cygwin -o VfrCompile *.o -L../Library-mingw -lCommon
diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
new file mode 100644
index 0000000000..217c4075cc
--- /dev/null
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" ?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="GenTool" basedir=".">
+<!--
+    EDK VfrCompile Tool
+  Copyright (c) 2006, Intel Corporation
+-->
+  <property name="ToolName" value="VfrCompile"/>
+  <property name="FileSet" value="*.cpp"/>
+  <property name="FileSetPccts" value="ATokenBuffer.cpp DLexerBase.cpp AParser.cpp"/>
+  <taskdef resource="cpptasks.tasks"/>
+  <typedef resource="cpptasks.types"/>
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+
+  <property environment="env"/>
+
+  <property name="LINK_OUTPUT_TYPE" value="static"/>
+  <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>
+
+  <target name="GenTool" depends="init, Antlr, Dlg, Tool">
+    <echo message="Building the EDK Tool: ${ToolName}"/>
+  </target>
+
+  <target name="init">
+    <echo message="The EDK Tool: ${ToolName}"/>
+    <mkdir dir="${BUILD_DIR}"/>
+    <if>
+      <equals arg1="${GCC}" arg2="cygwin"/>
+      <then>
+        <echo message="Cygwin Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    <elseif>
+      <os family="dos"/>
+      <then>
+        <echo message="Windows Family"/>
+        <property name="ToolChain" value="msvc"/>
+      </then>
+    </elseif>
+    <elseif>
+      <os family="unix"/>
+      <then>
+        <echo message="UNIX Family"/>
+        <property name="ToolChain" value="gcc"/>
+      </then>
+    </elseif>
+
+    <else>
+      <echo>
+        Unsupported Operating System
+        Please Contact Intel Corporation
+      </echo>
+    </else>
+    </if>
+    <if>
+      <equals arg1="${ToolChain}" arg2="msvc"/>
+      <then>
+        <property name="ext_static" value=".lib"/>
+        <property name="ext_dynamic" value=".dll"/>
+        <property name="ext_exe" value=".exe"/>
+      </then>
+      <elseif>
+        <equals arg1="${ToolChain}" arg2="gcc"/>
+        <then>
+          <property name="ext_static" value=".a"/>
+          <property name="ext_dynamic" value=".so"/>
+          <property name="ext_exe" value=""/>
+        </then>
+      </elseif>
+    </if>
+		<condition property="CheckDepends">
+		  <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
+			  <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
+			</uptodate>
+		</condition>
+  </target>
+
+  <target name="Antlr" depends="init" unless="CheckDepends">
+    <exec dir="${basedir}/${ToolName}" executable="antlr.exe" failonerror="TRUE">
+      <arg line="-CC -e3 -ck 3 -o . VfrCompile.g"/>
+    </exec>
+  </target>
+
+  <target name="Dlg" depends="Antlr" unless="CheckDepends">
+    <exec dir="${basedir}/${ToolName}" executable="dlg.exe" failonerror="TRUE">
+      <arg line="-C2 -i -CC -o . Parser.dlg"/>
+    </exec>
+  </target>
+
+  <target name="Tool" depends="init, Dlg">
+    <cc name="${ToolChain}" objdir="${BUILD_DIR}" 
+        outfile="${BIN_DIR}/${ToolName}"
+        outtype="executable"
+        libtool="${haveLibtool}"
+        optimize="speed">
+
+      <fileset dir="${basedir}/${ToolName}" 
+        includes="${FileSet}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <fileset dir="${basedir}/Pccts/h" 
+        includes="${FileSetPccts}" 
+        defaultexcludes="TRUE" 
+        excludes="*.xml *.inf"/>
+
+      <includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Ia32"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Common"/>
+      <includepath path="${env.WORKSPACE}/MdePkg/Include/Protocol"/>
+      <includepath path="${PACKAGE_DIR}/Common"/>
+
+      <linkerarg value="${LIB_DIR}/CommonTools.lib"/>
+
+    </cc>
+  </target>
+
+  <target name="clean" depends="init">
+    <echo message="Removing Intermediate Files Only"/>  
+    <delete>
+      <fileset dir="${BUILD_DIR}" includes="*.obj"/>
+    </delete>
+  </target>
+
+  <target name="cleanall" depends="init">
+    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
+    <delete dir="${BUILD_DIR}">
+      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>
+    </delete>
+  </target>
+
+</project>
diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
new file mode 100644
index 0000000000..8a7b3badc2
--- /dev/null
+++ b/Tools/Source/TianoTools/build.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="all" basedir=".">
+<!-- Copyright (c) 2006, Intel Corporation -->
+<!-- Filename: Tools/Source/build.xml -->
+
+  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
+  <property environment="env" />
+  <property name="WORKSPACE" value="${env.WORKSPACE}" />
+  <property name="WORKSPACE_DIR" value="${WORKSPACE}" />
+  <property name="PACKAGE" value="Tools" />
+  <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools/Source/TianoTools" />
+  <property name="LIB_DIR" value="${PACKAGE_DIR}/Library" />
+  <property name="BIN_DIR" value="${WORKSPACE}/Tools/bin" />
+  <property name="BUILD_MODE" value="PACKAGE" />
+
+  <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />
+
+  <path id="classpath">
+    <fileset dir="${WORKSPACE}/Tools/Jars" includes="*.jar"/>
+    <fileset dir="${WORKSPACE}/Tools/bin/xmlbeans/lib" includes="*.jar"/>
+  </path>
+
+  <target name="all" depends="init, Tools" />
+  
+  <target name="init">
+    <taskdef classpathref="classpath" resource="GenBuild.tasks" />
+    <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />
+
+    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>
+    <typedef classpathref="classpath" resource="cpptasks.types"/>
+
+    <mkdir dir="${BIN_DIR}" />
+    <mkdir dir="${LIB_DIR}" />
+    <if>
+      <os family="unix" />
+      <then>
+        <echo message="OS Family UNIX" />
+      </then>
+      <elseif>
+        <os family="dos" />
+        <then>
+          <echo message="OS Family DOS" />
+        </then>
+      </elseif>
+      <elseif>
+        <os family="mac" />
+        <then>
+          <echo message="OS Family OS X" />
+        </then>
+      </elseif>
+      <else>
+        <echo message="OS Family Unsupported" />
+      </else>
+    </if>
+
+    <property name="HOST_ARCH" value="IA32"/>
+    <ToolChainSetup confPath="${WORKSPACE_DIR}/Tools/Conf" />
+  </target>
+  
+  <target name="Libraries">
+    <subant target="" inheritall="true">
+      <fileset dir="${PACKAGE_DIR}" 
+        includes="Common/build.xml CustomizedCompress/build.xml"/>
+    </subant>
+  </target>
+
+  <target name="Tools" depends="Libraries">
+    <subant target="" inheritall="true">
+      <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"
+        excludes="Common/build.xml CustomizedCompress/build.xml"/>
+    </subant>
+  </target>
+
+  <target name="clean">
+    <subant target="clean" inheritall="true">
+      <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
+    </subant>
+  </target>
+
+  <target name="cleanall">
+    <subant target="cleanall" inheritall="true">
+      <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>
+    </subant>
+    <delete dir="${LIB_DIR}"/>
+  </target>
+</project>
diff --git a/Tools/Source/Tools.msa b/Tools/Source/Tools.msa
new file mode 100644
index 0000000000..303381722e
--- /dev/null
+++ b/Tools/Source/Tools.msa
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleSurfaceArea xmlns="http://nwlxweb02.jf.intel.com/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://nwlxweb02.jf.intel.com/2006/Edk2.0  http://nwlxweb02.jf.intel.com/2006/Edk2.0/SurfaceArea.xsd">
+  <MsaHeader>
+    <BaseName>Tools</BaseName>
+    <ModuleType>BASE</ModuleType>
+    <ComponentType>USER_DEFINED</ComponentType>
+    <Guid>5d6c499e-53fd-430e-9285-2d7811b924e8</Guid>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.
+    </Description>
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+  </MsaHeader>
+  <LibraryClass>
+    <Library>Java</Library>
+    <Library>Perl</Library>
+  </LibraryClass>
+  <SourceFiles>
+    <Filename Path="Common">FrameworkDatabase.db</Filename>
+    <Filename Path="Conf">cygwin_tools.txt</Filename>
+    <Filename Path="Conf">desktop_efi_flags.txt</Filename>
+    <Filename Path="Conf">embedded_efi_flags.txt</Filename>
+    <Filename Path="Conf">gcc_tools.txt</Filename>
+    <Filename Path="Conf">global_efi_flags.txt</Filename>
+    <Filename Path="Conf">intel_tools.txt</Filename>
+    <Filename Path="Conf">mobile_efi_flags.txt</Filename>
+    <Filename Path="Conf">msft_tools.txt</Filename>
+    <Filename Path="Conf">my_efi_flags.txt</Filename>
+    <Filename Path="Conf">node.txt</Filename>
+    <Filename Path="Conf">server_efi_flags.txt</Filename>
+    <Filename Path="Conf">target.txt</Filename>
+    <Filename Path="Conf">tools_def.txt</Filename>
+    <Filename Path="Conf">winddk_tools.txt</Filename>
+    <Filename Path="Jars">cpptasks.jar</Filename>
+    <Filename Path="Jars">frameworktasks.jar</Filename>
+    <Filename Path="Jars">GenBuild.jar</Filename>
+  </SourceFiles>
+  <Includes>
+    <ModuleName>Base</ModuleName>
+  </Includes>
+  <Externs>
+    <Extern>
+      <ModuleEntryPoint></ModuleEntryPoint>
+    </Extern>
+  </Externs>
+  <BuildOptions>
+    <Option>DO_NOT_COMPILE</Option>
+  </BuildOptions>
+</ModuleSurfaceArea>
diff --git a/Tools/ToolResources.msa b/Tools/ToolResources.msa
new file mode 100644
index 0000000000..4347771b32
--- /dev/null
+++ b/Tools/ToolResources.msa
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <MsaHeader>
+    <BaseName>ToolResources</BaseName>
+    <ModuleType>BASE</ModuleType>
+    <ComponentType>CUSTOM_BUILD</ComponentType>
+    <Guid>5d6c499e-53fd-430e-9285-2d7811b924e8</Guid>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
+    <Description> This Module provides the EFI/Tiano Tools and resources that are used to create EFI/Tiano Modules and Platform Binary Files (PBF) These resources and tools do not require compilation. (The three JAR files are provided, Pre-compiled, and do not require additional compilation, the sources are provided, but will not be built under normal procedures. </Description>
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
+    <License> All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. </License>
+    <Created>2006-03-30 10:05</Created>
+  </MsaHeader>
+  <LibraryClassDefinitions>
+    <LibraryClass>Java</LibraryClass>
+    <LibraryClass>Perl</LibraryClass>
+  </LibraryClassDefinitions>
+  <SourceFiles>
+    <Filename Path="bin" FileType="pl">inf2msa.pl</Filename>
+    <Filename Path="bin" FileType="pl">mkspd.pl</Filename>
+    <Filename Path="bin" FileType="pl">mkdb.pl</Filename>
+    <Filename Path="Conf" FileType="db">FrameworkDatabase.db</Filename>
+    <Filename Path="Conf" FileType="txt">cygwin_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">desktop_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">embedded_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">gcc_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">global_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">intel_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">mobile_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">msft_tools.txt</Filename>
+    <Filename Path="Conf" FileType="txt">my_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">node.txt</Filename>
+    <Filename Path="Conf" FileType="txt">server_efi_flags.txt</Filename>
+    <Filename Path="Conf" FileType="txt">target.txt</Filename>
+    <Filename Path="Conf" FileType="txt">tools_def.txt</Filename>
+    <Filename Path="Conf" FileType="txt">winddk_tools.txt</Filename>
+    <Filename Path="Jars" FileType="jar">cpptasks.jar</Filename>
+    <Filename Path="Jars" FileType="jar">frameworktasks.jar</Filename>
+    <Filename Path="Jars" FileType="jar">GenBuild.jar</Filename>
+  </SourceFiles>
+  <Includes>
+    <PackageName>Base</PackageName>
+  </Includes>
+  <BuildOptions>
+    <Option>DO_NOTHING</Option>
+  </BuildOptions>
+</ModuleSurfaceArea>
diff --git a/Tools/Tools.spd b/Tools/Tools.spd
new file mode 100644
index 0000000000..5fd0a381f4
--- /dev/null
+++ b/Tools/Tools.spd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <SpdHeader>
+    <PackageName>Tools</PackageName>
+    <Guid>53f84ca0-53fe-4412-b4e7-dcec602e1d49</Guid>
+    <Version>0.1</Version>
+    <Abstract>TianoCore.org EFI Tiano Tools</Abstract>
+    <Description> This package provides the tools needed to create EFI Tiano platform binary files (PBF) and EFI Tiano Modules that can be incorporated into a PBF. Source Code is provided for all C and Java applications. This package also provides the directory structure for holding configuration files. </Description>
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
+    <License> All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at http://opensource.org/licenses/bsd-license.php THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. </License>
+    <Created>2006-02-24 14:49</Created>
+    <URL>http://www.TianoCore.org</URL>
+    <PackageType>MIXED</PackageType>
+  </SpdHeader>
+  <MsaFiles>
+  <!--
+    <MsaFile>
+      <Filename>ToolResources.msa</Filename>
+    </MsaFile>
+    <MsaFile Guid="faf22a0f-10fc-428e-b311-fe506a9c0b2d">
+      <Filename>JavaResources.msa</Filename>
+    </MsaFile>
+    <MsaFile Guid="2a1b3a91-8d57-4fc3-a6c9-ae95bb699bac">
+      <Filename>Source/Tools.msa</Filename>
+    </MsaFile>
+    -->
+  </MsaFiles>
+</PackageSurfaceArea>
diff --git a/Tools/XMLSchema/FDPManifest.xsd b/Tools/XMLSchema/FDPManifest.xsd
new file mode 100644
index 0000000000..f6b3715426
--- /dev/null
+++ b/Tools/XMLSchema/FDPManifest.xsd
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Filename: SurfaceArea.xsd
+
+Copyright (c) 2006, Intel Corp.
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which may be found at http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+    targetNamespace="http://www.TianoCore.org/2006/Edk2.0"
+    xmlns="http://www.TianoCore.org/2006/Edk2.0">
+    <xs:annotation>
+        <xs:documentation xml:lang="en"> This schema defines FDP Manifest </xs:documentation>
+    </xs:annotation>
+    <!--<xs:include schemaLocation="http://nwlxweb02.jf.intel.com/2006/Edk2.0/FrameworkHeaders.xsd"/>-->
+    <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:element name="FrameworkDevPkgManifest">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">At the top level of the Manifest we have four sections:
+                Header, Private, Public and Contents.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Header"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Private"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Public"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Contents"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Header">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> The Header contains some three elements that can
+                uniquely identify this package (PackageName, Guid, Version) as well as several
+                fields that identify the licensing and compyright status of the contents of the
+                package. The rest of the fields are there to idenify who created the package and
+                when it was made. The buid fields are here to identify when the package was created,
+                not when the package was compiled. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="PackageType" type="PackageType"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Creator"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Vendor"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Updated"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Modifier"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="DefaultInstallDir"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildNumber"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="BuildTarget"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildSystem"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildType"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ReleaseType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="BuildNumber" type="xs:integer">
+        <xs:annotation>
+            <xs:documentation> The Build number is an integer that is meant to represent the exact
+                build of the package. </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="Type">
+        <xs:annotation>
+            <xs:documentation> In the Type field we can record what kinds of modules are contained
+                in the package. The possibilities are source, binary and mixed (both source and
+                binary.) </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.Type"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.Type">
+        <xs:attribute name="Value" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="Source"/>
+                    <xs:enumeration value="Binary"/>
+                    <xs:enumeration value="Mixed"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="attlist.Guid">
+        <xs:attribute name="Value" use="required" type="xs:NMTOKEN"/>
+    </xs:attributeGroup>
+    <xs:element name="BuildTarget" type="SupportedArchitectures">
+        <xs:annotation>
+            <xs:documentation> The build target is used to record what target architecture the
+                modules within this package were compiled for. </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="Creator">
+        <xs:annotation>
+            <xs:documentation> In the creator field, we can record the name, user id, and email
+                address of the person who created this package. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.Creator"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.Creator">
+        <xs:attribute name="Name" use="required"/>
+        <xs:attribute name="UserId"/>
+        <xs:attribute name="Email"/>
+    </xs:attributeGroup>
+    <xs:element name="Modifier">
+        <xs:annotation>
+            <xs:documentation> In the Modifier field, we can record the name, user id, and email
+                address of the person who changed/updated or modified this package.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.Modifier"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.Modifier">
+        <xs:attribute name="Name" use="required"/>
+        <xs:attribute name="UserId"/>
+        <xs:attribute name="Email"/>
+    </xs:attributeGroup>
+    <xs:element name="Vendor" type="xs:token">
+        <xs:annotation>
+            <xs:documentation> The name of the company, organization or individual that created or
+                distributes the package. </xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="BuildSystem">
+        <xs:annotation>
+            <xs:documentation>This is the place to record the name and DNS name of the computer on
+                which the package was created.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.BuildSystem"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.BuildSystem">
+        <xs:attribute name="Name" use="required"/>
+        <xs:attribute name="NetAddr"/>
+    </xs:attributeGroup>
+    <xs:element name="BuildType">
+        <xs:annotation>
+            <xs:documentation> The package may be Debug or Production. </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+            <xs:restriction base="xs:token">
+                <xs:enumeration value="Debug"/>
+                <xs:enumeration value="Production"/>
+            </xs:restriction>
+        </xs:simpleType>
+    </xs:element>
+    <xs:element name="ReleaseType">
+        <xs:annotation>
+            <xs:documentation> We may identify the quality level of the package here.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:simpleType>
+            <xs:restriction base="xs:token">
+                <xs:enumeration value="Developer Build"/>
+                <xs:enumeration value="Experimental Release"/>
+                <xs:enumeration value="Alpha Release"/>
+                <xs:enumeration value="Beta Release"/>
+                <xs:enumeration value="Release Canidate"/>
+                <xs:enumeration value="Official Release"/>
+                <xs:enumeration value="Patch Release"/>
+                <xs:enumeration value="Integration Build Release"/>
+            </xs:restriction>
+        </xs:simpleType>
+    </xs:element>
+    <xs:element name="DefaultInstallDir">
+        <xs:annotation>
+            <xs:documentation> This is the directory, relative to the root of the workspace, where
+                the package will be installed by default. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.DefaultInstallDir"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.DefaultInstallDir">
+        <xs:attribute name="Name" use="required"/>
+    </xs:attributeGroup>
+    <xs:element name="Dependencies">
+        <xs:annotation>
+            <xs:documentation> We can track the pakages that this package provides (these are the
+                packages contained in this pacakge.) We also record which packages are required by
+                this package. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" ref="Requires"/>
+                <xs:element minOccurs="0" ref="Provides"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Requires">
+        <xs:annotation>
+            <xs:documentation> This is a list of the packages that this package requires to be
+                installed in the workspace for package to function and/or build correctly. In the
+                case of source packages, these are the necessary dependencies for successful
+                build-time operation of the package. For binary packages these dependencies are
+                necessary for successful runtime operation.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="Package">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This tag is used in the Framework Package
+                            Database File to track individual package information. The Path is a
+                            relative path to the SPD File.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence maxOccurs="unbounded">
+                            <xs:element minOccurs="0" maxOccurs="1" ref="PackageName"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PackageAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element ref="Includes"/>
+                <xs:element name="Library">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="BaseNameConvention">
+                                <xs:attributeGroup ref="LibraryAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="Protocol">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="ProtocolAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element ref="Guid"/>
+                <xs:element ref="File"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Provides">
+        <xs:annotation>
+            <xs:documentation>The list of dependencies that the package fulfills.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element name="Package">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This tag is used in the Framework Package
+                            Database File to track individual package information. The Path is a
+                            relative path to the SPD File.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence maxOccurs="unbounded">
+                            <xs:element minOccurs="0" maxOccurs="1" ref="PackageName"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PackageAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element ref="Includes"/>
+                <xs:element name="Library">
+                    <xs:annotation><xs:documentation>
+                        A library. It can be provided by or required by this or other packages.
+                    </xs:documentation></xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="BaseNameConvention">
+                                <xs:attributeGroup ref="LibraryAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="Protocol">
+                    <xs:annotation>
+                        <xs:documentation>
+                        A protocol. It can be provided by or required by this or other packages.
+                    </xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="ProtocolAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element ref="Guid"/>
+                <xs:element ref="File"/>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.Library">
+        <xs:attribute name="Name" use="required"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="attlist.Protocol">
+        <xs:attribute name="Name" use="required"/>
+        <xs:attribute name="Guid" use="required" type="xs:NMTOKEN"/>
+    </xs:attributeGroup>
+    <xs:element name="Private">
+        <xs:annotation>
+            <xs:documentation> The Private section is a place where the files are listed that should
+                not be seen by the users of this package. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="File"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Public">
+        <xs:annotation>
+            <xs:documentation> The Public section is a list of files that are meant to be seen by
+                the users of the package. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="File"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Contents">
+        <xs:annotation>
+            <xs:documentation>This is a list of all the files within this package. Each file is
+                identified by its path relative to the workspace root.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="File"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="File">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Specify a filename including the path</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:normalizedString">
+                    <xs:attributeGroup ref="attlist.File"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.File">
+        <xs:attribute name="Type"/>
+        <xs:attribute name="Desc"/>
+        <xs:attribute name="Size" type="xs:NMTOKEN"/>
+        <xs:attribute name="CDate" type="xs:NMTOKEN"/>
+        <xs:attribute name="CTime" type="xs:NMTOKEN"/>
+        <xs:attribute name="MDate" type="xs:NMTOKEN"/>
+        <xs:attribute name="MTime" type="xs:NMTOKEN"/>
+        <xs:attribute name="ADate" type="xs:NMTOKEN"/>
+        <xs:attribute name="ATime" type="xs:NMTOKEN"/>
+        <xs:attribute name="Checksum" type="xs:NMTOKEN"/>
+    </xs:attributeGroup>
+</xs:schema>
diff --git a/Tools/XMLSchema/FrameworkDataElements.xsd b/Tools/XMLSchema/FrameworkDataElements.xsd
new file mode 100644
index 0000000000..bbc75d9729
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkDataElements.xsd
@@ -0,0 +1,1479 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: FrameworkDataElements.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:annotation>
+        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Data Elements </xs:documentation>
+    </xs:annotation>
+    <xs:include schemaLocation="NamingConvention.xsd"/>
+    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
+    <xs:element name="Abstract">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Abstract is valid for all Description Files</xs:documentation>
+            <xs:documentation xml:lang="en">This section is required. This is a single sentence to describe the module and will be used in sample files as the abstract data in the header comment section.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="Sentence">
+                    <xs:attribute name="URL" type="xs:anyURI"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="AntCmd">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a sub-element of AntTask</xs:documentation>
+            <xs:documentation xml:lang="en">This is an ant command that will be inserted into a biuld sequence. Since ant commands are valid XML statements, special care must be taken to use the correct tokens for reserved words and escape quote characters.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" name="Id" type="xs:int"/>
+                <xs:element name="ExecutionOrder">
+                    <xs:simpleType>
+                        <xs:list itemType="xs:normalizedString"/>
+                    </xs:simpleType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attributeGroup ref="SectionAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="AntTask">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a sub-element of UserDefinedAntTasks</xs:documentation>
+            <xs:documentation xml:lang="en">Define a file that contains one or more ant tasks that are to be added into or replacing of sequences of build steps. These files will be called using the ant-call task on a file name. These files must be valid apache-ant formatted task files.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice>
+                <xs:element ref="AntCmd"/>
+                <xs:element ref="Filename"/>
+            </xs:choice>
+            <xs:attribute name="Id" type="xs:int" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="BaseName">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">BaseName is valid for all Description Files</xs:documentation>
+            <xs:documentation xml:lang="en"> We need to be able to permit different attributes for every basename </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="BaseNameConvention">
+                    <xs:attributeGroup ref="BaseNameAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="BootModes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">BootModes is valid for all Description Files</xs:documentation>
+            <xs:documentation xml:lang="en">This is a list of BootModes Supported by the Module</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="BootMode">
+                    <xs:complexType>
+                        <xs:attributeGroup ref="BootModeAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="BuildOptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">BuildOptions is valid for MBD and FPD files.</xs:documentation>
+            <xs:documentation xml:lang="en">Specific Build Options, by Tool Chain, than should be applied, overriding any global options</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" ref="UserDefinedAntTasks"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ImageEntryPoint"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Ffs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Sections"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filenames"/>
+                <xs:sequence minOccurs="0">
+                    <xs:element minOccurs="0" maxOccurs="unbounded" name="Option">
+                        <xs:complexType>
+                            <xs:simpleContent>
+                                <xs:extension base="xs:normalizedString">
+                                    <xs:attributeGroup ref="OptionAttributes"/>
+                                </xs:extension>
+                            </xs:simpleContent>
+                        </xs:complexType>
+                    </xs:element>
+                    <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                        <xs:complexType>
+                            <xs:sequence minOccurs="1">
+                                <xs:element maxOccurs="unbounded" name="Option">
+                                    <xs:complexType>
+                                        <xs:simpleContent>
+                                            <xs:extension base="xs:normalizedString">
+                                                <xs:attributeGroup ref="OptionAttributes"/>
+                                            </xs:extension>
+                                        </xs:simpleContent>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:sequence>
+                            <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                        </xs:complexType>
+                    </xs:element>
+                </xs:sequence>
+            </xs:sequence>
+            <xs:attribute name="ToolChain" type="ToolChains"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="C_Name" type="C_Name">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">C_Name is valid for all Description Files</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="ComponentName" type="C_Name">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">ComponentName is valid for all Description Files</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="ComponentType" type="FrameworkComponentTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the valid Framework Component Type</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="Condition">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="0" maxOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="1" name="Condition" type="xs:normalizedString"/>
+            </xs:sequence>
+            <xs:attribute name="ConditionalTarget" type="ConditionalTarget" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ConditionalExpression">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">A conditional expression that must be evaluated to determine whether a feature is implemented or not. The expression must be either numeric, string or boolean.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Condition" type="xs:normalizedString"/>
+            </xs:sequence>
+            <xs:attribute name="ConditionalTarget" type="ConditionalTarget" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Constructor" type="C_Name"/>
+    <xs:element name="Copyright" type="Sentence"/>
+    <xs:element name="Created" type="DateType"/>
+    <xs:element name="CreatedBy" type="UserName"/>
+    <xs:element name="DataHubs">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a list of DataHubRecord elements.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="DataHubRecord">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="xs:normalizedString">
+                                <xs:attributeGroup ref="DataHubAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="DataHubRecord">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="xs:normalizedString">
+                                            <xs:attributeGroup ref="DataHubAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="DatabaseName">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">The Name of the Database, "FrameworkDatabase"</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="BaseNameConvention">
+                    <xs:attributeGroup ref="BaseNameAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="DefaultValue">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">The default setting of a PCD entry.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:normalizedString"/>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Description" type="Paragraph">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section is required for new modules and libraries and must contain more information than the Abstract.</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="Destructor" type="C_Name"/>
+    <xs:element name="DriverBinding" type="C_Name"/>
+    <xs:element name="DriverConfig" type="C_Name"/>
+    <xs:element name="DriverDiag" type="C_Name"/>
+    <xs:element name="E-Mail" type="E-Mail"/>
+    <xs:element name="Events">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a list of Events</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="CreateEvents">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:element name="Event">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="EventAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="Event">
+                                            <xs:complexType>
+                                                <xs:sequence>
+                                                    <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                </xs:sequence>
+                                                <xs:attributeGroup ref="EventAttributes"/>
+                                            </xs:complexType>
+                                        </xs:element>
+                                    </xs:sequence>
+                                    <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" name="SignalEvents">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Module has an event that is waiting to be signaled. Event is named by GUID.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:element name="Event">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="EventAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element name="Event">
+                                            <xs:complexType>
+                                                <xs:sequence>
+                                                    <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                                    <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                                </xs:sequence>
+                                                <xs:attributeGroup ref="EventAttributes"/>
+                                            </xs:complexType>
+                                        </xs:element>
+                                    </xs:sequence>
+                                    <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ExitBootServicesCallBack" type="C_Name"/>
+    <xs:element name="Externs">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a child of MSA files, both Library and Module.</xs:documentation>
+            <xs:documentation xml:lang="en">This is a list of Extern statements, right now, only Driver Binding information is provided.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="Extern">
+                    <xs:complexType>
+                        <xs:choice minOccurs="1">
+                            <xs:sequence minOccurs="0" maxOccurs="1">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Driver Module</xs:documentation>
+                                </xs:annotation>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ModuleEntryPoint"/>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ModuleUnloadImage"/>
+                            </xs:sequence>
+                            <xs:sequence minOccurs="0" maxOccurs="1">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Library Module</xs:documentation>
+                                </xs:annotation>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Constructor"/>
+                                <xs:element minOccurs="0" maxOccurs="1" ref="Destructor"/>
+                            </xs:sequence>
+                            <xs:sequence minOccurs="0" maxOccurs="1">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Allow multiple entries for DriverBinding, ComponentName, DriverConfig and DriverDiag elements. For ComponentName, DriverConfig and/or DriverDiag - you must have a 1:1 mapping to DriverBinding if the element is defined.</xs:documentation>
+                                    <xs:documentation xml:lang="en">Permit User Defined Extern Tags</xs:documentation>
+                                </xs:annotation>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverBinding"/>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ComponentName"/>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverConfig"/>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverDiag"/>
+                            </xs:sequence>
+                            <xs:sequence minOccurs="0" maxOccurs="1">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en"> Module Call Backs</xs:documentation>
+                                </xs:annotation>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="SetVirtualAddressMapCallBack"/>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" ref="ExitBootServicesCallBack"/>
+                            </xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="UserDefined" type="C_Name"/>
+                        </xs:choice>
+                        <xs:attributeGroup ref="ExternAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Extern">
+                                <xs:complexType>
+                                    <xs:choice minOccurs="1">
+                                        <xs:sequence minOccurs="0" maxOccurs="1">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">Driver Module</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="ModuleEntryPoint"/>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="ModuleUnloadImage"/>
+                                        </xs:sequence>
+                                        <xs:sequence minOccurs="0" maxOccurs="1">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">Library Module</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="Constructor"/>
+                                            <xs:element minOccurs="0" maxOccurs="1" ref="Destructor"/>
+                                        </xs:sequence>
+                                        <xs:sequence minOccurs="0" maxOccurs="1">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">Allow multiple entries for DriverBinding, ComponentName, DriverConfig and DriverDiag elements. For ComponentName, DriverConfig and/or DriverDiag - you must have a 1:1 mapping to DriverBinding if the element is defined.</xs:documentation>
+                                                <xs:documentation xml:lang="en">Permit User Defined Extern Tags</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverBinding"/>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="ComponentName"/>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverConfig"/>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="DriverDiag"/>
+                                        </xs:sequence>
+                                        <xs:sequence minOccurs="0" maxOccurs="1">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en"> Module Call Backs</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="SetVirtualAddressMapCallBack"/>
+                                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="ExitBootServicesCallBack"/>
+                                        </xs:sequence>
+                                        <xs:element minOccurs="0" maxOccurs="unbounded" name="UserDefined" type="C_Name"/>
+                                    </xs:choice>
+                                    <xs:attributeGroup ref="ExternAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Ffs">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define the FFS File attributes within a sections and containing sections information</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Attribute">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Value" type="C_Name"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Sections"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Filename">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the valid content of a filename</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="VariableConvention">
+                    <xs:attributeGroup ref="FilenameAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Filenames">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a list of Filenames</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1">
+                            <xs:element maxOccurs="unbounded" ref="Filename"/>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Formsets">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the list of a Formset elements</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="Formset">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Describe the valid content of a Formset</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="FormsetAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Formset">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Describe the valid content of a Formset</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="C_Name">
+                                            <xs:attributeGroup ref="FormsetAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Guid">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the valid content of a GUID</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="GuidType">
+                    <xs:attributeGroup ref="GuidAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="GuidDeclarations">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                        </xs:sequence>
+                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Guids">
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="GuidEntry">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Describe the valid content of a PCD GUID element</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence minOccurs="0" maxOccurs="1">
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="GuidAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="GuidEntry">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Describe the valid content of a PCD GUID element</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:sequence minOccurs="0" maxOccurs="1">
+                                        <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="GuidValue"/>
+                                        <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                                        <xs:element minOccurs="0" maxOccurs="unbounded" ref="ConditionalExpression"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="DefaultValue"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="GuidAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="GuidValue" type="GuidType"/>
+    <xs:element name="HelpText" type="Paragraph">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section is used to describe how a GUID, PPI or PROTOCOL is to be used within the context of PCDs.</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="Hobs">
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="Hob">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="HobAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Hob">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:normalizedString"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="C_Name"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="HobAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ImageEntryPoint" type="C_Name"/>
+    <xs:element name="IncludeHeader">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="FileNameConvention">
+                    <xs:attributeGroup ref="IncludeAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Includes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">One or More Package Names or Arch sections is required. Includes are not files, but paths to where header files are located.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="PackageName"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1">
+                            <xs:element maxOccurs="unbounded" ref="PackageName"/>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="InstalledDate" type="DateType"/>
+    <xs:element name="Libraries">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Different Instances of Libraries</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Library">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="BaseNameConvention">
+                                <xs:attributeGroup ref="LibraryAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Library">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="BaseNameConvention">
+                                            <xs:attributeGroup ref="LibraryAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:choice>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryClass">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define in the MSA and/or SPD, what class of library is being produced by a library module - for components, it can also specify what class of library is consumed.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="BaseNameConvention">
+                    <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryClassDeclaration">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element defines a class of library, along with the path to the Include Header for this library</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="0">
+                <xs:element minOccurs="1" maxOccurs="1" ref="LibraryClass"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="IncludeHeader"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryClassDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element ref="LibraryClassDeclaration"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryClassDefinitions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section defines what Classes of Libraries that this library belongs to. A Library may belong to multiple different library classes.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element ref="LibraryClass"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="License">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="Paragraph">
+                    <xs:attribute name="URL" type="xs:anyURI"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Modified" type="DateType"/>
+    <xs:element name="Module">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is record format for a Module entry in the Framework Database file.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:annotation>
+                <xs:documentation xml:lang="en">This describes the fields in an Module record in the Framework Database. The Path field is relative to the workspace to Module Surface Area (MSA) files.</xs:documentation>
+            </xs:annotation>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="ModuleName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleEntryPoint" type="xs:normalizedString"/>
+    <xs:element name="ModuleList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track package installation</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="Module"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleName">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the valid content of a Module Name</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="BaseNameConvention">
+                    <xs:attributeGroup ref="ModuleNameAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleType" type="ModuleTypeDef">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the valid EFI Phase that the Module is designed to execute under.</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="ModuleUnloadImage" type="xs:normalizedString"/>
+    <xs:element name="MsaFiles">
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="MsaFile">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Describe the valid content of a Surface Area Package Description (SPD) file</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence minOccurs="0" maxOccurs="1">
+                            <xs:element minOccurs="0" ref="Filename"/>
+                            <xs:element minOccurs="0" ref="BuildOptions"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="MsaAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1">
+                            <xs:element maxOccurs="unbounded" name="MsaFile">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Describe the valid content of a Surface Area Package Description (SPD) file</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:sequence minOccurs="0" maxOccurs="1">
+                                        <xs:element minOccurs="0" ref="Filename"/>
+                                        <xs:element minOccurs="0" ref="BuildOptions"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="MsaAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="OutputDirectory">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define where we want our output to go. The Attribute, IntermediateDirectories, default MODULE, says that intermediate files will be local to the module, versus a unified directory structure.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="DirectoryNamingConvention">
+                    <xs:attribute default="MODULE" name="IntermediateDirectories">
+                        <xs:simpleType>
+                            <xs:restriction base="UCNameType">
+                                <xs:enumeration value="MODULE"/>
+                                <xs:enumeration value="UNIFIED"/>
+                            </xs:restriction>
+                        </xs:simpleType>
+                    </xs:attribute>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PCDs">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Module Surface Area documents, MSA and MBD files, Library Modules and Other Modules</xs:documentation>
+            <xs:documentation xml:lang="en">One or more PcdData or PcdBuildData Elements Only one type is permitted</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdData">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is a child of PCDs and can occur in the MSA and MBD files.</xs:documentation>
+                        <xs:documentation xml:lang="en">This is date element is used in the Module Surface Area (MSA) file and contains references to be used by a Platform Build</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="HexDoubleWordDataType"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+                            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="MaxSku" type="HexByteDataType"/>
+                            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="1"/>
+                                        <xs:maxInclusive value="16777215"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" ref="HelpText"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageDependencies">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="PackageName"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="PackageNameAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageHeaders">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This defines the minimum header file needed to support a given ModuleType.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="IncludeHeader"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageList">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track all packages installed in a workspace.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element minOccurs="1" name="Package">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This tag is used in the Framework Package Database File to track individual package information. The Path is a relative path to the SPD File.</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence maxOccurs="unbounded">
+                            <xs:element minOccurs="0" maxOccurs="1" ref="PackageName"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Path"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="InstalledDate"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PackageAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageName">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This tag is used in the Package Surface Area Description File to track package dependencies for a module</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="BaseNameConvention">
+                    <xs:attributeGroup ref="PackageAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageType" type="PackageType"/>
+    <xs:element name="Path">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describe the valid content of a filename</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="DirectoryNamingConvention">
+                    <xs:attributeGroup ref="DirectoryAttributes"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PcdBuildDeclarations">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Framework Platform Description (FPD)</xs:documentation>
+            <xs:documentation xml:lang="en">We permit the FPD to use an external XML file for PCD information or else the information must be contained within the XML data element, PcdBuildData.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="1" ref="Filename"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PcdBuildData">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Child of PcdBuildDeclarations</xs:documentation>
+                        <xs:documentation xml:lang="en">This is date element is used in the platform build description file and contains valid data for a Platform Build</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This as a unique identifier defined for either this name space.</xs:documentation>
+                                    <xs:documentation xml:lang="en">The Target Attribute may be used to define a Target name space, such as PCI.</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="HexDoubleWordDataType">
+                                            <xs:attribute name="Target" type="C_Name" use="optional"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This specifies the size of the Pcd Datum. It is either 8, 16, 32 or 64 bits for values, 1 bit for BOOLEAN and variable length for elements defined as VOID*</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="HiiEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This Bit means that the Variable data is associated with HII</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="VpdEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This bit enables the Vital Product Data area within flash for maintaining PCD information</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean">
+                                <xs:annotation>
+                                    <xs:documentation>This is only applicable to ItemType DYNAMIC_EX</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="1" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+                            <xs:choice minOccurs="0">
+                                <xs:element minOccurs="0" maxOccurs="1" name="SkuDataArray">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This element is a list of two entries per line, the first should be an integer, while the second entry should be a string value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:simpleType>
+                                        <xs:list itemType="xs:normalizedString"/>
+                                    </xs:simpleType>
+                                </xs:element>
+                                <xs:element minOccurs="0" maxOccurs="unbounded" name="SkuData">
+                                    <xs:annotation>
+                                        <xs:documentation xml:lang="en">This section is for a list of SkuData Elements, ID and Value</xs:documentation>
+                                    </xs:annotation>
+                                    <xs:complexType>
+                                        <xs:sequence minOccurs="1">
+                                            <xs:element name="Id" type="xs:int"/>
+                                            <xs:element name="Value" type="xs:normalizedString"/>
+                                        </xs:sequence>
+                                    </xs:complexType>
+                                </xs:element>
+                            </xs:choice>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="MaxSku" type="HexByteDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This value comes from a production line database, and has nothing to do with the number of SkuData IDs that have been defined.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element default="0x00" minOccurs="1" maxOccurs="1" name="SkuId" type="HexByteDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the specific Sku ID for this build.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumSize">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="1"/>
+                                        <xs:maxInclusive value="16777215"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableGuid" type="VariableGuidType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the Variable's GUID if and only if HII is enabled.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="VariableName" type="xs:normalizedString">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is the C Name for the Variable, and is valid if and only HII is enabled.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DataOffset" type="Hex64BitDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">If HII is enabled, This is the offset into the variable data entry, If Vpd is enabled, then it's the Offset into the VPD area of the image defined by platform manufacturer, if neither HII nor Vpd are enabled, it's the offset into the PCD Data Area. HII and VPD can never be enabled at the same time (as of the date of this document.)</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This field is only valid if AlternateNameSpaceEnable is true.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DefaultValue" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:choice>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PcdDefinitions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Child of Package Surface Area Description (SPD)</xs:documentation>
+            <xs:documentation xml:lang="en">This permits entering information about a package's PCD information</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element maxOccurs="unbounded" name="PcdEntry">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is the valid content of the PCD table of a Module. The contents may not be wired at build time, and these only refer to Platform Build values, not modules.</xs:documentation>
+                        <xs:documentation xml:lang="en">This element is valid for PcdInfo.xml and FPD files.</xs:documentation>
+                        <xs:documentation xml:lang="en">There is ONE required Attribute, ItemType</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="Token" type="Token"/>
+                            <xs:element minOccurs="1" maxOccurs="1" name="DatumType" type="PcdDataTypes"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="HiiEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="VpdEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="AlternateNameSpaceEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuEnable" type="xs:boolean"/>
+                            <xs:element default="false" minOccurs="0" maxOccurs="1" name="SkuDataArrayEnable" type="xs:boolean"/>
+                            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="MaxSku" type="HexByteDataType"/>
+                            <xs:element default="0x00" minOccurs="0" maxOccurs="1" name="SkuId" type="HexByteDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DatumSize">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Max Number of Bytes of the data.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="1"/>
+                                        <xs:maxInclusive value="16777215"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableName" type="xs:normalizedString"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="VariableGuid" type="VariableGuidType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DataOffset" type="Hex64BitDataType"/>
+                            <xs:element default="0" minOccurs="0" maxOccurs="1" name="GuidOffset" type="Hex64BitDataType"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="DefaultValue" type="DefaultValue"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="PcdAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Platform">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Database Entry to locate the Platform Build Tips - path to FPD file.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="PlatformName">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Define the Name of a Platform</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="PlatformNamingConvention">
+                                <xs:attributeGroup ref="PlatformAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element ref="Path"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="AlternatePcdFile" type="FileNameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="AlternateFdfFile" type="FileNameConvention"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="PlatformAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PpiDeclarations">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                        </xs:sequence>
+                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PPIs">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Provide for one or more Ppi or PpiNotify sections. </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="PpiAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="PpiNotifyAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Ppi">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="C_Name">
+                                            <xs:attributeGroup ref="PpiAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="PpiNotify">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="C_Name">
+                                            <xs:attributeGroup ref="PpiNotifyAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ProtocolDeclarations">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Entry">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="C_Name"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="FeatureFlag" type="C_Name"/>
+                        </xs:sequence>
+                        <xs:attribute name="Name" type="xs:normalizedString" use="required"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Protocols">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">If either Protocol or ProtocolNotify sections are needed, one or more of them should be specified within this section</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="ProtocolAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
+                    <xs:complexType>
+                        <xs:simpleContent>
+                            <xs:extension base="C_Name">
+                                <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
+                            </xs:extension>
+                        </xs:simpleContent>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="Protocol">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="C_Name">
+                                            <xs:attributeGroup ref="ProtocolAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="unbounded" name="ProtocolNotify">
+                                <xs:complexType>
+                                    <xs:simpleContent>
+                                        <xs:extension base="C_Name">
+                                            <xs:attributeGroup ref="ProtocolNotifyAttributes"/>
+                                        </xs:extension>
+                                    </xs:simpleContent>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element default="false" name="ReadOnly" type="xs:boolean"/>
+    <xs:element default="false" name="RePackage" type="xs:boolean"/>
+    <xs:element name="Sections">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Sections refers to the Firmware Filesystem sections, PE32, UI, VER, DXS, etc. and how they are made</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Section">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" ref="Filenames"/>
+                            <xs:element minOccurs="0" name="Args" type="ArgsType"/>
+                            <xs:element minOccurs="0" name="OutFile" type="FileNameConvention"/>
+                            <xs:element minOccurs="0" name="OutputFileExtension" type="xs:string"/>
+                            <xs:element minOccurs="0" name="ToolName" type="ToolType"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="SectionAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Sections">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                            <xs:element name="Section">
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="0" ref="Filenames"/>
+                                        <xs:element minOccurs="0" name="Args" type="ArgsType"/>
+                                        <xs:element minOccurs="0" name="OutFile" type="FileNameConvention"/>
+                                        <xs:element minOccurs="0" name="OutputFileExtension" type="xs:string"/>
+                                        <xs:element minOccurs="0" name="ToolName" type="ToolType"/>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="SectionAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="SectionsAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+            <xs:attributeGroup ref="SectionsAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="SetVirtualAddressMapCallBack" type="C_Name"/>
+    <xs:element name="SourceFiles">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Multiple Filenames may be specified, and they may also be scoped to a specific Architecture.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Filename"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence minOccurs="1">
+                            <xs:element maxOccurs="unbounded" ref="Filename"/>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Specification">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This string is used to provide the name and version of the Specification that the component conforms to.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:normalizedString">
+                    <xs:attribute name="Version" type="xs:normalizedString" use="optional"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="SystemTables">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is list of System Table elements.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="SystemTable">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="0" maxOccurs="1" name="Entry" type="xs:normalizedString"/>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="SystemTableAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Updated" type="DateType"/>
+    <xs:element name="URL" type="xs:anyURI"/>
+    <xs:element name="URI" type="xs:anyURI"/>
+    <xs:element name="UserDefinedAntTasks">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is a sub-element of BuildOptions</xs:documentation>
+            <xs:documentation xml:lang="en">Permit Users to define their own custom ANT tasks.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element minOccurs="1" ref="AntTask"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Variables">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">A list of EFI Variables described by GUID string pair.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element name="Variable">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">This is an EFI Variable Entry</xs:documentation>
+                    </xs:annotation>
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
+                            <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                            <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This entry represents the Hex Byte Offset {0x0, 0xn} to where the data starts.</xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="BitOffset">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This entry represents the Location of the Starting Bit {0,8} of the start of Data. A value of zero or 1 indicates that there is no BitOffset into the byte.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="0"/>
+                                        <xs:maxInclusive value="8"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                            <xs:element minOccurs="0" maxOccurs="1" name="OffsetBitSize">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This number represents the number of bits to use {0, 7} starting at the BitOffset. A value of 0 indicates that the entire Byte should be used.</xs:documentation>
+                                </xs:annotation>
+                                <xs:simpleType>
+                                    <xs:restriction base="xs:int">
+                                        <xs:minInclusive value="0"/>
+                                        <xs:maxInclusive value="7"/>
+                                    </xs:restriction>
+                                </xs:simpleType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attributeGroup ref="VariableAttributes"/>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Arch">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="Variable">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">This is an EFI Variable Entry</xs:documentation>
+                                </xs:annotation>
+                                <xs:complexType>
+                                    <xs:sequence>
+                                        <xs:element minOccurs="1" maxOccurs="1" name="String" type="xs:normalizedString"/>
+                                        <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="ByteOffset" type="HexWordDataType">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">This entry represents the Hex Byte Offset {0x0, 0xn} to where the data starts.</xs:documentation>
+                                            </xs:annotation>
+                                        </xs:element>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="BitOffset">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">This entry represents the Location of the Starting Bit {0,8} of the start of Data. A value of zero or 1 indicates that there is no BitOffset into the byte.</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:simpleType>
+                                                <xs:restriction base="xs:int">
+                                                    <xs:minInclusive value="0"/>
+                                                    <xs:maxInclusive value="8"/>
+                                                </xs:restriction>
+                                            </xs:simpleType>
+                                        </xs:element>
+                                        <xs:element minOccurs="0" maxOccurs="1" name="OffsetBitSize">
+                                            <xs:annotation>
+                                                <xs:documentation xml:lang="en">This number represents the number of bits to use {0, 7} starting at the BitOffset. A value of 0 indicates that the entire Byte should be used.</xs:documentation>
+                                            </xs:annotation>
+                                            <xs:simpleType>
+                                                <xs:restriction base="xs:int">
+                                                    <xs:minInclusive value="0"/>
+                                                    <xs:maxInclusive value="7"/>
+                                                </xs:restriction>
+                                            </xs:simpleType>
+                                        </xs:element>
+                                    </xs:sequence>
+                                    <xs:attributeGroup ref="VariableAttributes"/>
+                                </xs:complexType>
+                            </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="ArchType" type="SupportedArchitectures"/>
+                    </xs:complexType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Version" type="xs:normalizedString"/>
+</xs:schema>
diff --git a/Tools/XMLSchema/FrameworkDataTypes.xsd b/Tools/XMLSchema/FrameworkDataTypes.xsd
new file mode 100644
index 0000000000..402d2b2752
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkDataTypes.xsd
@@ -0,0 +1,1196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: FrameworkDataTypes.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:annotation>
+        <xs:documentation xml:lang="en">This schema defines EFI and Framework Attribute and Data Types. Only simpleType and attributeGroups are specified in this file. </xs:documentation>
+    </xs:annotation>
+    <xs:include schemaLocation="NamingConvention.xsd"/>
+    <xs:simpleType name="BlockNameType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">FIRMWARE: Define a block name to be BLOCK[A-F0-9]{2}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:pattern value="BLOCK([A-F0-9]){2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BootModeNames">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes what boot modes can be set (produced) or what boot modes can be supported, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="FULL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_WITH_FULL_CONFIGURATION</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MINIMAL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_WITH_MINIMAL_CONFIGURATION</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NO_CHANGE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ASSUMING_NO_CONFIGURATION_CHANGES</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DIAGNOSTICS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_WITH_FULL_CONFIGURATION_PLUS_DIAGNOSTICS</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_WITH_DEFAULT_SETTINGS</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="S2_RESUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ON_S2_RESUME</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="S3_RESUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ON_S3_RESUME</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="S4_RESUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ON_S4_RESUME</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="S5_RESUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ON_S5_RESUME</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FLASH_UPDATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_ON_FLASH_UPDATE</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RECOVERY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">BOOT_IN_RECOVERY_MODE</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BootModeUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Boot Mode Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Supports the Boot Mode</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Supports the Boot Mode on some execution path</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Always changes the Boot Mode</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sometimes changes the Boot Mode</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ComponentExecutionPhase">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">These are the supported EFI/Framework Execution Phases</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="MDE"/>
+            <xs:enumeration value="SEC"/>
+            <xs:enumeration value="PEI_CORE"/>
+            <xs:enumeration value="PEIM"/>
+            <xs:enumeration value="DXE_CORE"/>
+            <xs:enumeration value="DXE_DRIVER"/>
+            <xs:enumeration value="DXE_RUNTIME_DRIVER"/>
+            <xs:enumeration value="DXE_SAL_DRIVER"/>
+            <xs:enumeration value="DXE_SMM_DRIVER"/>
+            <xs:enumeration value="UEFI"/>
+            <xs:enumeration value="UEFI_APPLICATION"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ConditionalTarget">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Conditional Targets are Other FeatureFlag Identifiers</xs:documentation>
+        </xs:annotation>
+        <xs:list itemType="C_Name"/>
+    </xs:simpleType>
+    <xs:simpleType name="DataHubUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Data Hub Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The module always consumes a data hub entry via registering a filter driver.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The module will use a data hub entry if it exists via registering a filter driver.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The module always logs data into the data hub.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The module will log data into the data hub under certain circumstances</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">DataHub is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DateType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Date Format is YYYY-MM-DD HH:MM (24hr time format)</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString">
+            <xs:pattern value="[1-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9] [0-2][0-9]:[0-5][0-9]"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DefaultValue">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> The DefaultValue is a union of a string and an integer. </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="xs:normalizedString xs:int UnicodeString"/>
+    </xs:simpleType>
+    <xs:simpleType name="EfiSectionType">
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="EFI_SECTION_FREEFORM_SUBTYPE_GUID"/>
+            <xs:enumeration value="EFI_SECTION_VERSION"/>
+            <xs:enumeration value="EFI_SECTION_USER_INTERFACE"/>
+            <xs:enumeration value="EFI_SECTION_DXE_DEPEX"/>
+            <xs:enumeration value="EFI_SECTION_PEI_DEPEX"/>
+            <xs:enumeration value="EFI_SECTION_PE32"/>
+            <xs:enumeration value="EFI_SECTION_PIC"/>
+            <xs:enumeration value="EFI_SECTION_TE"/>
+            <xs:enumeration value="EFI_SECTION_RAW"/>
+            <xs:enumeration value="EFI_SECTION_COMPRESSION"/>
+            <xs:enumeration value="EFI_SECTION_GUID_DEFINED"/>
+            <xs:enumeration value="EFI_SECTION_COMPATIBILITY16"/>
+            <xs:enumeration value="EFI_SECTION_FIRMWARE_VOLUME_IMAGE"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EventTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Supported Event Groups, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="EVENT_GROUP_EXIT_BOOT_SERVICES"/>
+            <xs:enumeration value="EVENT_GROUP_VIRTUAL_ADDRESS_CHANGE"/>
+            <xs:enumeration value="EVENT_GROUP_MEMORY_MAP_CHANGE"/>
+            <xs:enumeration value="EVENT_GROUP_READY_TO_BOOT"/>
+            <xs:enumeration value="EVENT_GROUP_LEGACY_BOOT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EventUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Event Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module registers a notification function and requires it to be executed for the module to fully function.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module registers a notification function and utilizes it if it's signaled.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module will always signal the event.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module will sometimes signal the event.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Event is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExecutionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines the output types: Relocatable (REL,) Non-Relocatable (NREL,) Execute in Place (XIP) or Position Independent Code (PIC) </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="REL" id="Relocatable"/>
+            <xs:enumeration value="NREL" id="Non-Relocatable"/>
+            <xs:enumeration value="XIP" id="Execute_In_Place"/>
+            <xs:enumeration value="PIC" id="Position_Independent_Code"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">C Identifier Name for the Extern data as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(_*\w*\W*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Extern Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The EXTERN is always imported by the module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The EXTERN is always exported by the module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FileNameUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the FileName Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module requires a file named GUID in an FV</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will use a file named GUID in an FV if it is present</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module Always produces a file named GUID in an FV</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module sometimes produces a file named GUID in an FV</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Filename is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FormSetUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Formset Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The Formset is always registered into HII by the module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Some execution paths through the modules register forms into HII</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Formset is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FrameworkComponentTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> These are the EFI/Framework Component Types defined in the EFI Development Kit (EDK) Getting Started Guide </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="APRIORI"/>
+            <xs:enumeration value="SEC"/>
+            <xs:enumeration value="LIBRARY"/>
+            <xs:enumeration value="FV_IMAGE_FILE"/>
+            <xs:enumeration value="BS_DRIVER"/>
+            <xs:enumeration value="RT_DRIVER"/>
+            <xs:enumeration value="SAL_RT_DRIVER"/>
+            <xs:enumeration value="PE32_PEIM"/>
+            <xs:enumeration value="PIC_PEIM"/>
+            <xs:enumeration value="COMBINED_PEIM_DRIVER"/>
+            <xs:enumeration value="PEI_CORE"/>
+            <xs:enumeration value="DXE_CORE"/>
+            <xs:enumeration value="APPLICATION"/>
+            <xs:enumeration value="BS_DRIVER_EFI"/>
+            <xs:enumeration value="SHELLAPP"/>
+            <xs:enumeration value="APPLICATION"/>
+            <xs:enumeration value="UEFI_APPLICATION"/>
+            <xs:enumeration value="BINARY"/>
+            <xs:enumeration value="LOGO"/>
+            <xs:enumeration value="CUSTOM_BUILD"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FvRegionTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">FIRMWARE: Pre-defined Firmware Volume Region Types</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="FV_MAIN"/>
+            <xs:enumeration value="FV_MAIN_COMPACT"/>
+            <xs:enumeration value="NV_STORAGE"/>
+            <xs:enumeration value="FV_RECOVERY"/>
+            <xs:enumeration value="FV_RECOVERY_FLOPPY"/>
+            <xs:enumeration value="FV_FILE"/>
+            <xs:enumeration value="CAPSULE_CARGO"/>
+            <xs:enumeration value="NULL"/>
+            <xs:enumeration value="USER_DEFINED"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GuidUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Guid Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module always consumes the GUID</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will consume the GUID only if the GUID is present</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will always produce the GUID</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module sometimes produces the GUID</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the package</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Guid is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HobTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Type of HOB that is being produced or consumed, as specified in the Module Surface Area Specification.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="PHIT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_HANDOFF</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MEMORY_ALLOCATION">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_MEMORY_ALLOCATION Note: The BaseName of the GUID is also required</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RESOURCE_DESCRIPTOR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_RESOURCE_DESCRIPTOR</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GUID_EXTENSION">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_GUID_EXTENSION Note: The BaseName of the GUID is also required.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FIRMWARE_VOLUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_FV</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CPU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_CPU</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="POOL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_PEI_MEMORY_POOL</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CAPSULE_VOLUME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">EFI_HOB_TYPE_CV</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HobUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Hob Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The HOB must be present in the system</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The HOB will be used if it's present in the system</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The HOB is always produced by the module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The HOB will sometimes be produced by the module.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">HOB is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="LibraryUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Library Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module always consumes the library. This Guid represents the class of the library.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED"/>
+            <xs:enumeration value="ALWAYS_PRODUCED"/>
+            <xs:enumeration value="SOMETIMES_PRODUCED"/>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the library.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Library is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ModuleTypeDef">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> These are the supported Framework Module Types </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="BASE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module only depends on things in the MDE package and is environment neutral</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SEC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is the Security Section and depends on catching the reset vectory</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PEI_CORE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is the PEI Core</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PEIM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a PEIM and depends on the PEI Services Table</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DXE_CORE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is the DXE Core</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DXE_DRIVER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DXE_RUNTIME_DRIVER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module runs after ExitBootServices and produces CreateEvent EventGroupExitBootServices and EventGroupVirtualAddressChange. Code written in this module can run in physical or virtual mode.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DXE_SAL_DRIVER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module runs after ExitBootServices and produces CreateEvent EventGroupExitBootServices and EventGroupVirtualAddressChange. Code written in this module can run in physical AND in virtual mode.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DXE_SMM_DRIVER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a DXE Driver and depends on the EFI Boot Services, EFI Runtime Services and the DXE Service Table. The module also runs in SMM mode and depends on the SMM Service Table. </xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TOOLS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The TOOLS ModuleType is to be used for Tiano Tools modules</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UEFI_DRIVER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a UEFI Driver and depends on the EFI and Service Tables.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UEFI_APPLICATION">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module is a UEFI Applciation and depens on the EFI and Service Tables.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="USER_DEFINED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module does not fit into other classifications. The user must have an apriori knowledge of its Usage, and must provide that information to others using this module.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Module_Unified">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a flag to determine whether to put intermediate build files into a directory under the Module, or into a unified tree under the package or platform build trees</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="MODULE"/>
+            <xs:enumeration value="UNIFIED"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PackageType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Packages are either source, binary or mixed packages.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="SOURCE"/>
+            <xs:enumeration value="BINARY"/>
+            <xs:enumeration value="MIXED"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PackageUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Package Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">A module always consumes a package. This GUID represents the class of the package.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">This is the Package we are creating. This GUID represents the class of the package.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The default is the GUID that specifies the instance of the package.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PcdTypes">
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="FIXED_AT_BUILD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PATCHABLE_IN_MODULE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DYNAMIC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DYNAMIC_EX">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PcdDataTypes">
+        <xs:restriction base="xs:normalizedString">
+            <xs:enumeration value="UINT8"/>
+            <xs:enumeration value="UINT16"/>
+            <xs:enumeration value="UINT32"/>
+            <xs:enumeration value="UINT64"/>
+            <xs:enumeration value="VOID*"/>
+            <xs:enumeration value="BOOLEAN"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PcdFeatureFlagUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the PCD FEATURE_FLAG Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UsageTypes">
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is tagged as the default</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PcdItemTypes">
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="FEATURE_FLAG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The PCD Item represents a feature flag for the module. Features can only be selected at build time. Items of type FeatureFlag are used to conditionally construct module surface area that is produced as a result of a buld.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FIXED_AT_BUILD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is only a build time option and cannot be Dyanmic or Binary patched into the module.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PATCHABLE_IN_MODULE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is set to a default value at build time and a binary of the module can be patched to update the value.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DYNAMIC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. The token that matches the PCD entry is either generated by the build (and is only unique to that build) or is from the default database. This form also implies a build option will be produced for this module that allows the user to pick FixedAtBuild, PatchableInModule or Dynamic. If no Type is specified, it defaults to Dynamic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DYNAMIC_EX">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">PCD Item is found via a PCD PPI in PEI or a PCD Protocol in DXE. Any PCD token database is supported</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PcdUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">The PCD Usage is only relevant to Items tagged with FeatureFlag, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The PCD entry must always be provide as the build will include the code and the associated Surface Area.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">If the FEATURE_FLAG is TRUE the build will include the code and the associated Surface Area. If the FEATURE_FLAG is FALSE, the code and the associated surface area is not included.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">The PCD Entry is Always included in the build code</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">If the FEATURE_FLAG is TRUE the build will include the code and the associated Surface Area. If the FEATURE_FLAG is FALSE, the code and the associated surface area is not included.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">"true" or "false". Indicates the default value for the PCD entry. This is used by the platform wizard to suggest values for a given platform build.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PpiNotifyUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the PPI Notify Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will consume the PPI if it's produced. Consumption is defined by executing the PPI notify function.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PpiUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the PPI Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ppi is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ProtocolNotifyUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the PROTOCOL Notify Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will Consume protocol if it's produced. Consumption is defined by executing the protocol notify function.</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ProtocolUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the PROTOCOL Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TO_START">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Protocol Only - Protocol is required by driver binding Start() function to make Start() succeed</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BY_START">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Protocol Only - Protocol is produced by driver binding Start() function if and only if Start() succeeds</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Protocol is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SupportedArchitectures">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> These are the currently Supportted Architectures type codes </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALL"/>
+            <xs:enumeration value="EBC"/>
+            <xs:enumeration value="ARM"/>
+            <xs:enumeration value="IA32"/>
+            <xs:enumeration value="X64"/>
+            <xs:enumeration value="IPF"/>
+            <xs:enumeration value="PPC"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SystemTableUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the System Table Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module requires a GUIDed entry in the system table</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will use the GUIDed entry in the system table only if the GUID is present</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module Always produces a GUIDed entry in the system table</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module sometimes produces a GUIDed entry in the system table for some of its execution flow</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">SystemTable is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Token">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> The Token data is union of HexDoubleWordDataType, GuidNaming Convetion and GuidArrayType. </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="GuidArrayType GuidNamingConvention HexDoubleWordDataType"/>
+    </xs:simpleType>
+    <xs:simpleType name="ToolChains">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Supported Tool Chains are MSFT, INTEL, GCC and CYGWIN</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="MSFT"/>
+            <xs:enumeration value="INTEL"/>
+            <xs:enumeration value="GCC"/>
+            <xs:enumeration value="CYGWIN"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ToothPick">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describes which way the directory separator is leaning, either \ for WINDOWS or / for UNIX</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString">
+            <xs:enumeration value="UNIX"/>
+            <xs:enumeration value="WINDOWS"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UnicodeString">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define how we specify unicode strings</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString">
+            <xs:pattern value="L(:)?(&quot;)(\w+)*((\W*)*(\s*)*(\w*)*)*(&quot;)"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UsageTypes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Generic Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Required for the driver to function. This is part of the dependency expression of a module if the item represents a PPI or Protocol</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Consumed by the driver if the Item exists</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Always produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Conditionally produced</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TO_START">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Protocol Only - Protocol is required by driver binding Start() function to make Start() succeed</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BY_START">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Protocol Only - Protocol is produced by driver binding Start() function if and only if Start() succeeds</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Item is Private to the module and cannot be used by other modules</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DEFAULT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">This is the default value for an Item</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="VariableOffsetValues">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Describes the available Variable Offset data types, Bytes:Bits or BitSize</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="\d+(:)?\d*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="VariableUsage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the Variable Usage Attributes, as defined in the Module Surface Area Specification</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="NameConvention">
+            <xs:enumeration value="ALWAYS_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module requires the variable entry to be set</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_CONSUMED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module will use the variable entry if it's set</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ALWAYS_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module Always will write the variable</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SOMETIMES_PRODUCED">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Module sometimes writes the variable</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PRIVATE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Variable is produced and consumed only by this module</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <!-- Complex Data Types -->
+    <xs:complexType name="ArgsType">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="Arg" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ToolType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This type is to permit adding specific tools and tool arguments for User Defined tools, into the Module Build Description file.</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="ToolName" type="xs:string"/>
+            <xs:element name="ToolArgs" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:attributeGroup name="BaseNameAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="BootModeAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="BootModeName" type="BootModeNames" use="required"/>
+        <xs:attribute name="Usage" type="BootModeUsage" use="required"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="ConvertAttributeString">
+        <xs:attribute name="SourceString" type="xs:string" use="optional"/>
+        <xs:attribute default="Unicode" name="OutputFiletype" type="xs:string" use="optional"/>
+        <xs:attribute name="OutputFilename" type="FileNameConvention" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="DataHubAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Usage" type="DataHubUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="DirectoryAttributes">
+        <xs:attribute name="Separator" type="ToothPick"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="EventAttributes">
+        <xs:attribute name="Usage" type="EventUsage" use="optional"/>
+        <xs:attribute name="EventGroup" type="EventTypes" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="ExternAttributes">
+        <xs:attribute name="Usage" type="ExternUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="FilenameAttributes">
+        <xs:attribute name="Usage" type="FileNameUsage" use="optional"/>
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>
+        <xs:attribute name="FileType" type="xs:string" use="optional"/>
+        <xs:attribute name="ToolChain" type="ToolChains" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="FormsetAttributes">
+        <xs:attribute name="Usage" type="FormSetUsage" use="optional"/>
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="GuidAttributes">
+        <xs:attribute name="Usage" type="GuidUsage" use="optional"/>
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="HobAttributes">
+        <xs:attribute name="Usage" type="HobUsage" use="optional"/>
+        <xs:attribute name="HobType" type="HobTypes" use="required"/>
+        <xs:attribute default="true" name="HobEnabled" type="xs:boolean" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="IncludeAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Path" type="DirectoryNamingConvention" use="optional"/>
+        <xs:attribute name="Class" type="xs:normalizedString" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+        <xs:attribute name="ModuleType" type="ModuleTypeDef" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="LibraryAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="LibraryClass" type="BaseNameConvention" use="optional"/>
+        <xs:attribute name="ClassGuid" type="GuidType" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+        <xs:attribute name="Usage" type="LibraryUsage" use="optional"/>
+        <xs:attribute name="Package" type="xs:string" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="ModuleNameAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="MsaAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Arch" type="SupportedArchitectures" use="optional"/>
+        <xs:attribute name="ModuleName" type="C_Name" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>
+        <xs:attribute name="BuildSequence" type="xs:int" use="optional"/>
+        <xs:attribute name="FV" type="xs:string" use="optional"/>
+        <xs:attribute name="FvBinding" type="xs:string" use="optional"/>
+        <xs:attribute name="PACKAGE" type="xs:string" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="OptionAttributes">
+        <xs:attribute name="Platform" type="PlatformNamingConvention" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+        <xs:attribute name="ToolChain" type="ToolChains"  use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PackageAttributes">
+        <xs:attribute name="Usage" type="PackageUsage" use="optional"/>
+        <xs:attribute name="PackageType" type="PackageType" use="optional"/>
+        <xs:attribute name="UpdatedDate" type="DateType" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PackageNameAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PcdAttributes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">These attributes are for the Pcds listed in PcdData, PcdEntry and/or PcdBuildData entries.</xs:documentation>
+            <xs:documentation xml:lang="en">PcdUsage is only valid for PcdItemTypes = FEATURE_FLAG</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="ItemType" type="PcdItemTypes" use="required"/>
+        <xs:attribute name="PcdUsage" type="PcdUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PlatformAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Version" type="VersionDataType" use="optional"/>
+        <xs:attribute name="AlternateName" type="FileNameConvention" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PpiAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Usage" type="PpiUsage" use="optional"/>
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="PpiNotifyAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Usage" type="PpiNotifyUsage" use="optional"/>
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="ProtocolAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Usage" type="ProtocolUsage" use="optional"/>
+        <xs:attribute default="true" name="EnableFeature" type="xs:boolean" use="optional"/>
+        <xs:attribute name="FeatureFlag" type="C_Name" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="ProtocolNotifyAttributes">
+        <xs:attribute name="Guid" type="GuidType" use="optional"/>
+        <xs:attribute name="Usage" type="ProtocolNotifyUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="SectionAttributes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Attributes are either compressable and/or sequence order binding</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="SectionType" type="EfiSectionType" use="optional"/>
+        <xs:attribute default="true" name="Compressible" type="xs:boolean" use="optional"/>
+        <xs:attribute name="BindingOrder" type="xs:int" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="SectionsAttributes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Attributes for Sections, EncapsulationTag, EncapsulationType and OverrideID</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="EncapsulationType" type="xs:normalizedString" use="optional"/>
+        <xs:attribute name="EncapsulationTag" type="xs:string" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="SystemTableAttributes">
+        <xs:attribute name="Usage" type="SystemTableUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="VariableAttributes">
+        <xs:attribute name="Usage" type="VariableUsage" use="optional"/>
+        <xs:attribute name="OverrideID" type="xs:int" use="optional"/>
+    </xs:attributeGroup>
+    <xs:attributeGroup name="UrlAttribute">
+        <xs:attribute name="Url" type="xs:anyURI"/>
+    </xs:attributeGroup>
+</xs:schema>
diff --git a/Tools/XMLSchema/FrameworkHeaders.xsd b/Tools/XMLSchema/FrameworkHeaders.xsd
new file mode 100644
index 0000000000..3937dc5c84
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkHeaders.xsd
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: FrameworkHeaders.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:element name="FdbHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the header for the Framework Package Database file.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="DatabaseName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Path"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MbdHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the header for the Component Module Build Description (MBD) file. NOTE: The GUID may be different from the GUID in the MSA file, as the Guid is updated every time the file is changed, as the Guid may change if the contents of the file are changed.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MbdLibHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the header for the Library Module Build Description (MBD) file. NOTE: The Guid may be different from the Guid in the MSA file, as the Guid may change when the contents of the file are changed..</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Modified"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MsaHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Component Module Surface Area Description Header - a replacement for INF files. The GUID may change when the contents of the file are changed.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="MsaLibHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Library Module Surface Area Description Header - a replacement for INF files. The Guid may change when the contents of the file are changed.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="BaseName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="ModuleType"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="ComponentType"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Specification"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PlatformHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This head is for the Framework Platform Description file (FPD.)</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="PlatformName" type="PlatformNamingConvention">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Define the Name of a Platform</xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element maxOccurs="1" minOccurs="1" ref="CreatedBy"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="SpdHeader">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This head is for the Surface Area Package Description file (SPD) The Guid may change when the contents of the file are changed.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PackageName"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Guid"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Version"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Abstract"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Description"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Copyright"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="License"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="Created"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="E-Mail"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Updated"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="URL"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PackageType"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ReadOnly"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="RePackage"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Specification"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="OutputDirectory"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/Tools/XMLSchema/FrameworkPlatformDataElements.xsd b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
new file mode 100644
index 0000000000..5cbaaca699
--- /dev/null
+++ b/Tools/XMLSchema/FrameworkPlatformDataElements.xsd
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://www.TianoCore.org/2006/Edk2.0" targetNamespace="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: FrameworkPlatformDataElements.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:annotation>
+        <xs:documentation xml:lang="en"> This schema defines EFI and Framework Platform Data Elements that are specific to platform creation.</xs:documentation>
+    </xs:annotation>
+    <xs:include schemaLocation="NamingConvention.xsd"/>
+    <xs:include schemaLocation="FrameworkDataTypes.xsd"/>
+    <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:element name="Capsule">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="CapsuleId" type="xs:string"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="CapsuleOptions"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="CapsuleAttributes"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CapsuleAttributes">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CapsuleOptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Capsules">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Permit multiple Capsule Sections</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element ref="Capsule"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Disable" type="xs:string"/>
+    <xs:element name="Enable" type="xs:string"/>
+    <xs:element name="Flash">
+        <xs:complexType>
+            <xs:annotation>
+                <xs:documentation xml:lang="en">We allow specifying the Flash layout in this directory, or we allow specifying a flashmap filename</xs:documentation>
+            </xs:annotation>
+            <xs:sequence>
+                <xs:choice>
+                    <xs:element name="FlashDefinition" type="FlashData"/>
+                    <xs:element name="FlashDefinitionFile" type="FileNameConvention"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImages"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Capsules"/>
+            </xs:sequence>
+            <xs:attribute name="MicrocodeFile" type="FileNameConvention" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define contents of the regions in flash. The files and data are placed in the output image in the order they are encountered in this definition. Multiple FlashDeviceImage sections may be defined. Which one the tool should use is specified by Name on the command line.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1" maxOccurs="unbounded">
+                <xs:element minOccurs="1" maxOccurs="1" name="Name" type="NameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="File" type="FvImageFileType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceInfo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Flash Devcie definition List</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
+                <xs:element default="512KB" minOccurs="1" maxOccurs="1" name="FlashSize" type="FlashSize"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="BaseAddress" type="HexAddressType"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="OutputDirectory" type="DirectoryNamingConvention"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="MicrocodeFile" type="FileNameConvention"/>
+                <xs:element minOccurs="1" maxOccurs="255" name="Block" type="BlockNameType"/>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="Region" type="RegionDataType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceOverrideImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define OVERRIDE contents of the regions in flash. Only what is different here from what may defined in other areas (or files) is needed </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="NameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="File" type="FvImageOverrideFileType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FlashDeviceOverrideInfo">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Flash Devcie Override Definition list. Only what is different from the previously defined stuff needs to be included.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" name="Name" type="UCNameType"/>
+                <xs:element default="512KB" minOccurs="0" maxOccurs="1" name="FlashSize" type="FlashSize"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="BaseAddress" type="HexAddressType"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="OutputDirectory" type="DirectoryNamingConvention"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="MicrocodeFile" type="FileNameConvention"/>
+                <xs:element minOccurs="0" maxOccurs="255" name="Block" type="BlockNameType"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" name="Region" type="RegionDataType"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImage">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" ref="FvImageNames"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FvImageOptions"/>
+            </xs:sequence>
+            <xs:attribute name="Type" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImageName">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="FvImageOptions"/>
+            </xs:sequence>
+            <xs:attribute name="Name" type="FvRegionTypes" use="required"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImageNames" type="xs:string"/>
+    <xs:element name="FvImageOptions">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used specify different name value pairs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Enable"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="Disable"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FvImages">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This section allows the user to define specific information regarding the FvImage</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="NameValue"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImage"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="FvImageName"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleSA">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This element is used to specify information in the Platform Description File.</xs:documentation>
+            <xs:documentation xml:lang="en">This is a mixed element, allowing the user to specify the name of the MSA file, as well as to optionally specify additional override information.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence minOccurs="1">
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+            </xs:sequence>
+            <xs:attributeGroup ref="MsaAttributes"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="NameValue">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:attribute name="Name" type="xs:string" use="required"/>
+                    <xs:attribute name="Value" type="xs:string" use="required"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Overrides">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceOverrideInfo"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="FlashDeviceOverrideImage"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PlatformDescriptions">
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Platform"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="TianoImage">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This defines the required sections of a valid EFI/Tiano binary image</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" name="SEC" type="Components"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="PEI_CORE" type="Components"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="PEIM" type="Components"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="DXE_CORE" type="Components"/>
+                <xs:element minOccurs="1" maxOccurs="1" name="DXE_DRIVERS" type="Components"/>
+                <xs:element minOccurs="0" maxOccurs="1" name="OTHER_COMPONENTS" type="Components"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:simpleType name="EfiFvAttributeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">The list of EFI_FLASH_AREA Attributes</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="EFI_FLASH_AREA_FV"/>
+            <xs:enumeration value="EFI_FLASH_AREA_MEMMAPPED_FV"/>
+            <xs:enumeration value="EFI_FLASH_AREA_SUBFV"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EfiFvAreaType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">The list of valid EFI Area Types</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="EFI_FLASH_AREA_EFI_VARIABLES"/>
+            <xs:enumeration value="EFI_FLASH_AREA_UNUSED"/>
+            <xs:enumeration value="EFI_FLASH_AREA_MAIN_BIOS"/>
+            <xs:enumeration value="EFI_FLASH_AREA_GUID_DEFINED"/>
+            <xs:enumeration value="EFI_FLASH_AREA_FTW_STATE"/>
+            <xs:enumeration value="EFI_FLASH_AREA_FTW_BACKUP"/>
+            <xs:enumeration value="EFI_FLASH_AREA_RECOVERY_BIOS"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EfiNameGuidType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Right now, only EFI_FLASH_MAP_HOB_GUID is defined</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="EFI_FLASH_MAP_HOB_GUID"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FlashSize">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="256KB"/>
+            <xs:enumeration value="512KB"/>
+            <xs:enumeration value="1MB"/>
+            <xs:enumeration value="2MB"/>
+            <xs:enumeration value="4MB"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FvSubRegionTypes">
+        <xs:restriction base="UCNameType">
+            <xs:enumeration value="NV_VARIABLE_STORE"/>
+            <xs:enumeration value="MICROCODE"/>
+            <xs:enumeration value="NV_FTW_WORKING"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="Components">
+        <xs:sequence minOccurs="1" maxOccurs="unbounded">
+            <xs:element ref="ModuleSA"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FlashData">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:choice minOccurs="0" maxOccurs="1">
+                <xs:sequence>
+                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceInfo"/>
+                    <xs:element minOccurs="1" maxOccurs="1" ref="FlashDeviceImage"/>
+                </xs:sequence>
+            </xs:choice>
+            <xs:element minOccurs="0" maxOccurs="1" ref="Overrides"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FvImageFileType">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="FileNameConvention"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="RawData" type="RawDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FvImageOverrideFileType">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="FileNameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="RawData" type="RawDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RawDataType">
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="NameConvention"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="Region" type="FvRegionTypes"/>
+            <xs:element minOccurs="0" maxOccurs="1" name="UserDefinedFvRegion" type="NameConvention"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="SubRegion" type="FvSubRegionTypes"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Data" type="HexDataType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="RegionDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="SubRegion" type="SubRegionType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SubRegionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define the regions and their uses for the device</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element default="true" minOccurs="1" maxOccurs="1" name="CreateHob" type="xs:boolean"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Name" type="UCNameType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="Size" type="HexAddressType"/>
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Attributes" type="EfiFvAttributeType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="AreaType" type="EfiFvAreaType"/>
+            <xs:element minOccurs="1" maxOccurs="1" name="NameGuid" type="EfiNameGuidType"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
diff --git a/Tools/XMLSchema/NamingConvention.xsd b/Tools/XMLSchema/NamingConvention.xsd
new file mode 100644
index 0000000000..4f998b827d
--- /dev/null
+++ b/Tools/XMLSchema/NamingConvention.xsd
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: NamingConvention.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:annotation>
+        <xs:documentation xml:lang="en"> This schema defines various data types and naming conventions including: base name, filename and directory naming conventions. These are all simple data types.</xs:documentation>
+    </xs:annotation>
+    <xs:simpleType name="BaseNameConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Base Names must start with an upper case character, followed by one or more alphanumeric characters and/or an optional underscore (_) character followed by one or more alphanumeric characters. Examples: Base_name3, BASE_NAME3, BaseName3 </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]([a-zA-Z0-9])*(_)?([a-zA-Z0-9])*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="C_Name">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> C_Names must start with either an underscore (_) character followed by one or more alpha characters, followed by any combination of underscore or alphanumeric characters.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="((_)*([a-zA-Z])+((_)*[a-zA-Z0-9]*))*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DirectoryNamingConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Directory naming convention is a UNION of DOS an UNIX directory path names </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="Directory_DOS Directory_UNIX"/>
+    </xs:simpleType>
+    <xs:simpleType name="Directory_DOS">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Directory naming convention for Windows backslash (\) directory path name </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="([a-zA-Z]:\\)?(((\\?_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\)?)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Directory_UNIX">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Directory naming convention for UNIX forwardslash (/) directory path name </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(\/)?(((_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\/)?)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="E-Mail">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z]+(( )*.?-?[a-zA-Z]*)*@[a-zA-Z]+(( )*.?-?[a-zA-Z]*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FileNameConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines what a Filename is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a optional dot and more alphanumeric characters. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*((_)*(-)*(.)*[a-zA-Z0-9]*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GuidArrayType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines the minimum specification for a GUID Array which is 8 Hex Digits - 4 Hex Digits - 4 Hex Digits - 8 Hex Bytes, the last 16 Hex Digits can be enclosed in sqiggle {} brackets.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\})?"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GuidNamingConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> A GUID must contain five different Hexadecimal character sets that are separated by a dash (-) character. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GuidType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> The GUID data is union of GuidNaming Convetion and GuidArrayType. </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="GuidArrayType GuidNamingConvention"/>
+    </xs:simpleType>
+    <xs:simpleType name="Hex64BitDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex 64 Bit Value to be 0x[a-f0-9]{16}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(0x)?[a-fA-F0-9]{1,16}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexAddressType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Address, 0x[a-fA-F0-9]{1,16}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="0x[a-fA-F0-9]{1,16}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexByteDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Byte Value to be 0x[a-f0-9]{2}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(0x)?[a-fA-F0-9]{1,2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Value to be 0x[a-f0-9]+</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="0x[a-fA-F0-9]+"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexDigitType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Diget to be 0x[a-f0-9]</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-fA-F0-9]{1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexDoubleWordDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Double Word Value to be 0x[a-f0-9]{8}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="0x[a-fA-F0-9]{1,8}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="HexWordDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define a Hex Word Value to be 0x[a-f0-9]{4}</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="0x[a-fA-F0-9]{1,4}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="LibraryNameConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines what a Library name is: alphanumeric characters and optional underscore (_) characters. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z][a-zA-Z0-9]*(_*[a-zA-Z0-9])*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="NameConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">What is a name, any series of alphanumeric characters and one or more underline characters that may occur in any position</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString">
+            <xs:pattern value="(_*[a-zA-Z0-9]*_*)+"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Paragraph">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This describes the normal text of a paragraph that can be used in a license or description tag.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString"/>
+    </xs:simpleType>
+    <xs:simpleType name="PlatformNamingConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines what a Platform Name is: Alphanumeric characters and optional underscore (_) or dash (-) characters, followed by a dot and more alphanumeric characters. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(([a-zA-Z][a-zA-Z0-9]*)(_)*(.)*)+"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Sentence">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This data type requires two or more words </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:normalizedString">
+            <xs:pattern value="(\w+\W*)+( )+(\W*\w*\W*\s*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ToolNameConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> This defines what a Tool name is: Alphanumeric characters and optional underscore (_) or dash (-) characters, optionally followed by a dot and more alphanumeric characters. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z][a-zA-Z0-9]*(_*-*.*[a-zA-Z0-9])*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UCLetterType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a UpperCase Letter type, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]{1}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UCNameType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a UpperCase Name, which can be any combination of upper case characters followed by zero or more underscore and/or uppercase alphanumeric characters </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[A-Z]+(_*[A-Z0-9]*( )*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UserName">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Specify a User Name</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z]+(( )*.?-?[a-zA-Z]*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="V1">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">%VAR%(Directory)*(File_Names)*</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="((%[A-Z](_*[A-Z0-9]*)*%)+((((\\)?_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\\)?)*)"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="V2">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">($VAR | $( VAR) | ${VAR})(Directory)*(File_Names)</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(($[A-Z](_*[A-Z0-9]*)*)+||($\([A-Z](_*[A-Z0-9]*)*\))+||($\{[A-Z](_*[A-Z0-9]*)*\})+)+(\/)?(((((_*-*.*[a-zA-Z0-9]*)*(_*-*.*[a-zA-Z0-9])*)+(\/)?)*)*)"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="VariableConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">VariableConvention is a UNION of: $VAR, $( VAR), ${VAR} and %VAR% and Directory and File Names</xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="V1 V2"/>
+    </xs:simpleType>
+    <xs:simpleType name="VariableGuidType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> The GUID data is union of GuidNaming Convetion and GuidArrayType. </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="GuidArrayType GuidNamingConvention Zero"/>
+    </xs:simpleType>
+    <xs:simpleType name="VariableNamingConvention">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">VariableConvention is a UNION of: $VAR, $( VAR), ${VAR} and %VAR%</xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="Variable_DOS Variable_UNIX Variable_UNIX_Scope1 Variable_UNIX_Scope2"/>
+    </xs:simpleType>
+    <xs:simpleType name="Variable_DOS">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a DOS Variable Name: %VAR% It must start with an Upper Case character.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="%[A-Z](_*[A-Z0-9]*)*%"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Variable_UNIX">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a UNIX Variable Name: $VAR It must start with an Upper Case character.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="$[A-Z](_*[A-Z0-9]*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Variable_UNIX_Scope1">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a UNIX Variable Name: $( VAR1) It must start with an Upper Case character.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="$\([A-Z](_*[A-Z0-9]*)*\)"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Variable_UNIX_Scope2">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a UNIX Variable Name: ${ VAR1} It must start with an Upper Case character.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="$\{[A-Z](_*[A-Z0-9]*)*\}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="VersionDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="xs:normalizedString"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="Zero">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Define Zero as a vaild value</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:int">
+            <xs:pattern value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="OldVersionDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en"> Definition of a Version Number, which can be any combination of a number followed by zero or more alphanumeric-dot-alphanumeric characters </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="([0-9])+[a-zA-Z0-9]*(-?.?([a-zA-Z0-9])*)*"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
new file mode 100644
index 0000000000..7b309570ae
--- /dev/null
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.TianoCore.org/2006/Edk2.0" xmlns="http://www.TianoCore.org/2006/Edk2.0">
+    <!--
+    Filename: SurfaceArea.xsd
+    
+    Copyright (c) 2006, Intel Corp.
+    All rights reserved. This program and the accompanying materials
+    are licensed and made available under the terms and conditions of the BSD License
+    which may be found at http://opensource.org/licenses/bsd-license.php
+    
+    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    
+  -->
+    <xs:include schemaLocation="FrameworkHeaders.xsd"/>
+    <xs:include schemaLocation="FrameworkDataElements.xsd"/>
+    <xs:include schemaLocation="FrameworkPlatformDataElements.xsd"/>
+    <xs:element name="FrameworkDatabase">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the valid format for the Package Database File. Note: MsaList is used for Modules that have not yet been included in a package.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="FdbHeader"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PackageList"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ModuleList"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PlatformDescriptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="FrameworkPlatformDescription">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the valid format for the Framework Platform Description (FPD) File.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="PlatformHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Flash"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="TianoImage"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdBuildDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryModuleBuildDescription">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Module Build Description that contains the list of overrides, library instances that can or must be used by the library.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MbdLibHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="LibraryModuleSurfaceArea">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Module Library Surface Area Description that contains the list of the module's source files, library classes that can or must be used by the module, the Class(es) of the Library that will be supported by the library, the Include Paths, Protocols and Ppi's that are either produced or consued.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MsaLibHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleBuildDescription">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Module Build Description that contains the list of overrides, library instances that can or must be used by the module.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MbdHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Libraries"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ModuleSurfaceArea">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is the Module Surface Area Description that contains the list of the module's source files, library classes that can or must be used by the module, the Include Paths, Protocols and Ppi's that are either produced or consued.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MsaHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDefinitions"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SourceFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Includes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Protocols"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Events"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Hobs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PPIs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Variables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BootModes"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="SystemTables"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="DataHubs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Formsets"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="PackageSurfaceArea">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">This is valid content for a Package Surface Area Description (SPD) file.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="1" ref="SpdHeader"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="LibraryClassDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageDependencies"/>
+                <xs:element minOccurs="1" maxOccurs="1" ref="MsaFiles"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PackageHeaders"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="GuidDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="ProtocolDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PpiDeclarations"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdDefinitions"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/Tools/XMLSchema/SurfaceArea.xsdconfig b/Tools/XMLSchema/SurfaceArea.xsdconfig
new file mode 100644
index 0000000000..aa52361510
--- /dev/null
+++ b/Tools/XMLSchema/SurfaceArea.xsdconfig
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corp.
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which may be found at http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<xb:config xmlns:xb="http://xml.apache.org/xmlbeans/2004/02/xbean/config">
+  <xb:namespace uri="http://www.TianoCore.org/2006/Edk2.0">
+    <xb:package>org.tianocore</xb:package>
+  </xb:namespace>
+</xb:config>
+
diff --git a/Tools/bin/CreateMdkPkg.bat b/Tools/bin/CreateMdkPkg.bat
new file mode 100644
index 0000000000..70de527e29
--- /dev/null
+++ b/Tools/bin/CreateMdkPkg.bat
@@ -0,0 +1,42 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+REM @echo off
+
+:check_java
+if "%JAVA_HOME%"=="" goto no_jdk
+:check_wks
+if "%WORKSPACE%"=="" goto no_wks
+
+set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant
+set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATH%
+
+call "ant" -f %WORKSPACE%\Tools\Source\CreateMdkPkg\build.xml
+
+echo DONE
+
+goto end
+
+:no_jdk
+echo.
+echo !!! Please set JAVA_HOME !!!
+echo.
+goto check_wks
+
+:no_wks
+echo.
+echo !!! Please set WORKSPACE !!!
+echo.
+goto end
+
+:end
+@echo on
+
diff --git a/Tools/bin/GenBuildFile.bat b/Tools/bin/GenBuildFile.bat
new file mode 100644
index 0000000000..323969fa40
--- /dev/null
+++ b/Tools/bin/GenBuildFile.bat
@@ -0,0 +1,45 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@echo off
+
+@if "%JAVA_HOME%"=="" goto no_jdk
+@if "%WORKSPACE%"=="" goto no_wks
+
+@if "%1"=="-H" (goto usage)
+@if "%1"=="-h" (goto usage) else (goto all)
+
+:usage
+@echo.
+@echo Generate entrance build.xml for each module under current directory
+@echo.
+@echo Usage: GenBuildFile.bat - must be executed in the package level directory
+@echo.
+goto end
+
+:all
+  ant -q -f %WORKSPACE%\Tools\bin\GenBuildFile.xml
+  goto end
+
+:no_jdk
+  @echo.
+  @echo !!! Please set JAVA_HOME !!!
+  @echo.
+  @goto end
+
+:no_wks
+  @echo.
+  @echo !!! Please set WORKSPACE !!!
+  @echo.
+  @goto end
+
+:end
+@echo on
diff --git a/Tools/bin/GenBuildFile.xml b/Tools/bin/GenBuildFile.xml
new file mode 100644
index 0000000000..81a2900a92
--- /dev/null
+++ b/Tools/bin/GenBuildFile.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project default="workspace" basedir=".">
+  <taskdef resource="GenBuild.tasks" />
+  
+  <target name="workspace">
+    <bf recursive="true" />
+  </target>
+</project>
diff --git a/Tools/bin/MakeDeps.exe b/Tools/bin/MakeDeps.exe
new file mode 100644
index 0000000000..b73c3bfaa7
--- /dev/null
+++ b/Tools/bin/MakeDeps.exe
diff --git a/Tools/bin/PackageEditor.bat b/Tools/bin/PackageEditor.bat
new file mode 100644
index 0000000000..5a496663b0
--- /dev/null
+++ b/Tools/bin/PackageEditor.bat
@@ -0,0 +1,47 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@echo off
+
+:check_java
+if "%JAVA_HOME%"=="" goto no_jdk
+:check_wks
+if "%WORKSPACE%"=="" goto no_wks
+
+set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant
+set XMLBEANS_HOME=%WORKSPACE%\Tools\bin\xmlbeans
+set Framework_Tools_Path=%WORKSPACE%\Tools\bin
+
+set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATH%
+
+set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\saxon8-jdom.jar;%XMLBEANS_HOME%\lib\saxon8-sql.jar;%XMLBEANS_HOME%\lib\resolver.jar
+
+call "ant" -f %WORKSPACE%\Tools\Source\PackageEditor\build.xml
+
+call "java" -jar %WORKSPACE%\Tools\bin\PackageEditor.jar
+
+goto end
+
+:no_jdk
+echo.
+echo !!! Please set JAVA_HOME !!!
+echo.
+goto check_wks
+
+:no_wks
+echo.
+echo !!! Please set WORKSPACE !!!
+echo.
+goto end
+
+:end
+@echo on
+
diff --git a/Tools/bin/SABeans.bat b/Tools/bin/SABeans.bat
new file mode 100644
index 0000000000..4e49540005
--- /dev/null
+++ b/Tools/bin/SABeans.bat
@@ -0,0 +1,54 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@echo off
+if "%JAVA_HOME%"=="" goto no_jdk
+if "%WORKSPACE%"=="" goto no_wks
+
+if "%1"=="" (goto usage)
+if "%1"=="-h" (goto usage)
+if "%1"=="-H" (goto usage) else (goto all)
+
+:usage
+echo.
+echo Generate SurfaceArea Java Beans from schema
+echo.
+echo Usage: 
+echo        SABeans.bat SurfaceArea.jar
+echo            generate compiled SurfaceArea Java Beans only
+echo.
+echo        SABeans.bat SurfaceArea.java
+echo            generate source code of SurfaceArea Java Beans only
+echo.
+echo        SABeans.bat SurfaceArea
+echo            generate both compiled and source code of SurfaceArea Java Beans
+echo.
+goto end
+
+:all
+  ant -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml %1
+  goto end
+
+:no_jdk
+  echo.
+  echo !!! Please set JAVA_HOME !!!
+  echo.
+  goto end
+
+:no_wks
+  echo.
+  echo !!! Please set WORKSPACE !!!
+  echo.
+  goto end
+
+:end
+@echo on
+
diff --git a/Tools/bin/SACreate.bat b/Tools/bin/SACreate.bat
new file mode 100644
index 0000000000..5bcef42d2e
--- /dev/null
+++ b/Tools/bin/SACreate.bat
@@ -0,0 +1,51 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@if "%JAVA_HOME%"=="" goto no_jdk
+@if "%WORKSPACE%"=="" goto no_wks
+
+@if "%1"=="" goto usage
+@if "%1"=="-H" (goto usage)
+@if "%1"=="-h" (goto usage) else (goto all)
+
+:usage
+@echo off
+@echo.
+@echo Create a empty SurfaceArea description file for specified SurfaceArea element
+@echo.
+@echo Usage: SACreate.bat "MSA_FILE" "SURFACE_AREA_ELEMENT" 
+@echo.
+@echo        Supported surface area top level element
+@echo                                 ModuleSurfaceArea
+@echo                                 ModuleBuildDescription
+@echo                                 LibraryModuleSurfaceArea
+@echo                                 LibraryModuleBuildDescription
+@echo                                 FrameworkPlatformDescription
+@echo                                 PackageSurfaceArea
+goto end
+
+:all
+@ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml generate -DSURFACE_AREA_FILE=%~f1 -DSURFACE_AREA_ELEMENT=%2
+@goto end
+
+:no_jdk
+  @echo.
+  @echo !!! Please set JAVA_HOME !!!
+  @echo.
+  @goto end
+
+:no_wks
+  @echo.
+  @echo !!! Please set WORKSPACE !!!
+  @echo.
+  @goto end
+
+:end
diff --git a/Tools/bin/SAPretty.bat b/Tools/bin/SAPretty.bat
new file mode 100644
index 0000000000..a6e191cd3c
--- /dev/null
+++ b/Tools/bin/SAPretty.bat
@@ -0,0 +1,45 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@if "%JAVA_HOME%"=="" goto no_jdk
+@if "%WORKSPACE%"=="" goto no_wks
+
+@if "%1"=="" goto usage
+@if "%1"=="-H" (goto usage)
+@if "%1"=="-h" (goto usage) else (goto all)
+
+:usage
+@echo off
+@echo.
+@echo Beautify XML file format
+@echo.
+@echo Usage: SAPretty.bat "XML_FILE" 
+@echo.
+goto end
+
+:all
+@ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml pretty -DSURFACE_AREA_FILE=%~f1
+@goto end
+
+:no_jdk
+  @echo.
+  @echo !!! Please set JAVA_HOME !!!
+  @echo.
+  @goto end
+
+:no_wks
+  @echo.
+  @echo !!! Please set WORKSPACE !!!
+  @echo.
+  @goto end
+
+:end
+
diff --git a/Tools/bin/SAVerify.bat b/Tools/bin/SAVerify.bat
new file mode 100644
index 0000000000..1f4566a74e
--- /dev/null
+++ b/Tools/bin/SAVerify.bat
@@ -0,0 +1,55 @@
+@REM
+@REM Copyright (c) 2006, Intel Corporation
+@REM All rights reserved. This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM 
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+@if "%JAVA_HOME%"=="" goto no_jdk
+@if "%WORKSPACE%"=="" goto no_wks
+
+@if "%1"=="" (goto usage)
+@if "%1"=="-h" (goto usage)
+@if "%1"=="-H" (goto usage)
+@if "%1"=="all" (goto all)
+@if "%1"=="ALL" (goto all) else (goto standalone)
+
+:usage
+@echo off
+@echo.
+@echo Verify SurfaceArea file(s)
+@echo.
+@echo Usage: 
+@echo        SAVerify.bat "MSA_FILE"  - Verify SurfaceArea file named by MSA_FILE
+@echo        SAVerify.bat all         - Verify all SurfaceArea files under current directory and its sub-directories
+@echo        SAVerify.bat -h          - Print usage message
+@echo.
+goto end
+
+:all
+  @echo off
+  @for /R %%a in (*.msa *.mbd *.spd) do @ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml validate -DSURFACE_AREA_FILE=%%a
+  @echo on
+  @goto end
+
+:standalone
+  @ant -q -f %WORKSPACE%\Tools\Source\SurfaceArea\build.xml validate -DSURFACE_AREA_FILE=%~f1
+  @goto end
+
+:no_jdk
+  @echo.
+  @echo !!! Please set JAVA_HOME !!!
+  @echo.
+  @goto end
+
+:no_wks
+  @echo.
+  @echo !!! Please set WORKSPACE !!!
+  @echo.
+  @goto end
+
+:end
diff --git a/Tools/build.xml b/Tools/build.xml
new file mode 100644
index 0000000000..38149c38e7
--- /dev/null
+++ b/Tools/build.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<project name="Tools" default="all" basedir=".">
+
+  <property environment="env"/>
+
+  <target name="JavaCode" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <!-- Note: this is an ordered list. The projects have dependencies between them. -->
+      <filelist dir="."
+        files="
+          Source/GenBuild/build.xml
+          Source/FrameworkTasks/build.xml
+          Source/Cpptasks/build.xml
+          Source/ModuleEditor/build.xml
+          Source/PackageEditor/build.xml
+          "/>
+    </subant>
+  </target>
+
+  <target name="all" depends="C_Code"/>
+
+  <target name="SurfaceArea" depends="makeCatalog">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/SurfaceArea/build.xml
+          "/>
+    </subant>
+  </target>
+
+  <target name="C_Code" depends="JavaCode">
+    <subant target="" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/TianoTools/build.xml
+          "/>
+    </subant>
+  </target>
+
+  <target name="makeCatalog">
+    <echo file="XMLSchema/catalog.xml">
+      <![CDATA[<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.xsd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.TianoCore.org/2006/Edk2.0/"
+    rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>
+  <rewriteURI uriStartString="http://www.TianoCore.org/2006/Edk2.0/"
+    rewritePrefix="file:/]]>${env.WORKSPACE}<![CDATA[/Tools/XMLSchema/"/>
+</catalog>]]>
+    </echo>
+  </target>
+  <target name="clean">
+    <subant target="clean" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/TianoTools/build.xml
+          Source/ModuleEditor/build.xml
+          Source/PackageEditor/build.xml
+          Source/FrameworkTasks/build.xml
+          Source/GenBuild/build.xml
+          Source/SurfaceArea/build.xml
+          Source/Cpptasks/build.xml
+          "/>
+    </subant>
+  </target>
+  <target name="cleanall">
+    <subant target="cleanall" verbose="true" inheritall="false">
+      <filelist dir="."
+        files="
+          Source/TianoTools/build.xml
+          Source/ModuleEditor/build.xml
+          Source/PackageEditor/build.xml
+          Source/FrameworkTasks/build.xml
+          Source/GenBuild/build.xml
+          Source/SurfaceArea/build.xml
+          Source/Cpptasks/build.xml
+          "/>
+    </subant>
+  </target>
+</project>
author	bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>	2006-04-21 22:54:32 +0000
committer	bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>	2006-04-21 22:54:32 +0000
commit	878ddf1fc3540a715f63594ed22b6929e881afb4 (patch)
tree	c56c44dac138137b510e1fba7c3efe5e4d84bea2 /Tools
download	edk2-platforms-878ddf1fc3540a715f63594ed22b6929e881afb4.tar.xz